Zhaops 6 years ago
parent
commit
dd6709b4a4

+ 28 - 0
aipt-service/src/main/java/com/diagbot/dto/PushDTO.java

@@ -0,0 +1,28 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.ScaleContent;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/11/20 13:44
+ */
+@Getter
+@Setter
+public class PushDTO {
+    private List<ConceptBaseDTO> symptom;
+    private List<ConceptBaseDTO> other;
+    private List<ConceptBaseDTO> vital;
+    private List<Long> markedVitalIds;
+    private List<ConceptBaseDTO> lab;
+    private List<ConceptBaseDTO> pacs;
+    private Map<String, List<ConceptBaseDTO>> dis;
+    private Map<String, Object> treat;
+    //private List<MedicalIndicationDTO> medicalIndications;
+    //private List<EvaluationModuleMappingDTO> evaluationModule;
+}

+ 70 - 0
aipt-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -0,0 +1,70 @@
+package com.diagbot.facade;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.client.bean.FeatureRate;
+import com.diagbot.client.bean.GdbResponse;
+import com.diagbot.client.bean.MedicalIndication;
+import com.diagbot.client.bean.MedicalIndicationDetail;
+import com.diagbot.client.bean.ResponseData;
+import com.diagbot.client.bean.SearchData;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.ScaleContent;
+import com.diagbot.enums.DisTypeEnum;
+import com.diagbot.enums.FeatureTypeEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.FastJsonUtils;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.SearchVo;
+import com.google.common.collect.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/5/7 16:12
+ */
+@Component
+public class PushFacade {
+    @Autowired
+    private ClinicalFacade clinicalFacade;
+
+    /**
+     * 推理接口
+     *
+     * @param searchVo
+     * @return ResponseData
+     */
+    public void pushInner(SearchVo searchVo) {
+        ResponseData data = clinicalFacade.processClinicalData(searchVo);
+        //大数据返回内容
+        List<FeatureRate> dis = data.getDis();
+
+        String featureType = searchVo.getFeatureType();
+        String[] featureTypes = featureType.split(",|,");
+        Set<String> featureTypeSet = new HashSet(Arrays.asList(featureTypes));
+
+        //症状 标签列表
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Symptom.getKey()))) {
+            List<FeatureRate> symptom = data.getSymptom();
+            if (ListUtil.isNotEmpty(symptom)) {
+                List<String> nameList = symptom.stream().map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());
+            }
+        }
+    }
+}

+ 12 - 42
aipt-service/src/main/java/com/diagbot/vo/SearchVo.java

@@ -4,10 +4,7 @@ import com.diagbot.dto.LisResult;
 import lombok.Getter;
 import lombok.Setter;
 
-import com.diagbot.client.bean.Feature;
-
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description:
@@ -18,50 +15,23 @@ import java.util.Map;
 @Setter
 public class SearchVo {
     private int length;
-
-    private int age_start;
-    private int age_end;
     private int age;
     private String sex;
-
-    // 搜索结果的贝叶斯阈值
-    private String threshold;
-
+    //特征类别
+    private String featureType;
+    //外部系统编码 用于返回映射数据,如果sysCode为空或null,则返回kl_standard_info标准名称
+    private String sysCode;
     private String symptom;
+    private String past;
+    private String other;
     private String vital;
     private String lis;
+    private List<LisResult> lisArr;
     private String pacs;
     private String diag;
-    private String past;
-    private String other;
-    private List<LisResult> lisArr;
-
-    //特征类别
-    private String featureType;
-    private Integer disType;
-    /*
-    //特征类别对","进行分割后数据
-    private String[] featureTypes;
-    //门诊 住院分类
-    private String resourceType;
-    //模型
-//    private AlgorithmClassify algorithmClassify[];
-    //模型
-    private String algorithmClassifyValue;
-    */
-    //外部系统编码 用于返回映射数据,如果sysCode为空或null,则返回kl_standard_info标准名称
-    private String sysCode;
-
-
-    private List<Feature> symptomFeatureList;
-    private List<Feature> lisFeatureList;
-    private List<Feature> pacsFeatureList;
-    private List<Feature> vitalFeatureList;
-    private List<Feature> symptompropertyFeatureList;
-
-    private List<Feature> diagFeatureList;
-    private Map<String, Map<String, String>> inputs;
-
-    private String scaleName;
-    private String indications;
+    private String diseaseName; //指定诊断,例如取治疗方案
+    private String scaleName;   //量表名称
+    private String indications; //指标结果
+    private String adverseReactions; //不良反应
+    private Integer disType;    //诊断类型
 }

+ 0 - 1
icss-service/src/main/java/com/diagbot/facade/CalculateFacade.java

@@ -1,7 +1,6 @@
 package com.diagbot.facade;
 
 import com.diagbot.client.AiptServiceClient;
-import com.diagbot.client.bean.Response;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;