Commit 3f77f5f27320131f979a36e0cb4cffad02e9830c
1 parent
2ea136ec39
Exists in
dev
#fix:优化五色专案管理查询已建档逻辑,不区分孕妇和产妇
Showing 2 changed files with 4 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java
View file @
3f77f5f
... | ... | @@ -815,6 +815,9 @@ |
815 | 815 | if (!authorization.contains(Authorization)){ |
816 | 816 | throw new RuntimeException("权限异常"); |
817 | 817 | } |
818 | + if (doctors.contains(doctor)){ | |
819 | + doctor="孙慧洁"; | |
820 | + } | |
818 | 821 | idtdyrmFmService.reportAppointmentList(response,doctor,startTime,endTime,name,doctorName); |
819 | 822 | } |
820 | 823 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
3f77f5f
... | ... | @@ -3988,7 +3988,7 @@ |
3988 | 3988 | if (StringUtils.isEmpty(queryRequest.getCardNo()) && StringUtils.isEmpty(queryRequest.getVcCardNo())) { |
3989 | 3989 | return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请输入查询条件"); |
3990 | 3990 | } |
3991 | - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), currentGroupHospital, 1, false, og.getbStatus() == 1, hospitalId); | |
3991 | + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), currentGroupHospital, -1, false, og.getbStatus() == 1, hospitalId); | |
3992 | 3992 | //查询产妇数据 |
3993 | 3993 | // patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 1, false, null, false); |
3994 | 3994 | } |