diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 7f11ee6..1e6010e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -322,13 +322,10 @@ public class Patients extends BaseModel { //丈夫生日 private Date husbandBirth; private String vcCardNo; - //丈夫文化程度Id private String hlevelTypeId; - //体验类型 private Integer expType; - //person表主键 private String pid; //是否隐藏 0 隐藏 1 显示 更改为：0，转诊建档，待接收 1，转诊建档，已接收 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 bf8462b..35d86e5 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 @@ -73,6 +73,8 @@ public class AntenatalExaminationFacade { @Autowired private AutoMatchFacade autoMatchFacade; @Autowired + private ApplyOrderFacade applyOrderFacade; + @Autowired private StopPregnancyService stopPregnancyService; @Autowired private UsersService usersService; @@ -402,12 +404,7 @@ public class AntenatalExaminationFacade { List orderModelList = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); if (CollectionUtils.isNotEmpty(orderModelList)) { ReferralApplyOrderModel referralApplyOrderModel = orderModelList.get(0); - String outHospitalId = referralApplyOrderModel.getOutHospitalId(); //查询转入申请单 - ReferralApplyOrderQuery referralApplyOrderQuery1 = new ReferralApplyOrderQuery(); - referralApplyOrderQuery1.setOutHospitalId(outHospitalId); - referralApplyOrderQuery1.setTransferredHospital(patients.getHospitalId()); - referralApplyOrderQuery1.setPid(patients.getPid()); ReferralApplyOrderModel model1 = new ReferralApplyOrderModel(); if (referralApplyOrderModel.getStatus() == 1) { //设置接收时间 @@ -437,16 +434,9 @@ public class AntenatalExaminationFacade { } catch (Exception e) { e.printStackTrace(); } - //设置转入申请单的状态为接收 - applyOrderService.updateByParentId(referralApplyOrderQuery1, model1); - - //查询转出申请单 - ReferralApplyOrderQuery referralApplyOrderQuery2 = new ReferralApplyOrderQuery(); - referralApplyOrderQuery2.setOutHospitalId(patients.getHospitalId()); - referralApplyOrderQuery2.setTransferredHospital(outHospitalId); - referralApplyOrderQuery2.setPid(patients.getPid()); - //设置转出申请单的状态为接收 - applyOrderService.updateByParentId(referralApplyOrderQuery2, model1); + //同步更新两条转诊记录信息 + applyOrderFacade.updataReferral(patients.getId(),model1); + System.out.println("查询转诊条件：" + referralApplyOrderQuery.convertToQuery().convertToMongoQuery()); } } @@ -2678,19 +2668,6 @@ public class AntenatalExaminationFacade { BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(basicConfig.getParentId()); if (null != basicConfig1) { Map map1 = new HashMap<>(); - // map1.put("id", basicConfig1.getId()); - // String name = basicConfig1.getName(); - // if (name.indexOf("黄色") > -1) { - // name = "黄色"; - // }else if (name.indexOf("橙色") > -1) { - // name = "橙色"; - // }else if (name.indexOf("红色") > -1) { - // name = "红色"; - // }else if (name.indexOf("紫色") > -1) { - // name = "紫色"; - // } - // map1.put("name", name); - // map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); basicConfig1.replenRisk(map1); dat1a.add(map1); } 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 53e1782..d9a686d 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 @@ -67,22 +67,51 @@ public class ApplyOrderFacade { @Autowired private CommonService commonService; + //添加回执单 public BaseResponse addReferralReceipt(ReferralReceiptRequest referralReceipt) { - ReferralApplyOrderModel referralApplyOrderModel = applyOrderService.findByIdReferralApplyOrder(referralReceipt.getId()); referralReceipt.convertToDataModel(referralApplyOrderModel); referralApplyOrderModel.setrRisk(queryRiskName(referralReceipt.getrRisk())); referralApplyOrderModel.setRiskFactorId(referralReceipt.getrRisk()); + int score = antenatalExaminationFacade.queryRisk(referralReceipt.getrRisk(), false).getScore(); + //高危评分 + referralApplyOrderModel.setScore(score); if (StringUtils.isNotEmpty(referralApplyOrderModel.getId())) { - ReferralApplyOrderQuery referralApplyOrderQuery1 = new ReferralApplyOrderQuery(); - referralApplyOrderQuery1.setId(referralReceipt.getId()); - applyOrderService.updateByParentId(referralApplyOrderQuery1, referralApplyOrderModel); + updataReferral(referralReceipt.getPatientId(),referralApplyOrderModel); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } else { return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("错误"); } } + //同步更新两条转诊记录信息 + public void updataReferral(String patientId,ReferralApplyOrderModel referralApplyModel){ + Patients patients = patientsService.findOnePatientById(patientId); + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); + referralApplyOrderQuery.setParentId(patientId); + //申请单状态 1 已转出 2 接收转诊 + //转诊单状态为待接收状态 + List orderModelList = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); + if (CollectionUtils.isNotEmpty(orderModelList)) { + ReferralApplyOrderModel referralApplyOrderModel = orderModelList.get(0); + String outHospitalId = referralApplyOrderModel.getOutHospitalId(); + + //查询转入申请单 + ReferralApplyOrderQuery referralApplyOrderQuery1 = new ReferralApplyOrderQuery(); + referralApplyOrderQuery1.setOutHospitalId(outHospitalId); + referralApplyOrderQuery1.setTransferredHospital(patients.getHospitalId()); + referralApplyOrderQuery1.setPid(patients.getPid()); + applyOrderService.updateByParentId(referralApplyOrderQuery1, referralApplyModel); + + //查询转出申请单 + ReferralApplyOrderQuery referralApplyOrderQuery2 = new ReferralApplyOrderQuery(); + referralApplyOrderQuery2.setOutHospitalId(patients.getHospitalId()); + referralApplyOrderQuery2.setTransferredHospital(outHospitalId); + referralApplyOrderQuery2.setPid(patients.getPid()); + applyOrderService.updateByParentId(referralApplyOrderQuery2, referralApplyModel); + } + } + private List queryRiskName(List l) { List data = new ArrayList(); if (CollectionUtils.isNotEmpty(l)) { @@ -115,9 +144,6 @@ public class ApplyOrderFacade { //表示区域的 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospital)) && type == 2) { String parentId = antenatalExaminationFacade.handHideBuild(referralApplyOrderAddRequest.getPid(), referralApplyOrderAddRequest.getParentId(), userId, -1); - if (StringUtils.isEmpty(parentId)) { - //打印日志 - } referralApplyOrderModel.setParentId(parentId); referralApplyOrderAddRequest.setParentId(parentId); } @@ -429,11 +455,12 @@ public class ApplyOrderFacade { List list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); ReferralApplyOrderResult referralApplyOrderResult = new ReferralApplyOrderResult(); if (CollectionUtils.isNotEmpty(list)) { + ReferralApplyOrderModel referralApplyOrderModel = list.get(0); String zhuanCName = ""; String zhuanRname = ""; - Patients patients = patientsService.findOnePatientById(list.get(0).getParentId()); - String zhuanchu = list.get(0).getOutHospitalId(); - String zhuanru = list.get(0).getTransferredHospital(); + Patients patients = patientsService.findOnePatientById(referralApplyOrderModel.getParentId()); + String zhuanchu = referralApplyOrderModel.getOutHospitalId(); + String zhuanru = referralApplyOrderModel.getTransferredHospital(); Map map1 = new HashMap(); zhuanCName = zhuanchu; zhuanRname = zhuanru; @@ -461,12 +488,12 @@ public class ApplyOrderFacade { } } - referralApplyOrderResult.convertToResult(list.get(0), patients, zhuanCName, zhuanRname); + referralApplyOrderResult.convertToResult(referralApplyOrderModel, patients, zhuanCName, zhuanRname); referralApplyOrderResult.setTransferredHospital(map1); try { - if (StringUtils.isNotEmpty(list.get(0).getDiagnosis())) { - List diagnosis = JsonUtil.toList(list.get(0).getDiagnosis(), List.class); + if (StringUtils.isNotEmpty(referralApplyOrderModel.getDiagnosis())) { + List diagnosis = JsonUtil.toList(referralApplyOrderModel.getDiagnosis(), List.class); referralApplyOrderResult.setDiagnosis(antenatalExaminationFacade.queryRisk(diagnosis, false).getHighRisk()); } } catch (Exception e) { @@ -474,15 +501,15 @@ public class ApplyOrderFacade { } Map map = new HashMap(); - if (StringUtils.isNotEmpty(list.get(0).getApplyDoctor())) { - Users users = usersService.getUsers(Integer.valueOf(list.get(0).getApplyDoctor())); + if (StringUtils.isNotEmpty(referralApplyOrderModel.getApplyDoctor())) { + Users users = usersService.getUsers(Integer.valueOf(referralApplyOrderModel.getApplyDoctor())); if (null != users) { map.put("id", users.getId()); map.put("name", users.getName()); } } try { - if (CollectionUtils.isNotEmpty(list.get(0).getRiskFactorId())) { + if (CollectionUtils.isNotEmpty(referralApplyOrderModel.getRiskFactorId())) { HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(list.get(0).getRiskFactorId(), false); referralApplyOrderResult.setRiskFactor(highScoreResult.getHighRisk()); } @@ -494,6 +521,13 @@ public class ApplyOrderFacade { List> screenList = antenatalExaminationFacade.getscreenResult(patients.getScreenResult()); referralApplyOrderResult.setScreenResult(screenList); + //接诊医生 + if (NumberUtils.isNumber(referralApplyOrderModel.getRecDoctor())) { + Users users = usersService.getUsers(NumberUtils.toInt(referralApplyOrderModel.getRecDoctor())); + if (null != users) { + referralApplyOrderResult.setRecDoctor(users.getName()); + } + } } return new BaseObjectResponse().setData(referralApplyOrderResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralReceiptRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralReceiptRequest.java index 07b3c6d..e22d61a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralReceiptRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralReceiptRequest.java @@ -20,6 +20,16 @@ public class ReferralReceiptRequest { private String otherDiagn; //接收医生 private String recDoctor; + //当前医院的patient + private String patientId; + + public String getPatientId() { + return patientId; + } + + public void setPatientId(String patientId) { + this.patientId = patientId; + } public String getRecDoctor() { return recDoctor; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java index 1e168d6..441942f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java @@ -68,11 +68,21 @@ public class ReferralApplyOrderResult { private String zhuanCName; //转入医院 private String zhuanRname; + //接诊医生 + private String recDoctor; //目前诊断 private List diagnosis; //其他诊断 private String otherDiagn; + public String getRecDoctor() { + return recDoctor; + } + + public void setRecDoctor(String recDoctor) { + this.recDoctor = recDoctor; + } + public List getDiagnosis() { return diagnosis; }