Commit a2aa44d9be317b13a1bedadabc8189981d39a088
1 parent
b9551ab260
Exists in
master
and in
6 other branches
追访
Showing 1 changed file with 2 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
View file @
a2aa44d
| ... | ... | @@ -964,7 +964,6 @@ |
| 964 | 964 | if (CollectionUtils.isNotEmpty(list)) { |
| 965 | 965 | SieveResultModel model = list.get(0); |
| 966 | 966 | |
| 967 | - | |
| 968 | 967 | sieveResultEditInfo.put("patientInfo", patientBaseResult); |
| 969 | 968 | sieveResultEditInfo.put("id", model.getId()); |
| 970 | 969 | sieveResultEditInfo.put("examineId", model.getExamineId()); |
| ... | ... | @@ -974,7 +973,7 @@ |
| 974 | 973 | sieveResultEditInfo.put("sbstValue", model.getSbstValue()); |
| 975 | 974 | sieveResultEditInfo.put("stzhz13Value", model.getStzhz13Value()); |
| 976 | 975 | sieveResultEditInfo.put("sjgjxValue", model.getSjgjxValue()); |
| 977 | - sieveResultEditInfo.put("publishName", model.getPublishName()); | |
| 976 | + sieveResultEditInfo.put("publishName", CommonsHelper.getUserName(model.getPublishName(), usersService)); | |
| 978 | 977 | sieveResultEditInfo.put("hcg", model.getHcg() != null ? model.getHcg() + "ng/ml" : ""); |
| 979 | 978 | sieveResultEditInfo.put("hcgMom", model.getHcgMom() != null ? model.getHcgMom() : ""); |
| 980 | 979 | sieveResultEditInfo.put("hafp", model.getHafp() != null ? model.getHafp() + "U/ml" : ""); |
| ... | ... | @@ -1034,7 +1033,7 @@ |
| 1034 | 1033 | result.put("age", DateUtil.getAge(sieveApply.getBirth(), sieveApply.getCreated())); |
| 1035 | 1034 | result.put("menstrWeek", sieveApply.getMensesWeek());//月经周 |
| 1036 | 1035 | result.put("historyBirth", sieveApply.getHistoryBirth());//生育史 |
| 1037 | - | |
| 1036 | + result.put("pastHistory",sieveApply.getPastHistory()); | |
| 1038 | 1037 | String collectionDoctorName = CommonsHelper.getUserName(sieveApply.getCollectionDoctorId(), usersService); |
| 1039 | 1038 | result.put("cxys", collectionDoctorName); |
| 1040 | 1039 |