Commit ead3b6701165fcd3694067577f6fcf0e2d5b4037
1 parent
1e1a71f2af
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 9 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java
View file @
ead3b67
... | ... | @@ -795,9 +795,7 @@ |
795 | 795 | } |
796 | 796 | data.put("referraHospital",referraHospital); |
797 | 797 | data.put("jwbqk",babyHighRiskBabyModel.getJwbqk()); |
798 | - BabyHighRiskBabyModel riskBabyModel1 = checkModels.get(0); | |
799 | - data.put("zgStatus",riskBabyModel1.getZgStatus()); | |
800 | - data.put("closeDate",DateUtil.getyyyy_MM_dd(riskBabyModel1.getcCDate())); | |
798 | + | |
801 | 799 | String diagnoseValue = getHighRiskDiagnoseStr(babyHighRiskBabyModel)+(babyHighRiskBabyModel.getHighRiskQt() == null ? "" : " "+ babyHighRiskBabyModel.getHighRiskQt()); |
802 | 800 | data.put("diagnoseValue",diagnoseValue); |
803 | 801 | } |
804 | 802 | |
... | ... | @@ -812,10 +810,13 @@ |
812 | 810 | fzData.put("handleOther", babyHighRiskBabyModel.getHandleOther()); |
813 | 811 | StringBuffer exection = new StringBuffer(); |
814 | 812 | |
815 | - handleExecption(babyHighRiskBabyModel.getSkin(),exection); | |
816 | - handleExecption(babyHighRiskBabyModel.getWg(),exection); | |
813 | + handleExecption(babyHighRiskBabyModel.getMs(), exection); | |
814 | + handleExecption(babyHighRiskBabyModel.getPf(), exection); | |
815 | + handleExecption(babyHighRiskBabyModel.getXf(), exection); | |
816 | +// handleExecption(babyHighRiskBabyModel.getSkin(), exection); | |
817 | + handleExecption(babyHighRiskBabyModel.getWg(), exection); | |
817 | 818 | handleExecption(babyHighRiskBabyModel.getTooth(),exection); |
818 | - handleExecption(babyHighRiskBabyModel.getHeart(),exection); | |
819 | +// handleExecption(babyHighRiskBabyModel.getHeart(),exection); | |
819 | 820 | handleExecption(babyHighRiskBabyModel.getLung(), exection); |
820 | 821 | handleExecption(babyHighRiskBabyModel.getAbdomen(), exection); |
821 | 822 | handleExecption(babyHighRiskBabyModel.getWszq(), exection); |
... | ... | @@ -828,7 +829,8 @@ |
828 | 829 | fzData.put("checkDate", DateUtil.getyyyy_MM_dd(babyHighRiskBabyModel.getCheckDate())); |
829 | 830 | fzData.put("age", DateUtil.getBabyMonthAge(babyHighRiskBabyModel.getBirthday(), babyHighRiskBabyModel.getCheckDate())); |
830 | 831 | fzData.put("checkDoctor", usersService.getUsers(Integer.parseInt(babyHighRiskBabyModel.getCheckDoctor())).getName()); |
831 | - | |
832 | + data.put("zgStatus",babyHighRiskBabyModel.getZgStatus()); | |
833 | + data.put("closeDate",DateUtil.getyyyy_MM_dd(babyHighRiskBabyModel.getcCDate())); | |
832 | 834 | fzDatas.add(fzData); |
833 | 835 | } |
834 | 836 | } |