From 175b016c3efb8cbf7ffcc20e315711830ca8aa6b Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Wed, 19 Jul 2023 08:56:41 +0800
Subject: [PATCH] query

---
 src/components/doctorCheck/ButtonList.vue     | 173 ++++++++++++++--
 src/components/doctorCheck/CheckItemList.vue  |  31 +--
 .../patientRegister/PatientRegisterList.vue   | 195 ++++++------------
 .../patientRegister/customerOrgTreeAll.vue    |   8 +-
 .../patientRegister/patientRegisterQuery.vue  |  14 +-
 src/store/index.js                            |  11 +-
 src/views/customerOrg/patientRegister.vue     |  13 +-
 src/views/doctorCheck/doctorCheck.vue         |   4 +-
 src/views/doctorCheck/sumDoctorCheck.vue      |   4 +-
 9 files changed, 258 insertions(+), 195 deletions(-)

diff --git a/src/components/doctorCheck/ButtonList.vue b/src/components/doctorCheck/ButtonList.vue
index 9ee0251..0ea81c7 100644
--- a/src/components/doctorCheck/ButtonList.vue
+++ b/src/components/doctorCheck/ButtonList.vue
@@ -7,13 +7,13 @@
             <el-button type="primary" @click="save">保存结果</el-button>
         </div>
         <div class="listBtn">
-            <el-button type="primary">修改结果</el-button>
+            <el-button type="primary" @click="edit">修改结果</el-button>
         </div>
         <div class="listBtn">
-            <el-button type="primary">删除结果</el-button>
+            <el-button type="primary" @click="del">删除结果</el-button>
         </div>
         <div class="listBtn">
-            <el-button type="primary">删除项目</el-button>
+            <el-button type="primary" @click="delItem">删除项目</el-button>
         </div>
         <div class="listBtn">
             <el-button type="primary">历次结果</el-button>
@@ -28,23 +28,23 @@
             <el-button type="primary">总检</el-button>
         </div>
         <div class="listBtn">
-            <el-button type="primary">审核</el-button>
+            <el-button type="primary" @click="audit">审核</el-button>
         </div>
         <div class="listBtn">
-            <el-button type="primary">取消审核</el-button>
+            <el-button type="primary" @click="unAudit">取消审核</el-button>
         </div>
         <div class="listBtn">
             <el-button type="primary">排队</el-button>
         </div>
         <div class="listBtn">
-            <el-button type="primary" @click="addSummary"> + 小结</el-button>
+            <el-button type="primary" @click="addSummary">新增小结</el-button>
         </div>
     </div>
 </template>
 <script>
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { tcdate } from "../../utlis/proFunc";
+import { arrayExistObj } from "../../utlis/proFunc";
 
 
 import PatientRegisterBase from "../../components/doctorCheck/PatientRegisterBase.vue";
