From e0414830da122b8d810bfb8dd8b94e2ffc779f62 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Sat, 21 Sep 2024 19:39:51 +0800
Subject: [PATCH] dj

---
 src/components/doctorCheck/CheckPicture.vue   |  8 +++----
 .../patientRegister/PatientRegisterList.vue   | 24 ++++++++++++++-----
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/components/doctorCheck/CheckPicture.vue b/src/components/doctorCheck/CheckPicture.vue
index 4d1fe1c..b428c39 100644
--- a/src/components/doctorCheck/CheckPicture.vue
+++ b/src/components/doctorCheck/CheckPicture.vue
@@ -375,14 +375,12 @@ export default {
       this.pacsParams.row = deepCopy(this.doctorCheck.checkItemList[0])
       this.pacsParams.index = 0
 
-      console.log('pacsParams', this.pacsParams)
-
-      this.iframeSrc = `${this.sysConfig.dcmViewers}/?mrn=${this.doctorCheck.checkRequestNo}`
+      // console.log('pacsParams', this.pacsParams)
+      let token = window.sessionStorage.getItem('token')
+      this.iframeSrc = `${this.sysConfig.dcmViewers}/?mrn=${this.doctorCheck.checkRequestNo}&token=${token}&pacsapi=${this.sysConfig.pacsApi}`
       // this.iframeSrc = `${this.sysConfig.dcmViewers}/viewer?StudyInstanceUIDs=1.3.12.2.1107.5.1.4.79623.30000024091203062645300000022`
       this.dialogDcm = true
 
-      
-
     },
 
     // 选择描述与结论
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 824449b..2275202 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -1115,12 +1115,24 @@ export default {
       if (this.patientRegister.query.phone)
         body.phone = this.patientRegister.query.phone;
 
-      if (this.patientRegister.query.idCardNo)
-        body = {
-          idNo: this.patientRegister.query.idCardNo,
-          skipCount: this.loadOpts.skipCount,
-          maxResultCount: this.loadOpts.maxResultCount
-        };
+      if (this.patientRegister.query.idCardNo) {
+        body.idNo = this.patientRegister.query.idCardNo;
+
+        try {
+          let sysParmId = "patient_register_query_idno"
+          let sysParam = await postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId })
+          // console.log('sysParam', sysParam)
+          if (sysParam.data != 'N') {
+            body = {
+              idNo: this.patientRegister.query.idCardNo,
+              skipCount: this.loadOpts.skipCount,
+              maxResultCount: this.loadOpts.maxResultCount
+            };
+          }
+        } catch (error) {
+          console.log(error)
+        }
+      }
 
       if (this.patientRegister.query.patientNo)
         body = {