diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java index 296ba35..71ea9f6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java @@ -434,9 +434,25 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { BabyHighRiskBabyResult highRiskBabyResult = new BabyHighRiskBabyResult(); //秦皇岛-高危儿专科(月龄=检查时间-预产期) if(null!=babyHighRiskBabyModel) { + Date birthDueDate = null; + BabyHighRiskBabyModelQuery babyQuery=new BabyHighRiskBabyModelQuery(); + List babyHighRiskBabyModelList = new ArrayList <>(); + if (StringUtils.isNotEmpty(babyHighRiskBabyModel.getBuildId()) && StringUtils.isNotEmpty(babyHighRiskBabyModel.getHospitalId())) { + babyQuery.setYn(YnEnums.YES.getId()); + babyQuery.setHospitalId(babyHighRiskBabyModel.getHospitalId()); + babyQuery.setBuildId(babyHighRiskBabyModel.getBuildId()); + babyQuery.setSort("checkDate"); + babyHighRiskBabyModelList = babyHighRiskBabyService.queryOne(babyQuery); + } + //秦皇岛-高危儿专科(拿到预产期复诊用) + for (BabyHighRiskBabyModel babyHighRiskBabyModel2 : babyHighRiskBabyModelList) { + if(null!=babyHighRiskBabyModel2.getBirthDueDate()){ + birthDueDate=babyHighRiskBabyModel2.getBirthDueDate(); + } + } if (StringUtils.isNotEmpty(babyHighRiskBabyModel.getHospitalId()) && "216".equals(babyHighRiskBabyModel.getHospitalId())) { - if (null != babyHighRiskBabyModel.getCheckDate() && null != babyHighRiskBabyModel.getBirthDueDate()) { - String checkMonth = DateUtil.getBabyMonthAge(babyHighRiskBabyModel.getBirthDueDate(), babyHighRiskBabyModel.getCheckDate()); + if (null != babyHighRiskBabyModel.getCheckDate() && null != birthDueDate) { + String checkMonth = DateUtil.getBabyMonthAge(birthDueDate, babyHighRiskBabyModel.getCheckDate()); babyHighRiskBabyModel.setCheckMonth(checkMonth); } } @@ -546,7 +562,13 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { babyQuery.setHospitalId(hospitalId); babyQuery.setSort("checkDate"); babyHighRiskBabyModelList = babyHighRiskBabyService.queryOne(babyQuery); - + } + //秦皇岛-高危儿专科(拿到预产期复诊用) + Date birthDueDate = null; + for (BabyHighRiskBabyModel babyHighRiskBabyModel : babyHighRiskBabyModelList) { + if(null!=babyHighRiskBabyModel.getBirthDueDate()){ + birthDueDate=babyHighRiskBabyModel.getBirthDueDate(); + } } String number = ""; String highRiskQt = ""; @@ -579,8 +601,8 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { //秦皇岛-高危儿专科(月龄=检查时间-预产期) if(StringUtils.isNotEmpty(hospitalId)&&"216".equals(hospitalId)){ - if(null!=babyHighRiskBabyModel.getCheckDate()&&null!=babyHighRiskBabyModel.getBirthDueDate()){ - String checkMonth=DateUtil.getBabyMonthAge(babyHighRiskBabyModel.getBirthDueDate(),babyHighRiskBabyModel.getCheckDate()); + if(null!=babyHighRiskBabyModel.getCheckDate()&&null!=birthDueDate){ + String checkMonth=DateUtil.getBabyMonthAge(birthDueDate,babyHighRiskBabyModel.getCheckDate()); babyHighRiskBabyResult.setCheckMonth(checkMonth); } }