Commit 8f838d4b06b759e52cf587b800ef21b4a18fa549
1 parent
d07cb39fad
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 27 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java
View file @
8f838d4
| ... | ... | @@ -434,9 +434,25 @@ |
| 434 | 434 | BabyHighRiskBabyResult highRiskBabyResult = new BabyHighRiskBabyResult(); |
| 435 | 435 | //秦皇岛-高危儿专科（月龄=检查时间-预产期） |
| 436 | 436 | if(null!=babyHighRiskBabyModel) { |
| 437 | + Date birthDueDate = null; | |
| 438 | + BabyHighRiskBabyModelQuery babyQuery=new BabyHighRiskBabyModelQuery(); | |
| 439 | + List <BabyHighRiskBabyModel> babyHighRiskBabyModelList = new ArrayList <>(); | |
| 440 | + if (StringUtils.isNotEmpty(babyHighRiskBabyModel.getBuildId()) && StringUtils.isNotEmpty(babyHighRiskBabyModel.getHospitalId())) { | |
| 441 | + babyQuery.setYn(YnEnums.YES.getId()); | |
| 442 | + babyQuery.setHospitalId(babyHighRiskBabyModel.getHospitalId()); | |
| 443 | + babyQuery.setBuildId(babyHighRiskBabyModel.getBuildId()); | |
| 444 | + babyQuery.setSort("checkDate"); | |
| 445 | + babyHighRiskBabyModelList = babyHighRiskBabyService.queryOne(babyQuery); | |
| 446 | + } | |
| 447 | + //秦皇岛-高危儿专科（拿到预产期复诊用） | |
| 448 | + for (BabyHighRiskBabyModel babyHighRiskBabyModel2 : babyHighRiskBabyModelList) { | |
| 449 | + if(null!=babyHighRiskBabyModel2.getBirthDueDate()){ | |
| 450 | + birthDueDate=babyHighRiskBabyModel2.getBirthDueDate(); | |
| 451 | + } | |
| 452 | + } | |
| 437 | 453 | if (StringUtils.isNotEmpty(babyHighRiskBabyModel.getHospitalId()) && "216".equals(babyHighRiskBabyModel.getHospitalId())) { |
| 438 | - if (null != babyHighRiskBabyModel.getCheckDate() && null != babyHighRiskBabyModel.getBirthDueDate()) { | |
| 439 | - String checkMonth = DateUtil.getBabyMonthAge(babyHighRiskBabyModel.getBirthDueDate(), babyHighRiskBabyModel.getCheckDate()); | |
| 454 | + if (null != babyHighRiskBabyModel.getCheckDate() && null != birthDueDate) { | |
| 455 | + String checkMonth = DateUtil.getBabyMonthAge(birthDueDate, babyHighRiskBabyModel.getCheckDate()); | |
| 440 | 456 | babyHighRiskBabyModel.setCheckMonth(checkMonth); |
| 441 | 457 | } |
| 442 | 458 | } |
| 443 | 459 | |
| ... | ... | @@ -546,8 +562,14 @@ |
| 546 | 562 | babyQuery.setHospitalId(hospitalId); |
| 547 | 563 | babyQuery.setSort("checkDate"); |
| 548 | 564 | babyHighRiskBabyModelList = babyHighRiskBabyService.queryOne(babyQuery); |
| 549 | - | |
| 550 | 565 | } |
| 566 | + //秦皇岛-高危儿专科（拿到预产期复诊用） | |
| 567 | + Date birthDueDate = null; | |
| 568 | + for (BabyHighRiskBabyModel babyHighRiskBabyModel : babyHighRiskBabyModelList) { | |
| 569 | + if(null!=babyHighRiskBabyModel.getBirthDueDate()){ | |
| 570 | + birthDueDate=babyHighRiskBabyModel.getBirthDueDate(); | |
| 571 | + } | |
| 572 | + } | |
| 551 | 573 | String number = ""; |
| 552 | 574 | String highRiskQt = ""; |
| 553 | 575 | Map map = new HashMap(); |
| ... | ... | @@ -579,8 +601,8 @@ |
| 579 | 601 | |
| 580 | 602 | //秦皇岛-高危儿专科（月龄=检查时间-预产期） |
| 581 | 603 | if(StringUtils.isNotEmpty(hospitalId)&&"216".equals(hospitalId)){ |
| 582 | - if(null!=babyHighRiskBabyModel.getCheckDate()&&null!=babyHighRiskBabyModel.getBirthDueDate()){ | |
| 583 | - String checkMonth=DateUtil.getBabyMonthAge(babyHighRiskBabyModel.getBirthDueDate(),babyHighRiskBabyModel.getCheckDate()); | |
| 604 | + if(null!=babyHighRiskBabyModel.getCheckDate()&&null!=birthDueDate){ | |
| 605 | + String checkMonth=DateUtil.getBabyMonthAge(birthDueDate,babyHighRiskBabyModel.getCheckDate()); | |
| 584 | 606 | babyHighRiskBabyResult.setCheckMonth(checkMonth); |
| 585 | 607 | } |
| 586 | 608 | } |