diff --git a/common/models/SurgicalDiagnosis.php b/common/models/SurgicalDiagnosis.php index 03611bf8..cb86841a 100755 --- a/common/models/SurgicalDiagnosis.php +++ b/common/models/SurgicalDiagnosis.php @@ -80,7 +80,8 @@ class SurgicalDiagnosis extends PathologyActiveRecord [['rev'], 'string', 'max' => 100], [['suggesstion_ihc', 'suggesstion_special_stain', 'suggesstion_other'], 'string', 'max' => 300], [['reason'], 'string'], - [['outlab_report'], 'file', 'extensions' => 'jpeg,jpg,png,gif,tif,tiff'], + // [['outlab_report'], 'file', 'extensions' => 'jpeg,jpg,png,gif,tif,tiff'], + [['outlab_report'], 'file', 'extensions' => 'pdf'], [['consult_outlab_report'], 'file', 'extensions' => 'jpeg,jpg,png,gif,tif,tiff'], [['microscopic_img'], 'file', 'extensions' => 'jpg,jpeg,png,gif,tif,tiff', 'skipOnEmpty' => true, 'maxFiles' => 20], [['microscopic_img_caption', 'icdos', 'outlab_report', 'consult_outlab_report'], 'safe'] diff --git a/frontend/modules/histo/views/label-sticker/index.php b/frontend/modules/histo/views/label-sticker/index.php index cfaee8e0..c7318ae4 100755 --- a/frontend/modules/histo/views/label-sticker/index.php +++ b/frontend/modules/histo/views/label-sticker/index.php @@ -11,43 +11,42 @@ use yii\helpers\Url; $this->title = 'พิมพ์ Label Sticker'; $this->params['breadcrumbs'][] = $this->title; ?> -
-
-
-
-
Generate - Sticker
+ +
+
+
Print + Sticker
+
+
+ + + errorSummary($model) ?> + +
+
field($model, 'id_case')->widget(MaskedInput::class, [ + 'mask' => 'A99-99999', + ]) ?>
+ +
+ field($model, 'label')->dropDownList( + [ + 1 => 'Recut', + 2 => 'Recut1', + 3 => 'Recut2', + 4 => 'Deeper 1', + 5 => 'Deeper 2', + 6 => 'Deeper 3', + 7 => 'Serial cut1', + 8 => 'Serial cut2', + 9 => 'Serial cut3', + ], + [ + 'prompt' => 'เลือก Label', + ] + ); ?>
-
- - errorSummary($model) ?> - -
-
field($model, 'id_case')->widget(MaskedInput::class, [ - 'mask' => 'A99-99999', - ]) ?>
- -
- field($model, 'label')->dropDownList( - [ - 1 => 'Recut', - 2 => 'Recut1', - 3 => 'Recut2', - 4 => 'Deeper 1', - 5 => 'Deeper 2', - 6 => 'Deeper 3', - 7 => 'Serial cut1', - 8 => 'Serial cut2', - 9 => 'Serial cut3', - ], - [ - 'prompt' => 'เลือก Label', - ] - ); ?> -
- - registerJs(" + registerJs(" $(\"#" . Html::getInputId($model, 'label') . "\").change(function() { //var selectedValue = $(this).val(); @@ -68,27 +67,27 @@ $this->params['breadcrumbs'][] = $this->title; // You can perform any additional operations with the selected value here }); ") ?> -
-
- field($model, 'stain1')->dropDownList( - ArrayHelper::map(ConstServiceCharge::find() - ->where(['lab' => 'immuno']) - ->all(), 'id', 'name'), - ['prompt' => 'เลือก ประเภทการย้อม'] - ) ?> -
- -
- field($model, 'stain2')->dropDownList( - ArrayHelper::map(ConstServiceCharge::find() - ->where(['lab' => 'histo']) - ->all(), 'id', 'name'), - ['prompt' => 'เลือก ประเภทการย้อม'] - ) ?> -
-
+
+
+ field($model, 'stain1')->dropDownList( + ArrayHelper::map(ConstServiceCharge::find() + ->where(['lab' => 'immuno']) + ->all(), 'id', 'name'), + ['prompt' => 'เลือก ประเภทการย้อม'] + ) ?>
- - 'btn btn-primary']) ?> -
- -
+ Generate Sticker', ['class' => 'btn btn-primary']) ?>
+ load(Yii::$app->request->post())) { ?> -
-
-
-
-
- QR Sticker
-
-
- -
-
-
+ +
+
+
+ Sticker
+
+ +
+
+ \ No newline at end of file diff --git a/frontend/modules/histo/views/staining/sticker.php b/frontend/modules/histo/views/staining/sticker.php index 48be5e14..672035ce 100755 --- a/frontend/modules/histo/views/staining/sticker.php +++ b/frontend/modules/histo/views/staining/sticker.php @@ -36,7 +36,7 @@ $this->params['breadcrumbs'][] = $this->title; ['class' => 'table truncate align-middle'], - 'layout' => "{summary}
\n{items}\n
{pager}
", + 'layout' => "{summary}
\n{items}\n
{pager}
", 'dataProvider' => $dataProvider, 'filterModel' => $searchModel, 'columns' => [ @@ -106,7 +106,7 @@ $this->params['breadcrumbs'][] = $this->title; 'format' => 'raw', 'value' => function ($model) { $im = HistoStaining::find()->where(['id_case' => $model->id_case])->orderBy(['id' => SORT_DESC])->one(); - if ($im->status_1 == 1) { + if ($im->status_1 == 1) { return '' . HistoComponent::getStatus1($im->status_1) . ''; } if ($im->status_1 == 2) { @@ -147,12 +147,12 @@ $this->params['breadcrumbs'][] = $this->title;
request->get('selection')) { ?> - -
-
- +
+
+ +
-
\ No newline at end of file diff --git a/frontend/modules/immuno/views/staining/sticker.php b/frontend/modules/immuno/views/staining/sticker.php index d1f90849..5b9d7bc0 100755 --- a/frontend/modules/immuno/views/staining/sticker.php +++ b/frontend/modules/immuno/views/staining/sticker.php @@ -31,101 +31,101 @@ $this->params['breadcrumbs'][] = $this->title;
$dataProvider, - 'filterModel' => $searchModel, - 'tableOptions' => ['class' => 'table table-striped truncate m-0'], - 'layout' => "{summary}
\n{items}\n
{pager}
", - 'columns' => [ - [ - 'class' => 'yii\grid\CheckboxColumn', - 'checkboxOptions' => function ($model) { - return ['value' => $model->id_case]; - } - ], - ['class' => 'yii\grid\SerialColumn'], - [ - 'attribute' => 'id_case', - 'label' => 'Case ID', - ], - /*[ + 'dataProvider' => $dataProvider, + 'filterModel' => $searchModel, + 'tableOptions' => ['class' => 'table table-striped truncate m-0'], + 'layout' => "{summary}
\n{items}\n
{pager}
", + 'columns' => [ + [ + 'class' => 'yii\grid\CheckboxColumn', + 'checkboxOptions' => function ($model) { + return ['value' => $model->id_case]; + } + ], + ['class' => 'yii\grid\SerialColumn'], + [ + 'attribute' => 'id_case', + 'label' => 'Case ID', + ], + /*[ 'label' => 'หน่วยงาน', 'value' => function ($model) { return ImmunoComponent::getHospitalCase($model->id_case); } ],*/ - [ - 'attribute' => 'caseStaining.pathologist', - 'label' => 'พยาธิแพทย์', - 'value' => function ($model) { - $model = ImmunoStaining::findOne(['id_case' => $model->id_case]); - return isset($model['patientCase']['pathologist']) == '---' ? $model['patientCase']['pathologist'] : ''; - } - ], - [ - 'attribute' => 'in_at', - 'value' => function ($model) { - $im = ImmunoStaining::find()->where(['id_case' => $model->id_case])->orderBy(['id' => SORT_DESC])->one(); - return $im->in_at; - } - ], - [ - 'attribute' => 'receive_at', - 'value' => function ($model) { - $im = ImmunoStaining::find()->where(['id_case' => $model->id_case])->orderBy(['id' => SORT_DESC])->one(); - return $im->receive_at; - } - ], - /*[ + [ + 'attribute' => 'caseStaining.pathologist', + 'label' => 'พยาธิแพทย์', + 'value' => function ($model) { + $model = ImmunoStaining::findOne(['id_case' => $model->id_case]); + return isset($model['patientCase']['pathologist']) == '---' ? $model['patientCase']['pathologist'] : ''; + } + ], + [ + 'attribute' => 'in_at', + 'value' => function ($model) { + $im = ImmunoStaining::find()->where(['id_case' => $model->id_case])->orderBy(['id' => SORT_DESC])->one(); + return $im->in_at; + } + ], + [ + 'attribute' => 'receive_at', + 'value' => function ($model) { + $im = ImmunoStaining::find()->where(['id_case' => $model->id_case])->orderBy(['id' => SORT_DESC])->one(); + return $im->receive_at; + } + ], + /*[ 'attribute' => 'send_at', 'value' => function($model){ $model = ImmunoStaining::findOne(['id_case' => $model->id_case]); return Yii::$app->pathology->thaiDateTime($model->send_at); } ],*/ - [ - 'attribute' => 'status_1', - 'filter' => [1 => 'New Request', 2 => 'Section Case', 3 => 'Staining Case', 4 => 'Send Case'], - 'format' => 'raw', - 'value' => function ($model) { - $im = ImmunoStaining::find()->where(['id_case' => $model->id_case, 'in_at' => Yii::$app->pathology->engDateTime($model->in_at)])->orderBy(['id' => SORT_DESC])->one(); - if ($im->status_1 == 1) { - return '' . ImmunoComponent::getStatus1($im->status_1) . ''; - } - if ($im->status_1 == 2) { - return '' . ImmunoComponent::getStatus1($im->status_1) . ''; - } - if ($im->status_1 == 3) { - return '' . ImmunoComponent::getStatus1($im->status_1) . ''; - } - if ($im->status_1 == 4) { - return '' . ImmunoComponent::getStatus1($im->status_1) . ''; - } - return ImmunoComponent::getStatus1($im->status_1); - } - ], - [ - 'label' => 'ผู้รับงาน', - 'value' => function ($model) { - $model = ImmunoStaining::findOne(['id_case' => $model->id_case]); - return isset($model['operate']) ? $model['operate']['realname'] : ''; - } + [ + 'attribute' => 'status_1', + 'filter' => [1 => 'New Request', 2 => 'Section Case', 3 => 'Staining Case', 4 => 'Send Case'], + 'format' => 'raw', + 'value' => function ($model) { + $im = ImmunoStaining::find()->where(['id_case' => $model->id_case, 'in_at' => Yii::$app->pathology->engDateTime($model->in_at)])->orderBy(['id' => SORT_DESC])->one(); + if ($im->status_1 == 1) { + return '' . ImmunoComponent::getStatus1($im->status_1) . ''; + } + if ($im->status_1 == 2) { + return '' . ImmunoComponent::getStatus1($im->status_1) . ''; + } + if ($im->status_1 == 3) { + return '' . ImmunoComponent::getStatus1($im->status_1) . ''; + } + if ($im->status_1 == 4) { + return '' . ImmunoComponent::getStatus1($im->status_1) . ''; + } + return ImmunoComponent::getStatus1($im->status_1); + } + ], + [ + 'label' => 'ผู้รับงาน', + 'value' => function ($model) { + $model = ImmunoStaining::findOne(['id_case' => $model->id_case]); + return isset($model['operate']) ? $model['operate']['realname'] : ''; + } - ], - [ - //'label' => 'รอบการย้อม', - 'attribute' => 'group_name', - 'format' => 'raw', - 'filter' => ['A' => 'A', 'B' => 'B', 'C' => 'C'], - 'value' => function ($model) { - $group = ImmunoStaining::find()->select(['group_name'])->where(['id_case' => $model->id_case])->groupBy('group_name')->all(); - $r = ''; - foreach ($group as $g) { - $r .= $g->group_name . ' '; - } - return $r; - } - ], - /*[ + ], + [ + //'label' => 'รอบการย้อม', + 'attribute' => 'group_name', + 'format' => 'raw', + 'filter' => ['A' => 'A', 'B' => 'B', 'C' => 'C'], + 'value' => function ($model) { + $group = ImmunoStaining::find()->select(['group_name'])->where(['id_case' => $model->id_case])->groupBy('group_name')->all(); + $r = ''; + foreach ($group as $g) { + $r .= $g->group_name . ' '; + } + return $r; + } + ], + /*[ 'label' => 'ผู้ส่งงาน', 'value' => function($model){ $model = ImmunoStaining::findOne(['id_case' => $model->id_case]); @@ -133,7 +133,7 @@ $this->params['breadcrumbs'][] = $this->title; } ],*/ - /*[ + /*[ 'attribute' => 'status_1', 'label' => 'สถานะ', 'format' => 'raw', @@ -141,9 +141,9 @@ $this->params['breadcrumbs'][] = $this->title; return $model['status_1'] > 0 ? $model['status_1'] > 1 ? $model['status_1'] > 2 ? "Sent" : "Staining" : "New" : ""; } ],*/ - //'status_2', - //['class' => 'yii\grid\ActionColumn'], - /*[ + //'status_2', + //['class' => 'yii\grid\ActionColumn'], + /*[ 'label' => '', 'format' => 'raw', 'value' => function($model){ @@ -151,8 +151,8 @@ $this->params['breadcrumbs'][] = $this->title; } ]*/ - ] - ]) ?> + ] + ]) ?>
@@ -167,17 +167,17 @@ $this->params['breadcrumbs'][] = $this->title; request->get('selection')) { ?> -
-
-
+
+
+
- - + + +
+
-
- \ No newline at end of file