diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java index 1a51320..c4f729b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java @@ -276,6 +276,19 @@ public class AntenatalExaminationModel extends BaseModel { //hit抗体检测 private String hivkt; + + //是否补录 1 为补录 空为不是补录 + private String supplement; + + + public String getSupplement() { + return supplement; + } + + public void setSupplement(String supplement) { + this.supplement = supplement; + } + public String getBxbjs() { return bxbjs; } 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 bcb3e93..91a608e 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 @@ -315,14 +315,20 @@ public class AntenatalExaminationFacade { model.setOperator(userId); model.setYn(YnEnums.YES.getId()); model.setHospitalId(hospitalId); - AntExQuery antExQuery = new AntExQuery(); - antExQuery.setYn(YnEnums.YES.getId()); - antExQuery.setParentId(antExAddRequest.getParentId()); - antExQuery.setStart(model.getCheckDate()); - List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); - if (CollectionUtils.isNotEmpty(list)) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("同一天只能建一次复诊"); + + //补录就不验证是否同一天复诊 + if (!StringUtils.isNotEmpty(antExAddRequest.getSupplement())) + { + AntExQuery antExQuery = new AntExQuery(); + antExQuery.setYn(YnEnums.YES.getId()); + antExQuery.setParentId(antExAddRequest.getParentId()); + antExQuery.setStart(model.getCheckDate()); + List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); + if (CollectionUtils.isNotEmpty(list)) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("同一天只能建一次复诊"); + } } + Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId()); model.setPid(patients.getPid()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index 852dddf..860f628 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -252,6 +252,15 @@ public class AntExAddRequest implements IBasicRequestConvert