From 0b26bac5c0706478fe0fdfb6eb5b4fe093c4df4c Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Sat, 4 May 2024 13:38:18 +0800
Subject: [PATCH] SUM

---
 .../doctorCheck/PatientRegisterBase.vue        | 15 +++++++--------
 src/components/sumDoctorCheck/SumItems.vue     | 14 ++++++--------
 src/components/sumDoctorCheck/SumSug.vue       | 18 ++++++++----------
 src/views/doctorCheck/sumDoctorCheck.vue       |  2 +-
 4 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/components/doctorCheck/PatientRegisterBase.vue b/src/components/doctorCheck/PatientRegisterBase.vue
index 56c71cb..5745fe2 100644
--- a/src/components/doctorCheck/PatientRegisterBase.vue
+++ b/src/components/doctorCheck/PatientRegisterBase.vue
@@ -155,14 +155,13 @@ export default {
       this.prBase = deepCopy(this.prBaseInit)
       objCopy(rd, this.prBase)
       this.doctorCheck.prBase = Object.assign({}, this.doctorCheck.prBase, rd)  //待优化
-      setTimeout(() => {
-        //触发检查医生诊台相关刷新
-        this.dataTransOpts.refresh.register_check.M++
-
-        //触发总检医生诊台相关刷新
-        this.dataTransOpts.refresh.sumDoctor.M++
-        this.dataTransOpts.refresh.sum_diagnosis.M++
-      }, 10);
+      
+      //触发检查医生诊台相关刷新
+      this.dataTransOpts.refresh.register_check.M++
+
+      //触发总检医生诊台相关刷新
+      this.dataTransOpts.refresh.sumDoctor.M++
+      // this.dataTransOpts.refresh.sum_diagnosis.M++      
 
       //显示照片
       this.patientRegister.photo = rd.photo || ''
diff --git a/src/components/sumDoctorCheck/SumItems.vue b/src/components/sumDoctorCheck/SumItems.vue
index 87b28ab..8a0ff14 100644
--- a/src/components/sumDoctorCheck/SumItems.vue
+++ b/src/components/sumDoctorCheck/SumItems.vue
@@ -126,10 +126,10 @@ export default {
           console.log("获取横向对比 SumItems", res.data);
           if (res.code != -1) {
             this.RegisterCheckList = res.data;
-            if (this.RegisterCheckList && this.RegisterCheckList.length > 0){
-              this.rowClick(this.RegisterCheckList[0])
-              this.$refs['registerCheckList'].setCurrentRow(this.RegisterCheckList[0])
-            }
+            // if (this.RegisterCheckList && this.RegisterCheckList.length > 0){
+            //   this.rowClick(this.RegisterCheckList[0])
+            //   this.$refs['registerCheckList'].setCurrentRow(this.RegisterCheckList[0])
+            // }
           }
         })
         .catch((err) => {
@@ -226,9 +226,7 @@ export default {
         })
 
       });
-
       this.tableData.push(summary)
-
     },
 
 
@@ -240,8 +238,8 @@ export default {
     "dataTransOpts.refresh.sumDoctor.M": {
       // immediate:true,
       handler(newVal, oldVal) {
-        console.log(`watch 总检--横向对比 newVal: ${newVal}, oldVal: ${oldVal} patientId: ${this.dataTransOpts.tableS.patient_register.id}`);
-        if(newVal != oldVal && this.tabChoosed == '5') this.registerCheckList(this.dataTransOpts.tableS.patient_register.id)
+        console.log(`watch 总检--横向对比 newVal: ${newVal}, oldVal: ${oldVal} patientId: ${this.patientId} tabChoosed: ${this.tabChoosed}`);
+        if(newVal != oldVal && this.tabChoosed == '5') this.registerCheckList(this.patientId)
       }
     },
   },
diff --git a/src/components/sumDoctorCheck/SumSug.vue b/src/components/sumDoctorCheck/SumSug.vue
index d0965eb..4e6eb58 100644
--- a/src/components/sumDoctorCheck/SumSug.vue
+++ b/src/components/sumDoctorCheck/SumSug.vue
@@ -430,17 +430,18 @@ export default {
               });
               summaryList.push({ id: `summary_${i}`, summaryTitle: ' ', details })
             });
-            this.sumDoctorCheck.summaryList = deepCopy(summaryList)
+            this.sumDoctorCheck.summaryList = summaryList
 
             // 自动高度有问题，需要这样处理一下
             setTimeout(() => {
-              this.sumDoctorCheck.summaryList = deepCopy(res.data);
-              this.sumDoctorCheck.summaryList.forEach((e, i) => {
+              res.data.forEach((e, i) => {
                 e.id = `summary_${i}`
                 e.details.forEach((e2, i2) => {
                   e2.id = `summaryDetails_${i2}`
                 });
               });
+              this.sumDoctorCheck.summaryList = res.data;
+
             }, 10);
             // this.sumDoctorCheck.summaryList = res.data;
             // this.textareaResize()
@@ -453,11 +454,8 @@ export default {
 
     //获取建议
     suggestionList(RegisterId, isGetExistData) {
-      if (!RegisterId) {
-        this.sumDoctorCheck.suggestionList = [];
-        return;
-      };
-
+      this.sumDoctorCheck.suggestionList = [];
+      if (!RegisterId) return;
       // {
       //   "patientRegisterId": "3a11ee70-02cb-c5e6-a087-79ecdd0356b6",
       //   "isGetExistData": "Y"
@@ -471,9 +469,8 @@ export default {
         .then((res) => {
           console.log("suggestionList", res.data);
           if (res.code > -1) {
-            this.sumDoctorCheck.suggestionList = res.data;
             // 处理拖动排序使用
-            this.sumDoctorCheck.suggestionList.forEach((e, i) => {
+            res.data.forEach((e, i) => {
               e.id = `suggestion_${i}`
               e.collapse = this.collapse
               if (e.medicalInterpretations) {
@@ -495,6 +492,7 @@ export default {
                 });
               }
             });
+            this.sumDoctorCheck.suggestionList = res.data;            
           }
         })
         .catch((err) => {
diff --git a/src/views/doctorCheck/sumDoctorCheck.vue b/src/views/doctorCheck/sumDoctorCheck.vue
index 9de0774..5ef8f5b 100644
--- a/src/views/doctorCheck/sumDoctorCheck.vue
+++ b/src/views/doctorCheck/sumDoctorCheck.vue
@@ -15,7 +15,7 @@
                 <div style="display: flex;">
                   <!-- 综述建议 -->
                   <div :style="'width:' + (window.pageWidth - 110 - 15) + 'px;'">
-                    <SumSug :patientRegisterId="dataTransOpts.tableS.patient_register.id"/>
+                    <SumSug :patientRegisterId="dataTransOpts.tableS.patient_register.id" :tabChoosed="tabChoosed"/>
                   </div>
                   <!-- 诊断 width:200px; 
                   <div v-if="false" style="width:200px;">