jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 38ad21cd7548262f139ceeaa9ead1051bfdb74b0

Authored by zhangchao
1 parent b1a3258958
Exists in dev

#fix:优化大同高危颜色查询逻辑

Showing 1 changed file with 52 additions and 2 deletions

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 38ad21c
... ... @@ -1173,7 +1173,15 @@
1173 1173 }
1174 1174 }else if (levelList.size()==4){
1175 1175 riskLevelIds.add(levelList.get(0));
  1176 + riskLevelIds.add(levelList.get(1));
  1177 + riskLevelIds.add(levelList.get(3));
1176 1178 riskLevelIds.add(levelList.get(2));
  1179 + MongoCondition condition18 = new MongoCondition("riskLevelId",JsonUtil.array2JsonString(riskLevelIds), MongoOper.IS);
  1180 + riskLevelIds.clear();
  1181 +
  1182 +
  1183 + riskLevelIds.add(levelList.get(0));
  1184 + riskLevelIds.add(levelList.get(2));
1177 1185 riskLevelIds.add(levelList.get(1));
1178 1186 riskLevelIds.add(levelList.get(3));
1179 1187 MongoCondition condition2 = new MongoCondition("riskLevelId",JsonUtil.array2JsonString(riskLevelIds), MongoOper.IS);
1180 1188  
1181 1189  
1182 1190  
... ... @@ -1185,9 +1193,24 @@
1185 1193 MongoCondition condition3 = new MongoCondition("riskLevelId",JsonUtil.array2JsonString(riskLevelIds), MongoOper.IS);
1186 1194  
1187 1195 riskLevelIds.clear();
  1196 + riskLevelIds.add(levelList.get(0));
  1197 + riskLevelIds.add(levelList.get(3));
1188 1198 riskLevelIds.add(levelList.get(1));
  1199 + riskLevelIds.add(levelList.get(2));
  1200 + MongoCondition condition12 = new MongoCondition("riskLevelId",JsonUtil.array2JsonString(riskLevelIds), MongoOper.IS);
  1201 +
  1202 + riskLevelIds.clear();
1189 1203 riskLevelIds.add(levelList.get(0));
  1204 + riskLevelIds.add(levelList.get(3));
1190 1205 riskLevelIds.add(levelList.get(2));
  1206 + riskLevelIds.add(levelList.get(1));
  1207 + MongoCondition condition13 = new MongoCondition("riskLevelId",JsonUtil.array2JsonString(riskLevelIds), MongoOper.IS);
  1208 +
  1209 +
  1210 + riskLevelIds.clear();
  1211 + riskLevelIds.add(levelList.get(1));
  1212 + riskLevelIds.add(levelList.get(0));
  1213 + riskLevelIds.add(levelList.get(2));
1191 1214 riskLevelIds.add(levelList.get(3));
1192 1215 MongoCondition condition4 = new MongoCondition("riskLevelId",JsonUtil.array2JsonString(riskLevelIds), MongoOper.IS);
1193 1216  
1194 1217  
1195 1218  
1196 1219  
1197 1220  
... ... @@ -1215,10 +1238,37 @@
1215 1238 MongoCondition condition7 = new MongoCondition("riskLevelId",JsonUtil.array2JsonString(riskLevelIds), MongoOper.IS);
1216 1239 riskLevelIds.clear();
1217 1240  
  1241 + riskLevelIds.add(levelList.get(1));
  1242 + riskLevelIds.add(levelList.get(3));
  1243 + riskLevelIds.add(levelList.get(0));
1218 1244 riskLevelIds.add(levelList.get(2));
  1245 + MongoCondition condition14 = new MongoCondition("riskLevelId",JsonUtil.array2JsonString(riskLevelIds), MongoOper.IS);
  1246 + riskLevelIds.clear();
1219 1247 riskLevelIds.add(levelList.get(1));
  1248 + riskLevelIds.add(levelList.get(3));
  1249 + riskLevelIds.add(levelList.get(2));
1220 1250 riskLevelIds.add(levelList.get(0));
  1251 + MongoCondition condition15 = new MongoCondition("riskLevelId",JsonUtil.array2JsonString(riskLevelIds), MongoOper.IS);
  1252 + riskLevelIds.clear();
  1253 +
  1254 + riskLevelIds.add(levelList.get(2));
  1255 + riskLevelIds.add(levelList.get(0));
  1256 + riskLevelIds.add(levelList.get(1));
1221 1257 riskLevelIds.add(levelList.get(3));
  1258 + MongoCondition condition16 = new MongoCondition("riskLevelId",JsonUtil.array2JsonString(riskLevelIds), MongoOper.IS);
  1259 + riskLevelIds.clear();
  1260 +
  1261 + riskLevelIds.add(levelList.get(2));
  1262 + riskLevelIds.add(levelList.get(0));
  1263 + riskLevelIds.add(levelList.get(3));
  1264 + riskLevelIds.add(levelList.get(1));
  1265 + MongoCondition condition17 = new MongoCondition("riskLevelId",JsonUtil.array2JsonString(riskLevelIds), MongoOper.IS);
  1266 + riskLevelIds.clear();
  1267 +
  1268 + riskLevelIds.add(levelList.get(2));
  1269 + riskLevelIds.add(levelList.get(1));
  1270 + riskLevelIds.add(levelList.get(0));
  1271 + riskLevelIds.add(levelList.get(3));
1222 1272 MongoCondition condition8 = new MongoCondition("riskLevelId",JsonUtil.array2JsonString(riskLevelIds), MongoOper.IS);
1223 1273 riskLevelIds.clear();
1224 1274  
1225 1275  
... ... @@ -1246,9 +1296,9 @@
1246 1296  
1247 1297 //condition=condition.orCondition(new MongoCondition[]{condition1, condition2,condition3,condition4,condition5,condition6,condition7,condition8,condition9,condition10,condition11});
1248 1298 if (c1 != null) {
1249   - c1 = c1.andOperator(c.orCondition(new MongoCondition[]{condition1, condition2,condition3,condition4,condition5,condition6,condition7,condition8,condition9,condition10,condition11}).getCriteria());
  1299 + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{condition1, condition2,condition3,condition4,condition5,condition6,condition7,condition8,condition9,condition10,condition11,condition12,condition13,condition14,condition15,condition16,condition17,condition18}).getCriteria());
1250 1300 } else {
1251   - c1 = c.orCondition(new MongoCondition[]{condition1, condition2,condition3,condition4,condition5,condition6,condition7,condition8,condition9,condition10,condition11}).getCriteria();
  1301 + c1 = c.orCondition(new MongoCondition[]{condition1, condition2,condition3,condition4,condition5,condition6,condition7,condition8,condition9,condition10,condition11,condition12,condition13,condition14,condition15,condition16,condition17,condition18}).getCriteria();
1252 1302 }
1253 1303 }
1254 1304