From b02607ce5b3a636c0a30f3e116f7fd6b09b9b3c5 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Tue, 6 Feb 2024 18:32:03 +0800
Subject: [PATCH] seo

---
 src/components/doctorCheck/CheckItemList.vue  |  8 +++---
 src/components/doctorCheck/CheckSumSug.vue    | 10 ++++---
 .../doctorCheck/PatientRegisterBase.vue       | 15 ++++++++---
 .../doctorCheck/PatientRegisterList.vue       | 27 ++++++++++++++++---
 .../doctorCheck/RegisterCheckEdit.vue         |  6 ++---
 .../doctorCheck/RegisterCheckList.vue         | 24 ++++++++++-------
 6 files changed, 63 insertions(+), 27 deletions(-)

diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue
index e30a8be..a8a2e7c 100644
--- a/src/components/doctorCheck/CheckItemList.vue
+++ b/src/components/doctorCheck/CheckItemList.vue
@@ -233,7 +233,7 @@ export default {
         `/api/app/registercheckitem/getlistinregistercheckid?RegisterCheckId=${RegisterCheckId}`
       );
       getapi(
-        `/api/app/registercheckitem/getlistinregistercheckid?RegisterCheckId=${RegisterCheckId}`
+        `/api/app/registercheckitem/getlistinregistercheckid?RegisterCheckId=${RegisterCheckId}&PatientRegisterId=${this.dataTransOpts.tableS.patient_register.id}`
       )
         .then((res) => {
           // console.log("checkItemList", res.data);
@@ -334,11 +334,11 @@ export default {
     // },
 
     //检查项目未切换换时 也可以强制刷新数据
-    "dataTransOpts.refresh.register_check_item.S":{
+    "dataTransOpts.refresh.register_check_item.M":{
       immediate:true,
       handler(newVal, oldVal) {
-        console.log(`watch dataTransOpts.refresh.register_check_item.S newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.registerCheckId}`);       
-        this.checkItemList(this.registerCheckId);
+        console.log(`watch 检查明细 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.register_check.id}`);       
+        this.checkItemList(this.dataTransOpts.tableS.register_check.id);
       }
     },
   },
diff --git a/src/components/doctorCheck/CheckSumSug.vue b/src/components/doctorCheck/CheckSumSug.vue
index 23f7a81..98050c6 100644
--- a/src/components/doctorCheck/CheckSumSug.vue
+++ b/src/components/doctorCheck/CheckSumSug.vue
@@ -4,6 +4,7 @@
       <el-table id="tableSummary" row-key="id" :data="doctorCheck.checkSummaryList" size="samll"        
         :height="sumHeight"
         width="100%" border @row-click="rowClick">
+        <el-table-column type="index" width="25" align="center"/>
         <el-table-column prop="summary" label="小结">
           <template slot="header">
             <div style="display: flex;justify-content:space-between;">
@@ -44,6 +45,7 @@
       <el-table id="tableSuggestion" row-key="id" :data="doctorCheck.checkSuggestionList" size="samll"
         :height="sumHeight"
         width="100%" border @row-click="rowClick">
+        <el-table-column type="index" width="25" align="center"/>
         <el-table-column prop="suggestion" label="建议" >
           <template slot-scope="scope">
             <div style="display: flex;">
@@ -221,12 +223,12 @@ export default {
     //   this.checkSuggestionList(newVal)      
     // },
     //检查项目未切换换时 也可以强制刷新数据
-    "dataTransOpts.refresh.register_check_item.S":{
+    "dataTransOpts.refresh.register_check.S":{
       immediate:true,
       handler(newVal, oldVal) {
-        console.log(`watch 小结 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.registerCheckId}`);        
-        this.checkSummaryList(this.registerCheckId)
-        this.checkSuggestionList(this.registerCheckId) 
+        console.log(`watch 小结 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.register_check.id}`);        
+        this.checkSummaryList(this.dataTransOpts.tableS.register_check.id)
+        this.checkSuggestionList(this.dataTransOpts.tableS.register_check.id) 
       }
     },
 
diff --git a/src/components/doctorCheck/PatientRegisterBase.vue b/src/components/doctorCheck/PatientRegisterBase.vue
index 94bf03c..2d4840c 100644
--- a/src/components/doctorCheck/PatientRegisterBase.vue
+++ b/src/components/doctorCheck/PatientRegisterBase.vue
@@ -267,9 +267,9 @@ export default {
       // debugger
       // console.log('rd,this.doctorCheck.prBase',rd.id,this.doctorCheck.prBase.id)
       objCopy(rd,this.prBase)
-
+      this.dataTransOpts.tableS.patient_register.id = rd.id
       this.doctorCheck.prBase = Object.assign({},this.doctorCheck.prBase,rd)
-      this.dataTransOpts.refresh.register_check.S++
+      this.dataTransOpts.refresh.register_check.M++  
       // objCopy(rd,this.doctorCheck.prBase)
 
       // this.sumPREditInit()
@@ -286,7 +286,8 @@ export default {
       let val = this.prBase[queryType]
       
       this.doctorCheckPrBaseInit()
-      this.dataTransOpts.refresh.register_check.S++
+      this.dataTransOpts.tableS.patient_register.id = ''
+      this.dataTransOpts.refresh.register_check.M++
 
       this.sumPREditInit()
 
@@ -446,6 +447,14 @@ export default {
       }
     },
 
+    // 强制刷新人员登记信息
+    "dataTransOpts.refresh.patient_register.S":{
+      immediate:true,
+      handler(newVal, oldVal) {
+        console.log(`watch 组合项目列表 newVal: ${newVal} oldVal: ${oldVal} patient_register.id: ${this.dataTransOpts.tableS.patient_register.id}`);        
+        this.dataTransOpts.refresh.register_check.M++     
+      }
+    },
   },
 };
 </script>
diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue
index d8b1ce1..b05a6e6 100644
--- a/src/components/doctorCheck/PatientRegisterList.vue
+++ b/src/components/doctorCheck/PatientRegisterList.vue
@@ -211,12 +211,28 @@ export default {
   //挂载完成
   mounted() { },
   computed: {
-    ...mapState(["window", "dict", "patientRegister", "customerOrg", "doctorCheck", "sumDoctorCheck","report"]),
+    ...mapState(["window","dataTransOpts", "dict", "patientRegister", "customerOrg", "doctorCheck", "sumDoctorCheck","report"]),
   },
   methods: {
     ...mapMutations(['doctorCheckPrBaseInit', 'sumPREditInit']),
 
     dictInit(){
+      // 默认 当天 体检日期 
+      let today = moment(new Date()).format('yyyy-MM-DD');
+      this.report.dataCusOrgOCX = [{
+        id: Date.now(),
+        customerOrgId: "",
+        customerOrgName: "",
+        customerOrgRegister: {},
+        customerOrgRegisterList: [],
+        dateType: "medicalStartDate",
+        startDate: today,
+        endDate: today,
+        customerOrgGroupIds: [],
+        customerOrgGroupList: []
+      }]
+      this.patientRegister.query.cusOrgOCX = `(体检${today}~${today})`
+
       // 获取组合项目
       postapi('/api/app/asbitem/getasbitemlist',{isFilterActive:'Y'}).then(res =>{
         if(res.code != -1){
@@ -268,7 +284,12 @@ export default {
 
     //点击体检次数行
     rowClick(row) {
-      
+
+      this.dataTransOpts.tableS.patient_register.id = row.id
+      setTimeout(() => {
+        this.dataTransOpts.refresh.patient_register.S++ //人员体检登记信息刷新
+      }, 10);
+
       this.doctorCheckPrBaseInit()
       this.doctorCheck.prBase.patientRegisterNo = row.patientRegisterNo
       objCopy(row, this.doctorCheck.prBase)        //基本信息
@@ -300,7 +321,7 @@ export default {
     //查询
     query() {
       let body = {},customerOrgs=[]
-
+      console.log('this.report.dataCusOrgOCX',this.report.dataCusOrgOCX)
       if (this.report.dataCusOrgOCX.length > 0) {
           this.report.dataCusOrgOCX.forEach(e => {
               let rd = {
diff --git a/src/components/doctorCheck/RegisterCheckEdit.vue b/src/components/doctorCheck/RegisterCheckEdit.vue
index afbd21b..d5fb1d2 100644
--- a/src/components/doctorCheck/RegisterCheckEdit.vue
+++ b/src/components/doctorCheck/RegisterCheckEdit.vue
@@ -82,11 +82,11 @@ export default {
     // },
 
     //检查项目未切换换时 也可以强制刷新数据
-    "dataTransOpts.refresh.register_check_item.S":{
+    "dataTransOpts.refresh.register_check.S":{
       immediate:true,
       handler(newVal, oldVal) {
-        console.log(`watch dataTransOpts.refresh.register_check_item newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.registerCheckId}`);        
-        this.getRegisterCheck(this.registerCheckId);
+        console.log(`watch 检查医生信息 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.register_check.id}`);        
+        this.getRegisterCheck(this.dataTransOpts.tableS.register_check.id);
       }
     },
   },
diff --git a/src/components/doctorCheck/RegisterCheckList.vue b/src/components/doctorCheck/RegisterCheckList.vue
index 6198d21..894f1e9 100644
--- a/src/components/doctorCheck/RegisterCheckList.vue
+++ b/src/components/doctorCheck/RegisterCheckList.vue
@@ -63,8 +63,9 @@ export default {
       this.doctorCheck.RegisterCheckId = row.id
       this.dataTransOpts.tableS.register_check.id = row.id
       setTimeout(() => { // 不管值是否改变，点击就强制刷新
-        this.dataTransOpts.refresh.register_check_item.S++
-      }, 100);
+        this.dataTransOpts.refresh.register_check.S++
+        this.dataTransOpts.refresh.register_check_item.M++
+      }, 10);
       // this.doctorCheck.RegisterCheckEdit = row
     },
 
@@ -85,15 +86,19 @@ export default {
             //查询出来 默认显示第1条记录明细、小结等
             if(res.data.length > 0) {
               this.doctorCheck.RegisterCheckId = res.data[0].id
-              this.dataTransOpts.tableS.register_check.id = res.data[0].id
-              setTimeout(() => { // 不管值是否改变，点击就强制刷新
-                this.dataTransOpts.refresh.register_check_item.S++
-              }, 100);
+              this.dataTransOpts.tableS.register_check.id = res.data[0].id              
               // this.doctorCheck.RegisterCheckEdit = res.data[0]
 
               this.$refs['doctorCheck_RegisterCheckList'].setCurrentRow(res.data[0])
 
+            }else{
+              this.dataTransOpts.tableS.register_check.id = ''
             }
+
+            setTimeout(() => { // 不管值是否改变，点击就强制刷新
+              this.dataTransOpts.refresh.register_check.S++   //刷新检查医生
+              this.dataTransOpts.refresh.register_check_item.M++  //刷新检查明细
+            }, 10);
           }
       })
       .catch((err) => {
@@ -105,15 +110,14 @@ export default {
   },
 
   
-
   //监听事件
   watch: {    
     //体检人员未切换时 也可以强制刷新数据
-    "dataTransOpts.refresh.register_check.S":{
+    "dataTransOpts.refresh.register_check.M":{
       immediate:true,
       handler(newVal, oldVal) {
-        console.log("watch doctorCheck.prBase.id newVal：", newVal, " oldVal：", oldVal);        
-        this.registerCheckList(this.doctorCheck.prBase.id)        
+        console.log(`watch 组合项目列表 newVal: ${newVal} oldVal: ${oldVal} patient_register.id: ${this.dataTransOpts.tableS.patient_register.id}`);        
+        this.registerCheckList(this.dataTransOpts.tableS.patient_register.id)        
       }
     },
   }