Merge remote-tracking branch 'origin/dev/diagbotcloud20190918_vital' into dev/diagbotcloud20190918_vital

prec-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -73,7 +73,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
             paramMap1.put("ids", sonQuestionIds);
             //获取第二级子标签
             List<QuestionInfoWrapper> questionMapping1 = this.getByQuestionMapping(paramMap1);
-            Map<Long, List<QuestionInfoWrapper>> qm1 = EntityUtil.makeEntityListMap(questionMapping1, "parentQuestion");
+            Map<Long, List<QuestionInfoWrapper>> qm1 =
+                    EntityUtil.makeEntityListMap(questionMapping1, "parentQuestion");
             for (QuestionDTO bean : sonQuestionList) {
                 List<QuestionDetail> questionDetailList1 = sonQuestionMap.get(bean.getId());
                 if (ListUtil.isEmpty(questionDetailList1)) {
@@ -128,7 +129,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         List<Long> questionId = questionInfoList.stream().map(r -> r.getId()).collect(Collectors.toList());
 
         // 获取第一层明细项
-        Map<Long, List<QuestionDetail>> detailMap = getQuestionDetailWithMap(questionInfoList.stream().filter(r -> r.getTagType() == 1).map(r -> r.getId()).collect(Collectors.toList()));
+        Map<Long, List<QuestionDetail>> detailMap = getQuestionDetailWithMap(questionInfoList.stream()
+                .filter(r -> r.getTagType() == 1).map(r -> r.getId()).collect(Collectors.toList()));
 
         // 获取第二层mapping和明细项
         List<Long> ques2 = new ArrayList<>();
@@ -193,7 +195,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .in("question_id", questionIds)
                 .orderByAsc("order_no"));
-        Map<Long, List<QuestionDetail>> detailMap = EntityUtil.makeEntityListMap(detailList, "questionId");
+        Map<Long, List<QuestionDetail>> detailMap =
+                EntityUtil.makeEntityListMap(detailList, "questionId");
         return detailMap;
     }
 

prec-service/src/main/java/com/diagbot/facade/RetrievalFacade.java

@@ -62,7 +62,8 @@ public class RetrievalFacade {
                     .ne("tag_type", 8)
                     .eq("item_type", 0);
             List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
-            Map<String, QuestionInfo> questionInfoMap = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getTagName, questionInfo -> questionInfo));
+            Map<String, QuestionInfo> questionInfoMap = questionInfoList.stream()
+                    .collect(Collectors.toMap(QuestionInfo::getTagName, questionInfo -> questionInfo));
             RetrievalDTO retrievalDTO = new RetrievalDTO();
             //封装
             for (ConceptRetrievalDTO conceptRetrievalDTO : conceptInfos.data) {

prec-service/src/main/java/com/diagbot/mapper/QuestionInfoMapper.java

@@ -19,7 +19,8 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
 
 
     /**
-     *  根据参数获取标签信息
+     * 根据参数获取标签信息
+     *
      * @param map 参数
      * @return
      */
@@ -27,7 +28,8 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
 
 
     /**
-     *  根据参数获取标签信息
+     * 根据参数获取标签信息
+     *
      * @param map 参数
      * @return
      */
@@ -35,14 +37,16 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
 
 
     /**
-     *  根据questionMapping获取标签信息
+     * 根据questionMapping获取标签信息
+     *
      * @param map 参数
      * @return
      */
     public List<QuestionInfoWrapper> getByQuestionMapping(Map map);
 
     /**
-     *  根据questionRelation获取标签信息
+     * 根据questionRelation获取标签信息
+     *
      * @param map 参数
      * @return
      */