From 8918474535289a9e34ec6ebcb5d74f710730211e Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Sat, 25 May 2024 19:45:05 +0800
Subject: [PATCH] report

---
 .../report/PatientRegisterListNobtn.vue          | 12 +++++++-----
 .../report/PatientRegisterQueryNobtn.vue         | 16 ++++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/components/report/PatientRegisterListNobtn.vue b/src/components/report/PatientRegisterListNobtn.vue
index 48f2940..925431f 100644
--- a/src/components/report/PatientRegisterListNobtn.vue
+++ b/src/components/report/PatientRegisterListNobtn.vue
@@ -276,6 +276,8 @@ export default {
       let body = {}
 
       console.log(`this.patientRegister.query`, this.patientRegister.query)
+
+      body = deepCopy(this.patientRegister.query)
       if (this.patientRegister.query.customerOrgFlag) {
         if (this.patientRegister.query.CustomerOrgParentId) {
           body.customerOrgId = this.patientRegister.query.CustomerOrgParentId
@@ -284,11 +286,7 @@ export default {
         }
       }
 
-      if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
-
-      if (this.patientRegister.query.patientName) body.patientName = this.patientRegister.query.patientName
-
-      if (this.patientRegister.query.completeFlag) body.completeFlag = this.patientRegister.query.completeFlag
+      if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex      
 
       //StartDate EndDate
       if (this.patientRegister.query.dateRange) {
@@ -296,6 +294,7 @@ export default {
         body.endDate = moment(new Date(this.patientRegister.query.dateRange[1])).format("yyyy-MM-DD")
       }
 
+      console.log('body',body)
 
       if (this.patientRegister.query.idCardNo) body = { idNo: this.patientRegister.query.idCardNo }
 
@@ -363,6 +362,9 @@ export default {
       if (this.patientRegister.query.isAudit) body.isAudit = this.patientRegister.query.isAudit
       if (this.patientRegister.query.reportPrintTimes >= 0) body.isReportPrint = this.patientRegister.query.reportPrintTimes
       if (this.patientRegister.query.isUpload) body.isUpload = this.patientRegister.query.isUpload
+      if (this.patientRegister.query.medicalTypeId) body.medicalTypeId = this.patientRegister.query.medicalTypeId
+      if (this.patientRegister.query.personnelTypeId) body.personnelTypeId = this.patientRegister.query.personnelTypeId
+
       //console.log('/api/app/peisreport/getpatientregisterreport',body)
 
       postapi('/api/app/peisreport/getpatientregisterreport', body).then(res => {
diff --git a/src/components/report/PatientRegisterQueryNobtn.vue b/src/components/report/PatientRegisterQueryNobtn.vue
index 5f2a639..4e564c5 100644
--- a/src/components/report/PatientRegisterQueryNobtn.vue
+++ b/src/components/report/PatientRegisterQueryNobtn.vue
@@ -81,6 +81,22 @@
             <el-option label="已打印" value=1 />
           </el-select>
         </div>
+        <div class="query">
+          <span class="spanClass">体检类别</span>
+          <el-select v-model="patientRegister.query.medicalTypeId" placeholder="请选择" clearable filterable style="width: 75px"
+            size="small">
+            <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.personnelTypeId" placeholder="请选择" clearable filterable style="width: 75px"
+            size="small">
+            <el-option v-for="item in dict.personnelType" :key="item.id" :label="item.displayName"
+                      :value="item.id" />
+          </el-select>
+        </div>     
       </div>
     </div>
     <!--通用选单位、体检次数、分组的控件-->