jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c8515ea641237054f3384e058938091ee90b0ebd

Authored by yangfei
1 parent a85a72b975
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

听力诊断模块

Showing 2 changed files with 42 additions and 8 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/HighRiskEnum.java View file @ c8515ea
... ... @@ -25,9 +25,6 @@
25 25 private String name;
26 26  
27 27 public static String getTitle(int id){
28   - if (id==0){
29   - return "";
30   - }
31 28 for (HighRiskEnum cfEnums:HighRiskEnum.values()){
32 29 if (id == cfEnums.getId()){
33 30 return cfEnums.getName();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java View file @ c8515ea
... ... @@ -792,6 +792,8 @@
792 792 hfString = historyStr.toString();
793 793 }
794 794 babyEarFamilyView.setBadLifeHistory(hfString);
  795 + }else{
  796 + babyEarFamilyView.setBadLifeHistory("无");
795 797 }
796 798 }
797 799  
... ... @@ -886,7 +888,12 @@
886 888 } else {
887 889 hfString = historyStr.toString();
888 890 }
889   - babyEarMotherView.setViralInfectionHistoryType(hfString);
  891 +
  892 + if(StringUtils.isNotEmpty(hfString)){
  893 + babyEarMotherView.setViralInfectionHistoryType(hfString);
  894 + }else{
  895 + babyEarMotherView.setViralInfectionHistoryType("无");
  896 + }
890 897 }
891 898  
892 899  
... ... @@ -951,7 +958,12 @@
951 958 } else {
952 959 hfString = historyStr.toString();
953 960 }
954   - babyEarMotherView.setGenitalInfectionHistoryType(hfString);
  961 +
  962 + if(StringUtils.isNotEmpty(hfString)){
  963 + babyEarMotherView.setGenitalInfectionHistoryType(hfString);
  964 + }else{
  965 + babyEarMotherView.setGenitalInfectionHistoryType("无");
  966 + }
955 967 }
956 968  
957 969  
... ... @@ -969,6 +981,8 @@
969 981 } else {
970 982 historyStr.append("无");
971 983 }
  984 + }else{
  985 + historyStr.append("无");
972 986 }
973 987 babyEarMotherView.setRadiationHistoryType(historyStr.toString());
974 988 }
... ... @@ -1055,6 +1069,8 @@
1055 1069 hfString = historyStr.toString();
1056 1070 }
1057 1071 babyEarMotherView.setBadLifeHistoryType(hfString);
  1072 + }else{
  1073 + babyEarMotherView.setBadLifeHistoryType("无");
1058 1074 }
1059 1075  
1060 1076 if (StringUtils.isNotEmpty(babyPatientExtendEarMother.getMedicalHistoryType())) {
... ... @@ -1173,7 +1189,7 @@
1173 1189 */
1174 1190 public BabyEarBirthView convertToBabyEarBirthView(BabyPatientExtendEarBirth babyPatientExtendEarBirth) {
1175 1191 BabyEarBirthView babyEarBirthView = new BabyEarBirthView();
1176   - babyEarBirthView.setFetuNumber(babyPatientExtendEarBirth.getFetuNumber() == null ? "" : babyPatientExtendEarBirth.getFetuNumber() + "次");
  1192 + babyEarBirthView.setFetuNumber(babyPatientExtendEarBirth.getFetuNumber() == null ? "" : "第"+babyPatientExtendEarBirth.getFetuNumber() + "胎");
1177 1193 babyEarBirthView.setProductNumber(babyPatientExtendEarBirth.getProductNumber() == null ? "" : babyPatientExtendEarBirth.getProductNumber() + "次");
1178 1194 babyEarBirthView.setBirthWeight(babyPatientExtendEarBirth.getBirthWeight());
1179 1195 babyEarBirthView.setBirthWeight(babyPatientExtendEarBirth.getBirthWeight());
1180 1196  
... ... @@ -1190,9 +1206,30 @@
1190 1206 babyEarBirthView.setAmnioticFluid("III度");
1191 1207 }
1192 1208 }
  1209 +
1193 1210 babyEarBirthView.setTireNumber(babyPatientExtendEarBirth.getTireNumber());
1194   - babyEarBirthView.setBirthDefectDesc(babyPatientExtendEarBirth.getBirthDefectDesc());
1195   - babyEarBirthView.setBirthInjuryPosition(babyPatientExtendEarBirth.getBirthInjuryPosition());
  1211 + String birthDefectType = "无";
  1212 + if(babyPatientExtendEarBirth.getBirthDefectType()!=null){
  1213 + if (babyPatientExtendEarBirth.getBirthDefectType() == 1) {//有
  1214 + birthDefectType = "有";
  1215 + if(StringUtils.isNotEmpty(babyPatientExtendEarBirth.getBirthDefectDesc())){
  1216 + birthDefectType = "有,"+babyPatientExtendEarBirth.getBirthDefectDesc();
  1217 + }
  1218 + }
  1219 + }
  1220 + babyEarBirthView.setBirthDefectDesc(birthDefectType);
  1221 +
  1222 + String birthInjuryType = "无";
  1223 + if(babyPatientExtendEarBirth.getBirthInjuryType()!=null){
  1224 + if (babyPatientExtendEarBirth.getBirthInjuryType() == 1) {//有
  1225 + birthInjuryType = "有";
  1226 + if(StringUtils.isNotEmpty(babyPatientExtendEarBirth.getBirthDefectDesc())){
  1227 + birthInjuryType = "有,"+babyPatientExtendEarBirth.getBirthInjuryPosition();
  1228 + }
  1229 + }
  1230 + }
  1231 + babyEarBirthView.setBirthInjuryPosition(birthInjuryType);
  1232 +
1196 1233 String parturitType = "无";
1197 1234 if (babyPatientExtendEarBirth.getAbnormalParturitionType() != null) {
1198 1235 if (babyPatientExtendEarBirth.getAbnormalParturitionType() == 1) {//有