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 7e5e78a..226ce20 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 @@ -169,13 +169,25 @@ public class AntenatalExaminationFacade { */ public BaseResponse addOneAntEx(AntExAddRequest antExAddRequest, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); + AntenatalExaminationModel model = antExAddRequest.convertToDataModel(); + //表示区域的 + if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { + String parentId = handHideBuild(antExAddRequest.getPid(), antExAddRequest.getParentId(), userId); + if (StringUtils.isEmpty(parentId)) { + //打印日志 + } + model.setParentId(parentId); + antExAddRequest.setParentId(parentId); + } + + if (StringUtils.isNotEmpty(antExAddRequest.getId())) { - AntenatalExaminationModel antenatalExamination = antExAddRequest.convertToDataModel(); - antenatalExamination.setHospitalId(hospitalId); - antenatalExamination.setOperator(userId); - antenatalExaminationService.updateOneAnt(antenatalExamination, antExAddRequest.getId()); + + model.setHospitalId(hospitalId); + model.setOperator(userId); + antenatalExaminationService.updateOneAnt(model, antExAddRequest.getId()); //修改申请单状态 - updateApplyOrder(antenatalExamination, antExAddRequest.getParentId()); + updateApplyOrder(model, antExAddRequest.getParentId()); Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId()); @@ -195,7 +207,7 @@ public class AntenatalExaminationFacade { //复诊,修改产检管理 antenatalExaminationService.updateAntExRecord(antExAddRequest.getId(), 2); } else { - AntenatalExaminationModel model = antExAddRequest.convertToDataModel(); + model.setOperator(userId); model.setYn(YnEnums.YES.getId()); model.setHospitalId(hospitalId); @@ -227,7 +239,6 @@ public class AntenatalExaminationFacade { updateLastRisk(antExAddRequest.getParentId()); - //修改本院最后一次定义高危 updateLastRhTime(patients.getId(), hospitalId);