ICSS获取模板信息

icss-service/src/main/java/com/diagbot/entity/ModuleDeptMapping.java

@@ -1,134 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 模板科室映射表
- * </p>
- *
- * @author wangyu
- * @since 2019-03-15
- */
-@TableName("icss_module_dept_mapping")
-public class ModuleDeptMapping implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 科室id
-     */
-    private Long deptId;
-
-    /**
-     * 模板id
-     */
-    private Long moduleId;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-    public Long getModuleId() {
-        return moduleId;
-    }
-
-    public void setModuleId(Long moduleId) {
-        this.moduleId = moduleId;
-    }
-
-    @Override
-    public String toString() {
-        return "ModuleDeptMapping{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", deptId=" + deptId +
-        ", moduleId=" + moduleId +
-        "}";
-    }
-}

icss-service/src/main/java/com/diagbot/entity/ModuleDiseaseMapping.java

@@ -1,134 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 模板疾病映射表
- * </p>
- *
- * @author wangyu
- * @since 2019-03-15
- */
-@TableName("icss_module_disease_mapping")
-public class ModuleDiseaseMapping implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 科室id
-     */
-    private Long disId;
-
-    /**
-     * 模板id
-     */
-    private Long moduleId;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public Long getDisId() {
-        return disId;
-    }
-
-    public void setDisId(Long disId) {
-        this.disId = disId;
-    }
-    public Long getModuleId() {
-        return moduleId;
-    }
-
-    public void setModuleId(Long moduleId) {
-        this.moduleId = moduleId;
-    }
-
-    @Override
-    public String toString() {
-        return "ModuleDiseaseMapping{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", disId=" + disId +
-        ", moduleId=" + moduleId +
-        "}";
-    }
-}

icss-service/src/main/java/com/diagbot/entity/ModuleInfo.java

@@ -68,11 +68,16 @@ public class ModuleInfo implements Serializable {
     /**
      * 慢病
      */
-    private Long diseaseType;
+    private Long moduleType;
 
     /**
      * 备注
      */
     private String remark;
 
+    /**
+     * 关联id
+     */
+    private Long relationId;
+
 }

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

@@ -1,31 +0,0 @@
-package com.diagbot.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.ModuleDeptMapping;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.ModuleDeptMappingServiceImpl;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2019/3/15 9:27
- */
-@Component
-public class ModuleDeptMappingFacade extends ModuleDeptMappingServiceImpl {
-
-    /**
-     * 根据科室id获取模板id
-     *
-     * @param deptId
-     * @return
-     */
-    public List<ModuleDeptMapping> getModuleIdByDept(Long deptId){
-        QueryWrapper<ModuleDeptMapping> moduleDeptMappingQueryWrapper = new QueryWrapper();
-        moduleDeptMappingQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("dept_id", deptId);
-        return this.list(moduleDeptMappingQueryWrapper);
-    }
-}

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

@@ -1,31 +0,0 @@
-package com.diagbot.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.ModuleDiseaseMapping;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.impl.ModuleDiseaseMappingServiceImpl;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2019/3/15 14:20
- */
-@Component
-public class ModuleDiseaseMappingFacade extends ModuleDiseaseMappingServiceImpl {
-
-    /**
-     * 根据疾病id获取模板id
-     *
-     * @param diseaseId
-     * @return
-     */
-    public List<ModuleDiseaseMapping> getModuleIdByDisease(Long diseaseId){
-        QueryWrapper<ModuleDiseaseMapping> moduleDiseaseMappingQueryWrapper = new QueryWrapper();
-        moduleDiseaseMappingQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("dis_id", diseaseId);
-        return this.list(moduleDiseaseMappingQueryWrapper);
-    }
-}

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

@@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.ModuleDetailDTO;
 import com.diagbot.dto.ModuleInfoDTO;
 import com.diagbot.dto.QuestionDTO;
-import com.diagbot.entity.ModuleDeptMapping;
 import com.diagbot.entity.ModuleDetail;
-import com.diagbot.entity.ModuleDiseaseMapping;
 import com.diagbot.entity.ModuleInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.ModuleInfoServiceImpl;
@@ -37,10 +35,6 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
     ModuleDetailFacade moduleDetailFacade;
     @Autowired
     QuestionFacade questionFacade;
