Commit b75b4e43f3e79846e3060b27cab67bffda0752a2
1 parent
630cd13790
Exists in
master
and in
6 other branches
听力诊断模块
Showing 1 changed file with 21 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
View file @
b75b4e4
| ... | ... | @@ -684,17 +684,20 @@ |
| 684 | 684 | if (historyJson.containsKey("yesOrNo")) { |
| 685 | 685 | int yesOrNo = historyJson.getIntValue("yesOrNo"); |
| 686 | 686 | if (yesOrNo == 1) { |
| 687 | - historyStr.append("有、"); | |
| 687 | + historyStr.append("有("); | |
| 688 | 688 | if (historyJson.containsKey("type")) { |
| 689 | 689 | String type = historyJson.getString("type"); |
| 690 | 690 | if ("yinJiu".equals(type)) { |
| 691 | 691 | historyStr.append("饮酒、"); |
| 692 | - } else if ("xiYan".equals(type)) { | |
| 692 | + } | |
| 693 | + if ("xiYan".equals(type)) { | |
| 693 | 694 | historyStr.append("吸烟、"); |
| 694 | - } else if ("xiDu".equals(type)) { | |
| 695 | + } | |
| 696 | + if ("xiDu".equals(type)) { | |
| 695 | 697 | historyStr.append("吸毒"); |
| 696 | 698 | } |
| 697 | 699 | } |
| 700 | + historyStr.append(")"); | |
| 698 | 701 | } else { |
| 699 | 702 | historyStr.append("无"); |
| 700 | 703 | } |
| ... | ... | @@ -919,7 +922,7 @@ |
| 919 | 922 | if (historyJson.containsKey("yesOrNo")) { |
| 920 | 923 | int yesOrNo = historyJson.getIntValue("yesOrNo"); |
| 921 | 924 | if (1 == yesOrNo) { |
| 922 | - historyStr.append("有、"); | |
| 925 | + historyStr.append("有("); | |
| 923 | 926 | } else { |
| 924 | 927 | historyStr.append("无"); |
| 925 | 928 | } |
| 926 | 929 | |
| 927 | 930 | |
| ... | ... | @@ -928,11 +931,14 @@ |
| 928 | 931 | String type = historyJson.getString("type"); |
| 929 | 932 | if ("yinJiu".equals(type)) { |
| 930 | 933 | historyStr.append("饮酒、"); |
| 931 | - } else if ("xiYan".equals(type)) { | |
| 934 | + } | |
| 935 | + if ("xiYan".equals(type)) { | |
| 932 | 936 | historyStr.append("吸烟、"); |
| 933 | - } else if ("xiDu".equals(type)) { | |
| 937 | + } | |
| 938 | + if ("xiDu".equals(type)) { | |
| 934 | 939 | historyStr.append("吸毒"); |
| 935 | 940 | } |
| 941 | + historyStr.append(")"); | |
| 936 | 942 | } |
| 937 | 943 | babyEarMotherView.setBadLifeHistoryType(historyStr.toString()); |
| 938 | 944 | } |
| 939 | 945 | |
| ... | ... | @@ -1042,10 +1048,18 @@ |
| 1042 | 1048 | String parturitionType = CZFmTypeEnums.getTitle(babyPatientExtendEarBirth.getParturitionType()); |
| 1043 | 1049 | babyEarBirthView.setParturitionType(parturitionType); |
| 1044 | 1050 | } |
| 1051 | + if(babyPatientExtendEarBirth.getAmnioticFluidType()!=null){ | |
| 1052 | + if(babyPatientExtendEarBirth.getAmnioticFluidType() == 1){ //1= I度 2=II度 3=III度 | |
| 1053 | + babyEarBirthView.setAmnioticFluid("I度"); | |
| 1054 | + }else if(babyPatientExtendEarBirth.getAmnioticFluidType() == 2){ //1= I度 2=II度 3=III度 | |
| 1055 | + babyEarBirthView.setAmnioticFluid("II度"); | |
| 1056 | + }else if(babyPatientExtendEarBirth.getAmnioticFluidType() == 2){ //1= I度 2=II度 3=III度 | |
| 1057 | + babyEarBirthView.setAmnioticFluid("III度"); | |
| 1058 | + } | |
| 1059 | + } | |
| 1045 | 1060 | babyEarBirthView.setTireNumber(babyPatientExtendEarBirth.getTireNumber()); |
| 1046 | 1061 | babyEarBirthView.setBirthDefectDesc(babyPatientExtendEarBirth.getBirthDefectDesc()); |
| 1047 | 1062 | babyEarBirthView.setBirthInjuryPosition(babyPatientExtendEarBirth.getBirthInjuryPosition()); |
| 1048 | - babyEarBirthView.setAmnioticFluid(babyPatientExtendEarBirth.getAmnioticFluidType() == null ? "" : babyPatientExtendEarBirth.getAmnioticFluidType() + ""); | |
| 1049 | 1063 | String parturitType = "无"; |
| 1050 | 1064 | if (babyPatientExtendEarBirth.getAbnormalParturitionType() != null) { |
| 1051 | 1065 | if (babyPatientExtendEarBirth.getAbnormalParturitionType() == 1) {//有 |