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 572e43f..fcd9ffb 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 @@ -784,20 +784,7 @@ public class AntenatalExaminationFacade { trackDownRecordService.updateTrackDownParent(trackDownRecord, excAddRequest.getParentId()); }*/ antenatalExaminationService.addOneAntEx(antExChuModel); - /** - * 秦皇岛区域定制：初诊选择预约住院分娩医院同时，修改档案的预约住院分娩医院 - * @Author: 武涛涛 - * @Date: 2021/4/21 15:56 - */ - - Organization og = organizationService.getOrganization(Integer.valueOf(hospitalId)); - //秦皇岛区域 - if(og!=null && "2".equals(og.getCityId()) && StringUtils.isNotEmpty(excAddRequest.getYyzyfmHospitalId()) && StringUtils.isNotEmpty(antExChuModel.getParentId())){ - Patients patients1 = new Patients(); - patients1.setId(antExChuModel.getParentId()); - patients1.setYyzyfmHospitalId(excAddRequest.getYyzyfmHospitalId()); - patientsService.updatePatient(patients1); - } + excAddRequest.setId(antExChuModel.getId()); @@ -899,7 +886,20 @@ public class AntenatalExaminationFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("您已经做过初诊"); } } + /** + * 秦皇岛区域定制：初诊选择预约住院分娩医院同时，修改档案的预约住院分娩医院 + * @Author: 武涛涛 + * @Date: 2021/4/21 15:56 + */ + Organization og = organizationService.getOrganization(Integer.valueOf(hospitalId)); + //秦皇岛区域 + if (og != null && "2".equals(og.getCityId()) && StringUtils.isNotEmpty(excAddRequest.getYyzyfmHospitalId()) && StringUtils.isNotEmpty(antExChuModel.getParentId())) { + Patients patients1 = new Patients(); + patients1.setId(antExChuModel.getParentId()); + patients1.setYyzyfmHospitalId(excAddRequest.getYyzyfmHospitalId()); + patientsService.updatePatient(patients1); + } //处理数据自动流转 updateChuAutoData(antExChuModel, excAddRequest, hospitalId, userId); @@ -2568,7 +2568,7 @@ public class AntenatalExaminationFacade { private void sortList(List listDate) { //按照数据排序 - Collections.sort(listDate, new Comparator() { + Collections.sort(listDate, new Comparator () { @Override public int compare(SortIn o1, SortIn o2) { if (o1.getDate() != null && null != o2.getDate() && o1.getDate().after(o2.getDate())) { @@ -2660,11 +2660,11 @@ public class AntenatalExaminationFacade { StringBuffer stringBuffer = new StringBuffer(); if (StringUtils.isNotEmpty(string)) { // string = string.replace("\\n", ""); - string = string.replace("\\n", "").replace("\\", "") ; + string = string.replace("\\n", "").replace("\\", ""); // List recordChoiceStrlist = com.alibaba.fastjson.JSONObject.parseArray(string, Map.class); - com.alibaba.fastjson.JSONObject parse = (com.alibaba.fastjson.JSONObject)com.alibaba.fastjson.JSONObject.parse(string); + com.alibaba.fastjson.JSONObject parse = (com.alibaba.fastjson.JSONObject) com.alibaba.fastjson.JSONObject.parse(string); HashMap hashMap = JSON.parseObject(string, HashMap.class); - if(parse != null){ + if (parse != null) { Object finding = parse.get("finding"); Object diagnosis = parse.get("diagnosis"); String str = finding + "\r\n" + diagnosis + "\r\n"; @@ -2672,7 +2672,6 @@ public class AntenatalExaminationFacade { } - // String strs = ""; /* HashMap hashMap = JSON.parseObject(str, HashMap.class); @@ -2819,22 +2818,23 @@ public class AntenatalExaminationFacade { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - public BaseObjectResponse saveRisData(List models) { - System.out.println("----------1-----------"+models.size()); - if(CollectionUtils.isNotEmpty(models)){ + + public BaseObjectResponse saveRisData(List models) { + System.out.println("----------1-----------" + models.size()); + if (CollectionUtils.isNotEmpty(models)) { for (RisInfoModelRequest risInfoModelRequest : models) { - if(StringUtils.isNotEmpty(risInfoModelRequest.getHospitalId())){ + if (StringUtils.isNotEmpty(risInfoModelRequest.getHospitalId())) { PatientsQuery patientsQuery1 = new PatientsQuery(); patientsQuery1.setYn(YnEnums.YES.getId()); patientsQuery1.setHospitalId(risInfoModelRequest.getHospitalId()); patientsQuery1.setVcCardNo(risInfoModelRequest.getVCCARDNO()); patientsQuery1.setPhone(risInfoModelRequest.getPHONE()); - System.out.println("----------2-----------"+patientsQuery1.convertToQuery().convertToMongoQuery()); - List patientses = patientsService.queryPatient(patientsQuery1); - if(CollectionUtils.isNotEmpty(patientses)){ + System.out.println("----------2-----------" + patientsQuery1.convertToQuery().convertToMongoQuery()); + List patientses = patientsService.queryPatient(patientsQuery1); + if (CollectionUtils.isNotEmpty(patientses)) { Patients patients = patientses.get(0); - saveRisDataCz(risInfoModelRequest,patients.getId()); - saveRisDataFz(risInfoModelRequest,patients.getId()); + saveRisDataCz(risInfoModelRequest, patients.getId()); + saveRisDataFz(risInfoModelRequest, patients.getId()); } } @@ -2842,11 +2842,10 @@ public class AntenatalExaminationFacade { } - - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - private void saveRisDataCz(RisInfoModelRequest risInfoModelRequest,String parentId) { + + private void saveRisDataCz(RisInfoModelRequest risInfoModelRequest, String parentId) { AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setHospitalId(risInfoModelRequest.getHospitalId());//2100001296 antExChuQuery.setYn(YnEnums.YES.getId()); @@ -2858,13 +2857,14 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(antExChu)) { AntExChuModel antExChuModel1 = antExChu.get(0); if (StringUtils.isEmpty(antExChuModel1.getbChao())) { - antExChuModel1.setbChao(risInfoModelRequest.getITEM_FINDING()+ "\r\n" + risInfoModelRequest.getITEM_DIAGNOSIS()+ "\r\n"); + antExChuModel1.setbChao(risInfoModelRequest.getITEM_FINDING() + "\r\n" + risInfoModelRequest.getITEM_DIAGNOSIS() + "\r\n"); System.out.println("-----------cc2--------antExChuModel1--" + antExChuModel1.toString()); iAntExChuDao.updateOneAntEx(antExChuModel1, antExChuModel1.getId()); - } + } } } - private void saveRisDataFz(RisInfoModelRequest risInfoModelRequest,String parentId) { + + private void saveRisDataFz(RisInfoModelRequest risInfoModelRequest, String parentId) { AntExQuery antExQuery = new AntExQuery(); antExQuery.setHospitalId(risInfoModelRequest.getHospitalId());//2100001296 @@ -2875,7 +2875,7 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(antExFu)) { AntenatalExaminationModel antenatalExaminationModel1 = antExFu.get(0); if (StringUtils.isEmpty(antenatalExaminationModel1.getbChao())) { - antenatalExaminationModel1.setbChao(risInfoModelRequest.getITEM_FINDING()+ "\r\n" + risInfoModelRequest.getITEM_DIAGNOSIS()+ "\r\n"); + antenatalExaminationModel1.setbChao(risInfoModelRequest.getITEM_FINDING() + "\r\n" + risInfoModelRequest.getITEM_DIAGNOSIS() + "\r\n"); System.out.println("-----------ff2--------antenatalExaminationModel1--" + antenatalExaminationModel1.toString()); antExService.updateOneAnt(antenatalExaminationModel1, antenatalExaminationModel1.getId()); } @@ -3641,8 +3641,7 @@ public class AntenatalExaminationFacade { //衡水区域并且不是衡水市第六人民医院 - if("12".equals(og.getCityId()) && !"2100002324".equals(hospitalId)) - { + if ("12".equals(og.getCityId()) && !"2100002324".equals(hospitalId)) { currentGroupHospital.remove("2100002324");//衡水市第六人民医院 } @@ -4021,9 +4020,9 @@ public class AntenatalExaminationFacade { list.addAll(checkList); }*/ if (CollectionUtils.isNotEmpty(checkList)) { - if(highRisk.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") && (StringUtils.isEmpty(oRisk) || "{}".equals(oRisk) || "[]".equals(oRisk)) ){ + if (highRisk.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") && (StringUtils.isEmpty(oRisk) || "{}".equals(oRisk) || "[]".equals(oRisk))) { list.addAll(checkList); - }else if(!highRisk.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")){ + } else if (!highRisk.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) { list.addAll(checkList); } } @@ -4435,9 +4434,7 @@ public class AntenatalExaminationFacade { } data.add(map); } - } - else - { + } else { Map map = new HashMap <>(); map.put("name", i); data.add(map);