Merge branch 'dev/icss' into debug

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

@@ -9,6 +9,7 @@ import lombok.Setter;
  * @time: 2018/11/21 11:39
  */
 public enum TagTypeEnum implements KeyedNamed {
+
     T1(1, "单项单列"),
     T2(2, "单项多列"),
     T3(3, "横铺单标签形式"),
@@ -16,7 +17,10 @@ public enum TagTypeEnum implements KeyedNamed {
     T5(5, "竖铺组合项"),
     T6(6, "组合项多列"),
     T7(7, "化验类型"),
-    T8(8, "模板专用文字");
+    T8(8, "文字标签"),
+    T9(9, "空标签"),
+    T10(10, "组合项标签"),
+    T11(11, "推送类型");
 
     @Setter
     private Integer key;

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

@@ -13,8 +13,6 @@ import com.diagbot.dto.PushKYJDTO;
 import com.diagbot.dto.QuestionDTO;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.entity.DeptVital;
-import com.diagbot.entity.LisConfig;
-import com.diagbot.entity.LisMapping;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.VitalOrder;
 import com.diagbot.enums.IsDeleteEnum;
@@ -37,7 +35,6 @@ import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.swing.*;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;

icssman-service/src/main/java/com/diagbot/enums/TagTypeEnum.java

@@ -18,7 +18,8 @@ public enum TagTypeEnum implements KeyedNamed {
     T7(7, "化验类型"),
     T8(8, "文字标签"),
     T9(9, "空标签"),
-    T10(10, "组合项标签");
+    T10(10, "组合项标签"),
+    T11(11, "推送类型");
 
     @Setter
     private Integer key;

icssman-service/src/main/java/com/diagbot/facade/ModuleInfoFacade.java

@@ -20,6 +20,7 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddModuleInfoVO;
+import com.diagbot.vo.GetModuleDetailInfoVO;
 import com.diagbot.vo.GetModuleInfoVO;
 import com.diagbot.vo.ModuleGetQuestionInfoVO;
 import com.diagbot.vo.UpdateModuleInfoVO;
@@ -220,4 +221,9 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         }
         return moduleInfoDTOIPage;
     }
+
+    public List<GetQuestionInfoDTO> getModuleDetailInfo(GetModuleDetailInfoVO getModuleDetailInfoVO){
+        List<GetQuestionInfoDTO> getQuestionInfoDTOList = questionFacade.getQuestionByModuleId(getModuleDetailInfoVO.getModuleId());
+        return getQuestionInfoDTOList;
+    }
 }

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

@@ -102,6 +102,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
             case T5:  //组合项，例如：有无治疗
             case T6:  // 组合项，例如：既往史
             case T7:  //化验
+            case T11: //推送类型
                 saveQuestionMapping(questionWrapper, param);
                 break;
             case T8:  //文字，无单独维护

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

@@ -93,4 +93,13 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
      */
     public List<QuestionInfoWrapper> getByQuestionMapping(Map map);
 
+
+    /**
+     * 根据模板id获取标签信息
+     *
+     * @param moduleId
+     * @return
+     */
+    public List<GetQuestionInfoDTO> getQuestionByModuleId(Long moduleId);
+
 }

icssman-service/src/main/java/com/diagbot/service/QuestionInfoService.java

@@ -109,6 +109,14 @@ public interface QuestionInfoService extends IService<QuestionInfo> {
      * @return
      */
     public List<QuestionInfoWrapper> getByQuestionMapping(Map map);
+
+    /**
+     * 根据模板id获取标签信息
+     *
+     * @param moduleId
+     * @return
+     */
+    public List<GetQuestionInfoDTO> getQuestionByModuleId(Long moduleId);
 }
 
 

icssman-service/src/main/java/com/diagbot/service/impl/QuestionInfoServiceImpl.java

@@ -43,6 +43,11 @@ public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, Que
         return baseMapper.getQuestiongInfoByName(getQuestionInfoVO);
     }
 
+    @Override
+    public List<GetQuestionInfoDTO> getQuestionByModuleId(Long moduleId) {
+        return baseMapper.getQuestionByModuleId(moduleId);
+    }
+
     @Override
     public List<GetQuestionInfoDTO> moduleGetQuestiongInfoByName(ModuleGetQuestionInfoVO moduleGetQuestionInfoVO) {
         return baseMapper.moduleGetQuestiongInfoByName(moduleGetQuestionInfoVO);

icssman-service/src/main/java/com/diagbot/vo/GetModuleDetailInfoVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/12/27 16:55
+ */
+@Getter
+@Setter
+public class GetModuleDetailInfoVO {
+    @NotNull(message = "请输入模板id")
+    private Long moduleId;
+}

icssman-service/src/main/java/com/diagbot/web/ModuleInfoController.java

@@ -9,6 +9,7 @@ import com.diagbot.dto.ModuleInfoListDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.ModuleInfoFacade;
 import com.diagbot.vo.AddModuleInfoVO;
+import com.diagbot.vo.GetModuleDetailInfoVO;
 import com.diagbot.vo.GetModuleInfoVO;
 import com.diagbot.vo.ModuleGetQuestionInfoVO;
 import com.diagbot.vo.UpdateModuleInfoVO;
@@ -108,4 +109,14 @@ public class ModuleInfoController {
         IPage<ModuleInfoListDTO> date = moduleInfoFacade.getModuleInfoList(getModuleInfoVO);
         return RespDTO.onSuc(date);
     }
+
+    @ApiOperation(value = "获取模板明细信息——修改获取已添加过的标签[by:wangyu]",
+            notes = "moduleId: 模板id<br>" +
+                    "<br>")
+    @PostMapping("/getModuleInfoList")
+    @SysLogger("getModuleInfoList")
+    public RespDTO<List<GetQuestionInfoDTO>> getModuleDetailInfo(@Valid @RequestBody GetModuleDetailInfoVO getModuleDetailInfoVO) {
+        List<GetQuestionInfoDTO> date= moduleInfoFacade.getModuleDetailInfo(getModuleDetailInfoVO);
+        return RespDTO.onSuc(date);
+    }
 }

icssman-service/src/main/resources/mapper/QuestionInfoMapper.xml

@@ -221,4 +221,10 @@
             <![CDATA[ and age_end >= #{age} ]]>
         </if>
     </select>
+
+    <select id="getQuestionByModuleId" resultType="com.diagbot.dto.GetQuestionInfoDTO">
+        SELECT a.id,a.tag_name FROM `icss_question_info` a
+        LEFT JOIN icss_module_detail b ON a.id = b.question_id
+        WHERE a.is_deleted = 'N' AND b.is_deleted = 'N' AND b.module_id = #{moduleId}
+    </select>
 </mapper>