jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 6fe06add8c59ef28082f482a1f483108d739b71b

Authored by zhangchao
1 parent cbfde61ef9
Exists in dev

#fix:优化高血压专病，新增多种高危类型

Showing 2 changed files with 44 additions and 17 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 6fe06ad
... ... @@ -1369,30 +1369,46 @@
1369 1369 //查询符合条件的孕妇
1370 1370 StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital);
1371 1371 stopWatch.start();
1372   -
  1372 + String twinsType= riskPatientsQueryRequest.getTwinsType();
1373 1373 Query yn = null;
1374   - if ("1".equals(riskPatientsQueryRequest.getTwinsType())) {
  1374 + if ("1".equals(twinsType)) {
1375 1375 Criteria criteria1 = Criteria.where("name").is("妊娠期高血压疾病（除外红、橙色）");
1376 1376 yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1));
1377   - } else if ("2".equals(riskPatientsQueryRequest.getTwinsType())) {
  1377 + } else if ("2".equals(twinsType)) {
1378 1378 Criteria criteria2 = Criteria.where("name").is("妊娠期高血压");
1379 1379 yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria2));
1380   - } else if ("3".equals(riskPatientsQueryRequest.getTwinsType())) {
  1380 + } else if ("3".equals(twinsType)) {
1381 1381 Criteria criteria3 = Criteria.where("name").is("子痫前期（轻）");
1382 1382 yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria3));
1383   - } else if ("4".equals(riskPatientsQueryRequest.getTwinsType())) {
  1383 + } else if ("4".equals(twinsType)) {
1384 1384 Criteria criteria4 = Criteria.where("name").is("慢性高血压合并妊娠");
1385 1385 yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria4));
1386   - } else if ("5".equals(riskPatientsQueryRequest.getTwinsType())) {
  1386 + } else if ("5".equals(twinsType)) {
1387 1387 Criteria criteria5 = Criteria.where("name").is("妊娠期高血压性心脏病");
1388 1388 yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria5));
1389   - } else if ("6".equals(riskPatientsQueryRequest.getTwinsType())) {
  1389 + } else if ("6".equals(twinsType)) {
1390 1390 Criteria criteria6 = Criteria.where("name").is("急性肾脏疾病伴高血压");
1391 1391 yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria6));
1392   - } else if ("7".equals(riskPatientsQueryRequest.getTwinsType())) {
  1392 + } else if ("7".equals(twinsType)) {
1393 1393 Criteria criteria7 = Criteria.where("name").is("慢性肾脏疾病伴高血压");
1394 1394 yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria7));
1395   - } else {
  1395 + } else if ("8".equals(twinsType)){
  1396 + Criteria criteria8 = Criteria.where("name").is("妊娠期高血压疾病病史");
  1397 + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria8));
  1398 +
  1399 + }else if ("9".equals(twinsType)){
  1400 + Criteria criteria9 = Criteria.where("name").is("重度子痫前期");
  1401 + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria9));
  1402 + }else if ("10".equals(twinsType)){
  1403 + Criteria criteria10 = Criteria.where("name").is("慢性高血压合并子痫前期");
  1404 + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria10));
  1405 + }/*else if ("11".equals(twinsType)){
  1406 + Criteria criteria11 = Criteria.where("name").is("高血压（需要药物治疗）");
  1407 + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria11));
  1408 + }*/else if ("11".equals(twinsType)){
  1409 + Criteria criteria11 = Criteria.where("name").is("泌尿系统疾病：急、慢性肾脏疾病伴高血压、肾功能不全（肌酐超过正常值上限的1.5倍）");
  1410 + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria11));
  1411 + }else {
1396 1412 Criteria criteria1 = Criteria.where("name").is("妊娠期高血压疾病（除外红、橙色）");
1397 1413 Criteria criteria2 = Criteria.where("name").is("妊娠期高血压");
1398 1414 Criteria criteria3 = Criteria.where("name").is("子痫前期（轻）");
... ... @@ -1400,7 +1416,12 @@
1400 1416 Criteria criteria5 = Criteria.where("name").is("妊娠期高血压性心脏病");
1401 1417 Criteria criteria6 = Criteria.where("name").is("急性肾脏疾病伴高血压");
1402 1418 Criteria criteria7 = Criteria.where("name").is("慢性肾脏疾病伴高血压");
1403   - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4, criteria5, criteria6, criteria7));
  1419 + Criteria criteria8 = Criteria.where("name").is("妊娠期高血压疾病病史");
  1420 + Criteria criteria9 = Criteria.where("name").is("重度子痫前期");
  1421 + Criteria criteria10 = Criteria.where("name").is("慢性高血压合并子痫前期");
  1422 + // Criteria criteria11 = Criteria.where("name").is("高血压（需要药物治疗）");
  1423 + Criteria criteria12 = Criteria.where("name").is("泌尿系统疾病：急、慢性肾脏疾病伴高血压、肾功能不全（肌酐超过正常值上限的1.5倍）");
  1424 + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4, criteria5, criteria6, criteria7,criteria8,criteria9,criteria10,criteria12));
1404 1425 }
1405 1426 List <BasicConfig> models = mongoTemplate.find(yn, BasicConfig.class);
1406 1427 List <String> rFactorList = new ArrayList <>();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BloodPressurePatientWorker.java View file @ 6fe06ad
... ... @@ -265,13 +265,19 @@
265 265 if (StringUtils.isNotEmpty(srt)) {
266 266 BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(srt);
267 267 if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) {
268   - if("妊娠期高血压疾病（除外红、橙色）".equals(basicConfig.getName())
269   - ||"妊娠期高血压".equals(basicConfig.getName())
270   - ||"子痫前期（轻）".equals(basicConfig.getName())
271   - ||"慢性高血压合并妊娠".equals(basicConfig.getName())
272   - ||"妊娠期高血压性心脏病".equals(basicConfig.getName())
273   - ||"急性肾脏疾病伴高血压".equals(basicConfig.getName())
274   - ||"慢性肾脏疾病伴高血压".equals(basicConfig.getName())
  268 + String name= basicConfig.getName();
  269 + if("妊娠期高血压疾病（除外红、橙色）".equals(name)
  270 + ||"妊娠期高血压".equals(name)
  271 + ||"子痫前期（轻）".equals(name)
  272 + ||"慢性高血压合并妊娠".equals(name)
  273 + ||"妊娠期高血压性心脏病".equals(name)
  274 + ||"急性肾脏疾病伴高血压".equals(name)
  275 + ||"慢性肾脏疾病伴高血压".equals(name)
  276 + ||"妊娠期高血压疾病病史".equals(name)
  277 + ||"重度子痫前期".equals(name)
  278 + ||"慢性高血压合并子痫前期".equals(name)
  279 + //||"高血压（需要药物治疗）".equals(name)
  280 + ||"泌尿系统疾病：急、慢性肾脏疾病伴高血压、肾功能不全（肌酐超过正常值上限的1.5倍）".equals(name)
275 281 ){
276 282 sb.append(basicConfig.getName()).append(',');
277 283 }