Commit 94e60a16c13d7932c68aa79112490342b6201bab
1 parent
97239b2b39
Exists in
master
and in
6 other branches
听力诊断模块
Showing 2 changed files with 23 additions and 14 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java
View file @
94e60a1
| ... | ... | @@ -140,7 +140,7 @@ |
| 140 | 140 | fuMap.put("id", fu.getId()); |
| 141 | 141 | fuMap.put("name", "随访"); |
| 142 | 142 | fuMap.put("type", "3"); |
| 143 | - if (fu.getIfclose() == 1) {//0-未结案，1-结案 | |
| 143 | + if (fu.getIfclose()!=null&&fu.getIfclose() == 1) {//0-未结案，1-结案 | |
| 144 | 144 | fuMap.put("close", "结案"); |
| 145 | 145 | } |
| 146 | 146 | fuMap.put("time", DateUtil.getyyyy_MM_dd(fu.getFollowTime())); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
View file @
94e60a1
| ... | ... | @@ -731,30 +731,35 @@ |
| 731 | 731 | if (historyJson.containsKey("yesOrNo")) { |
| 732 | 732 | int yesOrNo = historyJson.getIntValue("yesOrNo"); |
| 733 | 733 | if (yesOrNo == 1) { |
| 734 | - historyStr.append("有("); | |
| 734 | + historyStr.append("有,"); | |
| 735 | 735 | if (historyJson.containsKey("yinJiu")) { |
| 736 | 736 | boolean yinJiu = historyJson.getBoolean("yinJiu"); |
| 737 | 737 | if (yinJiu) { |
| 738 | - historyStr.append("饮酒、"); | |
| 738 | + historyStr.append("饮酒,"); | |
| 739 | 739 | } |
| 740 | 740 | } |
| 741 | 741 | if (historyJson.containsKey("xiYan")) { |
| 742 | 742 | boolean xiYan = historyJson.getBoolean("xiYan"); |
| 743 | 743 | if (xiYan) { |
| 744 | - historyStr.append("吸烟、"); | |
| 744 | + historyStr.append("吸烟,"); | |
| 745 | 745 | } |
| 746 | 746 | } |
| 747 | 747 | if (historyJson.containsKey("xiDu")) { |
| 748 | 748 | boolean xiDu = historyJson.getBoolean("xiDu"); |
| 749 | 749 | if (xiDu) { |
| 750 | - historyStr.append("吸毒、"); | |
| 750 | + historyStr.append("吸毒,"); | |
| 751 | 751 | } |
| 752 | 752 | } |
| 753 | - historyStr.append(")"); | |
| 754 | 753 | } else { |
| 755 | 754 | historyStr.append("无"); |
| 756 | 755 | } |
| 757 | - babyEarFamilyView.setBadLifeHistory(historyStr.toString()); | |
| 756 | + String hfString = null; | |
| 757 | + if (historyStr.toString().endsWith(",")) { | |
| 758 | + hfString = historyStr.substring(0, historyStr.length() - 1); | |
| 759 | + }else{ | |
| 760 | + hfString = historyStr.toString(); | |
| 761 | + } | |
| 762 | + babyEarFamilyView.setBadLifeHistory(hfString); | |
| 758 | 763 | } |
| 759 | 764 | } |
| 760 | 765 | |
| ... | ... | @@ -987,7 +992,7 @@ |
| 987 | 992 | if (historyJson.containsKey("yesOrNo")) { |
| 988 | 993 | int yesOrNo = historyJson.getIntValue("yesOrNo"); |
| 989 | 994 | if (1 == yesOrNo) { |
| 990 | - historyStr.append("有("); | |
| 995 | + historyStr.append("有,"); | |
| 991 | 996 | } else { |
| 992 | 997 | historyStr.append("无"); |
| 993 | 998 | } |
| 994 | 999 | |
| 995 | 1000 | |
| 996 | 1001 | |
| 997 | 1002 | |
| ... | ... | @@ -995,25 +1000,29 @@ |
| 995 | 1000 | if (historyJson.containsKey("yinJiu")) { |
| 996 | 1001 | boolean yinJiu = historyJson.getBoolean("yinJiu"); |
| 997 | 1002 | if (yinJiu) { |
| 998 | - historyStr.append("饮酒、"); | |
| 1003 | + historyStr.append("饮酒,"); | |
| 999 | 1004 | } |
| 1000 | 1005 | } |
| 1001 | 1006 | if (historyJson.containsKey("xiYan")) { |
| 1002 | 1007 | boolean xiYan = historyJson.getBoolean("xiYan"); |
| 1003 | 1008 | if (xiYan) { |
| 1004 | - historyStr.append("吸烟、"); | |
| 1009 | + historyStr.append("吸烟,"); | |
| 1005 | 1010 | } |
| 1006 | 1011 | } |
| 1007 | 1012 | if (historyJson.containsKey("xiDu")) { |
| 1008 | 1013 | boolean xiDu = historyJson.getBoolean("xiDu"); |
| 1009 | 1014 | if (xiDu) { |
| 1010 | - historyStr.append("吸毒、"); | |
| 1015 | + historyStr.append("吸毒,"); | |
| 1011 | 1016 | } |
| 1012 | 1017 | } |
| 1013 | - if(StringUtils.isNotEmpty(historyStr.toString())){ | |
| 1014 | - historyStr.append(")"); | |
| 1018 | + | |
| 1019 | + String hfString = null; | |
| 1020 | + if (historyStr.toString().endsWith(",")) { | |
| 1021 | + hfString = historyStr.substring(0, historyStr.length() - 1); | |
| 1022 | + } else { | |
| 1023 | + hfString = historyStr.toString(); | |
| 1015 | 1024 | } |
| 1016 | - babyEarMotherView.setBadLifeHistoryType(historyStr.toString()); | |
| 1025 | + babyEarMotherView.setBadLifeHistoryType(hfString); | |
| 1017 | 1026 | } |
| 1018 | 1027 | |
| 1019 | 1028 | if (StringUtils.isNotEmpty(babyPatientExtendEarMother.getMedicalHistoryType())) { |