浏览代码

主诉、现病史中的诊断判断空指针

kongwz 4 年之前
父节点
当前提交
f4d981c7f7
共有 1 个文件被更改,包括 7 次插入3 次删除
  1. 7 3
      src/main/java/com/diagbot/facade/CommonFacade.java

+ 7 - 3
src/main/java/com/diagbot/facade/CommonFacade.java

@@ -329,7 +329,9 @@ public class CommonFacade {
                 }
             }
             if (ListUtil.isNotEmpty(chiefLabel.getDiags())) {
-                List<Diag> chief_diags = chiefLabel.getDiags().stream().map(x ->
+                List<Diag> chief_diags = chiefLabel.getDiags().stream()
+                        .filter(x -> x.getNegative() == null && StringUtils.isNotBlank(x.getStandName()))
+                        .map(x ->
                 {
                     Diag diag = new Diag();
                     diag.setName(x.getStandName());
@@ -345,7 +347,8 @@ public class CommonFacade {
         if (presentLabel != null) {
             PresentPushVo presentPushVo = new PresentPushVo();
             if (ListUtil.isNotEmpty(presentLabel.getClinicals())) {
-                List<Symptom> presentClinicals = presentLabel.getClinicals().stream().filter(x -> x.getNegative() == null).map(z ->
+                List<Symptom> presentClinicals = presentLabel.getClinicals().stream()
+                        .filter(x -> x.getNegative() == null).map(z ->
                 {
                     Symptom symptom = new Symptom();
                     symptom.setName(z.getStandName());
@@ -354,7 +357,8 @@ public class CommonFacade {
                 presentPushVo.setSymptoms(presentClinicals);
             }
             if (ListUtil.isNotEmpty(presentLabel.getDiags())) {
-                List<Diag> presentdiags = presentLabel.getDiags().stream().filter(x -> x.getNegative() == null).map
+                List<Diag> presentdiags = presentLabel.getDiags().stream()
+                        .filter(x -> x.getNegative() == null && StringUtils.isNotBlank(x.getStandName())).map
                         (x -> x.getStandName()).distinct().map(z ->
                 {
                     Diag diag = new Diag();