Commit 314045bf9ec9c7e445167ba65957386e09653473
1 parent
2cbb31d75f
Exists in
master
and in
6 other branches
增加儿童高危同步功能
Showing 2 changed files with 81 additions and 24 deletions
platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java
View file @
314045b
| ... | ... | @@ -118,6 +118,10 @@ |
| 118 | 118 | private BabyCheckBaseService babyCheckBaseService; |
| 119 | 119 | @Autowired |
| 120 | 120 | private DoctorUsersBabysMapsService babysMapsService; |
| 121 | + @Autowired | |
| 122 | + private BabyRiskDetailsService babyRiskDetailsService; | |
| 123 | + @Autowired | |
| 124 | + private BabyRisksService babyRisksService; | |
| 121 | 125 | |
| 122 | 126 | @Autowired |
| 123 | 127 | private BabyService babyService; |
| 124 | 128 | |
| 125 | 129 | |
| 126 | 130 | |
| ... | ... | @@ -230,13 +234,13 @@ |
| 230 | 234 | String name = basicConfig.getName(); |
| 231 | 235 | if (name.indexOf("黄色") > -1) { |
| 232 | 236 | name = "黄色"; |
| 233 | - }else if (name.indexOf("橙色") > -1) { | |
| 237 | + } else if (name.indexOf("橙色") > -1) { | |
| 234 | 238 | name = "橙色"; |
| 235 | - }else if (name.indexOf("红色") > -1) { | |
| 239 | + } else if (name.indexOf("红色") > -1) { | |
| 236 | 240 | name = "红色"; |
| 237 | - }else if (name.indexOf("紫色") > -1) { | |
| 241 | + } else if (name.indexOf("紫色") > -1) { | |
| 238 | 242 | name = "紫色"; |
| 239 | - }else if (name.indexOf("绿色") > -1) { | |
| 243 | + } else if (name.indexOf("绿色") > -1) { | |
| 240 | 244 | name = "绿色"; |
| 241 | 245 | } |
| 242 | 246 | highLevel.put(basicConfig.getId(), name); |
| ... | ... | @@ -402,6 +406,26 @@ |
| 402 | 406 | } |
| 403 | 407 | } |
| 404 | 408 | |
| 409 | + private void addBabyRiskDetail(Integer patientId, String title) { | |
| 410 | + if (StringUtils.isEmpty(title) || null == patientId) { | |
| 411 | + return; | |
| 412 | + } | |
| 413 | + BabyRiskDetails babyRiskDetails = new BabyRiskDetails(); | |
| 414 | + babyRiskDetails.setCreated(new Date()); | |
| 415 | + babyRiskDetails.setYn(YnEnums.YES.getId()); | |
| 416 | + babyRiskDetails.setModified(new Date()); | |
| 417 | + babyRiskDetails.setPatientId(patientId); | |
| 418 | + | |
| 419 | + babyRiskDetails.setTitle(title); | |
| 420 | + babyRiskDetails.setPublishName("system-worker"); | |
| 421 | + babyRiskDetails.setPublishId(0); | |
| 422 | + babyRiskDetails.setYn(YnEnums.YES.getId()); | |
| 423 | + babyRiskDetails.setCreated(new Date()); | |
| 424 | + babyRiskDetails.setModified(new Date()); | |
| 425 | + babyRiskDetails.setPatientId(patientId); | |
| 426 | + babyRiskDetailsService.addBabyRiskDetails(babyRiskDetails); | |
| 427 | + } | |
| 428 | + | |
| 405 | 429 | private void loadRpBaby(String hospitalId) { |
| 406 | 430 | BabyModelQuery babyModelQuery = new BabyModelQuery(); |
| 407 | 431 | babyModelQuery.setHospitalId(hospitalId); |
| 408 | 432 | |
| 409 | 433 | |
| ... | ... | @@ -416,16 +440,49 @@ |
| 416 | 440 | if (CollectionUtils.isNotEmpty(babyModels)) { |
| 417 | 441 | for (BabyModel babyModel : babyModels) { |
| 418 | 442 | Patients patients = ConvertHelper.convertToMamiBaby(babyModel); |
| 443 | + | |
| 419 | 444 | //构建消息 |
| 420 | 445 | buildNotifyMessage(patients.getPhone(), patients.getUsername()); |
| 421 | 446 | patientsService.aouPatients(patients); |
| 422 | 447 | |
| 423 | 448 | |
| 424 | 449 | logger.info("loadRpBaby aouPatients:" + hospitalId + ",mami baby id:" + patients.getId()); |
| 450 | + | |
| 451 | + | |
| 425 | 452 | //处理建档的关系 |
| 426 | 453 | handBabyDoctor(getDoctorId(babyModel |
| 427 | 454 | .getBuildDoctor()), patients.getId()); |
| 428 | 455 | |
| 456 | + | |
| 457 | + List<String> risk = babyModel.getHighRiskInfo(); | |
| 458 | + | |
| 459 | + if (CollectionUtils.isEmpty(risk)) { | |
| 460 | + babyRiskDetailsService.deleteBabyRiskDetails1(patients.getId()); | |
| 461 | + StringBuilder sb= new StringBuilder(); | |
| 462 | + for (String riskId : risk) { | |
| 463 | + if (!"null".equals(riskId) && StringUtils.isNotEmpty(riskId)) { | |
| 464 | + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(riskId); | |
| 465 | + if (null != basicConfig) { | |
| 466 | + sb.append(basicConfig.getName()+", "); | |
| 467 | + addBabyRiskDetail(patients.getId(), basicConfig.getName()); | |
| 468 | + } | |
| 469 | + } | |
| 470 | + } | |
| 471 | + if (sb.length() >= 2) { | |
| 472 | + sb.setLength(sb.length() - 2); | |
| 473 | + } | |
| 474 | + if(sb.length()>0){ | |
| 475 | + BabyRisks risks = new BabyRisks(); | |
| 476 | + risks.setCreated(babyModel.getCreated()); | |
| 477 | + risks.setYn(YnEnums.YES.getId()); | |
| 478 | + risks.setModified(babyModel.getModified()); | |
| 479 | + risks.setPatientId(patients.getId()); | |
| 480 | + risks.setTitle(sb.toString()); | |
| 481 | + risks.setReason(sb.toString()); | |
| 482 | + babyRisksService.addBabyRisks(risks); | |
| 483 | + } | |
| 484 | + } | |
| 485 | + | |
| 429 | 486 | BabyCheckModelQuery babyCheckModelQuery = new BabyCheckModelQuery(); |
| 430 | 487 | babyCheckModelQuery.setYn(YnEnums.YES.getId()); |
| 431 | 488 | babyCheckModelQuery.setBuildId(babyModel.getId()); |
| ... | ... | @@ -436,7 +493,7 @@ |
| 436 | 493 | logger.info("loadRpBaby babycheck by:" + hospitalId + ",babycheck size:" + (null == babyCheckModels ? 0 : babyCheckModels.size())); |
| 437 | 494 | if (CollectionUtils.isNotEmpty(babyCheckModels)) { |
| 438 | 495 | for (BabyCheckModel babyCheckModel : babyCheckModels) { |
| 439 | - System.out.println("待同步的儿保检查数据："+babyCheckModel.toString()); | |
| 496 | + System.out.println("待同步的儿保检查数据：" + babyCheckModel.toString()); | |
| 440 | 497 | //儿保信息 |
| 441 | 498 | BabyCheckBase babyCheckBase = ConvertHelper.convertToBabyCheckBase(babyCheckModel, babyModel); |
| 442 | 499 | babyCheckBase.setPatientId(patients.getId()); |
| ... | ... | @@ -616,7 +673,7 @@ |
| 616 | 673 | } |
| 617 | 674 | } |
| 618 | 675 | |
| 619 | - Reports reports = ConvertHelper.convertAntEx(antExChuModel1, patients.getLastMenses(),basicConfigService,patientService, | |
| 676 | + Reports reports = ConvertHelper.convertAntEx(antExChuModel1, patients.getLastMenses(), basicConfigService, patientService, | |
| 620 | 677 | bgHighRisk, doctorUserName); |
| 621 | 678 | logger.info("query handleDoctorMemeber" + patients.getId() + ". antex chu:" + antExChuModel1.getId()); |
| 622 | 679 | handleDoctorMemeber(reports, antExChuModel1.getProdDoctor(), mamiPatient, patients, stopWatch3); |
| ... | ... | @@ -719,8 +776,8 @@ |
| 719 | 776 | //处理复诊高危 |
| 720 | 777 | handRiskFu(ant, mamiPatient.getId()); |
| 721 | 778 | |
| 722 | - Reports reports = ConvertHelper.convertAntExFu(ant, basicConfigService,patientService,patients.getLastMenses(), | |
| 723 | - bgHighRisk,hospitalsService,usersService, doctorUserName); | |
| 779 | + Reports reports = ConvertHelper.convertAntExFu(ant, basicConfigService, patientService, patients.getLastMenses(), | |
| 780 | + bgHighRisk, hospitalsService, usersService, doctorUserName); | |
| 724 | 781 | |
| 725 | 782 | logger.info("handleDoctorMemeber antex" + patients.getId() + ". antex id:" + ant.getId()); |
| 726 | 783 | handleDoctorMemeber(reports, ant.getCheckDoctor(), mamiPatient, patients, stopWatch3); |
| ... | ... | @@ -848,7 +905,7 @@ |
| 848 | 905 | List list2 = null; |
| 849 | 906 | boolean isdel = false; |
| 850 | 907 | try { |
| 851 | - if (null != antEx && StringUtils.isNotEmpty(antEx.getOtherRisk()) && !"{}".equals(antEx.getOtherRisk())&& !"[]".equals(antEx.getOtherRisk())) { | |
| 908 | + if (null != antEx && StringUtils.isNotEmpty(antEx.getOtherRisk()) && !"{}".equals(antEx.getOtherRisk()) && !"[]".equals(antEx.getOtherRisk())) { | |
| 852 | 909 | String otherHighRisk = antEx.getOtherRisk(); |
| 853 | 910 | List<Map> otherHighRisks = new ArrayList<>(); |
| 854 | 911 | if (otherHighRisk.startsWith("[") && otherHighRisk.endsWith("]")) { |
| ... | ... | @@ -897,7 +954,7 @@ |
| 897 | 954 | } |
| 898 | 955 | |
| 899 | 956 | |
| 900 | - if (null != antEx && StringUtils.isNotEmpty(antEx.getOtherRisk()) && !"{}".equals(antEx.getOtherRisk())&& !"[]".equals(antEx.getOtherRisk())) { | |
| 957 | + if (null != antEx && StringUtils.isNotEmpty(antEx.getOtherRisk()) && !"{}".equals(antEx.getOtherRisk()) && !"[]".equals(antEx.getOtherRisk())) { | |
| 901 | 958 | String otherHighRisk = antEx.getOtherRisk(); |
| 902 | 959 | List<Map> otherHighRisks = new ArrayList<>(); |
| 903 | 960 | if (otherHighRisk.startsWith("[") && otherHighRisk.endsWith("]")) { |
| 904 | 961 | |
| 905 | 962 | |
| 906 | 963 | |
| ... | ... | @@ -934,13 +991,13 @@ |
| 934 | 991 | String name = basicConfig.getName(); |
| 935 | 992 | if (name.indexOf("黄色") > -1) { |
| 936 | 993 | name = "黄色"; |
| 937 | - }else if (name.indexOf("橙色") > -1) { | |
| 994 | + } else if (name.indexOf("橙色") > -1) { | |
| 938 | 995 | name = "橙色"; |
| 939 | - }else if (name.indexOf("红色") > -1) { | |
| 996 | + } else if (name.indexOf("红色") > -1) { | |
| 940 | 997 | name = "红色"; |
| 941 | - }else if (name.indexOf("紫色") > -1) { | |
| 998 | + } else if (name.indexOf("紫色") > -1) { | |
| 942 | 999 | name = "紫色"; |
| 943 | - }else if (name.indexOf("绿色") > -1) { | |
| 1000 | + } else if (name.indexOf("绿色") > -1) { | |
| 944 | 1001 | name = "绿色"; |
| 945 | 1002 | } |
| 946 | 1003 | |
| ... | ... | @@ -1058,7 +1115,7 @@ |
| 1058 | 1115 | riskDetailsService.deleteRiskDetails(patientId); |
| 1059 | 1116 | } |
| 1060 | 1117 | } catch (Exception e) { |
| 1061 | - ExceptionUtils.catchException(e,"handlRiskChu error."); | |
| 1118 | + ExceptionUtils.catchException(e, "handlRiskChu error."); | |
| 1062 | 1119 | } |
| 1063 | 1120 | |
| 1064 | 1121 | Risks risks = new Risks(); |
| 1065 | 1122 | |
| ... | ... | @@ -1069,14 +1126,14 @@ |
| 1069 | 1126 | risks.setPatientId(patientId); |
| 1070 | 1127 | HighScoreResult highScoreResult = new HighScoreResult(); |
| 1071 | 1128 | try { |
| 1072 | - System.out.println("国家高危："+list2+",size:"+list2.size()); | |
| 1129 | + System.out.println("国家高危：" + list2 + ",size:" + list2.size()); | |
| 1073 | 1130 | //添加高危信息到详情表 |
| 1074 | 1131 | highScoreResult = queryRisk(list2, patientId); |
| 1075 | 1132 | } catch (Exception e) { |
| 1076 | 1133 | ERROR_LOGGER.error("convert high risk error." + list2, e); |
| 1077 | 1134 | } |
| 1078 | 1135 | |
| 1079 | - if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) { | |
| 1136 | + if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) { | |
| 1080 | 1137 | String otherHighRisk = antExChuModel.getOtherHighRisk(); |
| 1081 | 1138 | List<Map> otherHighRisks = new ArrayList<>(); |
| 1082 | 1139 | |
| 1083 | 1140 | |
| 1084 | 1141 | |
| 1085 | 1142 | |
| ... | ... | @@ -1114,13 +1171,13 @@ |
| 1114 | 1171 | String name = basicConfig; |
| 1115 | 1172 | if (name.indexOf("黄色") > -1) { |
| 1116 | 1173 | name = "黄色"; |
| 1117 | - }else if (name.indexOf("橙色") > -1) { | |
| 1174 | + } else if (name.indexOf("橙色") > -1) { | |
| 1118 | 1175 | name = "橙色"; |
| 1119 | - }else if (name.indexOf("红色") > -1) { | |
| 1176 | + } else if (name.indexOf("红色") > -1) { | |
| 1120 | 1177 | name = "红色"; |
| 1121 | - }else if (name.indexOf("紫色") > -1) { | |
| 1178 | + } else if (name.indexOf("紫色") > -1) { | |
| 1122 | 1179 | name = "紫色"; |
| 1123 | - }else if (name.indexOf("绿色") > -1) { | |
| 1180 | + } else if (name.indexOf("绿色") > -1) { | |
| 1124 | 1181 | name = "绿色"; |
| 1125 | 1182 | } |
| 1126 | 1183 | map2.put("name", name); |
| ... | ... | @@ -1157,8 +1214,8 @@ |
| 1157 | 1214 | String name = tmp.get("name") == null ? null : (String) tmp.get("name"); |
| 1158 | 1215 | if (null != name) { |
| 1159 | 1216 | RiskColorEnum colorEnum = map.get(name); |
| 1160 | - if(null==colorEnum){ | |
| 1161 | - logger.info("error :colorEnum null." +name); | |
| 1217 | + if (null == colorEnum) { | |
| 1218 | + logger.info("error :colorEnum null." + name); | |
| 1162 | 1219 | } |
| 1163 | 1220 | crisis = crisis | colorEnum.getId(); |
| 1164 | 1221 | } |
| ... | ... | @@ -1240,7 +1297,7 @@ |
| 1240 | 1297 | } |
| 1241 | 1298 | } |
| 1242 | 1299 | } |
| 1243 | - }catch (Exception e){ | |
| 1300 | + } catch (Exception e) { | |
| 1244 | 1301 | e.printStackTrace(); |
| 1245 | 1302 | } |
| 1246 | 1303 | highScoreResult.setHighRisk(data); |
platform-job-index/src/main/webapp/WEB-INF/lib/mainData.jar
View file @
314045b