seo

public/sysConfig.json

@@ -10,6 +10,9 @@
             { "id": "1", "displayName": "未检" },
             { "id": "2", "displayName": "部份已检" },
             { "id": "3", "displayName": "已总检" }
+        ],
+        "businessPlace":[
+            "B座","C座"
         ]
     }
 }

src/components/patientRegister/PatientRegisterList.vue

@@ -295,7 +295,7 @@
         @close="close_dialogWin_PatientRegisterEdit">
         <!-- :formInitData="patientRegister.patientRegisterRd" -->
         <PatientRegisterEdit :isDoctor="'1'" :patientRegisterId="patientRegister.patientRegisterRd.id"
-          :editTimes="editTimes" :refFuncSetData="refFuncSetData" :refQueryCondition="refQueryCondition"/>
+          :editTimes="editTimes" :refFuncSetData="refFuncSetData" :refQueryCondition="refQueryCondition" />
       </el-dialog>
 
       <!-- 修改信息 -->
@@ -1055,7 +1055,7 @@ export default {
         this.patient_register_read_idno_upPhoto = res.data || "N";
       }
     });
-    
+
 
   },
 
@@ -1552,7 +1552,7 @@ export default {
         });
         return;
       }
-      console.log('btnAdd.this.refQueryCondition',this.refQueryCondition)
+      console.log('btnAdd.this.refQueryCondition', this.refQueryCondition)
       let customerOrgId = this.refQueryCondition.customerOrgId;
       if (!customerOrgId) {
         this.$message.warning({ showClose: true, message: "请选择单位或个人" });
@@ -1785,7 +1785,7 @@ export default {
       this.lazyLoading = false;
     },
 
-    // 获取列表数据
+    // 查询获取人员列表数据
     async getPrList() {
       if (
         this.loadOpts.skipCount != 0 &&
@@ -1795,90 +1795,79 @@ export default {
         return;
       // console.log('getPrList', this.loadOpts)
 
-      let body = {
-        skipCount: this.loadOpts.skipCount,
-        maxResultCount: this.loadOpts.maxResultCount,
-      };
-
-      // console.log(`this.refQueryCondition`, this.refQueryCondition);
-      if (this.refQueryCondition.customerOrgFlag) {
-        // if (this.refQueryCondition.CustomerOrgParentId) {
-        //   body.customerOrgId = this.refQueryCondition.CustomerOrgParentId;
-        // } else {
-        //   if (this.refQueryCondition.customerOrgId)
-        //     body.customerOrgId = this.refQueryCondition.customerOrgId;
-        // }
-        if (this.refQueryCondition.customerOrgId)
-          body.customerOrgId = this.refQueryCondition.customerOrgId;
-
-        // 获取单位体检次数与分组
-        try {
-          if (
-            this.refQueryCondition.customerOrgId &&
-            this.refQueryCondition.customerOrgId != this.dict.personOrgId &&
-            this.refQueryCondition.customerOrgRegister.id
-          ) {
-            body.customerOrgRegisterId =
-              this.refQueryCondition.customerOrgRegister.id;
-            body.customerOrgGroupIds =
-              this.refQueryCondition.customerOrgGroupIds;
+      let body = Object.assign({}, this.loadOpts)
+      let queryType = this.refQueryCondition.queryType
+
+      console.log('getPrList.this.refQueryCondition', this.refQueryCondition)
+      // 非排他查询条件 ===================== Start ==========================
+      if (!queryType) {
+
+        // 查询条件--日期
+        if (this.refQueryCondition.startDate && this.refQueryCondition.endDate) {
+          body.dateType = this.refQueryCondition.dateType;
+          body.startDate = this.refQueryCondition.startDate
+          body.endDate = this.refQueryCondition.endDate
+          if (body.startDate > body.endDate) {
+            this.$message.warning({
+              showClose: true,
+              message: "起始日期不能大于截止日期，数据校验不通过！",
+            });
+            return;
           }
-        } catch (error) {
-          console.error(error);
         }
-      }
-
-      if (this.refQueryCondition.sex)
-        body.sexId = this.refQueryCondition.sex;
-
-      if (
-        this.refQueryCondition.medicalTypeIds &&
-        this.refQueryCondition.medicalTypeIds.length > 0
-      )
-        body.medicalTypeIds = this.refQueryCondition.medicalTypeIds;
-
-      if (
-        this.refQueryCondition.completeFlags &&
-        this.refQueryCondition.completeFlags.length > 0
-      )
-        body.completeFlags = this.refQueryCondition.completeFlags;
-
-      if (
-        this.refQueryCondition.personnelTypeIds &&
-        this.refQueryCondition.personnelTypeIds.length > 0
-      )
-        body.personnelTypeIds = this.refQueryCondition.personnelTypeIds;
 
-      if (this.refQueryCondition.isRecoverGuide)
-        body.isRecoverGuide = this.refQueryCondition.isRecoverGuide;
+        // 查询条件--单位、次数、分组
+        if (this.refQueryCondition.customerOrgFlag) {
+          if (this.refQueryCondition.customerOrgId) body.customerOrgId = this.refQueryCondition.customerOrgId
+          // 获取单位体检次数与分组
+          try {
+            if (
+              this.refQueryCondition.customerOrgId &&
+              this.refQueryCondition.customerOrgId != this.dict.personOrgId &&
+              this.refQueryCondition.customerOrgRegister.id
+            ) {
+              body.customerOrgRegisterId = this.refQueryCondition.customerOrgRegister.id;
+              if (this.refQueryCondition.customerOrgGroupIds) body.customerOrgGroupIds = this.refQueryCondition.customerOrgGroupIds
+            }
+          } catch (error) {
+            console.error(error);
+          }
+        }
 
-      //StartDate EndDate
-      if (
-        this.refQueryCondition.startDate &&
-        this.refQueryCondition.endDate
-      ) {
-        body.dateType = this.refQueryCondition.dateType;
-        body.startDate = moment(this.refQueryCondition.startDate).format(
-          "yyyy-MM-DD"
-        );
-        body.endDate = moment(this.refQueryCondition.endDate).format(
-          "yyyy-MM-DD"
-        );
-        if (body.startDate > body.endDate) {
-          this.$message.warning({
-            showClose: true,
-            message: "起始日期不能大于截止日期，数据校验不通过！",
-          });
-          return;
+        // 电话
+        if (this.refQueryCondition.phone) body.phone = this.refQueryCondition.phone
+        // 性别
+        if (this.refQueryCondition.sexId) body.sexId = this.refQueryCondition.sexId
+        // 体检类别
+        if (this.refQueryCondition.medicalTypeIds) body.medicalTypeIds = this.refQueryCondition.medicalTypeIds
+        // 人员状态
+        if (this.refQueryCondition.completeFlags) body.completeFlags = this.refQueryCondition.completeFlags
+        // 人员类别
+        if (this.refQueryCondition.personnelTypeIds) body.personnelTypeIds = this.refQueryCondition.personnelTypeIds
+        // 表格回收状态
+        if (this.refQueryCondition.isRecoverGuide) body.isRecoverGuide = this.refQueryCondition.isRecoverGuide
+
+        // 排他条件有值时
+        if (this.refQueryCondition.patientRegisterNo) {
+          queryType = "patientRegisterNo"
+        } else if (this.refQueryCondition.pacsNo) {
+          queryType = "pacsNo"
+        } else if (this.refQueryCondition.lisNo) {
+          queryType = "lisNo"
+        } else if (this.refQueryCondition.patientNo) {
+          queryType = "patientNo"
+        } else if (this.refQueryCondition.idCardNo) {
+          queryType = "idCardNo"
+        } else if (this.refQueryCondition.patientName) {
+          queryType = "patientName"
         }
-      }
 
-      if (this.refQueryCondition.phone)
-        body.phone = this.refQueryCondition.phone;
+      }
+      // 非排他查询条件 ===================== End ==========================
 
       // 排他查询条件
       let photo = ''
-      switch (this.refQueryCondition.queryType) {
+      switch (queryType) {
         case 'patientName': // 姓名排他判断          
           if (this.refQueryCondition.patientName) {
             body.patientName = this.refQueryCondition.patientName;
@@ -1902,7 +1891,7 @@ export default {
               };
             }
           }
-          if(this.refQueryCondition.photo) photo = this.refQueryCondition.photo;
+          if (this.refQueryCondition.photo) photo = this.refQueryCondition.photo;
           break;
         case 'patientNo': // 档案号排他判断      
           if (this.refQueryCondition.patientNo)
@@ -1936,10 +1925,10 @@ export default {
               maxResultCount: this.loadOpts.maxResultCount,
             };
           break;
-        default:
+        default: //           
           break;
       }
-      
+
       // 带费且合计  /api/app/PatientRegister/GetPatientRegisterWithCharge
       // 不带费且合计 /api/app/patientregister/getlistinfilter
       postapi(
@@ -1972,11 +1961,7 @@ export default {
           });
 
           // 不是连续扫码时，需要判断是否分页查询(连续扫码不清原来的数据)
-          console.log(
-            "this.refQueryCondition",
-            this.refQueryCondition.isSeries,
-            this.refQueryCondition.patientRegisterNo
-          );
+          // console.log("this.refQueryCondition", this.refQueryCondition.isSeries, this.refQueryCondition.patientRegisterNo);
           if (this.refQueryCondition.isSeries == "Y" && this.refQueryCondition.patientRegisterNo) {
             // 如果已经存在列表中，则不在添加
             for (let index = curLoad.length - 1; index > -1; index--) {
@@ -2009,7 +1994,7 @@ export default {
 
     //滚动加载数据
     async scrollFull(scroll, event) {
-      
+
       if (!scroll.judgeFlse) return;
 
       // 正在加载时阻止重复触发

src/components/patientRegister/patientRegisterQuery.vue

@@ -44,7 +44,7 @@
       </div>
       <div class="query">
         <span class="spanClass">性别</span>
-        <el-select v-model="query.sex" placeholder="性别" style="width: 50px" size="small" clearable>
+        <el-select v-model="query.sexId" placeholder="性别" style="width: 50px" size="small" clearable>
           <el-option v-for="item in dict.sex" :key="item.id" :label="item.displayName" :value="item.id">
           </el-option>
         </el-select>
@@ -149,35 +149,35 @@ export default {
       customerOrgRegisterList: [],
       query: {  //查询条件
         queryType: '', // 条码号patientRegisterNo/档案号patientNo 等 排他查询
-        dateType: 'creationTime', //登记日期
-        dateRange: null, //日期范围
-        startDate: null,
-        endDate: null,
-        containRefuse: true, //包含弃检项目        
         times: 0, //触发查询次数
-        customerOrgId: "", //体检单位ID                
         customerOrgTopId: "", //单位顶级ID
+        isSeries: 'N',  // 是否连续扫码
+        photo: '',  // 参数控制 读身份证查询时，是否更新照片用
+
+        // 查询条件 ================== Start ======================
+        dateType: '2', //体检日期        
+        startDate: null,
+        endDate: null,
+        
         customerOrgFlag: true, //单位作为查询条件
+        customerOrgId: "", //体检单位ID         
         customerOrgRegister: { id: '' }, //单位体检次数 
         customerOrgGroupIds: [], //体检分组
-        checkAsbs: null,
-        patientRegisterNo: '',
-        pacsNo: '',
-        lisNo: '',
+        
+        patientRegisterNo: '',  //人员条码
+        pacsNo: '',  //检查条码
+        lisNo: '',  //检验条码
+        patientNo:'', //档案号
+        idCardNo: '', //身份证号  
         patientName: '', //姓名
-        sex: '', //性别
-        idCardNo: '', //身份证号
-        isReportPrint: '', // 报告是否打印
-        isSeries: 'N',
-        isSmsComplete: "N",
-        isPhoneComplete: "N",
-        diagnosisLevelId: [],
-        medicalTypeIds: [],
-        completeFlags: [],
-        medicalConclusionId: [],
-        personnelTypeIds: [],
-        isRecoverGuide: '',
-        photo: '',  // 参数控制 读身份证查询时，是否更新照片用
+               
+        phone:'', // 电话
+        sexId: '', //性别
+        medicalTypeIds: [],  // 体检类别
+        completeFlags: [],   // 人员状态      
+        personnelTypeIds: [],  //人员类别
+        isRecoverGuide: '',   //表格回收状态
+        // 查询条件 ================== End ======================
       },
     };
   },
@@ -219,7 +219,7 @@ export default {
       this.query.patientName = ''
       this.query.pacsNo = ''
       this.query.lisNo = ''
-      this.query.sex = ''
+      this.query.sexId = ''
       this.query.phone = ''
       this.query.idCardNo = ''
 
@@ -293,8 +293,12 @@ export default {
     },
 
 
+    btnQuery(){
+      this.toQuery('')
+    },
+
     //查询
-    btnQuery(queryType) {
+    toQuery(queryType) {
       this.query.queryType = queryType
       if(queryType != 'idCardNo') this.query.photo = ''
       this.$emit('triggerQuery', this.query)
@@ -349,10 +353,10 @@ export default {
           this.query.photo = 'data:image/bmp;base64,' + idNos.Photo   //批量导入人员无照片，读身份证查询时，可以控制更新
 
           this.query.patientName = idNos.Name
-          this.query.sex = idNos.sexId
+          this.query.sexId = idNos.sexId
           this.query.idCardNo = idNos.IDCode
           // 触发按身份证查询
-          this.btnQuery('idCardNo') 
+          this.toQuery('idCardNo') 
         } else {
           this.$message.error({ showClose: true, message: lres.message })
         }
@@ -367,7 +371,7 @@ export default {
       postapi('/api/app/PatientRegister/GetPatientRegisterNoByCheckRequestNo', { checkRequestNo }).then(res => {
         if (res.code > 0) {
           this.query.patientRegisterNo = res.data.patientRegisterNo
-          this.btnQuery("patientRegisterNo")
+          this.toQuery("patientRegisterNo")
         }
       })
     },
@@ -377,7 +381,7 @@ export default {
       postapi('/api/app/PatientRegister/GetPatientRegisterNoByLisRequestNo', { lisRequestNo }).then(res => {
         if (res.code > 0) {
           this.query.patientRegisterNo = res.data.patientRegisterNo
-          this.btnQuery("patientRegisterNo")
+          this.toQuery("patientRegisterNo")
         }
       })
     },
@@ -401,20 +405,11 @@ export default {
               let placeholder = input.getAttribute('placeholder')
               switch (placeholder) {
                 case '条码号':
-                  if (input.value) this.btnQuery('patientRegisterNo')
+                  if (input.value) this.toQuery('patientRegisterNo')
                   input.select()
                   break;
                 case '档案号':
-                  if (input.value) this.btnQuery('patientNo')
-                  input.select()
-                  break;
-                case '姓名':
-                  if (input.value) this.btnQuery('patientName')
-                  input.select()
-                  break;
-                //case '预约手机号':
-                case '身份证':
-                  if (input.value) this.btnQuery('idCardNo')
+                  if (input.value) this.toQuery('patientNo')
                   input.select()
                   break;
                 case '检查条码':
@@ -425,6 +420,15 @@ export default {
                   if (input.value) this.onQueryByLisNo(input.value)
                   input.select()
                   break;
+                //case '预约手机号':
+                case '身份证':
+                  if (input.value) this.toQuery('idCardNo')
+                  input.select()
+                  break;
+                case '姓名':
+                  if (input.value) this.toQuery('patientName')
+                  input.select()
+                  break;
               }
             }
           });

src/views/customerOrg/patientRegister.vue

@@ -216,9 +216,9 @@ export default {
 
     // 查询条件 触发查询
     triggerQuery(queryCondition) {
-      //console.log('父.triggerQuery1', queryCondition)
+      console.log('父.triggerQuery1', queryCondition)
       this.queryCondition = Object.assign(this.queryCondition, queryCondition, { queryConditionTimes: Number(this.queryCondition.queryConditionTimes) + 1 })
-      //console.log('父.triggerQuery2', this.queryCondition)
+      console.log('父.triggerQuery2', this.queryCondition)
     },
 
   },