Merge remote-tracking branch 'origin/master'

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();

src/main/java/com/diagbot/model/ai/process/EntityProcessPacs.java

@@ -18,6 +18,23 @@ import java.util.stream.Collectors;
 public class EntityProcessPacs extends EntityProcess {
 
     public void extractEntity(JSONObject aiOut, PacsLabel pacsLabel) {
+        // 辅检项目
+        List<Lemma> pacsAll = createEntityTree(aiOut, EntityEnum.AUXILIARY_EXAMINATION.toString());
+        // 如果辅检项目为空，就不存在辅检提取的其他内容
+        if (ListUtil.isEmpty(pacsAll)) {
+            return ;
+        }
+        List<Item> collect = Lists.newArrayList();
+        if(ListUtil.isNotEmpty(pacsAll)) {
+            collect = pacsAll.stream().map(x -> {
+                Item item = new Item();
+                item.setName(x.getText());
+                item.setUniqueName(x.getText());
+                return item;
+            }).collect(Collectors.toList());
+        }
+        pacsLabel.setItem(collect);
+
         // 获取描述和部位、修饰的关系
         List<Pacs> pacsResults = new ArrayList<>(); // 辅检提取的描述信息
         List<Lemma> pacsLemmas = createEntityTree(aiOut, EntityEnum.AUXILIARY_DESCRIPT.toString());
@@ -48,18 +65,7 @@ public class EntityProcessPacs extends EntityProcess {
         }
         pacsLabel.setPacsResults(pacsResults);
 
-        // 辅检项目
-        List<Lemma> pacsAll = createEntityTree(aiOut, EntityEnum.AUXILIARY_EXAMINATION.toString());
-        List<Item> collect = Lists.newArrayList();
-        if(ListUtil.isNotEmpty(pacsAll)) {
-            collect = pacsAll.stream().map(x -> {
-                Item item = new Item();
-                item.setName(x.getText());
-                item.setUniqueName(x.getText());
-                return item;
-            }).collect(Collectors.toList());
-        }
-        pacsLabel.setItem(collect);
+
 
         // 辅检诊断
         List<Lemma> pacsDisease = createEntityTree(aiOut, EntityEnum.DIEASE.toString());

src/main/java/com/diagbot/web/CacheController.java

@@ -35,6 +35,7 @@ public class CacheController {
         cacheFacade.clear();
         cacheFacade.loadDrugTypeCache();
         cacheFacade.loadDiseaseTypeCache();
+        cacheFacade.getSymptomCache();
         return RespDTO.onSuc(true);
     }