diff --git a/frontend/modules/cyto/controllers/PapController.php b/frontend/modules/cyto/controllers/PapController.php index 31dc0a14..d0e8b6f6 100755 --- a/frontend/modules/cyto/controllers/PapController.php +++ b/frontend/modules/cyto/controllers/PapController.php @@ -512,52 +512,23 @@ class PapController extends \yii\web\Controller //$model->save(); if ($case_pap->save() && $model->save()) { - $log = new CytoPapDiagnosisLog([ - 'id_case' => $model->id_case, - 'user_id' => Yii::$app->user->getId(), - 'report_type' => $model->report_type, - 'specimen_adequacy' => $model->specimen_adequacy, - 'specimen_adequacy_1' => $model->specimen_adequacy_1, - 'specimen_adequacy_2' => $model->specimen_adequacy_2, - 'specimen_adequacy_3' => $model->specimen_adequacy_3, - 'adequacy_other' => $model->adequacy_other, - 'general_categorization' => $model->general_categorization, - 'general_categorization_1' => $model->general_categorization_1, - 'general_categorization_2' => $model->general_categorization_2, - 'categorization_other' => $model->categorization_other, - 'suggestion_list' => $model->suggestion_list, - 'suggestion' => $model->suggestion, - 'approve_at' => date('Y-m-d H:i:s'), - ]); - - - if ($log->save()) { - } - $center_approve = CenterApprove::findOne([ 'id_case' => $model->id_case, 'report_type' => $model->report_type, 'ref_id' => $model->id, ]); + + if (!$center_approve) { $center_approve = new CenterApprove([ 'id_case' => $model->id_case, 'report_type' => $model->report_type, 'cytotech1_id' => Yii::$app->user->getId(), - 'approve_status' => 4, - 'release_at' => date('Y-m-d H:i:s'), - 'release_by' => Yii::$app->user->getId() + 'approve_status' => 1 ]); } - - $center_approve->approve_status = 4; $center_approve->ref_id = $model->id; - $center_approve->cytotech1_id = Yii::$app->user->getId(); - $center_approve->approve_by = Yii::$app->user->getId(); - $center_approve->approve_at = date('Y-m-d H:i:s'); - $center_approve->release_by = Yii::$app->user->getId(); - $center_approve->release_at = date('Y-m-d H:i:s'); $center_approve->save(); } @@ -585,51 +556,6 @@ class PapController extends \yii\web\Controller if ($case_pap->save() && $model->save()) { - - $log = new CytoPapDiagnosisLog([ - 'id_case' => $model->id_case, - 'user_id' => Yii::$app->user->getId(), - 'report_type' => $model->report_type, - 'specimen_adequacy' => $model->specimen_adequacy, - 'specimen_adequacy_1' => $model->specimen_adequacy_1, - 'specimen_adequacy_2' => $model->specimen_adequacy_2, - 'specimen_adequacy_3' => $model->specimen_adequacy_3, - 'adequacy_other' => $model->adequacy_other, - 'general_categorization' => $model->general_categorization, - 'general_categorization_1' => $model->general_categorization_1, - 'general_categorization_2' => $model->general_categorization_2, - 'categorization_other' => $model->categorization_other, - 'suggestion_list' => $model->suggestion_list, - 'suggestion' => $model->suggestion, - 'approve_at' => date('Y-m-d H:i:s'), - ]); - if ($log->save()) { - } - - $center_approve = CenterApprove::findOne([ - 'id_case' => $model->id_case, - 'report_type' => $model->report_type, - 'ref_id' => $model->id, - ]); - - if (!$center_approve) { - $center_approve = new CenterApprove([ - 'id_case' => $model->id_case, - 'report_type' => $model->report_type, - 'pathologist_id' => Yii::$app->user->getId(), - 'approve_status' => 4 - ]); - } - $center_approve->approve_status = 4; - $center_approve->ref_id = $model->id; - $center_approve->cytotech1_id = Yii::$app->user->getId(); - $center_approve->cytotech1_at = date('Y-m-d H:i:s'); - $center_approve->approve_by = Yii::$app->user->getId(); - $center_approve->approve_at = date('Y-m-d H:i:s'); - $center_approve->release_by = Yii::$app->user->getId(); - $center_approve->release_at = date('Y-m-d H:i:s'); - $center_approve->save(); - Yii::$app->session->setFlash('success', 'บันทึกข้อมูลและส่งให้พยาธิแพทย์ เรียบร้อยแล้ว'); return $this->redirect(['/cyto/pap/pap-new']); } @@ -1352,4 +1278,4 @@ class PapController extends \yii\web\Controller 'tmp_histo_staining' => $tmp_histo_staining, ]); } -} +} \ No newline at end of file diff --git a/frontend/modules/histo/views/he/embed.php b/frontend/modules/histo/views/he/embed.php index e1bb8417..83558012 100644 --- a/frontend/modules/histo/views/he/embed.php +++ b/frontend/modules/histo/views/he/embed.php @@ -73,10 +73,11 @@ $session = Yii::$app->session;
รายการ Block ที่ Embed แล้ว
- +
+ @@ -85,9 +86,17 @@ $session = Yii::$app->session; joinWith(['histoHeEmbed'])->where(['id_case' => $session['he-embed-case']])->all() as $block): ?> - + - + @@ -115,7 +124,7 @@ $session = Yii::$app->session; 'label' => 'รายการ Block ที่ Embed แล้ว', 'format' => 'raw', 'value' => function ($model) { - $rt = '
Block No.จำนวนชิ้นเนื้อ ผู้ Embed วันที่ Embed
histoHeEmbed->id_case ?> block_no ?>histoHeEmbed->id_case ?> block_no ?> + where(['id_case' => $session['he-embed-case']]) + ->andWhere(['no_slide' => $block->block_no]) + ->all(); + echo !empty($surgicalSlides) ? array_sum(array_map(fn($slide) => $slide->quantity, $surgicalSlides)) : '-'; + ?> + embedBy->realname ?>embed_at ?>pathology->thaiDateTime($block->embed_at) ?>
'; + $rt = '
Block No.ผู้ Embedวันที่ Embed
'; foreach (HistoHeEmbedDetail::find()->joinWith(['histoHeEmbed'])->where(['id_case' => $model->id_case])->all() as $block) { $rt .= ''; } diff --git a/frontend/modules/histo/views/he/section.php b/frontend/modules/histo/views/he/section.php index d31c44a3..314fd233 100644 --- a/frontend/modules/histo/views/he/section.php +++ b/frontend/modules/histo/views/he/section.php @@ -79,16 +79,16 @@ $this->registerJs(" "); ?>
-
-
เลือกรายการ Block ที่ต้องการ Section
-
-
- 'get', 'action' => ['section']]) ?> -
-
+
+
เลือกรายการ Block ที่ต้องการ Section
+
+
+ 'get', 'action' => ['section']]) ?> +
+
- - field($model, 'id_case_block')->widget(MaskedInput::class, [ + + field($model, 'id_case_block')->widget(MaskedInput::class, [ 'mask' => 'A99-99999 AA', 'options' => [ 'autofocus' => true, // เริ่มต้น autofocus ที่ id_case_block @@ -98,94 +98,94 @@ $this->registerJs(" 'removeMaskOnSubmit' => true, ], ]) ?> -
-
- - field($model, 'id_case_slide')->widget(MaskedInput::class, [ +
+
+ + field($model, 'id_case_slide')->widget(MaskedInput::class, [ 'mask' => 'A99-99999 AA', 'options' => [ 'placeholder' => 'Enter Case Slide No.', 'disabled' => true, // เริ่มต้นปิดการใช้งาน ], ]) ?> -
-
- 'btn btn-primary']) ?> - 'btn btn-warning']) +
+
+ 'btn btn-primary']) ?> + 'btn btn-warning']) ?> -
+
+
+ +
- - -
-
+
-
+
-
รายการ Block ที่ยังไม่ได้ Section
-
-
Block No.ผู้ Embedวันที่ Embed
' . $block->block_no . '' . $block->embedBy->realname . '' . $block->embed_at . '
- - - - - - - - รายการ Block ที่ยังไม่ได้ Section +
+
Block No.
+ + + + + + + + joinWith(['histoHeSection'])->where(['id_case' => $session['he-section-case']])->all() as $block) { $blocks[] = $block->block_no; } foreach (HistoHeEmbedDetail::find()->joinWith(['histoHeEmbed'])->where(['histo_he_embed.id_case' => $session['he-section-case']])->andFilterWhere(['not in', 'block_no', $blocks])->all() as $block): ?> - - - - - - -
Block No.
block_no ?> $session['he-section-case'] . ' ' . $block->block_no], ['class' => 'btn btn-info btn-sm', 'data' => ['confirm' => 'ต้องการ Section Block ' . $block->histoHeEmbed->id_case . ' ' . $block->block_no . ' ใช่ไหม?']]) ?> -
-
+ + block_no ?> + $session['he-section-case'] . ' ' . $block->block_no], ['class' => 'btn btn-info btn-sm', 'data' => ['confirm' => 'ต้องการ Section Block ' . $block->histoHeEmbed->id_case . ' ' . $block->block_no . ' ใช่ไหม?']]) ?> + + + + + + -
รายการ Block ที่ Section แล้ว
-
- - - - - - - - - - joinWith(['histoHeSection'])->where(['id_case' => $session['he-section-case']])->all() as $block): ?> - - - - - - - -
Block No.ผู้ Sectionวันที่ Section
histoHeSection->id_case ?> block_no ?>sectionBy->realname ?>section_at ?>
-
+
รายการ Block ที่ Section แล้ว
+
+ + + + + + + + + + joinWith(['histoHeSection'])->where(['id_case' => $session['he-section-case']])->all() as $block): ?> + + + + + + + +
Block No.ผู้ Sectionวันที่ Section
histoHeSection->id_case ?> block_no ?>sectionBy->realname ?>section_at ?>
+
- +
-
-
รายการ Case ที่ Section แล้ว
-
-
-
- +
รายการ Case ที่ Section แล้ว
+
+
+
+ $dataProvider, 'filterModel' => $searchModel, 'tableOptions' => ['class' => 'table align-middle table-hover m-0 truncate'], @@ -197,7 +197,7 @@ $this->registerJs(" 'label' => 'รายการ Block ที่ Embed แล้ว', 'format' => 'raw', 'value' => function ($model) { - $rt = '
'; + $rt = '
Block No.ผู้ Embedวันที่ Embed
'; foreach (HistoHeEmbedDetail::find()->joinWith(['histoHeEmbed'])->where(['id_case' => $model->id_case])->all() as $block) { $rt .= ''; } @@ -218,7 +218,7 @@ $this->registerJs(" 'label' => 'รายการ Block ที่ Section แล้ว', 'format' => 'raw', 'value' => function ($model) { - $rt = '
Block No.ผู้ Embedวันที่ Embed
' . $block->block_no . '' . $block->embedBy->realname . '' . $block->embed_at . '
'; + $rt = '
Block No.ผู้ Section/Stainingวันที่ Section/Staining
'; foreach (HistoHeSectionDetail::find()->joinWith(['histoHeSection'])->where(['id_case' => $model->id_case])->all() as $block) { $rt .= ''; } @@ -242,7 +242,7 @@ $this->registerJs(" ], ] ]) ?> + - \ No newline at end of file diff --git a/frontend/modules/histo/views/he/send.php b/frontend/modules/histo/views/he/send.php index 56933c44..32b1f8ca 100644 --- a/frontend/modules/histo/views/he/send.php +++ b/frontend/modules/histo/views/he/send.php @@ -52,7 +52,7 @@ $this->params['breadcrumbs'][] = $this->title; 'label' => 'รายการ Slide ที่ Staining แล้ว', 'format' => 'raw', 'value' => function ($model) { - $rt = '
Block No.ผู้ Section/Stainingวันที่ Section/Staining
' . $block->block_no . '' . $block->sectionBy->realname . '' . $block->section_at . '
'; + $rt = '
Slide No.ผู้ Stainingวันที่ Staining
'; foreach (HistoHeStainingDetail::find()->joinWith(['histoHeStaining'])->where(['id_case' => $model->id_case])->all() as $block) { $rt .= ''; } @@ -71,7 +71,7 @@ $this->params['breadcrumbs'][] = $this->title; 'label' => 'รายการ Slide ที่ Send แล้ว', 'format' => 'raw', 'value' => function ($model) { - $rt = '
Slide No.ผู้ Stainingวันที่ Staining
' . $block->block_no . '' . $block->stainingBy->realname . '' . $block->staining_at . '
'; + $rt = '
Slide No.ผู้ Sendวันที่ Send
'; foreach (HistoHeSendDetail::find()->joinWith(['histoHeSend'])->where(['id_case' => $model->id_case])->all() as $block) { $rt .= ''; } diff --git a/frontend/modules/histo/views/he/staining.php b/frontend/modules/histo/views/he/staining.php index 335635f9..e47f6e94 100644 --- a/frontend/modules/histo/views/he/staining.php +++ b/frontend/modules/histo/views/he/staining.php @@ -19,15 +19,15 @@ $session = Yii::$app->session;
-
-
รายการ Case ที่ Staining แล้ว
-
-
-
- Staining and Send', ['class' => 'btn btn-warning btn-block mb-3', 'data-confirm' => 'ยืนยันการย้อม และส่งงาน?']) ?> +
+
รายการ Case ที่ Staining แล้ว
-
- +
+ Staining and Send', ['class' => 'btn btn-warning btn-block mb-3', 'data-confirm' => 'ยืนยันการย้อม และส่งงาน?']) ?> +
+
+ $dataProvider, 'filterModel' => $searchModel, 'tableOptions' => ['class' => 'table align-middle table-hover m-0 truncate'], @@ -65,7 +65,7 @@ $session = Yii::$app->session; 'label' => 'รายการ Block ที่ Section แล้ว', 'format' => 'raw', 'value' => function ($model) { - $rt = '
Slide No.ผู้ Sendวันที่ Send
' . $block->block_no . '' . $block->sendBy->realname . '' . $block->send_at . '
'; + $rt = '
Block No.ผู้ Sectionวันที่ Section
'; foreach (HistoHeSectionDetail::find()->joinWith(['histoHeSection'])->where(['id_case' => $model->id_case])->all() as $block) { $rt .= ''; } @@ -85,7 +85,7 @@ $session = Yii::$app->session; 'label' => 'รายการ Slide ที่ Staining แล้ว', 'format' => 'raw', 'value' => function ($model) { - $rt = '
Block No.ผู้ Sectionวันที่ Section
' . $block->block_no . '' . $block->sectionBy->realname . '' . $block->section_at . '
'; + $rt = '
Slide No.ผู้ Stainingวันที่ Staining
'; foreach (HistoHeStainingDetail::find()->joinWith(['histoHeStaining'])->where(['id_case' => $model->id_case])->all() as $block) { $rt .= ''; } @@ -102,10 +102,10 @@ $session = Yii::$app->session; ], ] ]) ?> + +
+ Staining and Send', ['class' => 'btn btn-warning btn-block mb-3', 'data-confirm' => 'ยืนยันการย้อม และส่งงาน?']) ?> +
-
- Staining and Send', ['class' => 'btn btn-warning btn-block mb-3', 'data-confirm' => 'ยืนยันการย้อม และส่งงาน?']) ?> -
- \ 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 63f1927e..48be5e14 100644 --- a/frontend/modules/histo/views/staining/sticker.php +++ b/frontend/modules/histo/views/staining/sticker.php @@ -1,6 +1,6 @@ title = 'Sticker'; -$this->params['breadcrumbs'][] = ['url' => '/histo/staining/index', 'label' => 'Histo Special Staining']; +$this->params['breadcrumbs'][] = ['url' => '/histo/staining/index', 'label' => 'Histo imecial Staining']; $this->params['breadcrumbs'][] = $this->title; ?> @@ -32,10 +32,11 @@ $this->params['breadcrumbs'][] = $this->title;
-
+
['class' => ' table truncate align-middle'], + 'tableOptions' => ['class' => 'table truncate align-middle'], + 'layout' => "{summary}
\n{items}\n
{pager}
", 'dataProvider' => $dataProvider, 'filterModel' => $searchModel, 'columns' => [ @@ -51,25 +52,25 @@ $this->params['breadcrumbs'][] = $this->title; 'label' => 'Case ID', ], /*[ - 'attribute' => 'hospital_id', - //'filter' => ArrayHelper::map(ConstHospital::find()->orderBy(['name' => SORT_ASC])->all(), 'id', 'name'), + 'attribute' => 'hoimital_id', + //'filter' => ArrayHelper::map(ConstHoimital::find()->orderBy(['name' => SORT_ASC])->all(), 'id', 'name'), 'filter' => Select2::widget([ 'theme' => Select2::THEME_BOOTSTRAP, 'model' => $searchModel, - 'attribute' => 'hospital_id', - 'data' => ArrayHelper::map(ConstHospital::find()->orderBy(['name' => SORT_ASC])->all(), 'id', 'name'), + 'attribute' => 'hoimital_id', + 'data' => ArrayHelper::map(ConstHoimital::find()->orderBy(['name' => SORT_ASC])->all(), 'id', 'name'), 'pluginOptions' => [ - 'placeholder' => 'Select hospital...', + 'placeholder' => 'Select hoimital...', 'allowClear' => 'true' ] ]), 'value' => function ($model) { - return isset($model->patientCase->hospital_name) ? $model->patientCase->hospital_name : null; + return isset($model->patientCase->hoimital_name) ? $model->patientCase->hoimital_name : null; } ],*/ [ 'attribute' => 'pathologist_id', - //'filter' => ArrayHelper::map(ConstHospital::find()->orderBy(['name' => SORT_ASC])->all(), 'id', 'name'), + //'filter' => ArrayHelper::map(ConstHoimital::find()->orderBy(['name' => SORT_ASC])->all(), 'id', 'name'), 'filter' => Select2::widget([ 'theme' => Select2::THEME_BOOTSTRAP, 'model' => $searchModel, @@ -101,18 +102,21 @@ $this->params['breadcrumbs'][] = $this->title; [ 'attribute' => 'status_1', - 'filter' => [1 => 'New', 2 => 'Staining', 3 => 'Sent'], + 'filter' => [1 => 'New Request', 2 => 'Section Case', 3 => 'Staining Case', 4 => 'Send Case'], 'format' => 'raw', 'value' => function ($model) { $im = HistoStaining::find()->where(['id_case' => $model->id_case])->orderBy(['id' => SORT_DESC])->one(); - if ($im->status_1 == 1) { - return '' . HistoComponent::getStatus1($im->status_1) . ''; + if ($im->status_1 == 1) { + return '' . HistoComponent::getStatus1($im->status_1) . ''; } if ($im->status_1 == 2) { - return '' . HistoComponent::getStatus1($im->status_1) . ''; + return '' . HistoComponent::getStatus1($im->status_1) . ''; } if ($im->status_1 == 3) { - return '' . HistoComponent::getStatus1($im->status_1) . ''; + return '' . HistoComponent::getStatus1($im->status_1) . ''; + } + if ($im->status_1 == 4) { + return '' . HistoComponent::getStatus1($im->status_1) . ''; } return HistoComponent::getStatus1($im->status_1); } @@ -143,12 +147,12 @@ $this->params['breadcrumbs'][] = $this->title;
request->get('selection')) { ?> - -
-
- -
+
+
+
+
\ No newline at end of file diff --git a/frontend/modules/pathologist/views/do/non-gyn-final.php b/frontend/modules/pathologist/views/do/non-gyn-final.php index e47d957e..77747060 100644 --- a/frontend/modules/pathologist/views/do/non-gyn-final.php +++ b/frontend/modules/pathologist/views/do/non-gyn-final.php @@ -522,10 +522,6 @@ $this->params['breadcrumbs'][] = $this->title;
-render('history-his', [ - 'case' => $case_non_gyn, -]) ?> - registerJs("CKEDITOR.config.scayt_autoStartup = false;") ?> render('_template_non_gyn', [ diff --git a/frontend/modules/pathologist/views/do/pap-final.php b/frontend/modules/pathologist/views/do/pap-final.php index 1d58ab29..d8f5e04f 100644 --- a/frontend/modules/pathologist/views/do/pap-final.php +++ b/frontend/modules/pathologist/views/do/pap-final.php @@ -311,8 +311,4 @@ $this->params['breadcrumbs'][] = $this->title; - - -render('history-his', [ - 'case' => $case_pap, -]) ?> \ No newline at end of file + \ No newline at end of file diff --git a/frontend/modules/slide/views/send-pathologist-detail/index.php b/frontend/modules/slide/views/send-pathologist-detail/index.php index b57951cf..648a5aa9 100644 --- a/frontend/modules/slide/views/send-pathologist-detail/index.php +++ b/frontend/modules/slide/views/send-pathologist-detail/index.php @@ -11,24 +11,24 @@ $this->title = 'ค้นหารายการ นำส่งสไลด์ $this->params['breadcrumbs'][] = $this->title; ?> -
-
-
-
-
title) ?> -
-
-
+
+
+
title) ?> +
+
- render('_search', ['model' => $searchModel]); +
+ + render('_search', ['model' => $searchModel]); ?> -
+
- $dataProvider, - 'tableOptions' => ['class' => 'table align-middle truncate m-0'], + 'tableOptions' => ['class' => 'table truncate align-middle'], + 'layout' => "{summary}
\n{items}\n
{pager}
", //'filterModel' => $searchModel, 'columns' => [ ['class' => 'yii\grid\SerialColumn'], @@ -46,8 +46,6 @@ $this->params['breadcrumbs'][] = $this->title; //['class' => 'yii\grid\ActionColumn'], ], ]); ?> -
-
\ No newline at end of file diff --git a/frontend/themes/nikom/views/layouts/_menu.php b/frontend/themes/nikom/views/layouts/_menu.php index 9978cfc8..6bed1dbd 100644 --- a/frontend/themes/nikom/views/layouts/_menu.php +++ b/frontend/themes/nikom/views/layouts/_menu.php @@ -1,9 +1,11 @@ user->can('pathologist')) { //['label' => 'Case Necropsy' . $count_new_necropsy . '', 'url' => ['/pathologist/task/necropsy-new']], //['label' => 'My Necropsy Case', 'url' => ['/pathologist/task/necropsy-all']], ['label' => ' My Finish Case', 'url' => ['/pathologist/task/my-finish-task']], - ['label' => ' ขอให้แก้ไขผลตรวจ', 'url' => ['/pathologist/task/my-approve-task']], + ['label' => ' ขอให้แก้ไขผลตรวจ' . + ' ' . + ApproveStatus::find()->where(['status_id' => 15, 'approve_status' => 2, 'pathologist_id' => Yii::$app->user->getId()])->count() . + '', 'url' => ['/pathologist/task/my-approve-task']], + //['label' => ' ขอให้แก้ไขผลตรวจ', 'url' => ['/pathologist/task/my-approve-task']], //['label' => 'ขอให้แก้ไขผลตรวจ ' . ApproveStatus::find()->filterWhere(['status_id' => 15])->andFilterWhere(['approve_status' => 2, 'pathologist_id' => Yii::$app->user->getId()])->count() . '', 'url' => ['/pathologist/task/my-approve-task']], //['label' => 'ค้นหาผลการตรวจเดิม', 'url' => ['/report/case/old']], - ['label' => ' รายการสั่งเติมเนื้อ', 'url' => ['/pathologist/surgical-add/index']], - ['label' => ' รายการสั่ง Recut', 'url' => ['/pathologist/surgical-recut/index']], - ['label' => ' Send Report to HIS', 'url' => ['/register/send-report-his/index']], + //['label' => ' รายการสั่งเติมเนื้อ', 'url' => ['/pathologist/surgical-add/index']], + //['label' => ' รายการสั่ง Recut', 'url' => ['/pathologist/surgical-recut/index']], + //['label' => ' Send Report to HIS', 'url' => ['/register/send-report-his/index']], + ], + ]; + + $count_consult_pathologist_surgical = SurgicalConsult::find()->where(['status' => 2, 'pathologist2_id' => Yii::$app->user->getId(), 'diagnosis_by' => 2])->count(); + $count_consult_pathologist_non_gyn = CytoNonGynConsult::find()->where(['status' => 2, 'pathologist2_id' => Yii::$app->user->getId(), 'diagnosis_by' => 2])->count(); + $count_consult_pathologist_pap = CytoPapConsult::find()->where(['status' => 2, 'pathologist2_id' => Yii::$app->user->getId(), 'diagnosis_by' => 2])->count(); + //$count_consult_pathologist_dish = DishConsult::find()->where(['status' => 2, 'pathologist2_id' => Yii::$app->user->getId(), 'diagnosis_by' => 2])->count(); + //$count_consult_pathologist_frozen = FrozenConsult::find()->where(['status' => 2, 'pathologist2_id' => Yii::$app->user->getId(), 'diagnosis_by' => 2])->count(); + //$count_consult_pathologist_fish = FishConsult::find()->where(['status' => 2, 'pathologist2_id' => Yii::$app->user->getId(), 'diagnosis_by' => 2])->count(); + //$count_consult_pathologist_flow = FlowConsult::find()->where(['status' => 2, 'pathologist2_id' => Yii::$app->user->getId(), 'diagnosis_by' => 2])->count(); + // $count_consult_pathologist_autopsy = AutopsyConsult::find()->where(['status' => 2, 'pathologist2_id' => Yii::$app->user->getId(), 'diagnosis_by' => 2])->count(); + //$count_consult_pathologist_molecular = MolecularConsult::find()->where(['status' => 2, 'pathologist2_id' => Yii::$app->user->getId(), 'diagnosis_by' => 2])->count(); + //$count_consult_pathologist_necropsy = NecropsyConsult::find()->where(['status' => 2, 'pathologist2_id' => Yii::$app->user->getId(), 'diagnosis_by' => 2])->count(); + + //$menu[] = ['label' => 'Consult Case', 'url' => '#', 'options' => ['class' => 'sidebar-list'], 'template' => '{label}', 'items' => [ + /*$menu[] = [ + 'label' => 'Consult Case' . '' . ($count_consult_pathologist_surgical + $count_consult_pathologist_non_gyn + $count_consult_pathologist_pap + $count_consult_pathologist_frozen + $count_consult_pathologist_dish + + $count_consult_pathologist_autopsy + $count_consult_pathologist_molecular + $count_consult_pathologist_necropsy) . '', 'url' => '#', 'options' => ['class' => 'sidebar-list'], 'template' => '{label}', 'items' => [ + ['label' => 'Surgical Consult' . $count_consult_pathologist_surgical . '', 'url' => ['/pathologist/surgical-consult/index']], + ['label' => 'Non-Gyn Consult' . $count_consult_pathologist_non_gyn . '', 'url' => ['/pathologist/non-gyn-consult/index']], + ['label' => 'Gyn Consult' . $count_consult_pathologist_pap . '', 'url' => ['/pathologist/pap-consult/index']], + //['label' => 'DISH Consult' . $count_consult_pathologist_dish . '', 'url' => ['/pathologist/dish-consult/index']], + //['label' => 'Frozen Consult' . $count_consult_pathologist_frozen . '', 'url' => ['/pathologist/frozen-consult/index']], + //['label' => 'FISH Consult' . $count_consult_pathologist_fish . '', 'url' => ['/pathologist/fish-consult/index']], + //['label' => 'Flow Consult' . $count_consult_pathologist_flow . '', 'url' => ['/pathologist/flow-consult/index']], + ['label' => 'Autopsy Consult' . $count_consult_pathologist_autopsy . '', 'url' => ['/pathologist/autopsy-consult/index']], + //['label' => 'Molecular Consult' . $count_consult_pathologist_molecular . '', 'url' => ['/pathologist/molecular-consult/index']], + //['label' => 'Necropsy Consult' . $count_consult_pathologist_necropsy . '', 'url' => ['/pathologist/necropsy-consult/index']], + ], 'submenuTemplate' => '
    {items}
' + ];*/ + + $menuItems[] = [ + //'label' => ' Consult Case ' . ' ' . ($count_consult_pathologist_surgical + $count_consult_pathologist_non_gyn + $count_consult_pathologist_pap + $count_consult_pathologist_autopsy) . '', + 'label' => ' Consult Diagnosis' . ' ' . ($count_consult_pathologist_surgical + $count_consult_pathologist_non_gyn + $count_consult_pathologist_pap/* + $count_consult_pathologist_autopsy*/) . '', + 'url' => 'javascript:void()', + 'options' => ['class' => 'treeview'], + 'items' => [ + ['label' => ' Surgical Consult ' . ($count_consult_pathologist_surgical) . '', 'url' => ['/pathologist/surgical-consult/index']], + ['label' => ' Non-Gyn Consult ' . $count_consult_pathologist_non_gyn . '', 'url' => ['/pathologist/non-gyn-consult/index']], + ['label' => ' Gyn Consult ' . $count_consult_pathologist_pap . '', 'url' => ['/pathologist/pap-consult/index']], + //['label' => ' Autopsy Consult ' . $count_consult_pathologist_autopsy . '', 'url' => ['/pathologist/autopsy-consult/index']], ], ]; @@ -358,19 +404,6 @@ if (Yii::$app->user->can('pathologist')) { ['label' => ' Diagnosis Template', 'url' => ['/pathologist/cyto-non-gyn-diagnosis-template/index']], ], ]; - - // $menuItems[] = ['label' => ' CENTER', 'url' => '#', 'options' => ['style' => 'background-color: #116aef;font-weight: bold;']]; - - /*$menuItems[] = [ - 'label' => ' Consult Outlab', - 'url' => 'javascript:void()', - 'options' => ['class' => 'treeview'], - 'items' => [ - ['label' => ' Case Surgical', 'url' => ['/register/consult-outlab-surgical/index']], - ['label' => ' Case Non Gyn', 'url' => ['/register/consult-outlab-non-gyn/index']], - ['label' => ' Case Gyn', 'url' => ['/register/consult-outlab-pap/index']], - ], - ];*/ } //รอตรวจสอบผล @@ -402,8 +435,8 @@ if (Yii::$app->user->can('approve')) { ['label' => ' Non Gyn Case ' . $count_release_non_gyn . '' . ' ' . $count_release_edit_non_gyn . '', 'url' => ['/approve/center-approve-non-gyn/index']], ['label' => ' Gyn Case ' . $count_release_pap . '' . ' ' . $count_release_edit_pap . '', 'url' => ['/approve/center-approve-gyn/index']], ['label' => ' Frozen Case ' . $count_release_frozen . '' . ' ' . $count_release_edit_frozen . '', 'url' => ['/approve/center-approve-frozen/index']], - ['label' => ' Resend API', 'url' => ['/approve/default/resend-report-api']], - ['label' => ' Resend API List', 'url' => ['/approve/send-his/index']], + //['label' => ' Resend API', 'url' => ['/approve/default/resend-report-api']], + //['label' => ' Resend API List', 'url' => ['/approve/send-his/index']], ], ]; } @@ -612,7 +645,7 @@ if (Yii::$app->user->can('cyto')) { ]; $count_new_cyto_non_gyn = CaseNonGyn::find()->orFilterWhere(['like', 'id_case', 'C'])->andFilterWhere(['cytotech1_id' => Yii::$app->user->getId()])->andFilterWhere(['<=', 'status_id', 7])->count(); - $count_new_cyto_pap = CasePap::find()->orFilterWhere(['like', 'id_case', 'P'])->andFilterWhere(['cytotech1_id' => Yii::$app->user->getId()])->andFilterWhere(['<=', 'status_id', 7])->count(); + $count_new_cyto_pap = CasePap::find()->orFilterWhere(['like', 'id_case', 'G'])->andFilterWhere(['cytotech1_id' => Yii::$app->user->getId()])->andFilterWhere(['<=', 'status_id', 7])->count(); $menuItems[] = [ 'label' => '' . Yii::$app->user->identity->realname . ' ' . ($count_new_cyto_non_gyn + $count_new_cyto_pap) . '', @@ -882,8 +915,8 @@ if (Yii::$app->user->can('histo')) { //['label' => 'สั่งพิมพ์ Sticker ติดสไลด์', 'url' => ['/histo/print/cassette']], ['label' => ' สั่งพิมพ์ Sticker ติดสไลด์', 'url' => ['/histo/print/slide-print']], //['label' => 'สั่งพิมพ์ Sticker ติดสไลด์ ย้อมพิเศษ', 'url' => ['/histo/print/special-print']], - ['label' => ' Block รายวัน', 'url' => ['/histo/print/print-day']], - ['label' => ' Histo Control Slide', 'url' => ['/histo/histo-slide-control/index']], + //['label' => ' Block รายวัน', 'url' => ['/histo/print/print-day']], + //['label' => ' Histo Control Slide', 'url' => ['/histo/histo-slide-control/index']], //['label' => 'รายการสั่ง Recut ' . SurgicalRecut::find()->where(['is', 'recut_end_at', new Expression('NULL')])->count() . '', 'url' => ['/histo/surgical-recut/index']], //['label' => 'Pap sticker', 'url' => ['/cyto/sticker/index']], ], diff --git a/frontend/themes/nikom/views/layouts/main.php b/frontend/themes/nikom/views/layouts/main.php index e88965a2..4ae8f442 100644 --- a/frontend/themes/nikom/views/layouts/main.php +++ b/frontend/themes/nikom/views/layouts/main.php @@ -309,7 +309,7 @@ $asset = Yii::$app->assetManager->getPublishedUrl('@frontend/themes/nikom/assets
- HANUMAN PATHOLOGY LIS v202501001 © + HANUMAN PATHOLOGY LIS v202411 ผลิตในประเทศไทย © 2024 '_blank']) ?>
Slide No.ผู้ Stainingวันที่ Staining
' . $block->block_no . '' . $block->stainingBy->realname . '' . $block->staining_at . '