Merge remote-tracking branch 'origin/master'

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

@@ -1,5 +1,6 @@
 package com.diagbot.facade;
 
+import com.diagbot.biz.push.entity.Item;
 import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.client.CRFServiceClient;
@@ -46,6 +47,7 @@ public class CommonFacade {
         wordCrfDTO.setPacsOrder(searchData.getPacsOrder());
         wordCrfDTO.setDrugOrder(searchData.getDrugOrder());
         wordCrfDTO.setOperationOrder(searchData.getOperationOrder());
+        wordCrfDTO.setDiagOrder(searchData.getDiagOrder());
         aiAnalyze.aiProcess(searchData, wordCrfDTO);
         return wordCrfDTO;
     }
@@ -61,7 +63,7 @@ public class CommonFacade {
         PresentLabel presentLabel = wordCrfDTO.getPresentLabel();
         clinicalList.addAll(CoreUtil.getPropertyList(presentLabel.getClinicals()));
 
-        //所有的疾病(主诉、现病史,诊断,既往史)
+        //所有的疾病(主诉、现病史,诊断,既往史,下的诊断)
         DiagLabel diagLabel = wordCrfDTO.getDiagLabel();
         PastLabel pastLabel = wordCrfDTO.getPastLabel();
         List<String> diagList = new ArrayList<>();
@@ -69,6 +71,9 @@ public class CommonFacade {
         diagList.addAll(CoreUtil.getPropertyList(presentLabel.getDiags()));
         diagList.addAll(CoreUtil.getPropertyList(diagLabel.getDiags()));
         diagList.addAll(CoreUtil.getPropertyList(pastLabel.getDiags()));
+        //下的诊断
+        diagList.addAll(CoreUtil.getPropertyList(wordCrfDTO.getDiagOrder().stream().filter(x -> StringUtils.isBlank(x.getUniqueName()))
+                .map(x -> x.getName()).collect(Collectors.toList())));
 
         //所有化验(结构化数据)
         List<String> allLis = new ArrayList<>();
@@ -148,6 +153,7 @@ public class CommonFacade {
         CoreUtil.setPropertyList(presentLabel.getClinicals(), map.get(StandConvertEnum.clinical.getName()));
         //诊断回填
         CoreUtil.setPropertyList(diagLabel.getDiags(), map.get(StandConvertEnum.disease.getName()));
+        CoreUtil.setPropertyList(wordCrfDTO.getDiagOrder(),"name", "uniqueName", map.get(StandConvertEnum.disease.getName()));
         //药品回填
         CoreUtil.setPropertyList(presentLabel.getMedicines(), map.get(StandConvertEnum.drug.getName()));
         CoreUtil.setPropertyList(pastLabel.getAllergyMedicines(), map.get(StandConvertEnum.drug.getName()));
@@ -173,6 +179,7 @@ public class CommonFacade {
         NeoPushVO pushVO = new NeoPushVO();
         ChiefLabel chiefLabel = wordCrfDTO.getChiefLabel();
         PresentLabel presentLabel = wordCrfDTO.getPresentLabel();
+        List<Item> diagOrder = wordCrfDTO.getDiagOrder();
         PastLabel pastLabel = wordCrfDTO.getPastLabel();
         List<Lis> lis = wordCrfDTO.getLis();
         List<Pacs> pacs = wordCrfDTO.getPacs();
@@ -229,6 +236,16 @@ public class CommonFacade {
             pacsPushVo.setPacs(pacs);
             pushVO.setPacsPushVo(pacsPushVo);
         }
+        if(ListUtil.isNotEmpty(diagOrder)){
+            DiagVo diagVo = new DiagVo();
+            List<Diag> diags = diagOrder.stream().map(x -> {
+                Diag diag = new Diag();
+                diag.setName(x.getUniqueName());
+                return diag;
+            }).collect(Collectors.toList());
+            diagVo.setDiags(diags);
+            pushVO.setDiagVo(diagVo);
+        }
 
         return pushVO;
     }

src/main/java/com/diagbot/vo/NeoPushVO.java

@@ -14,6 +14,7 @@ public class NeoPushVO {
     private Integer age;
     // 性别（1：男，2：女）
     private Integer sex;
+    private DiagVo diagVo;//下的诊断
     private ChiefPushVo chiefPushVo;//主诉
     private PresentPushVo presentPushVo;//现病史
     private PastPushVo pastPushVo;//既往史

src/main/java/com/diagbot/vo/neoPushEntity/DiagVo.java

@@ -0,0 +1,15 @@
+package com.diagbot.vo.neoPushEntity;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author kwz
+ * @date 2020/8/19
+ * @time 16:43
+ */
+@Data
+public class DiagVo {
+    private List<Diag> diags;
+}

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

@@ -1,17 +0,0 @@
-package com.diagbot.web;
-
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @Description: 静态信息
- * @author: gaodm
- * @time: 2020/8/14 16:19
- */
-@RequestMapping("/static")
-@RestController
-@SuppressWarnings("unchecked")
-@Api(value = "静态信息API", tags = { "静态信息API" })
-public class StaticInfoController {
-}