jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 471ed1220679a38131073fc0a233c709ab035273

Authored by yangfei
1 parent 685a7e5655
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

孕产妇管理根据疾病查询

Showing 1 changed file with 10 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 471ed12
... ... @@ -475,20 +475,22 @@
475 475 List<MongoCondition> mongoCondits = new ArrayList<>();
476 476 //乙肝查询
477 477 if (StringUtils.contains(riskPatientsQueryRequest.getDiseaseType(), DiseaseTypeEnums.YIGAN.getId())) {
478   - mongoCondits.add(new MongoCondition("ygbmky", true, MongoOper.EXISTS));
479   - mongoCondits.add(new MongoCondition("ygbmkt", true, MongoOper.EXISTS));
480   - mongoCondits.add(new MongoCondition("ygeky", true, MongoOper.EXISTS));
481   - mongoCondits.add(new MongoCondition("ygekt", true, MongoOper.EXISTS));
482   - mongoCondits.add(new MongoCondition("yghxkt", true, MongoOper.EXISTS));
  478 + mongoCondits.add(new MongoCondition("ygbmky", true, MongoOper.EXISTS).orCondition(new MongoCondition("ygbmky", "", MongoOper.NE)));
  479 + mongoCondits.add(new MongoCondition("ygbmkt", true, MongoOper.EXISTS).orCondition(new MongoCondition("ygbmkt", "", MongoOper.NE)));
  480 + mongoCondits.add(new MongoCondition("ygeky", true, MongoOper.EXISTS).orCondition(new MongoCondition("ygeky", "", MongoOper.NE)));
  481 + mongoCondits.add(new MongoCondition("ygekt", true, MongoOper.EXISTS).orCondition(new MongoCondition("ygekt", "", MongoOper.NE)));
  482 + mongoCondits.add(new MongoCondition("yghxkt", true, MongoOper.EXISTS).orCondition(new MongoCondition("yghxkt", "", MongoOper.NE)));
  483 +
483 484 }
484 485 //丙肝查询
485 486 if (StringUtils.contains(riskPatientsQueryRequest.getDiseaseType(), DiseaseTypeEnums.BINGGAN.getId())) {
486   - mongoCondits.add(new MongoCondition("bg", true, MongoOper.EXISTS));
  487 + mongoCondits.add(new MongoCondition("bg", true, MongoOper.EXISTS).orCondition(new MongoCondition("bg","",MongoOper.NE)));
487 488 }
488 489 //梅毒查询
489 490 if (StringUtils.contains(riskPatientsQueryRequest.getDiseaseType(), DiseaseTypeEnums.MEIDU.getId())) {
490   - mongoCondits.add(new MongoCondition("syjg", true, MongoOper.EXISTS));
491   - mongoCondits.add(new MongoCondition("hivkt", true, MongoOper.EXISTS));
  491 + mongoCondits.add(new MongoCondition("syjg", true, MongoOper.EXISTS).orCondition(new MongoCondition("syjg", "", MongoOper.NE)));
  492 + mongoCondits.add(new MongoCondition("hivkt", true, MongoOper.EXISTS).orCondition(new MongoCondition("hivkt", "", MongoOper.NE)));
  493 +
492 494 }
493 495 criteria = criteria.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()]));
494 496