Merge remote-tracking branch 'origin/master' into innerDevelop

src/main/java/com/diagbot/facade/TestFacade.java

@@ -856,15 +856,27 @@ public class TestFacade {
                                 indicationPushVOList.add(indphysiquePushVO);
                             }
                         } else {
-                            // 其他数值类型
-                            sbVital.append(vitalArr[0]);
-                            sbVital.append(getValue(vitalArr));
-                            sbVital.append(vitalArr[3]);
-                            indphysiquePushVO.setIdNum(bean.getIdNum());
-                            indphysiquePushVO.setRuleType("3");
-                            indphysiquePushVO.setMsg("体格：" + sbVital + "==" + operationNameMsg);
-                            indphysiquePushVO.setVital(sbVital.toString());
-                            indicationPushVOList.add(indphysiquePushVO);
+                            //TODO 血氧饱和度 待删除
+                            if ("血氧饱和度".equals(vitalArr[0].trim())) {
+                                sbVital.append(vitalArr[0]);
+                                sbVital.append(getValue(vitalArr));
+                                sbVital.append(vitalArr[3]);
+                                indphysiquePushVO.setIdNum(bean.getIdNum());
+                                indphysiquePushVO.setRuleType("3");
+                                indphysiquePushVO.setMsg("体格：" + sbVital + "==" + operationNameMsg);
+                                indphysiquePushVO.setVital("，"+sbVital.toString());
+                                indicationPushVOList.add(indphysiquePushVO);
+
+                            } else {// 其他数值类型
+                                sbVital.append(vitalArr[0]);
+                                sbVital.append(getValue(vitalArr));
+                                sbVital.append(vitalArr[3]);
+                                indphysiquePushVO.setIdNum(bean.getIdNum());
+                                indphysiquePushVO.setRuleType("3");
+                                indphysiquePushVO.setMsg("体格：" + sbVital + "==" + operationNameMsg);
+                                indphysiquePushVO.setVital(sbVital.toString());
+                                indicationPushVOList.add(indphysiquePushVO);
+                            }
                         }
                     } else {
                         sbVital.append(vitalArr[0]);

src/main/java/com/diagbot/model/ai/BeHospitalizedAI.java

@@ -318,7 +318,7 @@ public class BeHospitalizedAI extends ModelAI {
             pacsLabel = new PacsLabel();
             chiefLabel.setPacsLabel(pacsLabel);
         }
-        entityProcessPacs.extractEntity(aiOut, pacsLabel);
+        entityProcessPacs.extractEntity(aiOut, pacsLabel,false);
         wordCrfDTO.setChiefLabel(chiefLabel);
     }
 
@@ -346,7 +346,7 @@ public class BeHospitalizedAI extends ModelAI {
             pacsLabel = new PacsLabel();
             presentLabel.setPacsLabel(pacsLabel);
         }
-        entityProcessPacs.extractEntity(aiOut, pacsLabel);
+        entityProcessPacs.extractEntity(aiOut, pacsLabel,false);
         //服用药品
         List<Medicine> medicines = takeMedicine(presentLabel);
         presentLabel.setTakeMedicine(medicines);
@@ -709,7 +709,7 @@ public class BeHospitalizedAI extends ModelAI {
             return;
         }
         EntityProcessPacs entityProcessPacs = new EntityProcessPacs();
-        entityProcessPacs.extractEntity(aiOut, pacsLabel);
+        entityProcessPacs.extractEntity(aiOut, pacsLabel,true);
         //        EntityProcessPacsNew entityProcessPacsNew = new EntityProcessPacsNew();
         // Map<String, PacsNew> map = entityProcessPacsNew.extractEntity(aiOut);
         //

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

@@ -17,7 +17,28 @@ import java.util.stream.Collectors;
 
 public class EntityProcessPacs extends EntityProcess {
 
-    public void extractEntity(JSONObject aiOut, PacsLabel pacsLabel) {
+    public void extractEntity(JSONObject aiOut, PacsLabel pacsLabel, boolean flagPacs) {
+
+        // 辅检项目
+        List<Lemma> pacsAll = createEntityTree(aiOut, EntityEnum.AUXILIARY_EXAMINATION.toString());
+        // 如果辅检项目为空，就不存在辅检提取的其他内容
+        if(!flagPacs){
+            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 +69,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);
     }