diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMedicalRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMedicalRecordFacade.java index 619e0e4..1b23629 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMedicalRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMedicalRecordFacade.java @@ -171,14 +171,10 @@ public class PatientMedicalRecordFacade { * @param listData */ private void doHandAfterFmRecord(MedicalRecordGroupVo medicalRecordGroupVo, List listData, Date nextLastMenses) { - PostReviewQuery postReviewQuery = new PostReviewQuery(); + String pid = medicalRecordGroupVo.getPid(); - postReviewQuery.setStart(medicalRecordGroupVo.getFmDate()); - //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示 - postReviewQuery.setEnd(nextLastMenses); - postReviewQuery.setPid(pid); - Organization organization = null; + Organization organization = null; MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setPid(medicalRecordGroupVo.getPid()); @@ -225,6 +221,11 @@ public class PatientMedicalRecordFacade { } + PostReviewQuery postReviewQuery = new PostReviewQuery(); + postReviewQuery.setStart(medicalRecordGroupVo.getFmDate()); + //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示 + postReviewQuery.setEnd(nextLastMenses); + postReviewQuery.setPid(pid); //产后复查记录 List reviewModels = postReviewService.findWithList(postReviewQuery); if (CollectionUtils.isNotEmpty(reviewModels)) { @@ -259,6 +260,7 @@ public class PatientMedicalRecordFacade { organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())); } pid = patients.getPid(); + //隐藏建档不显示出来 if (!"2".equals(patients.getEnable())) { listData.add(new AntData(patients, null != organization ? organization.getName() : "")); }