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 23b39e2..f6fa5ef 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 @@ -63,7 +63,10 @@ public class AntenatalExaminationFacade { AntenatalExaminationModel antenatalExamination = antExAddRequest.convertToDataModel(); antenatalExamination.setHospitalId(autoMatchFacade.matchOrgId(userId).get(0) + ""); antenatalExaminationService.updateOneAnt(antenatalExamination, antExAddRequest.getId()); + //修改申请单状态 updateApplyOrder(antenatalExamination, antExAddRequest.getParentId()); + //修改孕妇高危等级 + updatePatientRiskLevel(antenatalExamination,patientsService.findOnePatientById(antExAddRequest.getParentId())); } else { AntenatalExaminationModel model = antExAddRequest.convertToDataModel(); model.setYn(YnEnums.YES.getId()); @@ -79,9 +82,13 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(list)) { return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("同一天只能建一次复诊"); } - model.setPid( patientsService.findOnePatientById(antExAddRequest.getParentId()).getPid()); + Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId()); + model.setPid(patients.getPid()); antenatalExaminationService.addOneBabyAnt(model); + //修改申请单状态 updateApplyOrder(model, antExAddRequest.getParentId()); + //修改孕妇高危等级 + updatePatientRiskLevel(model, patients); } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); @@ -113,6 +120,10 @@ public class AntenatalExaminationFacade { AntExChuModel antExChuModel = excAddRequest.convertToDataModel(); if (StringUtils.isNotEmpty(antExChuModel.getId()) && StringUtils.isNotEmpty(antExChuModel.getParentId())) { antenatalExaminationService.updateAntExChu(antExChuModel, antExChuModel.getId()); + + Patients patients = patientsService.findOnePatientById(excAddRequest.getParentId()); + //修改患者风险等级 + updatePatientRiskLevel(antExChuModel, patients); } else { List list1 = autoMatchFacade.matchOrgId(userId); Patients patients = patientsService.findOnePatientById(excAddRequest.getParentId()); @@ -136,10 +147,73 @@ public class AntenatalExaminationFacade { antExChuModel.setPid(patients.getPid()); antExChuModel.setYn(YnEnums.YES.getId()); antenatalExaminationService.addOneAntEx(antExChuModel); + //修改患者风险等级 + updatePatientRiskLevel(antExChuModel, patients); } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - + //修改患者风险等级 + private void updatePatientRiskLevel(AntExChuModel antExChuModel, Patients patients) { + List list = new ArrayList<>(); + try { + if (StringUtils.isNotEmpty(antExChuModel.getHighrisk()) && !"[]".equals(antExChuModel.getHighrisk())) { + List l = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); + for(int i=0;i< l.size();i++){ + BasicConfig basicConfig= basicConfigService.getOneBasicConfigById(l.get(i).toString()); + basicConfig= basicConfigService.getOneBasicConfigById(basicConfig.getParentId()); + if(null!=basicConfig&&!list.contains(basicConfig.getId())){ + list.add(basicConfig.getId()); + } + } + } + } catch (Exception e) { + } + try { + if (StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk())) { + Map map = JsonUtil.str2Obj(antExChuModel.getOtherHighRisk(), Map.class); + String m = (String) map.get("fyyse"); + if(!list.contains(m)){ + list.add(m); + } + } + } catch (Exception e) { + } + if (!list.isEmpty()) { + patients.setRiskLevelId(JsonUtil.array2JsonString(list)); + patientsService.updatePatient(patients); + } + } + //修改患者风险等级 + private void updatePatientRiskLevel(AntenatalExaminationModel antExChuModel, Patients patients) { + List list = new ArrayList<>(); + try { + if (StringUtils.isNotEmpty(antExChuModel.getRiskFactor()) && !"[]".equals(antExChuModel.getRiskFactor())) { + List l = JsonUtil.toList(antExChuModel.getRiskFactor(), List.class); + for(int i=0;i< l.size();i++){ + BasicConfig basicConfig= basicConfigService.getOneBasicConfigById(l.get(i).toString()); + basicConfig= basicConfigService.getOneBasicConfigById(basicConfig.getParentId()); + if(null!=basicConfig&&!list.contains(basicConfig.getId())){ + list.add(basicConfig.getId()); + } + } + } + } catch (Exception e) { + } + try { + if (StringUtils.isNotEmpty(antExChuModel.getOtherRisk()) && !"{}".equals(antExChuModel.getOtherRisk())) { + Map map = JsonUtil.str2Obj(antExChuModel.getOtherRisk(), Map.class); + String m = (String) map.get("fyyse"); + if(!list.contains(m)){ + list.add(m); + } + } + } catch (Exception e) { + } + if (!list.isEmpty()) { + patients.setRiskLevelId(JsonUtil.array2JsonString(list)); + patientsService.updatePatient(patients); + } + } /** * 获取最后一次高危产检的高危信息 *

@@ -462,7 +536,7 @@ public class AntenatalExaminationFacade { antExChuModel = antExChulist.get(0); }*/ HighScoreResult highScoreResult = findLastRisk(patients.getId()); - AntExQuery antExQuery=new AntExQuery(); + AntExQuery antExQuery = new AntExQuery(); antExQuery.setYn(YnEnums.YES.getId()); antExQuery.setPid(patients.getPid()); //查询产前检查记录 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java index f143a19..f0bbc67 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java @@ -79,7 +79,7 @@ public class MatDeliverListResult { if (CollectionUtils.isNotEmpty(destList)) { List list = new ArrayList<>(); for (MaternalDeliverModel model : destList) { - list.add(new MatDeliverExt(model,patients.getCreated(),patients.getBuildType())); + list.add(new MatDeliverExt(model,patients.getCreated(),patients.getBuildType(),patients.getFmDate())); } setData(list); } @@ -179,7 +179,9 @@ public class MatDeliverListResult { private String enableEdit = "0"; //建档类型 0 未分娩建档 1儿童建档时建档 private String dueType; - public MatDeliverExt(MaternalDeliverModel deliverModel, Date lastCreatedTime,Integer buildType) { + //分娩时间,补录时使用 + private String dueDate; + public MatDeliverExt(MaternalDeliverModel deliverModel, Date lastCreatedTime,Integer buildType,Date dueDate) { setCheckTime(deliverModel.getDueDate()); setId(deliverModel.getId()); setHospitalId(deliverModel.getHospitalId()); @@ -191,6 +193,17 @@ public class MatDeliverListResult { if(null!=buildType){ dueType=buildType+""; } + if(null!=dueDate){ + this.dueDate=DateUtil.getyyyy_MM_dd(dueDate); + } + } + + public String getDueDate() { + return dueDate; + } + + public void setDueDate(String dueDate) { + this.dueDate = dueDate; } public String getDueType() {