-    @Autowired
-    ModuleDeptMappingFacade moduleDeptMappingFacade;
-    @Autowired
-    ModuleDiseaseMappingFacade moduleDiseaseMappingFacade;
 
     /**
      * 返回所有的模型结构
@@ -52,37 +46,35 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
         //取到所有模板信息
         List<ModuleInfo> list = new ArrayList<>();
         List<Long> ids = new ArrayList<>();
-        if(moduleVO.getDiseaseType().intValue() == 1){
+        if(moduleVO.getMouduleType().intValue() == 1){
             //根据科室筛选如果没有，返回通用模板
-            List<ModuleDeptMapping> moduleDeptMappings = moduleDeptMappingFacade.getModuleIdByDept(moduleVO.getDeptId());
-            if(ListUtil.isNotEmpty(moduleDeptMappings)){
-                list = this.getModuleInfoByDisType(moduleVO.getDiseaseType());
-                ids = moduleDeptMappings.stream()
-                        .map(moduleDeptMapping -> moduleDeptMapping.getModuleId())
+            List<ModuleInfo> moduleInfoByDept = getModuleInfoByDisType(moduleVO.getMouduleType(),moduleVO.getRelationId());
+            if(ListUtil.isNotEmpty(moduleInfoByDept)){
+                ids = moduleInfoByDept.stream()
+                        .map(moduleInfo -> moduleInfo.getId())
                         .collect(Collectors.toList());
             }else {
-                list = this.getModuleInfoByDisType(2);
+                list = getModuleInfoByDisType(0,0L);
                 ids = list.stream()
                         .map(moduleInfo -> moduleInfo.getId())
                         .collect(Collectors.toList());
             }
-        }else if(moduleVO.getDiseaseType().intValue() == 0){
+        }else if(moduleVO.getMouduleType().intValue() == 2){
             //根据慢病筛选如果没有返回通用模板
-            List<ModuleDiseaseMapping> moduleDiseaseMappings = moduleDiseaseMappingFacade.getModuleIdByDisease(moduleVO.getDiseaseId());
-            if(ListUtil.isNotEmpty(moduleDiseaseMappings)){
-                list = this.getModuleInfoByDisType(moduleVO.getDiseaseType());
-                ids = moduleDiseaseMappings.stream()
-                        .map(moduleDeptMapping -> moduleDeptMapping.getModuleId())
+            List<ModuleInfo> moduleINfoByDis = getModuleInfoByDisType(moduleVO.getMouduleType(),moduleVO.getRelationId());
+            if(ListUtil.isNotEmpty(moduleINfoByDis)){
+                ids = moduleINfoByDis.stream()
+                        .map(moduleDeptMapping -> moduleDeptMapping.getId())
                         .collect(Collectors.toList());
             }else {
-                list = this.getModuleInfoByDisType(2);
+                list = getModuleInfoByDisType(0,0L);
                 ids = list.stream()
                         .map(moduleInfo -> moduleInfo.getId())
                         .collect(Collectors.toList());
             }
         }else {
             //默认
-            list = this.getModuleInfoByDisType(moduleVO.getDiseaseType());
+            list = this.getModuleInfoByDisType(moduleVO.getMouduleType(),moduleVO.getRelationId());
             ids = list.stream()
                     .map(artist -> artist.getId())
                     .collect(Collectors.toList());
@@ -124,13 +116,14 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
     /**
      * 获取相应类型的模板信息
      *
-     * @param diseaseType
+     * @param moduleType
      * @return
      */
