From ca4d45022426b94b7c6cdf388161c57a8181c821 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Mon, 15 Jul 2024 17:15:39 +0800
Subject: [PATCH] dj

---
 .../patientRegister/PatientRegisterList.vue   | 16 +++++-
 .../patientRegister/patientRegisterQuery.vue  | 50 ++++++++++++-------
 2 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index dbd03b8..c862f24 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -614,7 +614,7 @@ export default {
 
         if (!row.completeFlag || row.completeFlag == '0') reject('预登记人员，不可执行此操作！')
         toOutShell.BusinessCode = row.id
-
+        console.log(JSON.stringify(toOutShell))
         if (isPreview) {
           this.$peisAPI.printPre(JSON.stringify(toOutShell))
             .then(res => {
@@ -661,6 +661,12 @@ export default {
     printGuideLisPacs(row) {
       return new Promise((resolve, reject) => {
         this.guidePrintPromise("0008", false, row)
+          .then(res => {
+            return this.lisPrint(row,"0002",false)
+          })
+          .then(res => {
+            return this.pacsPrint(row,"0003",false)
+          })
           .then(res => {
             resolve(res)
           })
@@ -671,7 +677,13 @@ export default {
     },
 
 
-    async printPromise() {
+    async printPromise() {     
+
+      if (this.multipleSelection.length < 1) {
+        this.$message.info({ showClose: true, message: "请勾选要打印人员检验检查条码的记录！" });
+        return;
+      }
+
       this.elProgress.display = true;
       this.elProgress.percentage = 0;
 
diff --git a/src/components/patientRegister/patientRegisterQuery.vue b/src/components/patientRegister/patientRegisterQuery.vue
index 921f771..df30cf8 100644
--- a/src/components/patientRegister/patientRegisterQuery.vue
+++ b/src/components/patientRegister/patientRegisterQuery.vue
@@ -26,24 +26,26 @@
       <div class="query">
         <span class="spanClass">档案号</span>
         <el-input placeholder="档案号" v-model="patientRegister.query.patientNo" size="small" clearable
-          style="width: 110px" />
+          style="width: 80px" />
       </div>
       <div class="query">
         <span class="spanClass">姓名</span>
         <el-input placeholder="姓名" v-model="patientRegister.query.patientName" size="small" clearable
-          style="width: 80px" />
+          style="width: 60px" />
       </div>
       <div class="query">
         <span class="spanClass">检查条码</span>
-        <el-input placeholder="检查条码" v-model="patientRegister.query.pacsNo" size="small" clearable style="width: 120px" />
+        <el-input placeholder="检查条码" v-model="patientRegister.query.pacsNo" size="small" clearable
+          style="width: 120px" />
       </div>
       <div class="query">
         <span class="spanClass">检验条码</span>
-        <el-input placeholder="检验条码" v-model="patientRegister.query.lisNo" size="small" clearable style="width: 120px" />
+        <el-input placeholder="检验条码" v-model="patientRegister.query.lisNo" size="small" clearable
+          style="width: 120px" />
       </div>
       <div class="query">
         <span class="spanClass">性别</span>
-        <el-select v-model="patientRegister.query.sex" placeholder="请选择" style="width: 80px" size="small">
+        <el-select v-model="patientRegister.query.sex" placeholder="性别" style="width: 50px" size="small">
           <el-option v-for="item in dict.forSex" :key="item.id" :label="item.displayName" :value="item.id">
           </el-option>
         </el-select>
@@ -54,8 +56,8 @@
           style="width: 100px" />
       </div>
       <div class="query">
-        <span class="spanClass">身份证号</span>
-        <el-input placeholder="身份证号" v-model="patientRegister.query.idCardNo" size="small" clearable
+        <span class="spanClass">身份证</span>
+        <el-input placeholder="身份证" v-model="patientRegister.query.idCardNo" size="small" clearable
           style="width: 150px" />
       </div>
       <div class="query">
@@ -69,15 +71,22 @@
       <div class="query">
         <span class="spanClass">次数</span>
         <el-select v-model="patientRegister.query.customerOrgRegister" placeholder="次数"
-          @change="changeCustomerOrgRegister" style="width: 60px;" size="small" value-key="id">
+          @change="changeCustomerOrgRegister" style="width: 50px;" size="small" value-key="id">
           <el-option v-for="item in customerOrgRegisterList" :key="item.id" :label="item.medicalTimes" :value="item">{{
             item.medicalTimes + '次' }}</el-option>
         </el-select>
       </div>
+      <div class="query">
+        <span class="spanClass">体检类别</span>
+        <el-select v-model="patientRegister.query.medicalTypeIds" placeholder="请选择" clearable filterable
+          style="width: 170px" size="small" multiple collapse-tags>
+          <el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName" :value="item.id" />
+        </el-select>
+      </div>
       <div class="query">
         <span class="spanClass">状态</span>
-        <el-select v-model="patientRegister.query.completeFlag" placeholder="请选择" clearable style="width: 80px"
-          size="small">
+        <el-select v-model="patientRegister.query.completeFlags" placeholder="请选择" clearable style="width: 100px"
+          size="small" multiple collapse-tags>
           <el-option v-for="item in dict.completeFlag" :key="item.id" :label="item.displayName" :value="item.id">
           </el-option>
         </el-select>
@@ -111,7 +120,7 @@ export default {
       pagePriv: {
         routeUrlorPageName: 'patientRegister', //当前页面归属路由或归属页面权限名称
         privs: [] // 页面权限
-      },      
+      },
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now();
@@ -150,7 +159,7 @@ export default {
     let ldate = new Date();
     this.patientRegister.query.startDate = ldate;
     this.patientRegister.query.endDate = ldate;
-    this.patientRegister.query.dateType = '2' 
+    this.patientRegister.query.dateType = '2'
   },
 
   //挂载完成
@@ -165,7 +174,7 @@ export default {
   methods: {
     checkPagePriv,
 
-    btnClear(){
+    btnClear() {
       this.patientRegister.query.patientRegisterNo = ''
       this.patientRegister.query.patientNo = ''
       this.patientRegister.query.patientName = ''
@@ -205,6 +214,13 @@ export default {
           // console.log('this.patientRegister.query.customerOrgRegister',this.patientRegister.query.customerOrgRegister)
         }
       });
+
+      //体检类别
+      getapi("/api/app/medical-type/in-filter").then((res) => {
+        if (res.code > -1) {
+          this.dict.medicalType = res.data;
+        }
+      });
     },
 
 
@@ -259,7 +275,7 @@ export default {
 
     // 根据pacs条码查询
     onQueryByPacsNo(checkRequestNo) {
-      postapi('/api/app/PatientRegister/GetPatientRegisterNoByCheckRequestNo', {checkRequestNo}).then(res => {
+      postapi('/api/app/PatientRegister/GetPatientRegisterNoByCheckRequestNo', { checkRequestNo }).then(res => {
         if (res.code > 0) {
           this.patientRegister.query.patientRegisterNo = res.data.patientRegisterNo
           this.patientRegister.query.times++;
@@ -269,7 +285,7 @@ export default {
 
     // 根据lis条码查询
     onQueryByLisNo(lisRequestNo) {
-      postapi('/api/app/PatientRegister/GetPatientRegisterNoByLisRequestNo', {lisRequestNo}).then(res => {
+      postapi('/api/app/PatientRegister/GetPatientRegisterNoByLisRequestNo', { lisRequestNo }).then(res => {
         if (res.code > 0) {
           this.patientRegister.query.patientRegisterNo = res.data.patientRegisterNo
           this.patientRegister.query.times++;
@@ -299,7 +315,7 @@ export default {
                 case '档案号':
                 case '姓名':
                 case '预约手机号':
-                case '身份证号':
+                case '身份证':
                   if (input.value) this.patientRegister.query.times++;
                   input.select()
                   break;
@@ -322,7 +338,7 @@ export default {
               case '档案号':
               case '姓名':
               case '预约手机号':
-              case '身份证号':
+              case '身份证':
               case '检查条码':
               case '检验条码':
                 input.select()