sumdoctoer

src/components/doctorCheck/ButtonList.vue

@@ -200,7 +200,7 @@ export default {
     },
 
     computed: {
-        ...mapState(["dict", "patientRegister", "doctorCheck"]),
+        ...mapState(["dict", "patientRegister", "doctorCheck","sumDoctorCheck"]),
     },
 
     methods: {
@@ -674,6 +674,7 @@ export default {
         
         //总检
         toSumDoctorCheck() {
+            this.sumDoctorCheck.sumPREdit = Object.assign({},this.doctorCheck.prBase)
             this.$router.push({ path: "/sumDoctorCheck" });
         },
 

src/components/doctorCheck/PatientRegisterList.vue

@@ -258,18 +258,25 @@ export default {
 
     //点击体检次数行
     rowClick(row) {
+      
       this.doctorCheckPrBaseInit()
       this.doctorCheck.prBase.patientRegisterNo = row.patientRegisterNo
       objCopy(row, this.doctorCheck.prBase)        //基本信息
       this.patientRegister.photo = row.photo
-
+    
       this.sumPREditInit()
       objCopy(row, this.sumDoctorCheck.sumPREdit)  //总检信息
+          
     },
 
+    //双击选中客户记录后，并半闭列表
     rowDblclick(row){
       this.rowClick(row)
-      this.doctorCheck.doctorCheckDialogVisible = false
+      if(this.win == 'doctorCheck'){
+        this.doctorCheck.doctorCheckDialogVisible = false
+      }else{
+        this.sumDoctorCheck.sumDoctorCheckDialogVisible = false
+      }      
     },
 
     ldddw(arrayData, key, value, display) {

src/components/sumDoctorCheck/ButtonList.vue

@@ -42,11 +42,11 @@
         </el-dialog>
          -->
         <el-drawer title="体检人员列表" :visible.sync="sumDoctorCheck.sumDoctorCheckDialogVisible" direction="rtl" 
-          :wrapperClosable="false">
+          :wrapperClosable="false" :modal="false" :size="300">
           <PatientRegisterList :win="sumDoctorCheck" />
         </el-drawer>
 
-        <el-drawer title="诊断列表" :visible.sync="sumDoctorCheck.sumDiagnosisVisible" direction="ltr"  size="300"
+        <el-drawer title="诊断列表" :visible.sync="sumDoctorCheck.sumDiagnosisVisible" direction="ltr"  :size="300"
           :wrapperClosable="false">
           <SumDiagnosis :patientRegisterId="sumDoctorCheck.sumPREdit.id" />
         </el-drawer>
@@ -103,6 +103,8 @@ export default {
 
         //to医生诊台
         toDoctorCheck() {
+            // this.doctorCheck.prBase = Object.assign({},this.sumDoctorCheck.sumPREdit)
+            // this.patientRegister.photo = this.doctorCheck.prBase.photo
             this.$router.push({ path: "/doctorCheck" });
         },
 
@@ -444,18 +446,7 @@ export default {
 
     //监听事件()
     watch: {
-        //1级单位值改变，分组改变
-        "patientRegister.query.CustomerOrgParentId"(newVal, oldVal) {
-            console.log(
-                "watch patientRegister.query.CustomerOrgParentId newVal：",
-                newVal,
-                " oldVal：",
-                oldVal
-            );
-            if (newVal != oldVal && newVal !== this.dict.personOrgId) {
-                this.getCustomerOrgGroup(newVal);
-            }
-        },
+        
     },
 };
 </script>

src/components/sumDoctorCheck/CheckDetails.vue

@@ -73,6 +73,10 @@ export default {
   methods: {
     //获取结果明细
     CheckDetails(RegisterId) { 
+      if(!RegisterId){
+        this.tableData = []
+        return
+      }
       console.log(`/api/app/sumsummaryreport/getdetailedresultslist?PatientRegisterId=${RegisterId}`)
       getapi(`/api/app/sumsummaryreport/getdetailedresultslist?PatientRegisterId=${RegisterId}`)
         .then((res) => {
@@ -86,6 +90,7 @@ export default {
         });
     },
 
+    
     mergeSummarys(array,itemKey){
       let ret = ''
       array.forEach(e => {
@@ -98,9 +103,10 @@ export default {
   //监听事件
   watch: {
     //检查项目切换
-    "sumDoctorCheck.sumPREdit.id"(newVal, oldVal) {
-      console.log("watch sumDoctorCheck.sumPREdit.id newVal：", newVal, " oldVal：", oldVal);
-      if (newVal != oldVal && newVal != '') {
+    "sumDoctorCheck.sumPREdit.id":{
+      immediate:true,
+      handler(newVal, oldVal) {
+        console.log("watch sumDoctorCheck.sumPREdit.id newVal：", newVal, " oldVal：", oldVal);      
         this.CheckDetails(newVal);        
       }
     },

src/components/sumDoctorCheck/SumAsbItemStatus.vue

@@ -62,6 +62,12 @@ export default {
   },
   methods: {
     getSumAsbItemStatus(PatientRegisterId) {
+      this.data.unCheckedAsbitem = [];
+      this.data.giveUpAsbitem = [];
+      this.data.checkedNullValueItem = [];
+      this.data.checkedGiveUpItem = [];
+
+      if(!PatientRegisterId) return
       getapi(`/api/app/patientregister/getpatientregisteritemstatus?PatientRegisterId=${PatientRegisterId}`).then(res => {
         if (res.code != -1) {
           this.data.unCheckedAsbitem = res.data.unCheckedAsbitem;
@@ -76,9 +82,10 @@ export default {
   //监听事件
   watch: {
     //人员ID切换
-    "patientRegisterId"(newVal, oldVal) {
-      console.log("watch patientRegisterId newVal：", newVal, " oldVal：", oldVal);
-      if (newVal != oldVal && newVal != '') {
+    "patientRegisterId":{
+      immediate:true,
+      handler(newVal, oldVal) {
+        console.log("watch patientRegisterId newVal：", newVal, " oldVal：", oldVal);      
         this.getSumAsbItemStatus(newVal);
       }
     },

src/components/sumDoctorCheck/SumDiagnosis.vue

@@ -139,6 +139,8 @@ export default {
 
     //查询
     getDiagnosisList(PatientRegisterId) {
+      this.sumDoctorCheck.diagnosisList = []
+      if(!PatientRegisterId) return
       // /api/app/sumdiagnosis/getsumdiagnosislistinpatientregisterid?PatientRegisterId=3fa85f64-5717-4562-b3fc-2c963f66afa6
       getapi(`/api/app/sumdiagnosis/getsumdiagnosislistinpatientregisterid?PatientRegisterId=${PatientRegisterId}`)
         .then((res) => {
@@ -173,8 +175,9 @@ export default {
 
   //监听事件
   watch: {
-    "patientRegisterId"(newVal, oldVal){
-      if(newVal && newVal != oldVal){
+    "patientRegisterId":{
+      immediate:true,
+      handler(newVal, oldVal){      
         this.getDiagnosisList(newVal)
       }
     },

src/components/sumDoctorCheck/SumHistory.vue

@@ -57,7 +57,9 @@ export default {
     //   "sumSummarys": "*  乙肝两对半：\n(01)无免疫\n*  身高体重：\n(01)重度脂肪肝\n*  血常规：\n(01)白细胞计数升高\n*  心电图：\n(01)右眼近视\n",
     //   "sumSuggestions": "*  乙肝两对半：\n(01)接种疫苗\n*  身高体重：\n(01)减肥、锻炼\n*  血常规：\n(01)注意休息\n*  心电图：\n(01)护眼及注意用眼卫生\n"
     // },    
-    SumHistory(patientId) {   
+    SumHistory(patientId) {
+      this.tableData = []
+      if(!patientId) return
       console.log(`/api/app/sumsummaryreport/gethistoricalreviewlist?PatientId=${patientId}`)
       getapi(`/api/app/sumsummaryreport/gethistoricalreviewlist?PatientId=${patientId}`)
         .then((res) => {
@@ -80,9 +82,10 @@ export default {
   //监听事件
   watch: {
     //检查项目切换
-    "sumDoctorCheck.sumPREdit.patientId"(newVal, oldVal) {
-      console.log("watch sumDoctorCheck.sumPREdit.patientId newVal：", newVal, " oldVal：", oldVal);
-      if (newVal != oldVal && newVal != '') {
+    "sumDoctorCheck.sumPREdit.patientId":{
+      immediate:true,
+      handler(newVal, oldVal) {
+        console.log("watch sumDoctorCheck.sumPREdit.patientId newVal：", newVal, " oldVal：", oldVal);      
         this.SumHistory(newVal)        
       }
     },

src/components/sumDoctorCheck/SumItems.vue

@@ -64,6 +64,8 @@ export default {
 
     //获取检查组合项目
     registerCheckList(patientId) {
+      this.RegisterCheckList = []
+      if(!patientId) return
       console.log(`/api/app/sumsummaryreport/gethorizontalcomparisonasbitemlist?PatientId=${patientId}`)
       getapi(`/api/app/sumsummaryreport/gethorizontalcomparisonasbitemlist?PatientId=${patientId}`)
         .then((res) => {
@@ -151,9 +153,10 @@ export default {
   //监听事件
   watch: {
     //检查项目切换
-    "sumDoctorCheck.sumPREdit.patientId"(newVal, oldVal) {
-      console.log("watch sumDoctorCheck.sumPREdit.patientId newVal：", newVal, " oldVal：", oldVal);
-      if (newVal != oldVal && newVal != '') {
+    "sumDoctorCheck.sumPREdit.patientId":{
+      immediate:true,
+      handler(newVal, oldVal) {
+        console.log("watch sumDoctorCheck.sumPREdit.patientId newVal：", newVal, " oldVal：", oldVal);      
         this.registerCheckList(newVal)
       }
     },

src/components/sumDoctorCheck/SumItemsType.vue

@@ -41,6 +41,8 @@ export default {
   methods: {
     //获取结果明细 3a0c6589-9989-4d7f-ba54-61e5b0138220
     SumItems(patientId) {  
+      this.orgData = []
+      if(!patientId) return
       console.log(`/api/app/sumsummaryreport/getitemtypecontrastlist?PatientId=${patientId}`)
       getapi(`/api/app/sumsummaryreport/getitemtypecontrastlist?PatientId=${patientId}`)
         .then((res) => {
@@ -96,9 +98,10 @@ export default {
   //监听事件
   watch: {
     //检查项目切换
-    "sumDoctorCheck.sumPREdit.patientId"(newVal, oldVal) {
-      console.log("watch sumDoctorCheck.sumPREdit.patientId newVal：", newVal, " oldVal：", oldVal);
-      if (newVal != oldVal && newVal != '') {
+    "sumDoctorCheck.sumPREdit.patientId":{
+      immediate:true,
+      handler(newVal, oldVal) {
+        console.log("watch sumDoctorCheck.sumPREdit.patientId newVal：", newVal, " oldVal：", oldVal);      
         this.SumItems(newVal)        
       }
     },

src/components/sumDoctorCheck/SumSug.vue

@@ -32,14 +32,17 @@
         <el-table-column prop="suggestionTitle" label="建议">
           <template slot-scope="scope">
             <div>
-              <el-input v-model="scope.row.suggestionTitle" placeholder="请输入建议标题"
-                :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'">
-                <el-button slot="append" icon="el-icon-plus" @click="addSug(scope.$index)"
+              <div style="display: flex;">
+                <el-input v-model="scope.row.suggestionTitle" placeholder="请输入建议标题" 
+                  :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'">
+                </el-input>
+
+                <el-button type="success" icon="el-icon-plus" style="min-width: 30px;" @click="addSug(scope.$index)"
+                  :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'"></el-button>
+                <el-button type="danger" icon="el-icon-delete" style="margin-left: 2px;min-width: 30px;" @click="delSugHead(scope.$index)"
                   :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'"></el-button>
-                <!--
-                <el-button slot="append" icon="el-icon-d-caret"></el-button>
-                -->
-              </el-input>
+              </div>  
+              
               <el-table :id="'sug' + scope.row.id" row-key="displayOrder" style="margin-left: 30px;"
                 :data="scope.row.details" border @row-click="rowClickSug" :show-header="false"
                 :row-style="{ height: '30px' }">
@@ -48,21 +51,21 @@
                     <div>{{ scope2.$index + 1 }}</div>
                   </template>
                 </el-table-column>
-                <el-table-column prop="suggestionContent" label="建议">
-                  <template slot-scope="scope2">
+                <el-table-column prop="suggestionContent" label="建议" min-width="400">
+                  <template slot-scope="scope2">                    
                     <el-input type="textarea" v-model="scope2.row.suggestionContent" placeholder="请输入建议内容"
                       :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'"
                       :autosize="{ minRows: 1, maxRows: 100 }">
-                    </el-input>
+                    </el-input>                                
                   </template>
                 </el-table-column>
-                <el-table-column label="" width="87">
-                  <template slot-scope="scope2">
-                    <el-button type="danger" icon="el-icon-delete" @click="delSug(scope.row.details, scope2.$index)"
+                <el-table-column prop="suggestionContent" label="操作" min-width="60">
+                  <template slot-scope="scope2">                    
+                    <el-button type="danger" style="min-width:30px;" icon="el-icon-delete" @click="delSug(scope.row.details, scope2.$index)"
                       :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'"
-                      size="small"></el-button>
+                      size="small"></el-button>                      
                   </template>
-                </el-table-column>
+                </el-table-column>                  
               </el-table>
             </div>
           </template>
@@ -91,11 +94,6 @@ export default {
   mounted() {
     this.rowDrop();
     this.rowDropSuggestion();
-
-    if(this.sumDoctorCheck.sumPREdit.id){
-      this.summaryList(this.sumDoctorCheck.sumPREdit.id);
-      this.suggestionList(this.sumDoctorCheck.sumPREdit.id);
-    }
   },
 
   computed: {
@@ -105,6 +103,10 @@ export default {
   methods: {
     //获取综述
     summaryList(RegisterId) {
+      if(!RegisterId){
+        this.sumDoctorCheck.summaryList = [];
+        return
+      }
       // [
       //   {
       //     "id": "3a0c5bbb-dfea-eec1-ed37-78203086987c",
@@ -136,6 +138,10 @@ export default {
 
     //获取建议
     suggestionList(RegisterId) {
+      if(!RegisterId){
+        this.sumDoctorCheck.suggestionList = [];
+        return;
+      };
       // [
       //   {
       //     "id": "3a0c6589-9b6f-bbb1-bb8b-d6876ea5e4e6",
@@ -174,6 +180,11 @@ export default {
       })
     },
 
+    //删除建议头及明细
+    delSugHead(index) {
+      this.sumDoctorCheck.suggestionList.splice(index,1)
+    },
+
     //删除建议明细
     delSug(details, indexD) {
       details.splice(indexD, 1);
@@ -295,20 +306,19 @@ export default {
   //监听事件
   watch: {
     //检查项目切换
-    "sumDoctorCheck.sumPREdit.id"(newVal, oldVal) {
-      console.log("watch sumDoctorCheck.sumPREdit.id newVal：", newVal, " oldVal：", oldVal);
-      if (newVal != oldVal && newVal != '') {
+    "sumDoctorCheck.sumPREdit.id":{
+      immediate:true,
+      handler(newVal, oldVal) {
+        console.log("watch sumDoctorCheck.sumPREdit.id newVal：", newVal, " oldVal：", oldVal);        
         this.summaryList(newVal)
-        this.suggestionList(newVal)
+        this.suggestionList(newVal)        
       }
     },
   },
 };
 </script>
 <style scoped>
-::v-deep .el-table td.el-table__cell,
-.el-table th.el-table__cell.is-leaf {
-  padding: 0;
-}
+@import '../../assets/css/global_table.css';
+
 </style>
   

src/views/doctorCheck/sumDoctorCheck.vue

@@ -14,9 +14,11 @@
             <el-tabs v-model="tabChoosed">
               <el-tab-pane label="综述建议" name="1">
                 <div>
-                  <SumSug />
+                  <!-- -->
+                  <SumSug />                  
                   <SumPREdit />
                   <SumAsbItemStatus :patientRegisterId="sumDoctorCheck.sumPREdit.id" />
+                  
                 </div>
               </el-tab-pane>
               <el-tab-pane label="明细结果" name="2">
@@ -43,7 +45,7 @@
   </div>
 </template>
 <script>
-import { mapState, mapActions } from "vuex";
+import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { tcdate } from "../../utlis/proFunc";
 
@@ -92,7 +94,7 @@ export default {
   },
 
   methods: {
-    ...mapActions(["getCustomerOrgGroup"]),
+    
     //数据初始化
     dictInit() {
       //性别
@@ -201,18 +203,7 @@ export default {
 
   //监听事件()
   watch: {
-    //1级单位值改变，分组改变
-    "patientRegister.query.CustomerOrgParentId"(newVal, oldVal) {
-      console.log(
-        "watch patientRegister.query.CustomerOrgParentId newVal：",
-        newVal,
-        " oldVal：",
-        oldVal
-      );
-      if (newVal != oldVal && newVal !== this.dict.personOrgId) {
-        this.getCustomerOrgGroup(newVal);
-      }
-    },
+    
   },
 };
 </script>