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 ca5f56f..5c690f6 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 @@ -932,7 +932,6 @@ public class SieveFacade { String parentId = jsonObject.getString("parentId"); int type = jsonObject.getInt("type"); - Map map = new HashMap<>(); Patients pat = patientsService.findOnePatientById(parentId); HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(pat.getPid(), false); @@ -943,7 +942,6 @@ public class SieveFacade { patientBaseResult.setRiskFactor(highScoreResult.getHighRisk()); patientBaseResult.setRiskScore(highScoreResult.getScoreStr()); - map.put("patientInfo", patientBaseResult); SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); sieveApplyOrderQuery1.setParentId(parentId); sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); @@ -956,6 +954,7 @@ public class SieveFacade { List list = sieveService.queryListSieveResult(sieveResultQuery); if (CollectionUtils.isNotEmpty(list)) { SieveResultModel model = list.get(0); + sieveResultEditInfo.put("patientInfo", patientBaseResult); sieveResultEditInfo.put("id", model.getId()); sieveResultEditInfo.put("hcg", model.getHcg() != null ? model.getHcg() : ""); sieveResultEditInfo.put("hcgMom", model.getHcgMom() != null ? model.getHcgMom() : ""); @@ -1015,13 +1014,13 @@ public class SieveFacade { } sieveResultEditInfo.put("stzhz13", stzhz13); } - map.put("sieveResultEditInfo", sieveResultEditInfo); + baseResponse.setObject(sieveResultEditInfo); } else {//查看申请单 List sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) { Map result = new HashMap<>(); SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0); - + result.put("patientInfo", patientBaseResult); result.put("weight", sieveApply.getWeight()); result.put("lastMenstr", DateUtil.getyyyy_MM_dd(sieveApply.getLastMenses())); result.put("bbh", sieveApply.getNumber()); @@ -1055,8 +1054,8 @@ public class SieveFacade { result.put("lastMenstr", chuModel.getLastMenses()); result.put("polyember", isTire); } + baseResponse.setObject(result); } - baseResponse.setObject(map); } return baseResponse; }