Commit d09c86a0de051d20491663249539613e7aecc3c0
1 parent
b218e4fd78
Exists in
master
and in
6 other branches
追访
Showing 1 changed file with 41 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
View file @
d09c86a
... | ... | @@ -1035,7 +1035,48 @@ |
1035 | 1035 | result.put("age", DateUtil.getAge(sieveApply.getBirth(), sieveApply.getCreated())); |
1036 | 1036 | result.put("menstrWeek", sieveApply.getMensesWeek());//月经周 |
1037 | 1037 | result.put("historyBirth", sieveApply.getHistoryBirth());//生育史 |
1038 | + | |
1039 | + Map<String, String> historMap = sieveApply.getHistoryBirth(); | |
1040 | + if(historMap.containsKey("tshr")){ | |
1041 | + if("true".equals(historMap.get("tshr"))){ | |
1042 | + historMap.put("tshr","是"); | |
1043 | + }else{ | |
1044 | + historMap.put("tshr","否"); | |
1045 | + } | |
1046 | + } | |
1047 | + if(historMap.containsKey("rsthr")){ | |
1048 | + if("true".equals(historMap.get("rsthr"))){ | |
1049 | + historMap.put("rsthr","是"); | |
1050 | + }else{ | |
1051 | + historMap.put("rsthr","否"); | |
1052 | + } | |
1053 | + } | |
1054 | + if(historMap.containsKey("sjhr")){ | |
1055 | + if("true".equals(historMap.get("sjhr"))){ | |
1056 | + historMap.put("sjhr","是"); | |
1057 | + }else{ | |
1058 | + historMap.put("sjhr","否"); | |
1059 | + } | |
1060 | + } | |
1061 | + if(historMap.containsKey("qt")){ | |
1062 | + if("true".equals(historMap.get("qt"))){ | |
1063 | + historMap.put("qt","是:"+historMap.get("qtText")); | |
1064 | + }else{ | |
1065 | + historMap.put("qt","否"); | |
1066 | + } | |
1067 | + } | |
1068 | + | |
1069 | + | |
1038 | 1070 | result.put("pastHistory",sieveApply.getPastHistory()); |
1071 | + if(historMap.containsKey("pastHistory")){ | |
1072 | + if("yes".equals(result.get("pastHistory"))){ | |
1073 | + result.put("pastHistory","是"); | |
1074 | + }else{ | |
1075 | + result.put("pastHistory","否"); | |
1076 | + } | |
1077 | + } | |
1078 | + | |
1079 | + | |
1039 | 1080 | String collectionDoctorName = CommonsHelper.getUserName(sieveApply.getCollectionDoctorId(), usersService); |
1040 | 1081 | result.put("cxys", collectionDoctorName); |
1041 | 1082 | result.put("experimentNum",""); |