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 23455c3..bf8462b 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 @@ -416,8 +416,8 @@ public class AntenatalExaminationFacade { model1.setStatus(2); model1.setModified(new Date()); } - - model1.setScore(NumberUtils.toInt(antenatalExamination.getRiskScore())); + //高危评分 + model1.setScore(patients.getRiskScore()); //其他诊断 model1.setOtherDiagn(antenatalExamination.getDiagnosisOther()); model1.setDiagnosis(antenatalExamination.getDiagnosis()); @@ -493,18 +493,15 @@ public class AntenatalExaminationFacade { commonThreadPool.execute(new Runnable() { @Override public void run() { - Patients patients = patientsService.findOnePatientById(excAddRequest.getParentId()); patients.setLastCheckEmployeeId(excAddRequest.getProdDoctor()); if (StringUtils.isNotEmpty(patients.getEnable()) && "0".equals(patients.getEnable())) { patients.setEnable("1"); } - patientsService.updateNextCheckTime(excAddRequest.getNextCheckTime(), patients.getId()); patientsService.updatePatient(patients); - //修改本系统最后的高危 updateLastRisk(patients.getId()); //修改本院最后一次定义高危 @@ -513,27 +510,20 @@ public class AntenatalExaminationFacade { setLashCTimes(excAddRequest.getParentId()); //冗余到产检表 antenatalExaminationService.updateAntExRecord(excAddRequest.getId(), 1); - //修改数据 syncMaster(excAddRequest.getParentId(), excAddRequest.getNextCheckTime()); } }); - - AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setYn(YnEnums.YES.getId()); antExChuQuery.setId(antExChuModel.getId()); List list = antenatalExaminationService.queryAntExChu(antExChuQuery); - operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), list.get(0), antExChuModel, OptActionEnums.UPDATE.getId(), "修改初诊"); - } else { AntExChuQuery antExChuQuery1 = new AntExChuQuery(); antExChuQuery1.setParentId(excAddRequest.getParentId()); antExChuQuery1.setYn(YnEnums.YES.getId()); - stopWatch.start("queryAntExChu"); List data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1); - stopWatch.stop(); if (CollectionUtils.isEmpty(data1)) { final Patients patients = patientsService.findOnePatientById(excAddRequest.getParentId()); @@ -569,31 +559,28 @@ public class AntenatalExaminationFacade { commonThreadPool.execute(new Runnable() { @Override public void run() { - // stopWatch.stop(); + //查询最后一次产检筛查结果冗余到patient表 + Map map = getPatLastScreenResult(patients.getId()); + if (map != null && map.containsKey("screenResult")) { + patients.setScreenResult((List) map.get("screenResult")); + } + patients.setLastCheckEmployeeId(excAddRequest.getProdDoctor()); + patientsService.updatePatient(patients); + /** 把优惠券设置为已使用状态 */ - //stopWatch.start("couponService.use"); couponService.use(hospitalId, excAddRequest.getCouponCode(), userId, chuId); - //stopWatch.stop(); //修改患者风险等级 - - patients.setLastCheckEmployeeId(excAddRequest.getProdDoctor()); patientsService.updateNextCheckTime(excAddRequest.getNextCheckTime(), patients.getId()); - patientsService.updatePatient(patients); updateLastRisk(patients.getId()); - //修改本院最后一次定义高危 updateLastRhTime(patients.getId(), hospitalId); setLashCTimes(chuParentId); - //stopWatch.start("updateAntExRecord"); antenatalExaminationService.updateAntExRecord(chuId, 1); - //stopWatch.stop(); syncMaster(excAddRequest.getParentId(), excAddRequest.getNextCheckTime()); } }); - operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), antExChuModel, OptActionEnums.ADD.getId(), "添加初诊"); - if (null != patients.getBuildType() && patients.getBuildType() == 3) { Patients patients1 = new Patients(); patients1.setEnable("1"); @@ -630,8 +617,6 @@ public class AntenatalExaminationFacade { } catch (Exception e) { e.printStackTrace(); } - - //设置接收时间 model.setReceived(antExChuModel.getCheckTime()); model.setRecDoctor(antExChuModel.getProdDoctor()); @@ -640,7 +625,6 @@ public class AntenatalExaminationFacade { model.setDiagnosis(antExChuModel.getDiagnosis()); model.setOtherDiagn(antExChuModel.getDiagnosisOther()); applyOrderService.updateByParentId(referralApplyOrderQuery1, model); - ReferralApplyOrderQuery referralApplyOrderQuery2 = new ReferralApplyOrderQuery(); referralApplyOrderQuery2.setOutHospitalId(hospitalId); referralApplyOrderQuery2.setTransferredHospital(outHospitalId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index fd34efa..53e1782 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -135,10 +135,6 @@ public class ApplyOrderFacade { referralApplyOrderModel.setTransferredHospital(organization.get(0).getId() + ""); } } - - - /* List list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); - if (CollectionUtils.isEmpty(list)) {*/ String id = ""; if (2 == type) { //查询产妇信息 @@ -159,9 +155,6 @@ public class ApplyOrderFacade { referralApplyOrderModel.setBirth(patients.getBirth()); referralApplyOrderModel.setExpVip(patients.getExpVip()); int days = -1; - if (patients.getType() == 1) { - days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); - } referralApplyOrderModel.setLastMenses(patients.getLastMenses()); referralApplyOrderModel.setrRisk(Arrays.asList(commonService.resloveFactor(patients.getRiskFactorId()).split(","))); referralApplyOrderModel.setOtherHighRisk(patients.getoRiskFactor()); @@ -172,15 +165,6 @@ public class ApplyOrderFacade { } referralApplyOrderModel.setrLevel(rlevel); referralApplyOrderModel.setScore(patients.getRiskScore()); - /* List lsit = new ArrayList(); - List list = highScoreResult.filter(highScoreResult.getLevel()); - for (Map map : list) { - String name = map.get("name"); - if (!lsit.contains(name)) { - lsit.add(name); - } - } - referralApplyOrderModel.setrLevel(lsit);*/ referralApplyOrderModel.setPid(patients.getPid()); referralApplyOrderModel.setDueWeek(new Date()); days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); @@ -200,7 +184,7 @@ public class ApplyOrderFacade { patientsQuery1.setHospitalId(referralApplyOrderModel.getTransferredHospital()); List patientsList = patientsService.queryPatient(patientsQuery1); - List organization = null; + List organization; try { OrganizationQuery organizationQuery = new OrganizationQuery(); organizationQuery.setId(Integer.valueOf(referralApplyOrderModel.getTransferredHospital())); @@ -226,7 +210,7 @@ public class ApplyOrderFacade { patientsService.updatePatient(patients1); } } catch (Exception e) { - + e.printStackTrace(); } } } @@ -275,7 +259,7 @@ public class ApplyOrderFacade { babyModelQuery.setYn(YnEnums.YES.getId()); List babyModels = babyService.queryBabyWithQuery(babyModelQuery); - List organization = null; + List organization; try { OrganizationQuery organizationQuery = new OrganizationQuery(); organizationQuery.setId(Integer.valueOf(referralApplyOrderModel.getTransferredHospital())); @@ -303,7 +287,7 @@ public class ApplyOrderFacade { babyService.updateOneBaby(babyModel1, babyModel1.getId()); } } catch (Exception e) { - + e.printStackTrace(); } } }