diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml index e49c8fe..f283378 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml @@ -399,6 +399,9 @@ AND today_count = #{todayCount,jdbcType=INTEGER} + + AND hospital_id = #{hospitalId,jdbcType=VARCHAR} + and baby_id in diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 7a05f32..a8ce258 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -1413,17 +1413,13 @@ public class PatientFacade { } catch (Exception e) { // 什么都不干 } -// if ("1000000114".equals(patients.getHospitalId())) { -// patientManagerQueryModel.setPhone(patients.getPhone()); -// patientManagerQueryModel.setCardNo(patients.getCardNo()); -// } else { -// patientManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone())); -// patientManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo())); -// } - - patientManagerQueryModel.setPhone(patients.getPhone()); - patientManagerQueryModel.setCardNo(patients.getCardNo()); - + if ("1000000114".equals(patients.getHospitalId())) { + patientManagerQueryModel.setPhone(patients.getPhone()); + patientManagerQueryModel.setCardNo(patients.getCardNo()); + } else { + patientManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone())); + patientManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo())); + } patientManagerQueryModel.setBuildWeek(dueWeek); String bookbuildingDoctor = "";