diff --git a/src/components/customerOrg/customerOrgEdit.vue b/src/components/customerOrg/customerOrgEdit.vue index 02261f7..e170cf4 100644 --- a/src/components/customerOrg/customerOrgEdit.vue +++ b/src/components/customerOrg/customerOrgEdit.vue @@ -484,6 +484,9 @@ export default { body.parentId = null; } } + if(!body.medicalTypeId) delete body.medicalTypeId; + if(!body.personnelTypeId) delete body.personnelTypeId; + console.log("body", body, "this.form", this.form); diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue index 6de58ff..ef2e4fe 100644 --- a/src/components/doctorCheck/PatientRegisterList.vue +++ b/src/components/doctorCheck/PatientRegisterList.vue @@ -35,13 +35,21 @@ -
- {{ win == 'doctorCheck' ? '检查' : '总检' }}医生: +
+ 检查医生:
+
+ 总检医生: + + + +
+
人员状态: @@ -186,9 +194,9 @@
{{ scope.row.isLock == "Y" ? "是" : "否" }}
- + - +
@@ -250,7 +258,7 @@ export default { isAuditCheck: '', //检查项目审核 medicalTypeIds: [], checkDoctorIds: [], - + summaryDoctorIds:[], }, completeFlag: [] }, @@ -357,7 +365,7 @@ export default { // 用户 - let operatorTypes = ["2", "3"] + let operatorTypes = ["2", "3"] //总检医生 if (this.win == 'doctorCheck') operatorTypes = ["1", "3"] postapi('/api/identity/users/GetListByOperatorType', { operatorTypes }) .then(res => { @@ -514,8 +522,15 @@ export default { if (this.local.query.haveImage) body.isPicture = 'Y' if (this.local.query.checkCompleteFlag) body.asbitemCompleteFlag = this.local.query.checkCompleteFlag if (this.local.query.isAuditCheck) body.asbitemIsAudit = this.local.query.isAuditCheck - body.medicalTypeIds = this.local.query.medicalTypeIds - body.checkDoctorIds = this.local.query.checkDoctorIds + if(Array.isArray(this.local.query.medicalTypeIds) && this.local.query.medicalTypeIds.length > 0){ + body.medicalTypeIds = this.local.query.medicalTypeIds + } + if(Array.isArray(this.local.query.checkDoctorIds) && this.local.query.checkDoctorIds.length > 0){ + body.checkDoctorIds = this.local.query.checkDoctorIds + } + if(Array.isArray(this.local.query.summaryDoctorIds) && this.local.query.summaryDoctorIds.length > 0){ + body.summaryDoctorIds = this.local.query.summaryDoctorIds + } body.isFilterPreRegistration = 'Y' //是否需要过滤预登记数据 Y=过滤预登记数据 N=不过滤 默认为N (备注:只有CompleteFlag参数的值不为0的情况才有效,null值也有效) // "patientName": "string", diff --git a/src/components/sumDoctorCheck/CheckDetails.vue b/src/components/sumDoctorCheck/CheckDetails.vue index 03fc161..2521b2d 100644 --- a/src/components/sumDoctorCheck/CheckDetails.vue +++ b/src/components/sumDoctorCheck/CheckDetails.vue @@ -1,5 +1,49 @@