Commit c57d9cec85422406013e00d81a391f659f786559
1 parent
7cca0fb875
Exists in
master
and in
6 other branches
//秦皇岛-高危儿专科（月龄=检查时间-预产期）改为之前的逻辑
Showing 1 changed file with 24 additions and 24 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java
View file @
c57d9ce
| ... | ... | @@ -436,30 +436,30 @@ |
| 436 | 436 | BabyHighRiskBabyModel babyHighRiskBabyModel = babyHighRiskBabyService.queryById(id); |
| 437 | 437 | BabyHighRiskBabyResult highRiskBabyResult = new BabyHighRiskBabyResult(); |
| 438 | 438 | //秦皇岛-高危儿专科（月龄=检查时间-预产期） |
| 439 | - if(null!=babyHighRiskBabyModel) { | |
| 440 | - Date birthDueDate = null; | |
| 441 | - BabyHighRiskBabyModelQuery babyQuery=new BabyHighRiskBabyModelQuery(); | |
| 442 | - List <BabyHighRiskBabyModel> babyHighRiskBabyModelList = new ArrayList <>(); | |
| 443 | - if (StringUtils.isNotEmpty(babyHighRiskBabyModel.getBuildId()) && StringUtils.isNotEmpty(babyHighRiskBabyModel.getHospitalId())) { | |
| 444 | - babyQuery.setYn(YnEnums.YES.getId()); | |
| 445 | - babyQuery.setHospitalId(babyHighRiskBabyModel.getHospitalId()); | |
| 446 | - babyQuery.setBuildId(babyHighRiskBabyModel.getBuildId()); | |
| 447 | - babyQuery.setSort("checkDate"); | |
| 448 | - babyHighRiskBabyModelList = babyHighRiskBabyService.queryOne(babyQuery); | |
| 449 | - } | |
| 450 | - //秦皇岛-高危儿专科（拿到预产期复诊用） | |
| 451 | - for (BabyHighRiskBabyModel babyHighRiskBabyModel2 : babyHighRiskBabyModelList) { | |
| 452 | - if(null!=babyHighRiskBabyModel2.getBirthDueDate()){ | |
| 453 | - birthDueDate=babyHighRiskBabyModel2.getBirthDueDate(); | |
| 454 | - } | |
| 455 | - } | |
| 456 | - if (StringUtils.isNotEmpty(babyHighRiskBabyModel.getHospitalId()) && "216".equals(babyHighRiskBabyModel.getHospitalId())) { | |
| 457 | - if (null != babyHighRiskBabyModel.getCheckDate() && null != birthDueDate) { | |
| 458 | - String checkMonth = DateUtil.getBabyMonthAge(birthDueDate, babyHighRiskBabyModel.getCheckDate()); | |
| 459 | - babyHighRiskBabyModel.setCheckMonth(checkMonth); | |
| 460 | - } | |
| 461 | - } | |
| 462 | - } | |
| 439 | +// if(null!=babyHighRiskBabyModel) { | |
| 440 | +// Date birthDueDate = null; | |
| 441 | +// BabyHighRiskBabyModelQuery babyQuery=new BabyHighRiskBabyModelQuery(); | |
| 442 | +// List <BabyHighRiskBabyModel> babyHighRiskBabyModelList = new ArrayList <>(); | |
| 443 | +// if (StringUtils.isNotEmpty(babyHighRiskBabyModel.getBuildId()) && StringUtils.isNotEmpty(babyHighRiskBabyModel.getHospitalId())) { | |
| 444 | +// babyQuery.setYn(YnEnums.YES.getId()); | |
| 445 | +// babyQuery.setHospitalId(babyHighRiskBabyModel.getHospitalId()); | |
| 446 | +// babyQuery.setBuildId(babyHighRiskBabyModel.getBuildId()); | |
| 447 | +// babyQuery.setSort("checkDate"); | |
| 448 | +// babyHighRiskBabyModelList = babyHighRiskBabyService.queryOne(babyQuery); | |
| 449 | +// } | |
| 450 | +// //秦皇岛-高危儿专科（拿到预产期复诊用） | |
| 451 | +// for (BabyHighRiskBabyModel babyHighRiskBabyModel2 : babyHighRiskBabyModelList) { | |
| 452 | +// if(null!=babyHighRiskBabyModel2.getBirthDueDate()){ | |
| 453 | +// birthDueDate=babyHighRiskBabyModel2.getBirthDueDate(); | |
| 454 | +// } | |
| 455 | +// } | |
| 456 | +// if (StringUtils.isNotEmpty(babyHighRiskBabyModel.getHospitalId()) && "216".equals(babyHighRiskBabyModel.getHospitalId())) { | |
| 457 | +// if (null != babyHighRiskBabyModel.getCheckDate() && null != birthDueDate) { | |
| 458 | +// String checkMonth = DateUtil.getBabyMonthAge(birthDueDate, babyHighRiskBabyModel.getCheckDate()); | |
| 459 | +// babyHighRiskBabyModel.setCheckMonth(checkMonth); | |
| 460 | +// } | |
| 461 | +// } | |
| 462 | +// } | |
| 463 | 463 | highRiskBabyResult.convertToResult(babyHighRiskBabyModel); |
| 464 | 464 | if (StringUtils.isEmpty(babyHighRiskBabyModel.getGmdz()) |
| 465 | 465 | && StringUtils.isEmpty(babyHighRiskBabyModel.getGmdz()) |