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 e7c2643..0b09b71 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 @@ -347,10 +347,9 @@ public class AntenatalExaminationFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("同一天只能建一次复诊"); } - final Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId()); + final Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId()); + model.setPid(patients.getPid()); - antenatalExaminationService.addOneBabyAnt(model); - final AntenatalExaminationModel modelTemp = model; commonThreadPool.execute(new Runnable() { @Override public void run() { @@ -359,26 +358,44 @@ public class AntenatalExaminationFacade { patients1.setId(patients.getId()); patients1.setLastCheckEmployeeId(antExAddRequest.getCheckDoctor()); - modelTemp.setPid(patients.getPid()); if (StringUtils.isNotEmpty(patients.getEnable()) && "0".equals(patients.getEnable())) { patients1.setEnable("1"); } - patientsService.updateNextCheckTime(antExAddRequest.getNextCheckTime(), patients.getId()); patientsService.updatePatient(patients1); patientsService.updatePatientOneCol(patients.getId(), com.lyms.platform.common.utils.StringUtils.isEmpty(antExAddRequest.getNextCheckTime()) ? null : DateUtil.parseYMD(antExAddRequest.getNextCheckTime())); + } + }); + + + antenatalExaminationService.addOneBabyAnt(model); - operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), modelTemp, OptActionEnums.ADD.getId(), "添加复诊"); + operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), model, OptActionEnums.ADD.getId(), "添加复诊"); + /** 验证产检券是否可用 可用就改为已使用状态 */ + if (StringUtils.isNotBlank(antExAddRequest.getCouponCode()) && antExAddRequest.getCouponType() != null) { + BaseObjectResponse resp = couponService.validate(antExAddRequest.getCouponCode(), antExAddRequest.getCouponType(), autoMatchFacade.getHospitalId(userId)); + if (resp.getErrorcode() != 0) { + return resp; + } else { + couponService.use(autoMatchFacade.getHospitalId(userId), antExAddRequest.getCouponCode(), userId, model.getId()); + } + } + + //修改申请单状态 + updateApplyOrder(model, antExAddRequest.getParentId()); + final String aid = model.getId(); + commonThreadPool.execute(new Runnable() { + @Override + public void run() { //修改最后一次检查时间 setLashCTimes(antExAddRequest.getParentId()); - //修改申请单状态 - updateApplyOrder(modelTemp, antExAddRequest.getParentId()); + //修改孕妇高危等级 - //updatePatientRiskLevel(model, patients); + // updatePatientRiskLevel(model, patients); //修改孕妇高危 updateLastRisk(antExAddRequest.getParentId()); @@ -388,51 +405,49 @@ public class AntenatalExaminationFacade { //修改数据 syncMaster(antExAddRequest.getParentId(), antExAddRequest.getNextCheckTime()); //复诊,修改产检管理 - antenatalExaminationService.updateAntExRecord(modelTemp.getId(), 2); - if (null != patients.getBuildType() && patients.getBuildType() == 3) { - ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); - referralApplyOrderQuery.setParentId(patients.getId()); - String hospital = autoMatchFacade.getHospitalId(userId); - referralApplyOrderQuery.setHospitalId(hospital); - referralApplyOrderQuery.setStatus(1); - List orderModelList = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); - if (CollectionUtils.isNotEmpty(orderModelList)) { - String outHospitalId = orderModelList.get(0).getOutHospitalId(); - ReferralApplyOrderQuery referralApplyOrderQuery1 = new ReferralApplyOrderQuery(); - referralApplyOrderQuery1.setOutHospitalId(outHospitalId); - referralApplyOrderQuery1.setTransferredHospital(hospital); - referralApplyOrderQuery1.setPid(patients.getPid()); - referralApplyOrderQuery1.setStatus(1); - ReferralApplyOrderModel model1 = new ReferralApplyOrderModel(); - //设置接收时间 - model1.setReceived(modelTemp.getCheckDate()); - model1.setRecDoctor(modelTemp.getCheckDoctor()); - model1.setModified(new Date()); - model1.setStatus(2); - applyOrderService.updateByParentId(referralApplyOrderQuery1, model1); - ReferralApplyOrderQuery referralApplyOrderQuery2 = new ReferralApplyOrderQuery(); - referralApplyOrderQuery2.setOutHospitalId(hospital); - referralApplyOrderQuery2.setTransferredHospital(outHospitalId); - referralApplyOrderQuery2.setPid(patients.getPid()); - referralApplyOrderQuery2.setStatus(1); - applyOrderService.updateByParentId(referralApplyOrderQuery2, model1); - } - } + antenatalExaminationService.updateAntExRecord(aid, 2); + }}); + + + if (null != patients.getBuildType() && patients.getBuildType() == 3) { + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); + referralApplyOrderQuery.setParentId(patients.getId()); + String hospital = autoMatchFacade.getHospitalId(userId); + referralApplyOrderQuery.setHospitalId(hospital); + referralApplyOrderQuery.setStatus(1); + List orderModelList = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); + if (CollectionUtils.isNotEmpty(orderModelList)) { + String outHospitalId = orderModelList.get(0).getOutHospitalId(); + ReferralApplyOrderQuery referralApplyOrderQuery1 = new ReferralApplyOrderQuery(); + referralApplyOrderQuery1.setOutHospitalId(outHospitalId); + referralApplyOrderQuery1.setTransferredHospital(hospital); + referralApplyOrderQuery1.setPid(patients.getPid()); + referralApplyOrderQuery1.setStatus(1); + ReferralApplyOrderModel model1 = new ReferralApplyOrderModel(); + //设置接收时间 + model1.setReceived(model.getCheckDate()); + model1.setRecDoctor(model.getCheckDoctor()); + model1.setModified(new Date()); + model1.setStatus(2); + applyOrderService.updateByParentId(referralApplyOrderQuery1, model1); + ReferralApplyOrderQuery referralApplyOrderQuery2 = new ReferralApplyOrderQuery(); + referralApplyOrderQuery2.setOutHospitalId(hospital); + referralApplyOrderQuery2.setTransferredHospital(outHospitalId); + referralApplyOrderQuery2.setPid(patients.getPid()); + referralApplyOrderQuery2.setStatus(1); + applyOrderService.updateByParentId(referralApplyOrderQuery2, model1); + } + } + + + commonThreadPool.execute(new Runnable() { + @Override + public void run() { //添加复诊时添加追访信息 addTrackDownInfo(userId,patients); } }); - - /** 验证产检券是否可用 可用就改为已使用状态 */ - if (StringUtils.isNotBlank(antExAddRequest.getCouponCode()) && antExAddRequest.getCouponType() != null) { - BaseObjectResponse resp = couponService.validate(antExAddRequest.getCouponCode(), antExAddRequest.getCouponType(), autoMatchFacade.getHospitalId(userId)); - if (resp.getErrorcode() != 0) { - return resp; - } else { - couponService.use(autoMatchFacade.getHospitalId(userId), antExAddRequest.getCouponCode(), userId, model.getId()); - } - } } commonThreadPool.execute(new Runnable() {