From 753215d1af452178c7f2a24c215861e563e54f3c Mon Sep 17 00:00:00 2001 From: Star Indy Date: Fri, 4 Apr 2025 00:50:57 +0700 Subject: [PATCH] fix --- .../histo/views/staining/send-case.php | 2 +- .../histo/views/staining/staining-case.php | 2 +- .../register/views/case/_form_non_gyn.php | 124 +++++++++--------- .../modules/register/views/case/_form_pap.php | 52 ++++---- .../views/send-pathologist-detail/index.php | 1 - .../slide/views/send-pathologist/index.php | 3 +- 6 files changed, 92 insertions(+), 92 deletions(-) diff --git a/frontend/modules/histo/views/staining/send-case.php b/frontend/modules/histo/views/staining/send-case.php index ba389835..c0a6d096 100755 --- a/frontend/modules/histo/views/staining/send-case.php +++ b/frontend/modules/histo/views/staining/send-case.php @@ -84,7 +84,7 @@ $this->params['breadcrumbs'][] = $this->title; return $rt;*/ $finance = FinanceServiceCharge::find() ->joinWith(['charge']) - ->where(['from_id' => $model->id, 'const_service_charge.lab' => 'immuno', 'id_case' => $model->id_case]) + ->where(['from_id' => $model->id, 'const_service_charge.lab' => 'special', 'id_case' => $model->id_case]) ->one(); if($finance){ return (isset($finance->charge) ? $finance->charge->code : '') . ' ' . (isset($finance->charge) ? $finance->charge->name : ''); diff --git a/frontend/modules/histo/views/staining/staining-case.php b/frontend/modules/histo/views/staining/staining-case.php index 0ea6dbe2..9550b8c0 100755 --- a/frontend/modules/histo/views/staining/staining-case.php +++ b/frontend/modules/histo/views/staining/staining-case.php @@ -90,7 +90,7 @@ $this->params['breadcrumbs'][] = $this->title; return $rt;*/ $finance = FinanceServiceCharge::find() ->joinWith(['charge']) - ->where(['from_id' => $model->id, 'const_service_charge.lab' => 'immuno', 'id_case' => $model->id_case]) + ->where(['from_id' => $model->id, 'const_service_charge.lab' => 'special', 'id_case' => $model->id_case]) ->one(); if($finance){ return (isset($finance->charge) ? $finance->charge->code : '') . ' ' . (isset($finance->charge) ? $finance->charge->name : ''); diff --git a/frontend/modules/register/views/case/_form_non_gyn.php b/frontend/modules/register/views/case/_form_non_gyn.php index 68f7bbe1..703eae9d 100755 --- a/frontend/modules/register/views/case/_form_non_gyn.php +++ b/frontend/modules/register/views/case/_form_non_gyn.php @@ -89,8 +89,8 @@ use unclead\multipleinput\MultipleInputColumn;
isNewRecord) { ?> - +
@@ -303,10 +303,10 @@ $('#patient-detail').on('click', '.select-patient-btn', function() { ]) ?>
- field($model, 'collected_at')->widget(DateTimePicker::class, [ + field($model, 'collected_at')->widget(DatePicker::class, [ 'options' => ['placeholder' => 'เลือกวันที่เก็บสิ่งส่งตรวจ ...'], 'pluginOptions' => [ - 'format' => 'dd/mm/yyyy hh:ii:ss', + 'format' => 'dd/mm/yyyy', 'allowClear' => true, 'autoclose' => true, 'todayHighlight' => true, @@ -454,8 +454,8 @@ $('#patient-detail').on('click', '.select-patient-btn', function() {
isNewRecord) { ?> -
- field($model, 'cytotech1_id')->widget(Select2::class, [ +
+ field($model, 'cytotech1_id')->widget(Select2::class, [ 'data' => ArrayHelper::map(User::find()->where(['role' => 'cyto'])->orderBy(['realname' => SORT_ASC])->all(), 'id', 'realname'), 'theme' => Select2::THEME_BOOTSTRAP, 'pluginOptions' => [ @@ -463,7 +463,7 @@ $('#patient-detail').on('click', '.select-patient-btn', function() { 'placeholder' => 'เลือก Cytotech...' ] ]) */ ?> - field($model, 'cytotech1_id')->widget(Select2::class, [ + field($model, 'cytotech1_id')->widget(Select2::class, [ // 'data' => ArrayHelper::map(User::find()->where(['role' => 'cyto', 'status' => 10])->orderBy(['realname' => SORT_ASC])->all(), 'id', 'realname'), 'data' => ArrayHelper::map(User::find()->andWhere(['or', ['role' => 'cyto', 'status' => 10], ['id' => 1060]])->orderBy(['realname' => SORT_ASC])->all(), 'id', 'realname'), 'theme' => Select2::THEME_BOOTSTRAP, @@ -472,9 +472,9 @@ $('#patient-detail').on('click', '.select-patient-btn', function() { 'placeholder' => 'เลือก Cytotech1...' ] ]) ?> -
-
- field($model, 'pathologist_id')->widget(Select2::class, [ +
+
+ field($model, 'pathologist_id')->widget(Select2::class, [ 'data' => ArrayHelper::map(User::find()->where(['role' => 'pathologist', 'status' => 10])->orderBy(['realname' => SORT_ASC])->all(), 'id', 'realname'), 'theme' => Select2::THEME_BOOTSTRAP, 'pluginOptions' => [ @@ -482,7 +482,7 @@ $('#patient-detail').on('click', '.select-patient-btn', function() { 'placeholder' => 'เลือก Pathologist...' ] ]) ?> -
+
field($model, 'is_express')->checkbox() ?> @@ -731,12 +731,12 @@ $('#patient-detail').on('click', '.select-patient-btn', function() {
isNewRecord) { ?> -
-
รายการ Spicimen
-
-
-
- field($cyto_non_gyn_container, 'items')->label(false)->widget(MultipleInput::class, [ +
+
รายการ Spicimen
+
+
+
+ field($cyto_non_gyn_container, 'items')->label(false)->widget(MultipleInput::class, [ 'max' => 50, 'id' => 'cytonongyncontainer-items', 'allowEmptyList' => true, @@ -816,8 +816,8 @@ $('#patient-detail').on('click', '.select-patient-btn', function() { ], ] ]) ?> -
+
registerJs(" @@ -864,13 +864,13 @@ $('#patient-detail').on('click', '.select-patient-btn', function() { ) ?> isNewRecord) { ?> -
-
-
-
- รายการ Test Order
-
- +
+
+
+ รายการ Test Order
+
+ false, 'tableOptions' => ['class' => 'table table-striped truncate m-0'], 'dataProvider' => new ActiveDataProvider([ @@ -884,8 +884,8 @@ $('#patient-detail').on('click', '.select-patient-btn', function() { ], 'layout' => "
\n{items}\n
{pager}
", ]) ?> -
+
@@ -898,8 +898,8 @@ $('#patient-detail').on('click', '.select-patient-btn', function() { foreach ($model->getFiles() as $file => $val) { if (!empty($val)) { ?> -
  • '_blank']); ?> - '_blank']); ?> + ', [ 'file-del', 'file' => $val, @@ -910,7 +910,7 @@ $('#patient-detail').on('click', '.select-patient-btn', function() { 'data-confirm' => 'ต้องการลบ?' ]); ?> -
    • + @@ -933,30 +933,30 @@ $('#patient-detail').on('click', '.select-patient-btn', function() { Container List
    getSpecimenDelImgs() ?>
    - + - -
    Outsource Data
    -     + +
    Outsource Data
    +     -
    -
    -
    - field($model, 'is_outlab')->checkbox() ?> -
    isNewRecord && $model->is_outlab ? '' : 'style="display: none;"' ?>> - field($model, 'outlab_report[]')->fileInput(['multiple' => true]) ?> -
    - -
    -
    -
    - บันทึกข้อมูล', ['class' => 'btn btn-success']) ?> +
    +
    + บันทึกข้อมูล', ['class' => 'btn btn-success']) ?> +
    -
    - + - +
    diff --git a/frontend/modules/register/views/case/_form_pap.php b/frontend/modules/register/views/case/_form_pap.php index c6e44310..1619e46a 100755 --- a/frontend/modules/register/views/case/_form_pap.php +++ b/frontend/modules/register/views/case/_form_pap.php @@ -74,8 +74,8 @@ use common\models\FinanceServiceCharge;
    isNewRecord) { ?> - +
    @@ -290,10 +290,10 @@ $('#patient-detail').on('click', '.select-patient-btn', function() { field($model, 'clinician')->textInput() ?>
    - field($model, 'collected_at')->widget(DateTimePicker::class, [ + field($model, 'collected_at')->widget(DatePicker::class, [ 'options' => ['placeholder' => 'เลือกวันที่เก็บสิ่งส่งตรวจ ...'], 'pluginOptions' => [ - 'format' => 'dd/mm/yyyy hh:ii:ss', + 'format' => 'dd/mm/yyyy', 'allowClear' => true, 'autoclose' => true, 'todayHighlight' => true, @@ -393,8 +393,8 @@ $('#patient-detail').on('click', '.select-patient-btn', function() {
    isNewRecord) { ?> -
    - field($model, 'cytotech1_id')->widget(Select2::class, [ +
    + field($model, 'cytotech1_id')->widget(Select2::class, [ // 'data' => ArrayHelper::map(User::find()->where(['role' => 'cyto', 'status' => 10])->orderBy(['realname' => SORT_ASC])->all(), 'id', 'realname'), 'data' => ArrayHelper::map(User::find()->andWhere(['or', ['role' => 'cyto', 'status' => 10], ['id' => 1060]])->orderBy(['realname' => SORT_ASC])->all(), 'id', 'realname'), 'theme' => Select2::THEME_BOOTSTRAP, @@ -403,7 +403,7 @@ $('#patient-detail').on('click', '.select-patient-btn', function() { 'placeholder' => 'เลือก Cytotech1...' ] ]) ?> -
    +
    @@ -640,13 +640,13 @@ $('#patient-detail').on('click', '.select-patient-btn', function() {
    isNewRecord) { ?> -
    -
    -
    -
    - รายการ Test Order
    -
    - +
    +
    +
    + รายการ Test Order
    +
    + false, 'tableOptions' => ['class' => 'table table-striped truncate m-0'], 'dataProvider' => new ActiveDataProvider([ @@ -660,15 +660,15 @@ $('#patient-detail').on('click', '.select-patient-btn', function() { ], 'layout' => "
    \n{items}\n
    {pager}
    ", ]) ?> -
    - + where(['his_ln' => $model->his_ln])->one(); if ($case_hpv) { ?> -
    - มีการส่งตรวจ HPV ด้วย ID Case: id_case ?> -
    - +
    + มีการส่งตรวจ HPV ด้วย ID Case: id_case ?> +
    + @@ -686,8 +686,8 @@ $('#patient-detail').on('click', '.select-patient-btn', function() { foreach ($model->getFiles() as $file => $val) { if (!empty($val)) { ?> -
  • '_blank']); ?> - '_blank']); ?> + ', [ 'file-del', 'file' => $val, @@ -698,7 +698,7 @@ $('#patient-detail').on('click', '.select-patient-btn', function() { 'data-confirm' => 'ต้องการลบ?' ]); ?> -
    • + @@ -731,8 +731,8 @@ $('#patient-detail').on('click', '.select-patient-btn', function() { getReport() as $file => $val) { ?> -
  • '_blank']); ?> - '_blank']); ?> + ', [ 'report-del', 'file' => $val, @@ -743,7 +743,7 @@ $('#patient-detail').on('click', '.select-patient-btn', function() { 'data-confirm' => 'ต้องการลบ?' ]); ?> -
    • + diff --git a/frontend/modules/slide/views/send-pathologist-detail/index.php b/frontend/modules/slide/views/send-pathologist-detail/index.php index 648a5aa9..ba0cc3d4 100755 --- a/frontend/modules/slide/views/send-pathologist-detail/index.php +++ b/frontend/modules/slide/views/send-pathologist-detail/index.php @@ -17,7 +17,6 @@ $this->params['breadcrumbs'][] = $this->title;
    title) ?>
    -
    render('_search', ['model' => $searchModel]); diff --git a/frontend/modules/slide/views/send-pathologist/index.php b/frontend/modules/slide/views/send-pathologist/index.php index 25dc6aed..36357ce0 100755 --- a/frontend/modules/slide/views/send-pathologist/index.php +++ b/frontend/modules/slide/views/send-pathologist/index.php @@ -28,7 +28,8 @@ $this->params['breadcrumbs'][] = $this->title;
    ['class' => 'yii\bootstrap5\LinkPager'], - 'tableOptions' => ['class' => 'table align-middle truncate m-0'], + 'tableOptions' => ['class' => 'table align-middle table-hover m-0 truncate'], + 'layout' => "{summary}
    \n{items}\n
    {pager}
    ", 'dataProvider' => $dataProvider, 'filterModel' => $searchModel, 'columns' => [