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 a0b8970..56cea67 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 @@ -994,12 +994,29 @@ public class AntenatalExaminationFacade { * @param antExQueryRequest * @return */ - public BaseResponse delOneAntEx(AntExQueryRequest antExQueryRequest) { + public BaseResponse delOneAntEx(AntExQueryRequest antExQueryRequest,Integer userId) { if ("1".equals(antExQueryRequest.getType())) { AntenatalExaminationModel antEx = new AntenatalExaminationModel(); antEx.setYn(YnEnums.NO.getId()); antEx.setId(antExQueryRequest.getId()); - antenatalExaminationService.updateOneAnt(antEx, antExQueryRequest.getId()); + String hospital = autoMatchFacade.getHospitalId(userId); + + AntExQuery antExQuery=new AntExQuery(); + antExQuery.setId(antExQueryRequest.getId()); + antExQuery.setYn(YnEnums.YES.getId()); + antExQuery.setHospitalId(hospital); + List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); + + if(CollectionUtils.isNotEmpty(list)){ + antExQuery.setStart(new Date(list.get(0).getCheckDate().getTime()+40000)); + } + antExQuery.setId(null); + list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); + if(CollectionUtils.isEmpty(list)){ + antenatalExaminationService.updateOneAnt(antEx, antExQueryRequest.getId()); + }else{ + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("当前产检记录不是本院最新的产检记录,不能删除"); + } } else { AntExChuModel antExChuModel = new AntExChuModel(); antExChuModel.setYn(YnEnums.NO.getId()); 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 6a212ff..4a0c944 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 @@ -51,6 +51,8 @@ public class SieveFacade { private OrganizationService organizationService; @Autowired private ApplyOrderService applyOrderService; + @Autowired + private PatientsService patientsService; /** * 增加一条产筛结果记录 @@ -216,6 +218,10 @@ public class SieveFacade { } sieveListResult.convertToResult(sieveModel); + Patients patients= patientsService.findOnePatientById(sieveModel.getParentId()); + if(null!=patients){ + sieveListResult.setIsGravida(patients.getType()==3?"0":"1"); + } data.add(sieveListResult); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java index 6017095..d0198f4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java @@ -34,6 +34,17 @@ public class SieveListResult implements IBasicResultConvert