Commit 44b29a0a8e68e49ad065f8ea17b5e7dd57d3028d
1 parent
fb182ac606
Exists in
master
and in
6 other branches
高危数据同步到小程序任务
Showing 2 changed files with 188 additions and 128 deletions
platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java
View file @
44b29a0
| ... | ... | @@ -149,7 +149,16 @@ |
| 149 | 149 | */ |
| 150 | 150 | public static final String CHINA_BASIC_ID = "f6c505dd-835a-43d7-b0bb-fdb9eb0b7b31"; |
| 151 | 151 | |
| 152 | + public static Map<String, String> scoreMap = new HashMap<>(); | |
| 153 | + | |
| 152 | 154 | static { |
| 155 | + scoreMap.put("5769f0640cf2d37f034793a2", "5"); | |
| 156 | + scoreMap.put("5769f0640cf2d37f034793a3", "10"); | |
| 157 | + scoreMap.put("5769f0650cf2d37f034793a4", "15"); | |
| 158 | + scoreMap.put("5769f0650cf2d37f034793a5", "20"); | |
| 159 | + } | |
| 160 | + | |
| 161 | + static { | |
| 153 | 162 | map.put("橙色", RiskColorEnum.Orange); |
| 154 | 163 | map.put("黄色", RiskColorEnum.Yellow); |
| 155 | 164 | map.put("红色", RiskColorEnum.Red); |
| ... | ... | @@ -157,6 +166,7 @@ |
| 157 | 166 | map.put("绿色", RiskColorEnum.Green); |
| 158 | 167 | } |
| 159 | 168 | |
| 169 | + | |
| 160 | 170 | private long readLastSyncTime() { |
| 161 | 171 | long time = 1500000L; |
| 162 | 172 | try { |
| 163 | 173 | |
| ... | ... | @@ -399,11 +409,10 @@ |
| 399 | 409 | for (BabyModel babyModel : babyModels) { |
| 400 | 410 | Patients patients = ConvertHelper.convertToMamiBaby(babyModel); |
| 401 | 411 | //构建消息 |
| 402 | - buildNotifyMessage(patients.getPhone(),patients.getUsername()); | |
| 412 | + buildNotifyMessage(patients.getPhone(), patients.getUsername()); | |
| 403 | 413 | patientsService.aouPatients(patients); |
| 404 | 414 | |
| 405 | 415 | |
| 406 | - | |
| 407 | 416 | logger.info("loadRpBaby aouPatients:" + hospitalId + ",mami baby id:" + patients.getId()); |
| 408 | 417 | //处理建档的关系 |
| 409 | 418 | handBabyDoctor(getDoctorId(babyModel |
| ... | ... | @@ -825,7 +834,7 @@ |
| 825 | 834 | com.lymsh.mommybaby.maindata.model.Patients mamiPatient = ConvertHelper |
| 826 | 835 | .convertPatient(patients); |
| 827 | 836 | |
| 828 | - if(StringUtils.isBlank(mamiPatient.getPhone())){ | |
| 837 | + if (StringUtils.isBlank(mamiPatient.getPhone())) { | |
| 829 | 838 | continue; |
| 830 | 839 | } |
| 831 | 840 | mamiPatient.setCrisis(setCric(patients)); |
| 832 | 841 | |
| 833 | 842 | |
| ... | ... | @@ -876,19 +885,30 @@ |
| 876 | 885 | List list2 = null; |
| 877 | 886 | boolean isdel = false; |
| 878 | 887 | try { |
| 879 | - if (null != antEx && !"{}".equals(antEx.getOtherRisk())) { | |
| 880 | - Map map = JsonUtil.str2Obj(antEx.getOtherRisk(), Map.class); | |
| 881 | - Object obj1 = map.get("fxysu"); | |
| 882 | - if (null != obj1 && !"".equals(obj1.toString())) { | |
| 883 | - risksService.deleteRisk(patientId); | |
| 884 | - riskDetailsService.deleteRiskDetails(patientId); | |
| 885 | - isdel = true; | |
| 888 | + if (null != antEx && !"{}".equals(antEx.getOtherRisk())&& !"[]".equals(antEx.getOtherRisk())) { | |
| 889 | + String otherHighRisk = antEx.getOtherRisk(); | |
| 890 | + List<Map> otherHighRisks = new ArrayList<>(); | |
| 891 | + if (otherHighRisk.startsWith("[") && otherHighRisk.endsWith("]")) { | |
| 892 | + list2 = JsonUtil.toList(otherHighRisk, Map.class); | |
| 893 | + otherHighRisks.addAll(list2); | |
| 894 | + } else { | |
| 895 | + Map otherMap = JsonUtil.jkstr2Obj(otherHighRisk, Map.class); | |
| 896 | + otherHighRisks.add(otherMap); | |
| 886 | 897 | } |
| 898 | + | |
| 899 | + if (CollectionUtils.isNotEmpty(otherHighRisks)) { | |
| 900 | + Map map = otherHighRisks.get(0); | |
| 901 | + Object obj1 = map.get("fxysu"); | |
| 902 | + if (null != obj1 && !"".equals(obj1.toString())) { | |
| 903 | + risksService.deleteRisk(patientId); | |
| 904 | + riskDetailsService.deleteRiskDetails(patientId); | |
| 905 | + isdel = true; | |
| 906 | + } | |
| 907 | + } | |
| 887 | 908 | } |
| 888 | 909 | } catch (Exception e) { |
| 889 | 910 | } |
| 890 | 911 | try { |
| 891 | - | |
| 892 | 912 | list2 = JsonUtil.toList(antEx.getRiskFactor(), List.class); |
| 893 | 913 | if (null != list2 && CollectionUtils.isNotEmpty(list2) && !isdel) { |
| 894 | 914 | risksService.deleteRisk(patientId); |
| 895 | 915 | |
| 896 | 916 | |
| 897 | 917 | |
| 898 | 918 | |
| 899 | 919 | |
| ... | ... | @@ -904,63 +924,74 @@ |
| 904 | 924 | risks.setModified(antEx.getModified()); |
| 905 | 925 | |
| 906 | 926 | risks.setPatientId(patientId); |
| 907 | - HighScoreResult highScoreResult =new HighScoreResult(); | |
| 927 | + HighScoreResult highScoreResult = new HighScoreResult(); | |
| 908 | 928 | try { |
| 909 | 929 | |
| 910 | 930 | list2 = JsonUtil.toList(antEx.getRiskFactor(), List.class); |
| 911 | - highScoreResult= queryRisk(list2, patientId); | |
| 912 | - }catch (Exception e){ | |
| 913 | - ERROR_LOGGER.error("convert high risk error."+list2, e); | |
| 931 | + highScoreResult = queryRisk(list2, patientId); | |
| 932 | + } catch (Exception e) { | |
| 933 | + ERROR_LOGGER.error("convert high risk error." + list2, e); | |
| 914 | 934 | } |
| 915 | 935 | |
| 916 | 936 | |
| 917 | - if (null != antEx && !"{}".equals(antEx.getOtherRisk())) { | |
| 918 | - Map map = JsonUtil.str2Obj(antEx.getOtherRisk(), Map.class); | |
| 919 | - //风险因素 | |
| 920 | - Map map1 = new HashMap(); | |
| 921 | - map1.put("id", ""); | |
| 922 | - Object obj = map.get("fxysu"); | |
| 923 | - if (null != obj && !"null".equals(obj.toString()) && !"".equals(obj.toString())) { | |
| 924 | - map1.put("name", map.get("fxysu")); | |
| 925 | - highScoreResult.getHighRisk().add(map1); | |
| 937 | + if (null != antEx && !"{}".equals(antEx.getOtherRisk())&& !"[]".equals(antEx.getOtherRisk())) { | |
| 938 | + String otherHighRisk = antEx.getOtherRisk(); | |
| 939 | + List<Map> otherHighRisks = new ArrayList<>(); | |
| 940 | + if (otherHighRisk.startsWith("[") && otherHighRisk.endsWith("]")) { | |
| 941 | + list2 = JsonUtil.toList(otherHighRisk, Map.class); | |
| 942 | + otherHighRisks.addAll(list2); | |
| 943 | + } else { | |
| 944 | + Map otherMap = JsonUtil.jkstr2Obj(otherHighRisk, Map.class); | |
| 945 | + otherHighRisks.add(otherMap); | |
| 926 | 946 | } |
| 927 | - RiskDetails riskDetails = new RiskDetails(); | |
| 928 | - //风险评分 | |
| 929 | - Object idObj = map.get("fxpf"); | |
| 930 | - if (null != idObj && !"null".equals(idObj.toString()) && !"".equals(idObj.toString())) { | |
| 931 | - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj.toString()); | |
| 932 | - riskDetails.setScore(NumberUtils.toInt(basicConfig.getName())); | |
| 933 | - highScoreResult.setScore(highScoreResult.getScore() + NumberUtils.toInt(basicConfig.getName(), 0)); | |
| 934 | - } | |
| 935 | - Object idObj1 = map.get("fyyse"); | |
| 936 | - if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) { | |
| 937 | - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString()); | |
| 938 | - if (null != basicConfig) { | |
| 939 | - Map<String, Object> map2 = new HashMap<>(); | |
| 940 | - map2.put("id", basicConfig.getId()); | |
| 941 | - String name = basicConfig.getName(); | |
| 942 | - if (name.indexOf("预警") > -1) { | |
| 943 | - name = name.replace("预警", ""); | |
| 947 | + for (Map map : otherHighRisks) { | |
| 948 | + if (map != null) {//风险因素 | |
| 949 | + //风险因素 | |
| 950 | + Map map1 = new HashMap(); | |
| 951 | + map1.put("id", ""); | |
| 952 | + Object obj = map.get("fxysu"); | |
| 953 | + if (null != obj && !"null".equals(obj.toString()) && !"".equals(obj.toString())) { | |
| 954 | + map1.put("name", map.get("fxysu")); | |
| 955 | + highScoreResult.getHighRisk().add(map1); | |
| 944 | 956 | } |
| 945 | - map2.put("name", name); | |
| 946 | - RiskColorEnum riskColorEnum = SyncDataWork.map.get(name); | |
| 947 | - riskDetails.setCrisis(riskColorEnum == null ? null : riskColorEnum.getId()); | |
| 948 | - map2.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); | |
| 949 | - highScoreResult.getLevel().add(map2); | |
| 950 | - } | |
| 951 | - } | |
| 957 | + RiskDetails riskDetails = new RiskDetails(); | |
| 958 | + //风险评分 | |
| 959 | + Object idObj = map.get("fxpf"); | |
| 960 | + if (null != idObj && !"null".equals(idObj.toString()) && !"".equals(idObj.toString())) { | |
| 961 | + riskDetails.setScore(NumberUtils.toInt(scoreMap.get(idObj.toString()))); | |
| 962 | + highScoreResult.setScore(highScoreResult.getScore() + NumberUtils.toInt(scoreMap.get(idObj.toString()))); | |
| 963 | + } | |
| 964 | + Object idObj1 = map.get("fyyse"); | |
| 965 | + if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) { | |
| 966 | + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString()); | |
| 967 | + if (null != basicConfig) { | |
| 968 | + Map<String, Object> map2 = new HashMap<>(); | |
| 969 | + map2.put("id", basicConfig.getId()); | |
| 970 | + String name = basicConfig.getName(); | |
| 971 | + if (name.indexOf("预警") > -1) { | |
| 972 | + name = name.replace("预警", ""); | |
| 973 | + } | |
| 974 | + map2.put("name", name); | |
| 975 | + RiskColorEnum riskColorEnum = SyncDataWork.map.get(name); | |
| 976 | + riskDetails.setCrisis(riskColorEnum == null ? null : riskColorEnum.getId()); | |
| 977 | + map2.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); | |
| 978 | + highScoreResult.getLevel().add(map2); | |
| 979 | + } | |
| 980 | + } | |
| 952 | 981 | |
| 953 | - Object obj1 = map1.get("name"); | |
| 954 | - if (null != obj1 && !"".equals(obj1.toString())) { | |
| 955 | - riskDetails.setTitle(map1.get("name").toString()); | |
| 956 | - riskDetails.setPublishName("system-worker"); | |
| 957 | - riskDetails.setPublishId(0); | |
| 958 | - riskDetails.setYn(YnEnums.YES.getId()); | |
| 959 | - riskDetails.setCreated(new Date()); | |
| 960 | - riskDetails.setModified(new Date()); | |
| 961 | - riskDetails.setPatientId(patientId); | |
| 962 | - if (StringUtils.isNotEmpty(riskDetails.getTitle())) { | |
| 963 | - riskDetailsService.addRiskDetails(riskDetails); | |
| 982 | + Object obj1 = map1.get("name"); | |
| 983 | + if (null != obj1 && !"".equals(obj1.toString())) { | |
| 984 | + riskDetails.setTitle(map1.get("name").toString()); | |
| 985 | + riskDetails.setPublishName("system-worker"); | |
| 986 | + riskDetails.setPublishId(0); | |
| 987 | + riskDetails.setYn(YnEnums.YES.getId()); | |
| 988 | + riskDetails.setCreated(new Date()); | |
| 989 | + riskDetails.setModified(new Date()); | |
| 990 | + riskDetails.setPatientId(patientId); | |
| 991 | + if (StringUtils.isNotEmpty(riskDetails.getTitle())) { | |
| 992 | + riskDetailsService.addRiskDetails(riskDetails); | |
| 993 | + } | |
| 994 | + } | |
| 964 | 995 | } |
| 965 | 996 | } |
| 966 | 997 | } |
| ... | ... | @@ -1084,7 +1115,12 @@ |
| 1084 | 1115 | System.out.print(crisis); |
| 1085 | 1116 | } |
| 1086 | 1117 | |
| 1087 | - | |
| 1118 | + /** | |
| 1119 | + * 处理初诊高危 | |
| 1120 | + * | |
| 1121 | + * @param antExChuModel | |
| 1122 | + * @param patientId | |
| 1123 | + */ | |
| 1088 | 1124 | private void handlRiskChu(AntExChuModel antExChuModel, Integer patientId) { |
| 1089 | 1125 | logger.info("handlRiskChu antexc" + antExChuModel.getId() + ". "); |
| 1090 | 1126 | if (null == patientId) { |
| 1091 | 1127 | |
| 1092 | 1128 | |
| ... | ... | @@ -1093,19 +1129,27 @@ |
| 1093 | 1129 | List list2 = null; |
| 1094 | 1130 | boolean isdel = false; |
| 1095 | 1131 | try { |
| 1096 | - if (null != antExChuModel && !"{}".equals(antExChuModel.getOtherHighRisk())) { | |
| 1097 | - Map map = JsonUtil.str2Obj(antExChuModel.getOtherHighRisk(), Map.class); | |
| 1098 | - Object obj1 = map.get("fxysu"); | |
| 1099 | - if (null != obj1 && !"".equals(obj1.toString())) { | |
| 1100 | - risksService.deleteRisk(patientId); | |
| 1101 | - riskDetailsService.deleteRiskDetails(patientId); | |
| 1102 | - isdel = true; | |
| 1132 | + if (null != antExChuModel && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) { | |
| 1133 | + String otherHighRisk = antExChuModel.getOtherHighRisk(); | |
| 1134 | + List<Map> otherHighRisks = new ArrayList<>(); | |
| 1135 | + if (otherHighRisk.startsWith("[") && otherHighRisk.endsWith("]")) { | |
| 1136 | + list2 = JsonUtil.toList(otherHighRisk, Map.class); | |
| 1137 | + otherHighRisks.addAll(list2); | |
| 1138 | + } else { | |
| 1139 | + Map otherMap = JsonUtil.jkstr2Obj(otherHighRisk, Map.class); | |
| 1140 | + otherHighRisks.add(otherMap); | |
| 1103 | 1141 | } |
| 1104 | - } | |
| 1105 | - } catch (Exception e) { | |
| 1106 | - } | |
| 1107 | - try { | |
| 1108 | 1142 | |
| 1143 | + if (CollectionUtils.isNotEmpty(otherHighRisks)) { | |
| 1144 | + Map map = otherHighRisks.get(0); | |
| 1145 | + Object obj1 = map.get("fxysu"); | |
| 1146 | + if (null != obj1 && !"".equals(obj1.toString())) { | |
| 1147 | + risksService.deleteRisk(patientId); | |
| 1148 | + riskDetailsService.deleteRiskDetails(patientId); | |
| 1149 | + isdel = true; | |
| 1150 | + } | |
| 1151 | + } | |
| 1152 | + } | |
| 1109 | 1153 | list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); |
| 1110 | 1154 | if (null != list2 && CollectionUtils.isNotEmpty(list2) && !isdel) { |
| 1111 | 1155 | risksService.deleteRisk(patientId); |
| 1112 | 1156 | |
| 1113 | 1157 | |
| 1114 | 1158 | |
| 1115 | 1159 | |
| ... | ... | @@ -1124,56 +1168,67 @@ |
| 1124 | 1168 | try { |
| 1125 | 1169 | highScoreResult = queryRisk(list2, patientId); |
| 1126 | 1170 | } catch (Exception e) { |
| 1127 | - ERROR_LOGGER.error("convert high risk error."+list2, e); | |
| 1171 | + ERROR_LOGGER.error("convert high risk error." + list2, e); | |
| 1128 | 1172 | } |
| 1129 | - | |
| 1130 | - if (null != antExChuModel && !"{}".equals(antExChuModel.getOtherHighRisk())) { | |
| 1131 | - Map map = JsonUtil.str2Obj(antExChuModel.getOtherHighRisk(), Map.class); | |
| 1132 | - //风险因素 | |
| 1133 | - Map map1 = new HashMap(); | |
| 1134 | - map1.put("id", ""); | |
| 1135 | - Object obj = map.get("fxysu"); | |
| 1136 | - if (null != obj && !"null".equals(obj.toString()) && !"".equals(obj.toString())) { | |
| 1137 | - map1.put("name", map.get("fxysu")); | |
| 1138 | - highScoreResult.getHighRisk().add(map1); | |
| 1173 | + if (null != antExChuModel && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) { | |
| 1174 | + String otherHighRisk = antExChuModel.getOtherHighRisk(); | |
| 1175 | + List<Map> otherHighRisks = new ArrayList<>(); | |
| 1176 | + if (otherHighRisk.startsWith("[") && otherHighRisk.endsWith("]")) { | |
| 1177 | + list2 = JsonUtil.toList(otherHighRisk, Map.class); | |
| 1178 | + otherHighRisks.addAll(list2); | |
| 1179 | + } else { | |
| 1180 | + Map otherMap = JsonUtil.jkstr2Obj(otherHighRisk, Map.class); | |
| 1181 | + otherHighRisks.add(otherMap); | |
| 1139 | 1182 | } |
| 1140 | - RiskDetails riskDetails = new RiskDetails(); | |
| 1141 | - //风险评分 | |
| 1142 | - Object idObj = map.get("fxpf"); | |
| 1143 | - if (null != idObj && !"null".equals(idObj.toString()) && !"".equals(idObj.toString())) { | |
| 1144 | - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj.toString()); | |
| 1145 | - riskDetails.setScore(NumberUtils.toInt(basicConfig.getName())); | |
| 1146 | - highScoreResult.setScore(highScoreResult.getScore() + NumberUtils.toInt(basicConfig.getName(), 0)); | |
| 1147 | - } | |
| 1148 | - Object idObj1 = map.get("fyyse"); | |
| 1149 | - if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) { | |
| 1150 | - String basicConfig = highLevel.get(idObj1.toString()); | |
| 1151 | - if (null != basicConfig) { | |
| 1152 | - Map<String, Object> map2 = new HashMap<>(); | |
| 1153 | - map2.put("id", idObj1.toString()); | |
| 1154 | - String name = basicConfig; | |
| 1155 | - if (name.indexOf("预警") > -1) { | |
| 1156 | - name = name.replace("预警", ""); | |
| 1183 | + | |
| 1184 | + for (Map map : otherHighRisks) { | |
| 1185 | + if (map != null) {//风险因素 | |
| 1186 | + Map map1 = new HashMap(); | |
| 1187 | + map1.put("id", ""); | |
| 1188 | + Object obj = map.get("fxysu"); | |
| 1189 | + if (null != obj && !"null".equals(obj.toString()) && !"".equals(obj.toString())) { | |
| 1190 | + map1.put("name", map.get("fxysu")); | |
| 1191 | + highScoreResult.getHighRisk().add(map1); | |
| 1157 | 1192 | } |
| 1158 | - map2.put("name", name); | |
| 1159 | - RiskColorEnum riskColorEnum = SyncDataWork.map.get(name); | |
| 1160 | - riskDetails.setCrisis(riskColorEnum == null ? null : riskColorEnum.getId()); | |
| 1161 | - map2.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); | |
| 1162 | - highScoreResult.getLevel().add(map2); | |
| 1193 | + RiskDetails riskDetails = new RiskDetails(); | |
| 1194 | + //风险评分 | |
| 1195 | + Object idObj = map.get("fxpf"); | |
| 1196 | + if (null != idObj && !"null".equals(idObj.toString()) && !"".equals(idObj.toString())) { | |
| 1197 | + // BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj.toString()); | |
| 1198 | + riskDetails.setScore(NumberUtils.toInt(scoreMap.get(idObj.toString()))); | |
| 1199 | + highScoreResult.setScore(highScoreResult.getScore() + NumberUtils.toInt(scoreMap.get(idObj.toString()))); | |
| 1200 | + } | |
| 1201 | + Object idObj1 = map.get("fyyse"); | |
| 1202 | + if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) { | |
| 1203 | + String basicConfig = highLevel.get(idObj1.toString()); | |
| 1204 | + if (null != basicConfig) { | |
| 1205 | + Map<String, Object> map2 = new HashMap<>(); | |
| 1206 | + map2.put("id", idObj1.toString()); | |
| 1207 | + String name = basicConfig; | |
| 1208 | + if (name.indexOf("预警") > -1) { | |
| 1209 | + name = name.replace("预警", ""); | |
| 1210 | + } | |
| 1211 | + map2.put("name", name); | |
| 1212 | + RiskColorEnum riskColorEnum = SyncDataWork.map.get(name); | |
| 1213 | + riskDetails.setCrisis(riskColorEnum == null ? null : riskColorEnum.getId()); | |
| 1214 | + map2.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); | |
| 1215 | + highScoreResult.getLevel().add(map2); | |
| 1216 | + } | |
| 1217 | + } | |
| 1218 | + | |
| 1219 | + Object obj1 = map1.get("name"); | |
| 1220 | + if (null != obj1 && !"".equals(obj1.toString())) { | |
| 1221 | + riskDetails.setTitle(obj1.toString()); | |
| 1222 | + riskDetails.setPublishName("system-worker"); | |
| 1223 | + riskDetails.setPublishId(0); | |
| 1224 | + riskDetails.setYn(YnEnums.YES.getId()); | |
| 1225 | + riskDetails.setCreated(new Date()); | |
| 1226 | + riskDetails.setModified(new Date()); | |
| 1227 | + riskDetails.setPatientId(patientId); | |
| 1228 | + riskDetailsService.addRiskDetails(riskDetails); | |
| 1229 | + } | |
| 1163 | 1230 | } |
| 1164 | 1231 | } |
| 1165 | - | |
| 1166 | - Object obj1 = map1.get("name"); | |
| 1167 | - if (null != obj1 && !"".equals(obj1.toString())) { | |
| 1168 | - riskDetails.setTitle(obj1.toString()); | |
| 1169 | - riskDetails.setPublishName("system-worker"); | |
| 1170 | - riskDetails.setPublishId(0); | |
| 1171 | - riskDetails.setYn(YnEnums.YES.getId()); | |
| 1172 | - riskDetails.setCreated(new Date()); | |
| 1173 | - riskDetails.setModified(new Date()); | |
| 1174 | - riskDetails.setPatientId(patientId); | |
| 1175 | - riskDetailsService.addRiskDetails(riskDetails); | |
| 1176 | - } | |
| 1177 | 1232 | } |
| 1178 | 1233 | String srt = highScoreResult.gethighRiskStr(); |
| 1179 | 1234 | risks.setTitle(srt); |
| 1180 | 1235 | |
| ... | ... | @@ -1207,10 +1262,10 @@ |
| 1207 | 1262 | List data = new ArrayList(); |
| 1208 | 1263 | List dat1a = new ArrayList(); |
| 1209 | 1264 | Integer score = null; |
| 1210 | - if (null!=id&&CollectionUtils.isNotEmpty(id)) { | |
| 1265 | + if (null != id && CollectionUtils.isNotEmpty(id)) { | |
| 1211 | 1266 | score = 0; |
| 1212 | 1267 | for (String i : id) { |
| 1213 | - if(StringUtils.isNotEmpty(i)){ | |
| 1268 | + if (StringUtils.isNotEmpty(i)) { | |
| 1214 | 1269 | basicConfigQuery.setId(i); |
| 1215 | 1270 | List<BasicConfig> basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery); |
| 1216 | 1271 | if (CollectionUtils.isNotEmpty(basicConfigs)) { |
| ... | ... | @@ -1238,7 +1293,7 @@ |
| 1238 | 1293 | Map<String, Object> map1 = new HashMap<>(); |
| 1239 | 1294 | map1.put("id", basicConfig.getParentId()); |
| 1240 | 1295 | String name = basicConfig1; |
| 1241 | - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(name)&&name.indexOf("预警") > -1) { | |
| 1296 | + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(name) && name.indexOf("预警") > -1) { | |
| 1242 | 1297 | name = name.replace("预警", ""); |
| 1243 | 1298 | } |
| 1244 | 1299 | map1.put("name", name); |
| ... | ... | @@ -1261,7 +1316,7 @@ |
| 1261 | 1316 | } |
| 1262 | 1317 | |
| 1263 | 1318 | private void bandingMember(com.lymsh.mommybaby.maindata.model.Patients patients) { |
| 1264 | - if(StringUtils.isBlank(patients.getPhone())){ | |
| 1319 | + if (StringUtils.isBlank(patients.getPhone())) { | |
| 1265 | 1320 | return; |
| 1266 | 1321 | } |
| 1267 | 1322 | MembersQuery membersQuery = new MembersQuery(); |
| ... | ... | @@ -1302,7 +1357,7 @@ |
| 1302 | 1357 | } |
| 1303 | 1358 | |
| 1304 | 1359 | |
| 1305 | - private void buildNotifyMessage(String phone,String name) { | |
| 1360 | + private void buildNotifyMessage(String phone, String name) { | |
| 1306 | 1361 | if (StringUtils.isEmpty(phone)) { |
| 1307 | 1362 | return; |
| 1308 | 1363 | } |
| ... | ... | @@ -1317,13 +1372,13 @@ |
| 1317 | 1372 | patientsQuery.setType(2); |
| 1318 | 1373 | patientsQuery.setYn(YnEnums.YES.getId()); |
| 1319 | 1374 | int count = patientsService.queryPatientsCount(patientsQuery); |
| 1320 | - if (CollectionUtils.isNotEmpty(members) && count == 0 &&StringUtils.isNotEmpty(members.get(0).getGzOpenId())) { | |
| 1321 | - String gzopendId= members.get(0).getGzOpenId(); | |
| 1322 | - Map params=new HashMap(); | |
| 1323 | - params.put("gzopenId",gzopendId); | |
| 1324 | - params.put("phone",phone); | |
| 1325 | - params.put("name",name); | |
| 1326 | - HttpClientUtil.doGet("https://weixin-push-save.healthbaby.com.cn/biz-push-web/direct/push",params,"UTF8","3d19960bf3e81e7d816c4f26051c49ba"); | |
| 1375 | + if (CollectionUtils.isNotEmpty(members) && count == 0 && StringUtils.isNotEmpty(members.get(0).getGzOpenId())) { | |
| 1376 | + String gzopendId = members.get(0).getGzOpenId(); | |
| 1377 | + Map params = new HashMap(); | |
| 1378 | + params.put("gzopenId", gzopendId); | |
| 1379 | + params.put("phone", phone); | |
| 1380 | + params.put("name", name); | |
| 1381 | + HttpClientUtil.doGet("https://weixin-push-save.healthbaby.com.cn/biz-push-web/direct/push", params, "UTF8", "3d19960bf3e81e7d816c4f26051c49ba"); | |
| 1327 | 1382 | } |
| 1328 | 1383 | } |
| 1329 | 1384 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HosptialHighRiskFacade.java
View file @
44b29a0
| ... | ... | @@ -169,6 +169,11 @@ |
| 169 | 169 | HosptialHighRisk hosptialHighRisk = hosptialHighRiskService.getOneHosptialHighRiskById(id); |
| 170 | 170 | if(hosptialHighRisk!=null&&!hosptialHighRisk.isUse()){ |
| 171 | 171 | hosptialHighRiskService.deleteHosptialHighRisk(id); |
| 172 | + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); | |
| 173 | + baseResponse.setErrormsg("删除失败"); | |
| 174 | + }else{ | |
| 175 | + baseResponse.setErrorcode(ErrorCodeConstants.DONT_DELETE); | |
| 176 | + baseResponse.setErrormsg("删除失败,该高危已经被使用过!"); | |
| 172 | 177 | } |
| 173 | 178 | } |
| 174 | 179 | return baseResponse; |