diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 287b9fb..8762c03 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -1666,7 +1666,8 @@ public class AntenatalExaminationFacade { List listData = new ArrayList(); Patients patients = iterator.next(); Patients patients2 = null; - + //获取产程ID + patientId = patients.getId(); List patientIds = new ArrayList<>(); patientIds.add(patientId); @@ -1674,8 +1675,7 @@ public class AntenatalExaminationFacade { if (null != patients.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())); } - //获取产程ID - patientId = patients.getId(); + if (patients.getBuildType() == 3) {//转诊建档,数据则装入主档案数据中,必须要有主档案,而且是第一条 if (CollectionUtils.isNotEmpty(sortList)) { listData = sortList.get(sortList.size() - 1); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java index 1cbdbc0..81c3219 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java @@ -62,7 +62,7 @@ public class BabyListTask implements Callable { for (BabyModel model : models) { BabyManageListResult result = new BabyManageListResult(); result.setId(model.getId()); - if (model.getLastHighRisk() == null || model.getLastHighRisk() == 0) { + if (model.getHighRisk() == null || model.getHighRisk() == 0) { result.setHighRisk("健康"); } else { result.setHighRisk("高危");