diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index a12a6b3..f2e6871 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -964,7 +964,6 @@ public class SieveFacade { if (CollectionUtils.isNotEmpty(list)) { SieveResultModel model = list.get(0); - sieveResultEditInfo.put("patientInfo", patientBaseResult); sieveResultEditInfo.put("id", model.getId()); sieveResultEditInfo.put("examineId", model.getExamineId()); @@ -974,7 +973,7 @@ public class SieveFacade { sieveResultEditInfo.put("sbstValue", model.getSbstValue()); sieveResultEditInfo.put("stzhz13Value", model.getStzhz13Value()); sieveResultEditInfo.put("sjgjxValue", model.getSjgjxValue()); - sieveResultEditInfo.put("publishName", model.getPublishName()); + sieveResultEditInfo.put("publishName", CommonsHelper.getUserName(model.getPublishName(), usersService)); sieveResultEditInfo.put("hcg", model.getHcg() != null ? model.getHcg() + "ng/ml" : ""); sieveResultEditInfo.put("hcgMom", model.getHcgMom() != null ? model.getHcgMom() : ""); sieveResultEditInfo.put("hafp", model.getHafp() != null ? model.getHafp() + "U/ml" : ""); @@ -1034,7 +1033,7 @@ public class SieveFacade { result.put("age", DateUtil.getAge(sieveApply.getBirth(), sieveApply.getCreated())); result.put("menstrWeek", sieveApply.getMensesWeek());//月经周 result.put("historyBirth", sieveApply.getHistoryBirth());//生育史 - + result.put("pastHistory",sieveApply.getPastHistory()); String collectionDoctorName = CommonsHelper.getUserName(sieveApply.getCollectionDoctorId(), usersService); result.put("cxys", collectionDoctorName);