指标推送一对一改一对多

aipt-service/src/main/java/com/diagbot/facade/ClinicalFacade.java

@@ -7,6 +7,7 @@ import com.diagbot.client.bean.ResponseData;
 import com.diagbot.dto.LisResult;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.util.ListUtil;
 import com.diagbot.vo.SearchVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -54,6 +55,9 @@ public class ClinicalFacade {
     }
 
     private List<LisResult> processLis(List<LisResult> lisArr) {
+        if(ListUtil.isEmpty(lisArr)){
+            return lisArr;
+        }
 
         String Otherval = "";
 

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

@@ -1,20 +1,19 @@
 package com.diagbot.client.bean;
 
-import com.alibaba.fastjson.JSONObject;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 
 /**
- * @Description:
+ * @Description:推送指标
  * @Author:zhaops
  * @time: 2019/3/14 14:40
  */
 @Getter
 @Setter
 public class MedicalIndication {
-    private Integer type; //1-量表，2-核心指标，3-公式，4，是否
     private String name;
-    private JSONObject content;  //type<>1 量表之外的内容
-    private String scaleName;    //type=1 量表名字
+    private List<MedicalIndicationDetail> details;
 }

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

@@ -0,0 +1,17 @@
+package com.diagbot.client.bean;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:推送指标明细
+ * @Author:zhaops
+ * @time: 2019/4/11 10:15
+ */
+@Getter
+@Setter
+public class MedicalIndicationDetail {
+    private Integer type; //1-量表，2-公式，3-其他指标
+    private JSONObject content;  //type<>1 非量表,返回内容;type=1 量表,返回量表名称{"name":""}
+}

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

@@ -4,6 +4,8 @@ import com.diagbot.client.bean.MedicalIndication;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * @Description: 指标推送结果
  * @Author:zhaops
@@ -11,8 +13,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class MedicalIndicationDTO extends MedicalIndication {
+public class MedicalIndicationDTO extends MedicalIndication{
     private Long id;
     private String tagName;
-    private ScaleDTO scale;
 }

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

@@ -1,17 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description: 量表
- * @Author:zhaops
- * @time: 2019/3/14 14:45
- */
-@Getter
-@Setter
-public class ScaleDTO {
-    private Long id;
-    private String name;
-    private String tagName;
-}