推理增加公式计算类型

icss-service/src/main/java/com/diagbot/client/bean/CalcResult.java

@@ -0,0 +1,16 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:公式计算结果
+ * @Author:zhaops
+ * @time: 2019/4/11 17:30
+ */
+@Getter
+@Setter
+public class CalcResult {
+    private Double value;
+    private String text;
+}

icss-service/src/main/java/com/diagbot/dto/PushDTO.java

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import com.diagbot.client.bean.CalcResult;
 import com.diagbot.entity.ScaleContent;
 import lombok.Getter;
 import lombok.Setter;
@@ -26,4 +27,5 @@ public class PushDTO {
     private List<MedicalIndicationDTO> medicalIndications;
     private List<ScaleContent> scale;
     private List<EvaluationModuleMappingDTO> evaluationModule;
+    private CalcResult calcResult;
 }

icss-service/src/main/java/com/diagbot/enums/FeatureTypeEnum.java

@@ -18,7 +18,8 @@ public enum FeatureTypeEnum implements KeyedNamed {
     Treat(8, "治疗"),
     Scale(21, "量表内容"),
     MedicalIndication(22, "指标"),
-    ManagementEvaluation(11, "管理评估");
+    ManagementEvaluation(11, "管理评估"),
+    Calculate(31,"计算");
 
     @Setter
     private Integer key;

icss-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.TranServiceClient;
+import com.diagbot.client.bean.CalcResult;
 import com.diagbot.client.bean.FeatureRate;
 import com.diagbot.client.bean.GdbResponse;
 import com.diagbot.client.bean.MedicalIndication;
@@ -416,6 +417,14 @@ public class PushFacade {
                 pushDTO.setMedicalIndications(medicalIndicationDTOList);
             }
         }
+
+        //公式计算 featuretype=31
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Calculate.getKey()))) {
+            CalcResult result = new CalcResult();
+            result.setValue(10D);
+            result.setText("肾功能衰竭");
+            pushDTO.setCalcResult(result);
+        }
         return pushDTO;
     }
 

icss-service/src/main/java/com/diagbot/vo/PushVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.alibaba.fastjson.JSONObject;
 import com.diagbot.client.bean.AdverseReaction;
 import com.diagbot.client.bean.IndicationResult;
 import lombok.Getter;
@@ -37,4 +38,5 @@ public class PushVO {
     private Integer disType;  //0-普通病（默认不填），1-慢病，2-急诊
     private List<AdverseReaction> adverseReactions; //不良反应
     private List<IndicationResult> medicalIndications;   //推理指标
+    private JSONObject formula;//计算公式
 }