Commit 0bed809fe56e70bdd15102d680197af252fc8335
1 parent
06b89b934f
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 26 additions and 28 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java
View file @
0bed809
| ... | ... | @@ -50,6 +50,8 @@ |
| 50 | 50 | @Autowired |
| 51 | 51 | private BabyBookbuildingService babyBookbuildingService; |
| 52 | 52 | @Autowired |
| 53 | + private MongoTemplate mongoTemplate; | |
| 54 | + @Autowired | |
| 53 | 55 | private BabyService babyService; |
| 54 | 56 | @Autowired |
| 55 | 57 | private AutoMatchFacade autoMatchFacade; |
| ... | ... | @@ -579,7 +581,7 @@ |
| 579 | 581 | babyQuery.setBirthEnd(babyQuery.getBirthEnd()); |
| 580 | 582 | } else { |
| 581 | 583 | babyQuery.setBirthEnd(start); |
| 582 | - Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -babyQuery.getMonthEnd() - 1), 1); | |
| 584 | + end = DateUtil.addDay(DateUtil.addMonth(currentDate, -babyQuery.getMonthEnd() - 1), 1); | |
| 583 | 585 | babyQuery.setBirthStart(end); |
| 584 | 586 | } |
| 585 | 587 | if (babyQuery.getBirthEnd() != null) { |
| 586 | 588 | |
| 587 | 589 | |
| 588 | 590 | |
| ... | ... | @@ -765,36 +767,33 @@ |
| 765 | 767 | List <BabyHighRiskBabyModel> checkModels = babyHighRiskBabyService.queryOne(babyHighRiskBabyModelQuery); |
| 766 | 768 | if (CollectionUtils.isNotEmpty(checkModels)) |
| 767 | 769 | { |
| 768 | - BabyHighRiskBabyModel riskBabyModel = checkModels.get(checkModels.size() - 1); | |
| 769 | - data.put("number",riskBabyModel.getNumber()); | |
| 770 | - data.put("manageDate",DateUtil.getyyyy_MM_dd(riskBabyModel.getCheckDate())); | |
| 771 | - | |
| 772 | - ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); | |
| 773 | - referralApplyOrderQuery.setParentId(id); | |
| 774 | - List<ReferralApplyOrderModel> list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); | |
| 775 | - String referraHospital = ""; | |
| 776 | - if (CollectionUtils.isNotEmpty(list)) | |
| 777 | - { | |
| 778 | - ReferralApplyOrderModel orderModel = list.get(0); | |
| 779 | - referraHospital = organizationService.getOrganization(Integer.parseInt(orderModel.getTransferredHospital())).getName(); | |
| 780 | - } | |
| 781 | - data.put("referraHospital",referraHospital); | |
| 782 | - data.put("jwbqk",riskBabyModel.getJwbqk()); | |
| 783 | - | |
| 784 | - BabyHighRiskBabyModel riskBabyModel1 = checkModels.get(0); | |
| 785 | - data.put("zgStatus",riskBabyModel1.getZgStatus()); | |
| 786 | - data.put("closeDate",DateUtil.getyyyy_MM_dd(riskBabyModel1.getcCDate())); | |
| 787 | - | |
| 788 | - String diagnoseValue = getHighRiskDiagnoseStr(riskBabyModel)+riskBabyModel.getHighRiskQt() == null ? "" : riskBabyModel.getHighRiskQt(); | |
| 789 | - | |
| 790 | - data.put("diagnoseValue",diagnoseValue); | |
| 791 | - | |
| 792 | 770 | List<Map> fzDatas = new LinkedList<>(); |
| 793 | - | |
| 794 | 771 | for (BabyHighRiskBabyModel babyHighRiskBabyModel : checkModels) |
| 795 | 772 | { |
| 796 | - if ("fz".equals(babyHighRiskBabyModel.getCzOrfzProject())) | |
| 773 | + if ("cz".equals(babyHighRiskBabyModel.getCzOrfzProject())) | |
| 797 | 774 | { |
| 775 | + data.put("number",babyHighRiskBabyModel.getNumber()); | |
| 776 | + data.put("manageDate",DateUtil.getyyyy_MM_dd(babyHighRiskBabyModel.getCheckDate())); | |
| 777 | + | |
| 778 | + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); | |
| 779 | + referralApplyOrderQuery.setParentId(id); | |
| 780 | + List<ReferralApplyOrderModel> list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); | |
| 781 | + String referraHospital = ""; | |
| 782 | + if (CollectionUtils.isNotEmpty(list)) | |
| 783 | + { | |
| 784 | + ReferralApplyOrderModel orderModel = list.get(0); | |
| 785 | + referraHospital = organizationService.getOrganization(Integer.parseInt(orderModel.getTransferredHospital())).getName(); | |
| 786 | + } | |
| 787 | + data.put("referraHospital",referraHospital); | |
| 788 | + data.put("jwbqk",babyHighRiskBabyModel.getJwbqk()); | |
| 789 | + BabyHighRiskBabyModel riskBabyModel1 = checkModels.get(0); | |
| 790 | + data.put("zgStatus",riskBabyModel1.getZgStatus()); | |
| 791 | + data.put("closeDate",DateUtil.getyyyy_MM_dd(riskBabyModel1.getcCDate())); | |
| 792 | + String diagnoseValue = getHighRiskDiagnoseStr(babyHighRiskBabyModel)+babyHighRiskBabyModel.getHighRiskQt() == null ? "" : babyHighRiskBabyModel.getHighRiskQt(); | |
| 793 | + data.put("diagnoseValue",diagnoseValue); | |
| 794 | + } | |
| 795 | + else | |
| 796 | + { | |
| 798 | 797 | Map fzData = new HashMap(); |
| 799 | 798 | fzData.put("evalMethod",babyHighRiskBabyModel.getEvalMethod()); |
| 800 | 799 | fzData.put("weight",babyHighRiskBabyModel.getWeight()); |
| ... | ... | @@ -816,7 +815,6 @@ |
| 816 | 815 | handleExecption(babyHighRiskBabyModel.getXlxwfy(),exection); |
| 817 | 816 | |
| 818 | 817 | fzData.put("exception", "".equals(exection.toString()) ? null : exection.toString()); |
| 819 | - | |
| 820 | 818 | |
| 821 | 819 | fzData.put("checkDate", DateUtil.getyyyy_MM_dd(babyHighRiskBabyModel.getCheckDate())); |
| 822 | 820 | fzData.put("age", DateUtil.getBabyMonthAge(babyHighRiskBabyModel.getBirthday(), babyHighRiskBabyModel.getCheckDate())); |