From c397090ba2db49db40433d36666540510c5cebb0 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Mon, 21 Apr 2025 10:33:54 +0800
Subject: [PATCH] report

---
 .../report/PatientRegisterListNobtn.vue       |  3 +-
 .../report/PatientRegisterQueryNobtn.vue      | 83 +++++++++++++++----
 src/store/index.js                            |  3 +-
 3 files changed, 70 insertions(+), 19 deletions(-)

diff --git a/src/components/report/PatientRegisterListNobtn.vue b/src/components/report/PatientRegisterListNobtn.vue
index 3e88cfa..c3a9668 100644
--- a/src/components/report/PatientRegisterListNobtn.vue
+++ b/src/components/report/PatientRegisterListNobtn.vue
@@ -352,8 +352,9 @@ export default {
       if (this.patientRegister.query.isAudit) body.isAudit = this.patientRegister.query.isAudit
       if (this.patientRegister.query.isReportPrint) body.isReportPrint = this.patientRegister.query.isReportPrint
       if (this.patientRegister.query.isUpload) body.isUpload = this.patientRegister.query.isUpload
-      if (this.patientRegister.query.medicalTypeIds) body.medicalTypeIds = this.patientRegister.query.medicalTypeIds
+      if (this.patientRegister.query.medicalTypeIds && this.patientRegister.query.medicalTypeIds.length > 0) body.medicalTypeIds = this.patientRegister.query.medicalTypeIds
       if (this.patientRegister.query.personnelTypeId) body.personnelTypeId = this.patientRegister.query.personnelTypeId
+      if (this.patientRegister.query.medicalConclusionId && this.patientRegister.query.medicalConclusionId.length > 0) body.medicalConclusionIds = this.patientRegister.query.medicalConclusionId
 
       //console.log('/api/app/peisreport/getpatientregisterreport',body)
 
diff --git a/src/components/report/PatientRegisterQueryNobtn.vue b/src/components/report/PatientRegisterQueryNobtn.vue
index fb1feae..ee9e2d9 100644
--- a/src/components/report/PatientRegisterQueryNobtn.vue
+++ b/src/components/report/PatientRegisterQueryNobtn.vue
@@ -59,12 +59,13 @@
           <span class="spanClass">检查状态</span>
           <el-select v-model="patientRegister.query.completeFlag" placeholder="请选择" clearable style="width: 80px"
             size="small" align="center">
-            <el-option v-for="item in dict.completeFlag" :key="item.id" :label="item.displayName" :value="item.id"/>
+            <el-option v-for="item in dict.completeFlag" :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.isAudit" placeholder="请选择" clearable style="width: 75px" size="small">
+          <el-select v-model="patientRegister.query.isAudit" placeholder="请选择" clearable style="width: 75px"
+            size="small">
             <el-option label="未审核" value="N" />
             <el-option label="已审核" value="Y" />
           </el-select>
@@ -87,20 +88,27 @@
         </div>
         <div class="query">
           <span class="spanClass">体检类别</span>
-          <el-select v-model="patientRegister.query.medicalTypeIds" placeholder="请选择" clearable filterable style="width: 200px"
-            size="small" multiple>
-            <el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName"
-                      :value="item.id" />
+          <el-select v-model="patientRegister.query.medicalTypeIds" placeholder="请选择" clearable filterable
+            style="width: 200px" size="small" multiple>
+            <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"
+          <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 class="query">
+          <span class="spanClass">检查结论</span>
+          <el-select v-model="patientRegister.query.medicalConclusionId" placeholder="请选择" clearable multiple collapse-tags style="width: 180px;"
             size="small">
-            <el-option v-for="item in dict.personnelType" :key="item.id" :label="item.displayName"
-                      :value="item.id" />
+            <el-option-group v-for="group in medicalConclusionGroup" :key="group.value" :label="group.label">
+              <el-option v-for="item in group.options" :key="item.id" :label="item.displayName" :value="item.id" />
+            </el-option-group>
           </el-select>
-        </div>     
+        </div>
       </div>
     </div>
     <!--通用选单位、体检次数、分组的控件-->
@@ -113,7 +121,7 @@
 <script>
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { deepCopy } from "../../utlis/proFunc"
+import { arrayExistObj,deepCopy } from "../../utlis/proFunc"
 import CusOrgOCX from "./CusOrgOCX.vue"
 
 export default {
@@ -124,14 +132,16 @@ export default {
   data() {
     return {
       dialogVisible: false,
-      local:{
-        completeFlag:[]
-      }
+      local: {
+        completeFlag: []
+      },
+      medicalConclusion:[], //体检结论
+      medicalConclusionGroup:[], //体检结论分组
     };
   },
 
   created() {
-
+    this.distInit()
   },
 
   //挂载完成
@@ -142,14 +152,25 @@ export default {
     this.local.completeFlag.splice(2, 0, { id: '5', displayName: '全部已检(未总检)' }) //插入
 
     this.enterToQuery()
-    
+
+    this.medicalConclusionHandle()
+
   },
 
   computed: {
     ...mapState(["window", "dict", "patientRegister", "customerOrg", "report"]),
   },
   methods: {
-
+    distInit(){
+      // 获取体检结论信息
+      getapi('/api/app/medical-conclusion/in-type')
+        .then(res => {
+          if (res.code != -1) {
+            this.medicalConclusion = res.data
+            this.medicalConclusionHandle()
+          }
+        })
+    },
     //选择单位
     changeCustomerOrgId(v) {
       console.log(v)
@@ -189,6 +210,34 @@ export default {
       ];
     },
 
+    // 体检结论分类
+    medicalConclusionHandle() {
+      //   <el-option-group
+      //   v-for="group in options"
+      //   :key="group.label"
+      //   :label="group.label">
+      //   <el-option
+      //     v-for="item in group.options"
+      //     :key="item.value"
+      //     :label="item.label"
+      //     :value="item.value">
+      //   </el-option>
+      // </el-option-group>
+      this.medicalConclusionGroup = []
+      this.medicalConclusion.forEach(e => {
+        let lfind = arrayExistObj(this.medicalConclusionGroup, 'value', e.medicalConclusionTypeId)
+        if (lfind > -1) {
+          this.medicalConclusionGroup[lfind]["options"].push({ id: e.id, displayName: e.displayName })
+        } else {
+          this.medicalConclusionGroup.push({
+            label: e.medicalConclusionTypeName,
+            value: e.medicalConclusionTypeId,
+            options: [{ id: e.id, displayName: e.displayName }]
+          })
+        }
+      });
+    },
+
     // 根据pacs条码查询
     onQueryByPacsNo(checkRequestNo) {
       postapi('/api/app/PatientRegister/GetPatientRegisterNoByCheckRequestNo', { checkRequestNo }).then(res => {
diff --git a/src/store/index.js b/src/store/index.js
index 44c1608..1768ac4 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -219,7 +219,8 @@ export default new Vuex.Store({
                 isPhoneComplete: "N",
                 diagnosisLevelId: [],
                 medicalTypeIds: [],
-                completeFlags: []
+                completeFlags: [],
+                medicalConclusionId:[], 
             }, //查询条件
             customerOrgGroup: [], //分组（针对单位）
             patientRegisterAbs: [], //人员已选组合项目