-    public List<ModuleInfo> getModuleInfoByDisType(Integer diseaseType){
+    public List<ModuleInfo> getModuleInfoByDisType(Integer moduleType,Long relationId){
         QueryWrapper<ModuleInfo> queryWrapper = new QueryWrapper();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("disease_type", diseaseType);
+                .eq("module_type", moduleType)
+                .eq("relation_id", relationId);
         queryWrapper.orderByAsc("id");
         return this.list(queryWrapper);
     }

icss-service/src/main/java/com/diagbot/mapper/ModuleDeptMappingMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.ModuleDeptMapping;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 模板科室映射表 Mapper 接口
- * </p>
- *
- * @author wangyu
- * @since 2019-03-15
- */
-public interface ModuleDeptMappingMapper extends BaseMapper<ModuleDeptMapping> {
-
-}

icss-service/src/main/java/com/diagbot/mapper/ModuleDiseaseMappingMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.ModuleDiseaseMapping;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 模板疾病映射表 Mapper 接口
- * </p>
- *
- * @author wangyu
- * @since 2019-03-15
- */
-public interface ModuleDiseaseMappingMapper extends BaseMapper<ModuleDiseaseMapping> {
-
-}

icss-service/src/main/java/com/diagbot/service/ModuleDeptMappingService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.diagbot.entity.ModuleDeptMapping;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 模板科室映射表 服务类
- * </p>
- *
- * @author wangyu
- * @since 2019-03-15
- */
-public interface ModuleDeptMappingService extends IService<ModuleDeptMapping> {
-
-}

icss-service/src/main/java/com/diagbot/service/ModuleDiseaseMappingService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.diagbot.entity.ModuleDiseaseMapping;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 模板疾病映射表 服务类
- * </p>
- *
- * @author wangyu
- * @since 2019-03-15
- */
-public interface ModuleDiseaseMappingService extends IService<ModuleDiseaseMapping> {
-
-}

icss-service/src/main/java/com/diagbot/service/impl/ModuleDeptMappingServiceImpl.java

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.diagbot.entity.ModuleDeptMapping;
-import com.diagbot.mapper.ModuleDeptMappingMapper;
-import com.diagbot.service.ModuleDeptMappingService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 模板科室映射表 服务实现类
- * </p>
- *
- * @author wangyu
- * @since 2019-03-15
- */
-@Service
-public class ModuleDeptMappingServiceImpl extends ServiceImpl<ModuleDeptMappingMapper, ModuleDeptMapping> implements ModuleDeptMappingService {
-
-}

icss-service/src/main/java/com/diagbot/service/impl/ModuleDiseaseMappingServiceImpl.java

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.diagbot.entity.ModuleDiseaseMapping;
-import com.diagbot.mapper.ModuleDiseaseMappingMapper;
-import com.diagbot.service.ModuleDiseaseMappingService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 模板疾病映射表 服务实现类
- * </p>
- *
- * @author wangyu
- * @since 2019-03-15
- */
-@Service
-public class ModuleDiseaseMappingServiceImpl extends ServiceImpl<ModuleDiseaseMappingMapper, ModuleDiseaseMapping> implements ModuleDiseaseMappingService {
-
-}

icss-service/src/main/java/com/diagbot/service/impl/impl/ModuleDiseaseMappingServiceImpl.java

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl.impl;
-
-import com.diagbot.entity.ModuleDiseaseMapping;
-import com.diagbot.mapper.ModuleDiseaseMappingMapper;
-import com.diagbot.service.ModuleDiseaseMappingService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 模板疾病映射表 服务实现类
- * </p>
- *
- * @author wangyu
- * @since 2019-03-15
- */
-@Service
-public class ModuleDiseaseMappingServiceImpl extends ServiceImpl<ModuleDiseaseMappingMapper, ModuleDiseaseMapping> implements ModuleDiseaseMappingService {
-
-}

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

@@ -14,9 +14,7 @@ public class ModuleVO {
     private Integer sexType;
     private Integer age;
     //模板类型
-    private Integer diseaseType;
+    private Integer mouduleType;
     //科室id
-    private Long deptId;
-    //疾病id
-    private Long diseaseId;
+    private Long relationId;
 }

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

@@ -33,9 +33,9 @@ public class ModuleInfoController {
     ModuleFacade moduleFacade;
 
     @ApiOperation(value = "返回所有的模型数据[by:zhoutg]",
-            notes = "diseaseType: 模板类型(0.慢病（根据疾病） 1.根据科室划分 2.通用模板)<br>" +
-                    "deptId: 科室id，普通病根据科室筛选对应模板,当diseaseType为1时填写<br>" +
-                    "diseaseId: 疾病id，慢病时根据疾病id筛选对应模板,当diseaseType为0时填写<br>")
+            notes = "moduleType: 模板类型(0.通用 1.根据科室划分 2.慢病)<br>" +
+                    "relationId: 关联id，当moduleType为0时传0,当moduleType为1时，传科室id，当moduleType为2时传疾病id<br>" +
+                    "<br>")
     @PostMapping("/getAll")
     public RespDTO<List<ModuleInfoDTO>> getAll(@RequestBody ModuleVO moduleVO) {
         List<ModuleInfoDTO> data = moduleFacade.getAll(moduleVO);

icss-service/src/main/resources/mapper/ModuleDeptMappingMapper.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.ModuleDeptMappingMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.ModuleDeptMapping">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="dept_id" property="deptId" />
-        <result column="module_id" property="moduleId" />
-    </resultMap>
-
-</mapper>

icss-service/src/main/resources/mapper/ModuleDiseaseMappingMapper.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.ModuleDiseaseMappingMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.ModuleDiseaseMapping">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="dis_id" property="disId" />
-        <result column="module_id" property="moduleId" />
-    </resultMap>
-
-</mapper>

icss-service/src/main/resources/mapper/ModuleInfoMapper.xml

@@ -12,7 +12,8 @@
         <result column="modifier" property="modifier" />
         <result column="name" property="name" />
         <result column="type" property="type" />
-        <result column="disease_type" property="diseaseType" />
+        <result column="module_type" property="moduleType" />
+        <result column="relation_id" property="relationId" />
         <result column="remark" property="remark" />
     </resultMap>