liquanyu / regional-platform

Download as
Browse Code ยป

Commit 5ea0bf6829584063133ccf056eecd7ce0d603a34

Authored by liquanyu
1 parent b6ffdf4aaa
Exists in master and in 1 other branch dev

update

Showing 1 changed file with 7 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java View file @ 5ea0bf6
... ... @@ -3,6 +3,7 @@
3 3 import com.lyms.platform.biz.service.*;
4 4 import com.lyms.platform.common.constants.ErrorCodeConstants;
5 5 import com.lyms.platform.common.enums.OptActionEnums;
  6 +import com.lyms.platform.common.enums.SexEnum;
6 7 import com.lyms.platform.common.enums.YnEnums;
7 8 import com.lyms.platform.common.result.BaseObjectResponse;
8 9 import com.lyms.platform.common.result.BaseResponse;
... ... @@ -757,7 +758,7 @@
757 758 Map<String,Object> data = new HashMap<>();
758 759 BabyModel babyModel = babyService.getOneBabyById(id);
759 760 data.put("babyName",babyModel.getName());
760   - data.put("babySex",babyModel.getSex());
  761 + data.put("babySex", SexEnum.getTextById(babyModel.getSex()));
761 762 data.put("babyBirth",DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
762 763 BabyHighRiskBabyModelQuery babyHighRiskBabyModelQuery = new BabyHighRiskBabyModelQuery();
763 764 babyHighRiskBabyModelQuery.setYn(YnEnums.YES.getId());
... ... @@ -789,7 +790,7 @@
789 790 BabyHighRiskBabyModel riskBabyModel1 = checkModels.get(0);
790 791 data.put("zgStatus",riskBabyModel1.getZgStatus());
791 792 data.put("closeDate",DateUtil.getyyyy_MM_dd(riskBabyModel1.getcCDate()));
792   - String diagnoseValue = getHighRiskDiagnoseStr(babyHighRiskBabyModel)+babyHighRiskBabyModel.getHighRiskQt() == null ? "" : babyHighRiskBabyModel.getHighRiskQt();
  793 + String diagnoseValue = getHighRiskDiagnoseStr(babyHighRiskBabyModel)+(babyHighRiskBabyModel.getHighRiskQt() == null ? "" : " "+ babyHighRiskBabyModel.getHighRiskQt());
793 794 data.put("diagnoseValue",diagnoseValue);
794 795 }
795 796 else
796 797  
... ... @@ -807,12 +808,12 @@
807 808 handleExecption(babyHighRiskBabyModel.getWg(),exection);
808 809 handleExecption(babyHighRiskBabyModel.getTooth(),exection);
809 810 handleExecption(babyHighRiskBabyModel.getHeart(),exection);
810   - handleExecption(babyHighRiskBabyModel.getLung(),exection);
811   - handleExecption(babyHighRiskBabyModel.getAbdomen(),exection);
812   - handleExecption(babyHighRiskBabyModel.getWszq(),exection);
  811 + handleExecption(babyHighRiskBabyModel.getLung(), exection);
  812 + handleExecption(babyHighRiskBabyModel.getAbdomen(), exection);
  813 + handleExecption(babyHighRiskBabyModel.getWszq(), exection);
813 814 handleExecption(babyHighRiskBabyModel.getJzsz(),exection);
814 815 handleExecption(babyHighRiskBabyModel.getSjxtjc(),exection);
815   - handleExecption(babyHighRiskBabyModel.getXlxwfy(),exection);
  816 + handleExecption(babyHighRiskBabyModel.getXlxwfy(), exection);
816 817  
817 818 fzData.put("exception", "".equals(exection.toString()) ? null : exection.toString());
818 819