@@ -83,17 +83,52 @@ export default {
     methods: {
         ...mapActions(["getCustomerOrgGroup"]),
 
-        //保存数据
-        save() {
+        prList(){
 
-            if (!this.doctorCheck.RegisterCheckEdit.id) {
-                alert("请选择检查项目")
-                return
+        },
+
+        //操作判断
+        optGrant(optType){    
+            let ret = ''        
+            if (!this.doctorCheck.RegisterCheckEdit.id) return '请选择组合项目'
+            if (this.doctorCheck.RegisterCheckEdit.isLock == 'Y') return '组合项目已锁定，不可执行此操作'
+            if (this.doctorCheck.RegisterCheckEdit.completeFlag == '2') return '组合项目已弃检，不可执行此操作'
+            if(optType == 'save'){
+                if (!this.doctorCheck.RegisterCheckEdit.checkDoctorId) return "请选择检查医生"
+                if (this.doctorCheck.RegisterCheckEdit.completeFlag == '1') return "该项目项目已保存，不可再执行此操作，如需操作请点【修改结果】"
+                if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return '组合项目已审核，请先取消审核，方可执行此操作！'
             }
-            if (!this.doctorCheck.RegisterCheckEdit.checkDoctorId) {
-                alert("请选择检查医生")
-                return
+            if(optType == 'edit'){
+                if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') return "该检查项目尚未保存，无需执行此操作"
+                if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return '组合项目已审核，请先取消审核，方可执行此操作！'
             }
+            if(optType == 'del'){
+                if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') return "该检查项目尚未保存，无需执行此操作"
+                if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return '组合项目已审核，请先取消审核，方可执行此操作！'
+            }
+            if(optType == 'audit'){
+                if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') return "该检查项目尚未保存，无需执行此操作"
+                if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return "该检查项目已审核，无需再执行此操作"
+            }
+            if(optType == 'unAudit'){
+                if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') return "该检查项目尚未保存，无需执行此操作"
+                if (this.doctorCheck.RegisterCheckEdit.isAudit == 'N') return "该检查项目尚未审核，无需执行此操作"
+            }
+            if(optType == 'delItem'){
+                if (this.doctorCheck.RegisterCheckEdit.completeFlag == '1') return "该项目项目已保存，不可再执行此操作，如需操作请点【修改结果】"
+                if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return "该检查项目已审核，请先取消审核"
+            }
+            
+            return ret
+        },
+
+        //保存数据
+        save() {
+            let ret = this.optGrant('save')
+            if(ret){
+                alert(ret)
+                return
+            }            
 
             //更新明细
             this.updateCheckItemList();
@@ -108,6 +143,108 @@ export default {
             this.saveCheckSuggestion();
         },
 
+        //修改结果
+        edit(){
+            let ret = this.optGrant('edit')
+            if(ret){
+                alert(ret)
+                return
+            } 
+            this.doctorCheck.RegisterCheckEdit.completeFlag = '0'
+        },
+
+        //删除结果
+        del(){
+            let ret = this.optGrant('del')
+            if(ret){
+                alert(ret)
+                return
+            }            
+            console.log(`/api/app/registercheck/updatecomplete?RegisterCheckId=${this.doctorCheck.RegisterCheckEdit.id}&CompleteFlag=0`)
+            postapi(`/api/app/registercheck/updatecomplete?RegisterCheckId=${this.doctorCheck.RegisterCheckEdit.id}&CompleteFlag=0`)
+                .then((res) => {
+                    console.log("del", res.data);
+                    if (res.code != -1) {
+                        this.doctorCheck.RegisterCheckEdit.completeFlag = '0';
+                    }
+                })
+                .catch((err) => {
+                    this.$message({ type: "error", message: `组合项目删除失败，原因：${err}` });
+                });
+        },
+
+        //删除明细项目
+        delItem(){
+            let ret = this.optGrant('delItem')
+            if(ret){
+                alert(ret)
+                return
+            }
+            let lfind =  arrayExistObj(this.doctorCheck.CheckItemList,'itemId',this.doctorCheck.checkItem.itemId)
+            if(lfind == -1) return
+            
+            console.log(`/api/app/registercheckitem/deleteregistercheckitem?RegisterCheckId=${this.doctorCheck.checkItem.registerCheckId}&ItemId=${this.doctorCheck.checkItem.itemId}`)
+            postapi(`/api/app/registercheckitem/deleteregistercheckitem?RegisterCheckId=${this.doctorCheck.checkItem.registerCheckId}&ItemId=${this.doctorCheck.checkItem.itemId}`)
+                .then((res) => {
+                    console.log("delItem", res.data);
+                    if (res.code != -1) {
+                        this.doctorCheck.CheckItemList.splice(lfind,1);
+                        this.doctorCheck.checkItem.itemId = ''
+                    }
+                })
+                .catch((err) => {
+                    this.$message({ type: "error", message: `项目明细删除失败，原因：${err}` });
+                });
+        },
+
+        //审核
+        audit(){
+            let ret = this.optGrant('audit')
+            if(ret){
+                alert(ret)
+                return
+            }
+            let body ={
+                registerCheckId: this.doctorCheck.RegisterCheckEdit.id,
+                //auditorUserId: "3fa85f64-5717-4562-b3fc-2c963f66afa6", 
+                //auditTime: "string" 不传时，取当前时间
+            }
+
+            console.log(`/api/app/registercheck/updateauditordoctor`,body)
+            postapi(`/api/app/registercheck/updateauditordoctor`,body)
+                .then((res) => {
+                    console.log("audit", res.data);
+                    if (res.code != -1) {
+                        this.doctorCheck.RegisterCheckEdit.isAudit = 'Y';
+                        this.$message({ type: "success", message: `组合项目审核成功` });
+                    }
+                })
+                .catch((err) => {
+                    this.$message({ type: "error", message: `组合项目审核失败，原因：${err}` });
+                });
+        },
+
+        //取消审核
+        unAudit(){
+            let ret = this.optGrant('unAudit')
+            if(ret){
+                alert(ret)
+                return
+            }            
+            
+            console.log(`/api/app/registercheck/updateisaudit?RegisterCheckId=${this.doctorCheck.RegisterCheckEdit.id}&IsAudit=N`)
+            postapi(`/api/app/registercheck/updateisaudit?RegisterCheckId=${this.doctorCheck.RegisterCheckEdit.id}&IsAudit=N`)
+                .then((res) => {
+                    console.log("unAudit", res.data);
+                    if (res.code != -1) {
+                        this.doctorCheck.RegisterCheckEdit.isAudit = 'N';
+                        this.$message({ type: "success", message: `组合项目取消审核成功` });
+                    }
+                })
+                .catch((err) => {
+                    this.$message({ type: "error", message: `组合项目取消审核失败，原因：${err}` });
+                });
+        },
 
         //更新检查项目与医生
         updateDoctorCheck() {
@@ -147,7 +284,7 @@ export default {
                 .then((res) => {
                     console.log("updateCheckItemList", res.data);
                     if (res.code != -1) {
-                        this.doctorCheck.checkItemList = res.data;
+                        //
                     }
                 })
                 .catch((err) => {
@@ -224,9 +361,9 @@ export default {
     //监听事件()
     watch: {
         //1级单位值改变，分组改变
-        "patientRegister.query.CustomerOrgParentld"(newVal, oldVal) {
+        "patientRegister.query.CustomerOrgParentId"(newVal, oldVal) {
             console.log(
-                "watch patientRegister.query.CustomerOrgParentld newVal：",
+                "watch patientRegister.query.CustomerOrgParentId newVal：",
                 newVal,
                 " oldVal：",
                 oldVal
diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue
index 78f237b..e38f320 100644
--- a/src/components/doctorCheck/CheckItemList.vue
+++ b/src/components/doctorCheck/CheckItemList.vue
@@ -5,8 +5,8 @@
       <el-table-column prop="result" label="结果" width="500">
         <template slot-scope="scope">
           <el-autocomplete style="width: 480px" class="inline-input" type="textarea"
-            v-model="doctorCheck.checkItemList[scope.$index].result" :fetch-suggestions="querySearch"
-            placeholder="请输入结果值" @select="handleSelect" />
+            v-model="doctorCheck.checkItemList[scope.$index].result" :fetch-suggestions="querySearch" 
+            placeholder="请输入结果值" @select="handleSelect" :disabled="doctorCheck.RegisterCheckEdit.completeFlag=='1' || doctorCheck.RegisterCheckEdit.completeFlag=='2'"/>
         </template>
 
       </el-table-column>
@@ -44,29 +44,9 @@ export default {
 
 
 
-    //选择组合项目
+    //选择项目
     rowClick(row) {
-      //registerCheckId
-       // "itemResultTemplates": [
-      //   {
-      //     "itemId": "3a0c6555-0dad-55b4-b59f-b11e8074cfdd",
-      //     "result": "阳性",
-      //     "diagnosisId": "db34f48c-8c2f-9311-076d-302dc31930e7",
-      //     "isNameIntoSummary": "Y",
-      //     "isResultIntoSummary": "Y",
-      //     "resultStatusId": "08",
-      //     "simpleCode": null
-      //   },
-      //   {
-      //     "itemId": "3a0c6555-0dad-55b4-b59f-b11e8074cfdd",
-      //     "result": "阴性",
-      //     "diagnosisId": "db34f48c-8c2f-9311-076d-302dc31930e7",
-      //     "isNameIntoSummary": "Y",
-      //     "isResultIntoSummary": "Y",
-      //     "resultStatusId": "08",
-      //     "simpleCode": null
-      //   }
-      // ],
+      this.doctorCheck.checkItem = row
       this.restaurants = row.itemResultTemplates
     },
 
@@ -86,8 +66,7 @@ export default {
     },
 
 
-    querySearch(queryString, cb) {
-     
+    querySearch(queryString, cb) {     
       
       var restaurants = [...this.restaurants] //[{ value: '阴性' },{ value: '阳性' }]      
       restaurants.forEach((item) =>{
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 2a39520..9589060 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -1,34 +1,15 @@
 <template>
   <div>
     <div style="display: flex">
-      <el-table
-        :data="dataList"
-        border
-        width="100%"
-        height="480"
-        row-key="id"
-        size="small"
-        class="el-table__body-wrapper tbody"
-        highlight-current-row
-        @row-click="rowick"
-        ref="dataList"
-        @selection-change="handleSelectionChange"
-      >
+      <el-table :data="dataList" border width="100%" height="480" row-key="id" size="small"
+        class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowick" ref="dataList"
+        @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="40">
-          
+
         </el-table-column>
         <el-table-column prop="completeFlag" label="体检进度">
           <template slot-scope="scope">
-            <div>
-              {{
-                ldddw(
-                  dict.completeFlag,
-                  "id",
-                  scope.row.completeFlag,
-                  "displayName"
-                )
-              }}
-            </div>
+            <div>{{ ldddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
           </template>
         </el-table-column>
         <el-table-column prop="isLock" label="锁住">
@@ -38,30 +19,18 @@
         </el-table-column>
         <el-table-column prop="customerOrgParentName" label="单位" width="180">
           <template slot-scope="scope">
-            <div>
-              {{
-                scope.row.customerOrgParentName
-                  ? scope.row.customerOrgParentName
-                  : scope.row.customerOrgName
-              }}
-            </div>
+            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}</div>
           </template>
         </el-table-column>
         <el-table-column prop="customerOrgName" label="部门" width="180">
           <template slot-scope="scope">
-            <div>
-              {{
-                scope.row.customerOrgParentName ? scope.row.customerOrgName : ""
-              }}
-            </div>
+            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
           </template>
         </el-table-column>
         <el-table-column prop="patientName" label="姓名" />
         <el-table-column prop="sexId" label="性别">
           <template slot-scope="scope">
-            <div>
-              {{ ldddw(dict.sex, "id", scope.row.sexId, "displayName") }}
-            </div>
+            <div>{{ ldddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
           </template>
         </el-table-column>
         <el-table-column prop="age" label="年龄" />
@@ -70,35 +39,11 @@
         <el-table-column prop="medicalTimes" label="体检次数"></el-table-column>
         <el-table-column label="分组/套餐" width="150">
           <template slot-scope="scope">
-            <div
-              v-if="
-                scope.row.medicalPackageId !== dict.personOrgId &&
-                scope.row.customerOrgId === dict.personOrgId
-              "
-            >
-              套餐{{
-                ldddw(
-                  dict.medicalPackage,
-                  "id",
-                  scope.row.medicalPackageId,
-                  "displayName"
-                )
-              }}
+            <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
+              {{ ldddw(dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName") }}
             </div>
-            <div
-              v-if="
-                scope.row.medicalPackageId !== dict.personOrgId &&
-                scope.row.customerOrgId !== dict.personOrgId
-              "
-            >
-              分组{{
-                ldddw(
-                  dict.customerOrgGroupAll,
-                  "id",
-                  scope.row.customerOrgGroupId,
-                  "displayName"
-                )
-              }}
+            <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
+              {{ ldddw(dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName") }}
             </div>
           </template>
         </el-table-column>
@@ -126,42 +71,21 @@
         <el-table-column prop="maritalStatusId" label="婚姻状况">
           <template slot-scope="scope">
             <div>
-              {{
-                ldddw(
-                  dict.maritalStatus,
-                  "id",
-                  scope.row.maritalStatusId,
-                  "displayName"
-                )
-              }}
+              {{ ldddw(dict.maritalStatus, "id", scope.row.maritalStatusId, "displayName") }}
             </div>
           </template>
         </el-table-column>
         <el-table-column prop="medicalTypeId" label="体检类别">
           <template slot-scope="scope">
             <div v-if="scope.row.medicalTypeId !== dict.personOrgId">
-              {{
-                ldddw(
-                  dict.medicalType,
-                  "id",
-                  scope.row.medicalTypeId,
-                  "displayName"
-                )
-              }}
+              {{ ldddw(dict.medicalType, "id", scope.row.medicalTypeId, "displayName") }}
             </div>
           </template>
         </el-table-column>
         <el-table-column prop="personnelTypeId" label="人员类别">
           <template slot-scope="scope">
             <div v-if="scope.row.personnelTypeId !== dict.personOrgId">
-              {{
-                ldddw(
-                  dict.personnelType,
-                  "id",
-                  scope.row.personnelTypeId,
-                  "displayName"
-                )
-              }}
+              {{ ldddw(dict.personnelType, "id", scope.row.personnelTypeId, "displayName") }}
             </div>
           </template>
         </el-table-column>
@@ -224,9 +148,7 @@
           <el-button type="danger" @click="del">删除</el-button>
         </div>
         <div class="listBtn">
-          <el-button type="primary" @click="openCamera" icon="el-icon-camera"
-            >拍照</el-button
-          >
+          <el-button type="primary" @click="openCamera" icon="el-icon-camera">拍照</el-button>
         </div>
         <div class="listBtn">
           <el-button type="primary">健康档案</el-button>
@@ -244,23 +166,13 @@
     </div>
 
     <!-- 体检人员登记 -->
-    <el-dialog
-      :title="patientRegister.patientRegisterId ? '编辑' : '新增'"
-      :visible.sync="dialogVisible"
-      width="100%"
-    >
+    <el-dialog :title="patientRegister.patientRegisterId ? '编辑' : '新增'" :visible.sync="dialogVisible" width="100%">
       <PatientRegisterEdit />
     </el-dialog>
 
     <!-- 拍照 -->
-    <el-dialog
-      title="拍照"
-      :visible.sync="patientRegister.cameraVisble"
-      width="400"
-      height="800"
-      :show-close="false"
-      :append-to-body="true"
-    >
+    <el-dialog title="拍照" :visible.sync="patientRegister.cameraVisble" width="400" height="800" :show-close="false"
+      :append-to-body="true">
       <Camera :id="patientRegister.patientRegisterId" />
     </el-dialog>
   </div>
@@ -288,10 +200,10 @@ export default {
     };
   },
 
-  created() {},
+  created() { },
 
   //挂载完成
-  mounted() {},
+  mounted() { },
   computed: {
     ...mapState(["dict", "patientRegister", "customerOrg"]),
   },
@@ -305,14 +217,13 @@ export default {
 
     //获取单位分组 /api/app/customer-org-group/in-customer-org-id/3a0c0444-d7a0-871f-4074-19faf1655caf
     getCustomerOrgGroup(customerOrgld) {
-      getapi(
-        `/api/app/customer-org-group/in-customer-org-id/${customerOrgld}`
-      ).then((res) => {
-        console.log("getCustomerOrgGroup", res.data);
-        if (res.code == 1) {
-          this.patientRegister.customerOrgGroup = res.data;
-        }
-      });
+      getapi(`/api/app/customer-org-group/in-customer-org-id/${customerOrgld}`)
+        .then((res) => {
+          console.log("getCustomerOrgGroup", res.data);
+          if (res.code == 1) {
+            this.patientRegister.customerOrgGroup = res.data;
+          }
+        });
     },
 
     //点击体检次数行
@@ -321,8 +232,8 @@ export default {
       this.patientRegister.patientRegisterId = row.id;
       this.patientRegister.patientRegisterRd = row;
       this.patientRegister.query.customerOrgParentId = row.customerOrgParentId;
-      this.patientRegister.customerOrgGroupChange = 0; //控制体检列表记录切换时，0 无需触发更换分组操作 
-      this.patientRegister.medicalPackageChange=0;     //控制体检列表记录切换时，0 无需触发更换套餐操作
+      this.patientRegister.customerOrgGroupChange = 0;   //控制体检列表记录切换时，0 无需触发更换分组操作 
+      this.patientRegister.medicalPackageChange = 0;     //控制体检列表记录切换时，0 无需触发更换套餐操作
       this.getCustomerOrgGroup(row.customerOrgParentId);
       this.dict.asbItem = [...this.dict.asbItemAll]
       this.getPatientRegisterAbs(row.id);
@@ -415,9 +326,7 @@ export default {
       })
         .then(() => {
           //console.log('${this.patientRegister.patientRegisterId}',this.patientRegister.patientRegisterId)
-          return deletapi(
-            `/api/app/patient-register/${this.patientRegister.patientRegisterId}`
-          );
+          return deletapi(`/api/app/patient-register/${this.patientRegister.patientRegisterId}`);
         })
         .then((res) => {
           this.$message.success("删除成功");
@@ -425,10 +334,7 @@ export default {
           this.patientRegister.patientRegisterId = "";
         })
         .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
+          this.$message({ type: "info", message: "已取消删除", });
         });
     },
 
@@ -442,9 +348,40 @@ export default {
 
     //查询
     query() {
-      getapi("/api/app/patient-register/in-filter").then((res) => {
-        this.dataList = res.data;
-      });
+      let body = {}
+      
+      console.log(`this.patientRegister.query`, this.patientRegister.query)
+      if (this.patientRegister.query.customerOrgFlag) {
+        if (this.patientRegister.query.CustomerOrgParentId) {
+          body.customerOrgId = this.patientRegister.query.CustomerOrgParentId
+        } else{
+          if (this.patientRegister.query.customerOrgId) body.customerOrgId = this.patientRegister.query.customerOrgId
+        } 
+      }
+
+      if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
+
+      if (this.patientRegister.query.patientName) body.patientName = this.patientRegister.query.patientName
+
+      //StartDate EndDate
+      if (this.patientRegister.query.dateRange) {
+        body.startDate = moment(new Date(this.patientRegister.query.dateRange[0])).format("yyyy-MM-DD")
+        body.endDate = moment(new Date(this.patientRegister.query.dateRange[1])).format("yyyy-MM-DD")
+      }
+
+
+      if (this.patientRegister.query.idCardNo) body = { idNo: this.patientRegister.query.idCardNo }
+
+      if (this.patientRegister.query.patientNo) body = { patientNo: this.patientRegister.query.patientNo }
+
+      if (this.patientRegister.query.patientRegisterNo) body = { patientRegisterNo: this.patientRegister.query.patientRegisterNo }
+
+
+      console.log('/api/app/patientregister/getlistinfilter', body)
+      postapi('/api/app/patientregister/getlistinfilter', body)
+        .then((res) => {
+          this.dataList = res.data;
+        });
     },
   },
 
diff --git a/src/components/patientRegister/customerOrgTreeAll.vue b/src/components/patientRegister/customerOrgTreeAll.vue
index 710c874..ff89f32 100644
--- a/src/components/patientRegister/customerOrgTreeAll.vue
+++ b/src/components/patientRegister/customerOrgTreeAll.vue
@@ -39,15 +39,15 @@ export default {
     },
 
     //获取体检单位父级ID api/app/customer-org/parent/[CustomerOrgld
-    getCustomerOrgParentld(customerOrgld) {
+    getCustomerOrgParentId(customerOrgld) {
       if (customerOrgld == this.dict.personOrgId) {
-        this.patientRegister.query.CustomerOrgParentld = this.dict.personOrgId;
+        this.patientRegister.query.CustomerOrgParentId = this.dict.personOrgId;
         return;
       }
       getapi(`/api/app/customer-org/parent/${customerOrgld}`).then((res) => {
         console.log("res.data", res.data);
         if (res.code == 1) {
-          this.patientRegister.query.CustomerOrgParentld = res.data;
+          this.patientRegister.query.CustomerOrgParentId = res.data;
         }
       });
     },
@@ -55,7 +55,7 @@ export default {
     //点击树节点
     treeclick(data) {
       this.patientRegister.query.customerOrgId = data.id;
-      this.getCustomerOrgParentld(data.id);
+      this.getCustomerOrgParentId(data.id);
       this.patientRegister.query.times++; //用于触发查询条件
     },
   },
diff --git a/src/components/patientRegister/patientRegisterQuery.vue b/src/components/patientRegister/patientRegisterQuery.vue
index a34d318..f1dad1b 100644
--- a/src/components/patientRegister/patientRegisterQuery.vue
+++ b/src/components/patientRegister/patientRegisterQuery.vue
@@ -44,7 +44,7 @@
           v-model="patientRegister.query.patientName"
           size="small"
           clearable
-          style="width: 135px"
+          style="width: 100px"
         />
       </div>
       <div class="query">
@@ -52,10 +52,10 @@
         <el-select
           v-model="patientRegister.query.sex"
           placeholder="请选择"
-          style="width: 80px"
+          style="width: 80px" size="small"
         >
           <el-option
-            v-for="item in dict.sex"
+            v-for="item in dict.forSex"
             :key="item.id"
             :label="item.displayName"
             :value="item.id"
@@ -70,11 +70,10 @@
           v-model="patientRegister.query.idCardNo"
           size="small"
           clearable
-          style="width: 200px"
+          style="width: 180px"
         />
       </div>
-      <div class="query">
-        <span>单位信息：</span>
+      <div class="query">        
         <el-cascader
           v-model="patientRegister.query.customerOrgId"
           :options="patientRegister.customerOrgTreeAll"
@@ -84,9 +83,10 @@
             ...customerOrg.treeprops,
           }"
           :show-all-levels="false"
-          disabled
+          disabled size="small"
         >
         </el-cascader>
+        <el-checkbox v-model="patientRegister.query.customerOrgFlag">单位作为查询条件</el-checkbox>
       </div>
     </div>
     <!-- 按钮区域 -->
diff --git a/src/store/index.js b/src/store/index.js
index a0228eb..56c61f7 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -92,7 +92,8 @@ export default new Vuex.Store({
       query: {
         times: 0, //触发查询次数
         customerOrgId: "", //体检单位ID
-        CustomerOrgParentld: "", //单位父级ID
+        CustomerOrgParentId: "", //单位父级ID
+        customerOrgFlag:true,    //单位作为查询条件
       }, //查询条件
       customerOrgGroup: [], //分组（针对单位）
       patientRegisterAbs: [], //人员已选组合项目
@@ -112,14 +113,16 @@ export default new Vuex.Store({
         completeFlag:'0',
         LastModificationTime:'',
         LastModifierId:null,
+        isLock:'N',
         isAudit:'N',
         auditorUserId:null,
         auditTime:'',
       },                          //组合项目详情
       RegisterCheckList:[],       //人员体检 组合项目列表
-      RegisterCheck:{},           //单检查记录
+      RegisterCheck:{},           //单组合项目记录
       RegisterCheckId:'',         //
       checkItemList:[],           //组合项目包含的明细项目
+      checkItem:{},               //单项目记录
       checkSummaryList:[],        //小结
       checkSuggestionList:[],     //建议 
     },
@@ -127,14 +130,14 @@ export default new Vuex.Store({
     //总检医生
     sumDoctorCheck:{
       sumPREdit:{},               //总检医生时间等相关信息
-
     },
 
     //公共字典数据 add by pengjun
     dict: {
       personOrgId: "00000000-0000-0000-0000-000000000000", //个人体检单位ID
       organization: [], //体检中心
-      sex: [], //性别
+      sex: [], //性别(人员档案用)
+      forSex:[],  //适用性别
       medicalType: [], //体检类别
       personnelType: [], //人员类别
       maritalStatus: [], //婚姻状况
diff --git a/src/views/customerOrg/patientRegister.vue b/src/views/customerOrg/patientRegister.vue
index e2dd082..aacf771 100644
--- a/src/views/customerOrg/patientRegister.vue
+++ b/src/views/customerOrg/patientRegister.vue
@@ -65,13 +65,20 @@ export default {
     ...mapActions(["getCustomerOrgGroup"]),
     //数据初始化
     dictInit() {
-      //性别
+      //性别（仅档案用）
       getapi("/api/app/sex").then((res) => {
         if (res.code == 1) {
           this.dict.sex = res.data;
         }
       });
 
+      //性别（查询）
+      getapi("/api/app/for-sex").then((res) => {
+        if (res.code == 1) {
+          this.dict.forSex = res.data;
+        }
+      });      
+
       //体检中心
       getapi("/api/app/organization-units/organization-unit-by-is-peis").then(
         (res) => {
@@ -172,9 +179,9 @@ export default {
   //监听事件()
   watch: {
     //1级单位值改变，分组改变
-    "patientRegister.query.CustomerOrgParentld"(newVal, oldVal) {
+    "patientRegister.query.CustomerOrgParentId"(newVal, oldVal) {
       console.log(
-        "watch patientRegister.query.CustomerOrgParentld newVal：",
+        "watch patientRegister.query.CustomerOrgParentId newVal：",
         newVal,
         " oldVal：",
         oldVal
diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue
index fed399e..6247253 100644
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@@ -180,9 +180,9 @@ export default {
   //监听事件()
   watch: {
     //1级单位值改变，分组改变
-    "patientRegister.query.CustomerOrgParentld"(newVal, oldVal) {
+    "patientRegister.query.CustomerOrgParentId"(newVal, oldVal) {
       console.log(
-        "watch patientRegister.query.CustomerOrgParentld newVal：",
+        "watch patientRegister.query.CustomerOrgParentId newVal：",
         newVal,
         " oldVal：",
         oldVal
diff --git a/src/views/doctorCheck/sumDoctorCheck.vue b/src/views/doctorCheck/sumDoctorCheck.vue
index 9b4873f..57cfa09 100644
--- a/src/views/doctorCheck/sumDoctorCheck.vue
+++ b/src/views/doctorCheck/sumDoctorCheck.vue
@@ -190,9 +190,9 @@
     //监听事件()
     watch: {
       //1级单位值改变，分组改变
-      "patientRegister.query.CustomerOrgParentld"(newVal, oldVal) {
+      "patientRegister.query.CustomerOrgParentId"(newVal, oldVal) {
         console.log(
-          "watch patientRegister.query.CustomerOrgParentld newVal：",
+          "watch patientRegister.query.CustomerOrgParentId newVal：",
           newVal,
           " oldVal：",
           oldVal