jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2d3c8c2402e432ca2188249e67022f3a6c331111

Authored by yangfei
2 parents 085dbc759b 60a3a05298
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java View file @ 2d3c8c2
... ... @@ -1021,7 +1021,10 @@
1021 1021 }
1022 1022 List list2 = null;
1023 1023 boolean isdel = false;
  1024 +
  1025 + //删除历史高危
1024 1026 try {
  1027 + //处理自定义高危
1025 1028 if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk())
1026 1029 && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) {
1027 1030 String otherHighRisk = antExChuModel.getOtherHighRisk();
... ... @@ -1033,7 +1036,7 @@
1033 1036 Map otherMap = JsonUtil.jkstr2Obj(otherHighRisk, Map.class);
1034 1037 otherHighRisks.add(otherMap);
1035 1038 }
1036   -
  1039 + //如果有自定義高危因数则先删除以前的高危
1037 1040 if (CollectionUtils.isNotEmpty(otherHighRisks)) {
1038 1041 Map map = otherHighRisks.get(0);
1039 1042 Object obj1 = map.get("fxysu");
... ... @@ -1044,6 +1047,7 @@
1044 1047 }
1045 1048 }
1046 1049 }
  1050 + //国家高危
1047 1051 list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
1048 1052 if (null != list2 && CollectionUtils.isNotEmpty(list2) && !isdel) {
1049 1053 risksService.deleteRisk(patientId);
... ... @@ -1061,6 +1065,8 @@
1061 1065 risks.setPatientId(patientId);
1062 1066 HighScoreResult highScoreResult = new HighScoreResult();
1063 1067 try {
  1068 + System.out.println("国家高危："+list2+",size:"+list2.size());
  1069 + //添加高危信息到详情表
1064 1070 highScoreResult = queryRisk(list2, patientId);
1065 1071 } catch (Exception e) {
1066 1072 ERROR_LOGGER.error("convert high risk error." + list2, e);
1067 1073  
1068 1074  
1069 1075  
1070 1076  
... ... @@ -1170,64 +1176,68 @@
1170 1176 List data = new ArrayList();
1171 1177 List dat1a = new ArrayList();
1172 1178 Integer score = null;
1173   - if (null != id && CollectionUtils.isNotEmpty(id)) {
1174   - score = 0;
1175   - for (String i : id) {
1176   - if (StringUtils.isNotEmpty(i)) {
1177   - basicConfigQuery.setId(i);
1178   - List<BasicConfig> basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery);
1179   - if (CollectionUtils.isNotEmpty(basicConfigs)) {
1180   - Integer crisis = null;
1181   - for (BasicConfig basicConfig : basicConfigs) {
1182   - Map<String, Object> map = new HashMap<>();
1183   - map.put("id", basicConfig.getId());
1184   - map.put("name", basicConfig.getName());
1185   - map.put("code", basicConfig.getCode());
1186   - RiskDetails riskDetails = new RiskDetails();
1187   - if (StringUtils.isNotEmpty(basicConfig.getCode())) {
1188   - score += NumberUtils.toInt(basicConfig.getCode(), 0);
1189   - riskDetails.setScore(NumberUtils.toInt(basicConfig.getCode()));
1190   - }
1191   - riskDetails.setCreated(new Date());
1192   - riskDetails.setYn(YnEnums.YES.getId());
1193   - riskDetails.setModified(new Date());
1194   - riskDetails.setPatientId(parentId);
1195   - riskDetails.setTitle(basicConfig.getName());
1196   -
1197   - riskDetails.setPublishId(0);
1198   - riskDetails.setPublishName("system-worker");
1199   - String basicConfig1 = highLevel.get(basicConfig.getParentId());
1200   - if (null != basicConfig1) {
1201   - Map<String, Object> map1 = new HashMap<>();
1202   - map1.put("id", basicConfig.getParentId());
1203   - String name = basicConfig1;
1204   - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(name) && name.indexOf("预警") > -1) {
1205   - name = name.replace("预警", "");
  1179 + try {
  1180 + if (null != id && CollectionUtils.isNotEmpty(id)) {
  1181 + score = 0;
  1182 + for (String i : id) {
  1183 + if (StringUtils.isNotEmpty(i)) {
  1184 + basicConfigQuery.setId(i);
  1185 + List<BasicConfig> basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery);
  1186 + if (CollectionUtils.isNotEmpty(basicConfigs)) {
  1187 + Integer crisis = null;
  1188 + for (BasicConfig basicConfig : basicConfigs) {
  1189 + Map<String, Object> map = new HashMap<>();
  1190 + map.put("id", basicConfig.getId());
  1191 + map.put("name", basicConfig.getName());
  1192 + map.put("code", basicConfig.getCode());
  1193 + RiskDetails riskDetails = new RiskDetails();
  1194 + if (StringUtils.isNotEmpty(basicConfig.getCode())) {
  1195 + score += NumberUtils.toInt(basicConfig.getCode(), 0);
  1196 + riskDetails.setScore(NumberUtils.toInt(basicConfig.getCode()));
1206 1197 }
1207   - if (name.indexOf("黄色") > -1) {
1208   - name = "黄色";
1209   - }else if (name.indexOf("橙色") > -1) {
1210   - name = "橙色";
1211   - }else if (name.indexOf("红色") > -1) {
1212   - name = "红色";
1213   - }else if (name.indexOf("紫色") > -1) {
1214   - name = "紫色";
1215   - }else if (name.indexOf("绿色") > -1) {
1216   - name = "绿色";
1217   - }
  1198 + riskDetails.setCreated(new Date());
  1199 + riskDetails.setYn(YnEnums.YES.getId());
  1200 + riskDetails.setModified(new Date());
  1201 + riskDetails.setPatientId(parentId);
  1202 + riskDetails.setTitle(basicConfig.getName());
1218 1203  
1219   - map1.put("name", name);
1220   - crisis = SyncDataWork.map.get(name) == null ? null : SyncDataWork.map.get(name).getId();
1221   - map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
1222   - dat1a.add(map1);
  1204 + riskDetails.setPublishId(0);
  1205 + riskDetails.setPublishName("system-worker");
  1206 + String basicConfig1 = highLevel.get(basicConfig.getParentId());
  1207 + if (null != basicConfig1) {
  1208 + Map<String, Object> map1 = new HashMap<>();
  1209 + map1.put("id", basicConfig.getParentId());
  1210 + String name = basicConfig1;
  1211 + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(name) && name.indexOf("预警") > -1) {
  1212 + name = name.replace("预警", "");
  1213 + }
  1214 + if (name.indexOf("黄色") > -1) {
  1215 + name = "黄色";
  1216 + } else if (name.indexOf("橙色") > -1) {
  1217 + name = "橙色";
  1218 + } else if (name.indexOf("红色") > -1) {
  1219 + name = "红色";
  1220 + } else if (name.indexOf("紫色") > -1) {
  1221 + name = "紫色";
  1222 + } else if (name.indexOf("绿色") > -1) {
  1223 + name = "绿色";
  1224 + }
  1225 +
  1226 + map1.put("name", name);
  1227 + map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
  1228 + dat1a.add(map1);
  1229 + crisis = SyncDataWork.map.get(name) == null ? null : SyncDataWork.map.get(name).getId();
  1230 + riskDetails.setCrisis(crisis);
  1231 + }
  1232 + riskDetailsService.addOneRiskDetails(riskDetails);
  1233 + data.add(map);
1223 1234 }
1224   - riskDetails.setCrisis(crisis);
1225   - riskDetailsService.addOneRiskDetails(riskDetails);
1226   - data.add(map);
1227 1235 }
1228 1236 }
1229 1237 }
1230 1238 }
  1239 + }catch (Exception e){
  1240 + e.printStackTrace();
1231 1241 }
1232 1242 highScoreResult.setHighRisk(data);
1233 1243 highScoreResult.setScore(score);
platform-job-index/src/main/resources/spring/applicationContext-quartz.xml View file @ 2d3c8c2
... ... @@ -22,7 +22,7 @@
22 22 <!-- 配置一个触发器 -->
23 23 <bean id="startWorkTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
24 24 <property name="jobDetail" ref="startWorkTask"></property>
25   - <property name="cronExpression" value="0 0/4 * * * ?"></property>
  25 + <property name="cronExpression" value="0 0 1 * * ?"></property>
26 26 </bean>
27 27  
28 28 <!-- 总调度,用于启动定时器 -->