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 1fc66ab..473971b 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 @@ -436,30 +436,30 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { BabyHighRiskBabyModel babyHighRiskBabyModel = babyHighRiskBabyService.queryById(id); 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 != birthDueDate) { - String checkMonth = DateUtil.getBabyMonthAge(birthDueDate, babyHighRiskBabyModel.getCheckDate()); - babyHighRiskBabyModel.setCheckMonth(checkMonth); - } - } - } +// 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 != birthDueDate) { +// String checkMonth = DateUtil.getBabyMonthAge(birthDueDate, babyHighRiskBabyModel.getCheckDate()); +// babyHighRiskBabyModel.setCheckMonth(checkMonth); +// } +// } +// } highRiskBabyResult.convertToResult(babyHighRiskBabyModel); if (StringUtils.isEmpty(babyHighRiskBabyModel.getGmdz()) && StringUtils.isEmpty(babyHighRiskBabyModel.getGmdz())