diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index c247176..a6f00e3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -783,35 +783,35 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } for (AntExChuModel antExChuModel : antExChuModels) { for (Patients patient : patients) { - if(antExChuModel.getParentId().equals(patient.getId())) { + if(antExChuModel.getParentId().equals(patient.getId()) && antExChuModel.getId().equals(usedId)) { return patient; } } } for (AntenatalExaminationModel antenatalExaminationModel : antenatalExaminationModels) { for (Patients patient : patients) { - if(antenatalExaminationModel.getParentId().equals(patient.getId())) { + if(antenatalExaminationModel.getParentId().equals(patient.getId()) && antenatalExaminationModel.getId().equals(usedId)) { return patient; } } } for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModels) { for (Patients patient : patients) { - if(maternalDeliverModel.getParentId().equals(patient.getId())) { + if(maternalDeliverModel.getParentId().equals(patient.getId()) && maternalDeliverModel.getId().equals(usedId)) { return patient; } } } for (DischargeAbstractMotherModel deliverModel : deliverModels) { for (Patients patient : patients) { - if(deliverModel.getPatientId().equals(patient.getId())) { + if(deliverModel.getPatientId().equals(patient.getId()) && deliverModel.getId().equals(usedId)) { return patient; } } } for (PostReviewModel postReviewModel : postReviewModels) { for (Patients patient : patients) { - if(postReviewModel.getParentId().equals(patient.getId())) { + if(postReviewModel.getParentId().equals(patient.getId()) && postReviewModel.getId().equals(usedId)) { return patient; } }