seo

src/components/doctorCheck/CheckItemList.vue

@@ -754,7 +754,7 @@ export default {
       this.moreResult.result = row.result;
       this.moreResult.defaultResult = row.defaultResult;
       this.moreResult.index = index;
-      if(!row.result){
+      if(!row?.result){
         this.selection.start = 0
         this.selection.end = 0
       }else{
@@ -1118,8 +1118,9 @@ export default {
       let input = document.getElementById("resultBox");
       this.selection.start = input.selectionStart;
       this.selection.end = input.selectionEnd;
-      //console.log('点击后光标',this.selection)
+      console.log('点击后光标',this.selection)
     },
+
     watchSelection() {
       this.$nextTick(() => {
         let that = this;

src/components/doctorCheck/PatientRegisterBase2.vue

@@ -256,7 +256,7 @@ export default {
       postapi('/api/app/PatientRegister/GetPatientRegisterNoByCheckRequestNo', { checkRequestNo }).then(res => {
         if (res.code > 0) {
           this.prBase.patientRegisterNo = res.data.patientRegisterNo
-          this.onQueryByOnlyNo('patientRegisterNo')
+          this.onQueryByOnlyNo('patientRegisterNo', 'pacsNo')
         }
       })
     },
@@ -266,27 +266,30 @@ export default {
       postapi('/api/app/PatientRegister/GetPatientRegisterNoByLisRequestNo', { lisRequestNo }).then(res => {
         if (res.code > 0) {
           this.prBase.patientRegisterNo = res.data.patientRegisterNo
-          this.onQueryByOnlyNo('patientRegisterNo')
+          this.onQueryByOnlyNo('patientRegisterNo', 'lisNo')
         }
       })
     },
 
     //按条码号、档案、身份证  查个人数据
-    onQueryByOnlyNo(noType) {
+    // noType -- 查询关键值字段名
+    // storeCol -- 保留字段值不刷新（用检查条码与检验条码查时）
+    onQueryByOnlyNo(noType, storeCol) {
       let noVal = this.prBase[noType]  //唯一号的值
       if (!noVal) return
       let body = {}
       if (noType == 'idNo') noVal = noVal.toUpperCase()
       body[noType] = noVal
-
+      let storeObj = {}
       let patientRegister = { id: '' }
+      if (storeCol) storeObj[storeCol] = this.prBase[storeCol]
       patientRegister[noType] = noVal
       this.prBase = deepCopy(patientRegister)
 
       postapi('/api/app/patientregister/GetAlreadyRegisterPatientRegisterByNo', body)
         .then((res) => {
           if (res.code > -1) {
-            this.prBase = res.data
+            this.prBase = Object.assign({},this.prBase, res.data, storeObj)
 
             // ----------  如果是总检与审核医生不可选时，则总检与审核默认当前用户，此功能放至保存时触发 
             if (this.prBase.completeFlag != '3') this.prBase.summaryDoctorId = this.prBase.summaryDoctorId || this.userId
@@ -294,8 +297,9 @@ export default {
               this.prBase.auditDoctorId = this.prBase.auditDoctorId || this.userId
             }
             // ----------
-            // console.log('res.data',res.data)
-            // console.log('this.prBase',this.prBase)
+            console.log('res.data',res.data)
+            console.log('this.prBase',this.prBase)
+            console.log('storeObj',storeObj)
 
           }
           this.afterFind(this.prBase)