diff --git a/frontend/modules/pathologist/models/PatientCaseSearch.php b/frontend/modules/pathologist/models/PatientCaseSearch.php
index 1c939d28..64b8c538 100755
--- a/frontend/modules/pathologist/models/PatientCaseSearch.php
+++ b/frontend/modules/pathologist/models/PatientCaseSearch.php
@@ -23,7 +23,7 @@ class PatientCaseSearch extends PatientCase
public function rules()
{
return [
- [['register_at', 'report_at', 'id_case', 'patient_name', /*'hospital',*/ 'status', 'status_id', 'hospital_name', 'is_outlab', 'h_n'], 'safe']
+ [['register_at', 'report_at', 'id_case', 'patient_name', /*'hospital',*/ 'status', 'status_id', 'hospital_name', 'is_outlab', 'h_n', 'is_cell_block'], 'safe']
];
}
public function search($params)
@@ -47,6 +47,7 @@ class PatientCaseSearch extends PatientCase
$query->andFilterWhere(['like', 'patient_name', $this->patient_name])
->andFilterWhere(['like', 'hospital_name', $this->hospital_name])
->andFilterWhere(['status' => $this->status])
+ ->andFilterWhere(['like', 'is_cell_block', $this->is_cell_block])
->andFilterWhere(['like', 'patient_case.id_case', $this->id_case])
->andFilterWhere(['is_outlab' => $this->is_outlab])
->andFilterWhere(['like', 'h_n', $this->h_n])
diff --git a/frontend/modules/register/models/CaseNonGynSearch.php b/frontend/modules/register/models/CaseNonGynSearch.php
index 8ee437f1..0e0f28c3 100755
--- a/frontend/modules/register/models/CaseNonGynSearch.php
+++ b/frontend/modules/register/models/CaseNonGynSearch.php
@@ -20,7 +20,7 @@ class CaseNonGynSearch extends CaseNonGyn
{
return [
[['id', 'patient_id', 'hospital_id', 'is_no_microscopic', 'pathologist_id', 'is_critical_diagnosis', 'is_outlab', 'h_n', 'age', 'cytotech1_id'], 'integer'],
- [['id_case', 'case_reference', 'hos_ref', 'a_n', 'ward', 'collected_at', 'specimen', 'clinical_diagnosis', 'gross_description', 'diagnosis', 'additional_diagnosis', 'additional_at', 'pathologist_at', 'report_at', 'microscopic_img', 'files', 'outlab_report', 'clinician', 'register_at', 'status_id'], 'safe'],
+ [['id_case', 'case_reference', 'hos_ref', 'a_n', 'ward', 'collected_at', 'specimen', 'clinical_diagnosis', 'gross_description', 'diagnosis', 'additional_diagnosis', 'additional_at', 'pathologist_at', 'report_at', 'microscopic_img', 'files', 'outlab_report', 'clinician', 'register_at', 'status_id', 'is_cell_block'], 'safe'],
];
}
@@ -81,6 +81,7 @@ class CaseNonGynSearch extends CaseNonGyn
->andFilterWhere(['like', 'title', $this->case_reference])
->andFilterWhere(['like', 'case_reference', $this->case_reference])
->andFilterWhere(['like', 'hos_ref', $this->hos_ref])
+ ->andFilterWhere(['like', 'is_cell_block', $this->is_cell_block])
//->andFilterWhere(['like', 'status_id', $this->status_id])
->andFilterWhere(['like', 'age', $this->age])
->andFilterWhere(['like', 'h_n', $this->h_n])
diff --git a/frontend/themes/nikom/views/layouts/_menu.php b/frontend/themes/nikom/views/layouts/_menu.php
index 34f2a262..0d470db4 100755
--- a/frontend/themes/nikom/views/layouts/_menu.php
+++ b/frontend/themes/nikom/views/layouts/_menu.php
@@ -8,6 +8,8 @@ use common\models\SurgicalAdd;
use common\models\ApproveStatus;
use common\models\CaConfirm;
use common\models\CenterApprove;
+use common\models\CytoCellBlock;
+use common\models\CytoCellBlockSlide;
use common\models\CytoNonGynCellBlock;
use common\models\HistoStaining;
use common\models\CytoPapConsult;
@@ -132,16 +134,17 @@ if (Yii::$app->user->can('center')) {
],
];
+ $count_cyto_cell_block = CytoCellBlockSlide::find()->andFilterWhere(['=', 'status', 1])->count();
+
$menuItems[] = [
- 'label' => ' ',
+ 'label' => '' . ' ' . $count_cyto_cell_block . '',
'url' => 'javascript:void()',
'options' => ['class' => 'treeview'],
'items' => [
- ['label' => 'รายการ Cell Block', 'url' => ['/register/cyto-cell-block-slide/index']],
+ ['label' => ' รายการ Cell Block' . ' ' . $count_cyto_cell_block . '', 'url' => ['/register/cyto-cell-block-slide/index']],
],
];
-
$menuItems[] = [
'label' => ' ',
'url' => 'javascript:void()',
@@ -612,6 +615,8 @@ if (Yii::$app->user->can('cyto')) {
],
];
+
+
$menuItems[] = [
'label' => '' . ' ' . CaseHpv::find()->andFilterWhere(['cytotech1_id' => Yii::$app->user->getId()])->andFilterWhere(['<', 'status_id', 9])->count() . '',
'url' => 'javascript:void()',
@@ -622,12 +627,14 @@ if (Yii::$app->user->can('cyto')) {
],
];
+ $count_cyto_cell_block = CytoCellBlockSlide::find()->andFilterWhere(['=', 'status', 1])->count();
+
$menuItems[] = [
- 'label' => ' ',
+ 'label' => '' . ' ' . $count_cyto_cell_block . '',
'url' => 'javascript:void()',
'options' => ['class' => 'treeview'],
'items' => [
- ['label' => 'รายการ Cell Block', 'url' => ['/cyto/cyto-cell-block-slide/index']],
+ ['label' => ' รายการ Cell Block' . ' ' . $count_cyto_cell_block . '', 'url' => ['/cyto/cyto-cell-block-slide/index']],
],
];