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 ed056bf..a12a6b3 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 @@ -949,26 +949,27 @@ public class SieveFacade { sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); if (type == 2) {//查看报告 - Map sieveResultEditInfo = new HashMap<>(); + + Map sieveResultEditInfo = new HashMap<>(); + List sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); + if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) { + SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0); + String hostName = CommonsHelper.getHospitalName(sieveApply.getSieveHospitalId(), organizationService); + sieveResultEditInfo.put("reportHostName",hostName); + } SieveResultQuery sieveResultQuery = new SieveResultQuery(); sieveResultQuery.setParentId(parentId); sieveResultQuery.setYn(YnEnums.YES.getId()); 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() : ""); - sieveResultEditInfo.put("hafp", model.getHafp() != null ? model.getHafp() : ""); - sieveResultEditInfo.put("hafpMom", model.getHafpMom() != null ? model.getHafpMom() : ""); sieveResultEditInfo.put("examineId", model.getExamineId()); sieveResultEditInfo.put("checkerId", model.getCheckerId()); sieveResultEditInfo.put("resultTime", DateUtil.getyyyy_MM_dd(model.getResultTime())); - sieveResultEditInfo.put("tszhz", model.getTszhz()); - sieveResultEditInfo.put("sbst", model.getSbst()); - sieveResultEditInfo.put("stzhz13", model.getStzhz13()); - sieveResultEditInfo.put("sjgjx", model.getSjgjx()); sieveResultEditInfo.put("tszhzValue", model.getTszhzValue()); sieveResultEditInfo.put("sbstValue", model.getSbstValue()); sieveResultEditInfo.put("stzhz13Value", model.getStzhz13Value());