Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
2024-04-15 14:26:11 +08:00
commit 13fee9d3ea

View File

@ -127,9 +127,9 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="就诊类型" prop="visitMethod"> <el-form-item label="就诊类型" prop="suitRange">
<el-select <el-select
v-model="queryParams.visitMethod" v-model="queryParams.suitRange"
placeholder="请选择就诊类型" placeholder="请选择就诊类型"
clearable clearable
@change="change" @change="change"
@ -415,7 +415,7 @@ export default {
visitSerialNumber: null, visitSerialNumber: null,
attendingPhysicianId: null, attendingPhysicianId: null,
patientId: null, patientId: null,
visitMethod: null, suitRange: null,
manageRouteId: null, manageRouteId: null,
manageRouteNodeId: null, manageRouteNodeId: null,
patientName: null, patientName: null,
@ -475,7 +475,7 @@ export default {
this.queryParams.mainDiagnosis=null this.queryParams.mainDiagnosis=null
this.queryParams.visitSerialNumber=null this.queryParams.visitSerialNumber=null
this.queryParams.attendingPhysicianId=null this.queryParams.attendingPhysicianId=null
this.queryParams.visitMethod=null this.queryParams.suitRange=null
this.queryParams.patientName=null this.queryParams.patientName=null
this.queryParams.hospitalAgencyId=null this.queryParams.hospitalAgencyId=null
this.queryParams.campusAgencyId=null this.queryParams.campusAgencyId=null
@ -651,12 +651,12 @@ export default {
this.queryParams.clinicalEndTime = null this.queryParams.clinicalEndTime = null
} else { } else {
console.log(this.queryParams, '-----') console.log(this.queryParams, '-----')
if (!this.queryParams.visitMethod || this.queryParams.visitMethod == 'IN_THE_HOSPITAL') { if (!this.queryParams.suitRange || this.queryParams.suitRange == 'IN_THE_HOSPITAL') {
this.queryParams.clinicalStartTime = this.mzTime[0] this.queryParams.clinicalStartTime = this.mzTime[0]
this.queryParams.clinicalEndTime = this.mzTime[1] this.queryParams.clinicalEndTime = this.mzTime[1]
this.queryParams.dischargeStartTime = this.queryParams.clinicalStartTime this.queryParams.dischargeStartTime = this.queryParams.clinicalStartTime
this.queryParams.dischargeEndTime = this.queryParams.clinicalEndTime this.queryParams.dischargeEndTime = this.queryParams.clinicalEndTime
} else if (this.queryParams.visitMethod == 'DISCHARGE') { } else if (this.queryParams.suitRange == 'DISCHARGE') {
this.queryParams.dischargeStartTime = this.mzTime[0] this.queryParams.dischargeStartTime = this.mzTime[0]
this.queryParams.dischargeEndTime = this.mzTime[1] this.queryParams.dischargeEndTime = this.mzTime[1]
@ -664,7 +664,7 @@ export default {
this.queryParams.clinicalStartTime = null this.queryParams.clinicalStartTime = null
this.queryParams.clinicalEndTime = null this.queryParams.clinicalEndTime = null
} else if (this.queryParams.visitMethod == 'OUTPATIENT_SERVICE') { } else if (this.queryParams.suitRange == 'OUTPATIENT_SERVICE') {
this.queryParams.dischargeStartTime = null this.queryParams.dischargeStartTime = null
this.queryParams.dischargeEndTime = null this.queryParams.dischargeEndTime = null
this.queryParams.clinicalStartTime = this.mzTime[0] this.queryParams.clinicalStartTime = this.mzTime[0]
@ -713,7 +713,7 @@ export default {
visitSerialNumber: null, visitSerialNumber: null,
attendingPhysicianId: null, attendingPhysicianId: null,
patientId: null, patientId: null,
visitMethod: null, suitRange: null,
manageRouteId: null, manageRouteId: null,
manageRouteNodeId: null, manageRouteNodeId: null,
patientName: null, patientName: null,