Merge branch 'dev/20200624_1.3.6.2' into dev/20200701_1.3.6.3

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

@@ -814,6 +814,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         GetDetailVO getDetailVO = new GetDetailVO();
         getDetailVO.setHospitalId(analyzeApiVO.getHospitalId());
         getDetailVO.setBehospitalCode(analyzeApiVO.getBehospitalCode());
+        getDetailVO.setNeedGroup(analyzeApiVO.getNeedGroup());
         return getByBehospitalCodeApi(getDetailVO);
     }
 
@@ -858,9 +859,12 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         BeanUtil.copyProperties(getDetailVO, analyzeVO);
         List<MsgDTO> msgDTOList = getMsg(analyzeVO);
         List<MsgApiDTO> msgApiDTOList = BeanUtil.listCopyTo(msgDTOList, MsgApiDTO.class);
-        Map<String, List<MsgApiDTO>> msgMap = EntityUtil.makeEntityListMap(msgApiDTOList, "modelName");
-
-        res.put("details", msgMap);
+        if (getDetailVO.getNeedGroup() == 0) {
+            res.put("details", msgApiDTOList);
+        } else {
+            Map<String, List<MsgApiDTO>> msgMap = EntityUtil.makeEntityListMap(msgApiDTOList, "modelName");
+            res.put("details", msgMap);
+        }
         return res;
     }
 

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

@@ -12,6 +12,7 @@ import lombok.Data;
 public class AnalyzeApiVO {
 
     private String behospitalCode; // 病历id
+    private int needGroup = 1; // 默认值：1:分组，0：不分组
     private Long hospitalId; //医院ID
     @ApiModelProperty(hidden = true)
     private Boolean isTask = true; // 使用hospitalId传入的值

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

@@ -15,6 +15,7 @@ import java.util.List;
 public class GetDetailVO {
 
     private String behospitalCode; // 病历id
+    private int needGroup = 1; // 默认值：1:分组，0：不分组
     @ApiModelProperty(hidden = true)
     private Long hospitalId; //医院ID
     private List<String> paramStr = new ArrayList<>(); // 获取具体的参数