Explorar el Código

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

wangyu hace 6 años
padre
commit
0526d7e629
Se han modificado 20 ficheros con 575 adiciones y 188 borrados
  1. 2 5
      icss-service/src/main/java/com/diagbot/dto/PushDTO.java
  2. 170 136
      icss-service/src/main/java/com/diagbot/facade/PushFacade.java
  3. 2 1
      icss-service/src/main/resources/mapper/DisTypeMapper.xml
  4. 6 15
      icssman-service/src/main/java/com/diagbot/dto/QuestionPageDTO.java
  5. 1 1
      icssman-service/src/main/java/com/diagbot/entity/CommonParam.java
  6. 77 0
      icssman-service/src/main/java/com/diagbot/entity/DisType.java
  7. 52 0
      icssman-service/src/main/java/com/diagbot/enums/DisTypeEnum.java
  8. 51 0
      icssman-service/src/main/java/com/diagbot/enums/InsertOrUpdateEnum.java
  9. 14 0
      icssman-service/src/main/java/com/diagbot/facade/DisTypeFacade.java
  10. 69 25
      icssman-service/src/main/java/com/diagbot/facade/QuestionFacade.java
  11. 16 0
      icssman-service/src/main/java/com/diagbot/mapper/DisTypeMapper.java
  12. 16 0
      icssman-service/src/main/java/com/diagbot/service/DisTypeService.java
  13. 20 0
      icssman-service/src/main/java/com/diagbot/service/impl/DisTypeServiceImpl.java
  14. 33 0
      icssman-service/src/main/java/com/diagbot/vo/DisTypeVO.java
  15. 1 1
      icssman-service/src/main/java/com/diagbot/vo/QuestionSaveVO.java
  16. 20 0
      icssman-service/src/main/java/com/diagbot/web/DisTypeController.java
  17. 1 1
      icssman-service/src/main/resources/mapper/DeptVitalMapper.xml
  18. 19 0
      icssman-service/src/main/resources/mapper/DisTypeMapper.xml
  19. 3 1
      icssman-service/src/main/resources/mapper/QuestionInfoMapper.xml
  20. 2 2
      icssman-service/src/test/java/com/diagbot/CodeGeneration.java

+ 2 - 5
icss-service/src/main/java/com/diagbot/dto/PushDTO.java

@@ -1,6 +1,5 @@
 package com.diagbot.dto;
 
-import com.alibaba.fastjson.JSONObject;
 import com.diagbot.entity.ScaleContent;
 import lombok.Getter;
 import lombok.Setter;
@@ -24,9 +23,7 @@ public class PushDTO {
     private List<QuestionDTO> pacs;
     private Map<String, List<QuestionDTO>> dis;
     private Map<String, Object> treat;
-    private List<EvaluationModuleMappingDTO> evaluationModule;
-    private Map<String, JSONObject> managementEvaluation;
-    private Map<String, JSONObject> scale;
     private List<MedicalIndicationDTO> medicalIndications;
-    private List<ScaleContent> scaleContent;
+    private List<ScaleContent> scale;
+    private List<EvaluationModuleMappingDTO> evaluationModule;
 }

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 170 - 136
icss-service/src/main/java/com/diagbot/facade/PushFacade.java


+ 2 - 1
icss-service/src/main/resources/mapper/DisTypeMapper.xml

@@ -18,6 +18,7 @@
 
     <select id="getDisType" resultType="com.diagbot.dto.DisDTO">
         SELECT a.type,a.parent_id,b.name,b.id,b.tag_type FROM `icss_dis_type` a, icss_question_info b
-        where a.dis_id = b.id and a.is_deleted = 'N' and b.is_deleted = 'N' order by a.type
+        where a.dis_id = b.id and a.is_deleted = 'N' and b.is_deleted = 'N' and a.type in (1,2)
+        order by a.type
     </select>
 </mapper>

+ 6 - 15
icssman-service/src/main/java/com/diagbot/dto/QuestionPageDTO.java

@@ -2,9 +2,6 @@ package com.diagbot.dto;
 
 import com.diagbot.entity.QuestionDetail;
 import com.diagbot.entity.QuestionMapping;
-import com.diagbot.enums.ControlTypeEnum;
-import com.diagbot.enums.QuestionTypeEnum;
-import com.diagbot.enums.TagTypeEnum;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -153,6 +150,8 @@ public class QuestionPageDTO implements Serializable {
      */
     private Integer copyType;
 
+
+
     /**
      * 复制文字
      */
@@ -176,16 +175,8 @@ public class QuestionPageDTO implements Serializable {
     private List<QuestionMapping> questionMappings = new ArrayList<>();
 
 
-
-    /*****************************将类型转换成中文返回*****************************************/
-    public String getTypeCn() {
-        return QuestionTypeEnum.getName(this.type);
-    }
-    public String getTagTypeCn() {
-        return this.tagType == null ? "" : TagTypeEnum.getName(this.tagType);
-    }
-    public String getControlTypeCn() {
-        return this.controlType == null ? "" : ControlTypeEnum.getName(this.controlType);
-    }
-    /**********************************************************************/
+    /**
+     * 诊断类型
+     */
+    private Integer disType;
 }

+ 1 - 1
icssman-service/src/main/java/com/diagbot/entity/CommonParam.java

@@ -15,6 +15,6 @@ import java.util.Date;
 public class CommonParam {
     private String person;     //操作人
     private Date now;          //当前时间
-    private String saveOrUpdate;//更新或新增标识
+    private int insertOrUpdate;//更新或新增标识
     private QuestionInfo questionInfo; //主表信息
 }

+ 77 - 0
icssman-service/src/main/java/com/diagbot/entity/DisType.java

@@ -0,0 +1,77 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 诊断类型表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-03-28
+ */
+@TableName("icss_dis_type")
+@Getter
+@Setter
+public class DisType 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 parentId;
+
+    /**
+     * 1:慢病,2:急诊
+     */
+    private Integer type;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

+ 52 - 0
icssman-service/src/main/java/com/diagbot/enums/DisTypeEnum.java

@@ -0,0 +1,52 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * 
+ * @author zhoutg
+ * @Description: 诊断类型
+ * @date 2018年11月21日 下午2:31:42
+ */
+public enum DisTypeEnum implements KeyedNamed {
+    COMMON(0, "常规病"),
+    CHRONIC(1, "慢病"),
+    EMERGENCY(2, "急诊");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    DisTypeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static DisTypeEnum getEnum(Integer key) {
+        for (DisTypeEnum item : DisTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        DisTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}
+

+ 51 - 0
icssman-service/src/main/java/com/diagbot/enums/InsertOrUpdateEnum.java

@@ -0,0 +1,51 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 下午2:31:42
+ */
+public enum InsertOrUpdateEnum implements KeyedNamed {
+    Insert(1, "新增"),
+    Update(2, "修改");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    InsertOrUpdateEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static InsertOrUpdateEnum getEnum(Integer key) {
+        for (InsertOrUpdateEnum item : InsertOrUpdateEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        InsertOrUpdateEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}
+

+ 14 - 0
icssman-service/src/main/java/com/diagbot/facade/DisTypeFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.DisTypeServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @Author:zhoutg
+ * @time: 2018/11/23 11:37
+ */
+@Component
+public class DisTypeFacade extends DisTypeServiceImpl {
+
+}

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

@@ -11,6 +11,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.CommonParam;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.entity.DeptVital;
+import com.diagbot.entity.DisType;
 import com.diagbot.entity.ModuleDetail;
 import com.diagbot.entity.ModuleInfo;
 import com.diagbot.entity.QuestionDetail;
@@ -21,7 +22,9 @@ import com.diagbot.entity.VitalOrder;
 import com.diagbot.entity.wrapper.QuestionInfoWrapper;
 import com.diagbot.entity.wrapper.QuestionMappingWrapper;
 import com.diagbot.entity.wrapper.QuestionWrapper;
+import com.diagbot.enums.InsertOrUpdateEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.enums.TagTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -92,6 +95,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
     DeptVitalFacade deptVitalFacade;
     @Autowired
     RetrievalMappingFacade retrievalMappingFacade;
+    @Autowired
+    DisTypeFacade disTypeFacade;
 
 
     /**
@@ -102,7 +107,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
     public void saveOrUpdate(QuestionSaveVO questionSaveVO) {
         QuestionWrapper questionWrapper = questionSaveVO.getQuestionWrapper();
         CommonParam param = initCommonParam();
-        saveQuestionInfo(questionWrapper, param);
+        saveQuestionInfo(questionWrapper, param); //保存|修改主表信息
         switch (TagTypeEnum.getEnum(questionWrapper.getTagType())) {
             case T1:   //单项,例如:程度、体温
                 saveQuestionDetail(questionWrapper, param);
@@ -117,12 +122,15 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
                 saveQuestionMapping(questionWrapper, param);
                 break;
             case T8:  //文字,无单独维护
-            case T9:  //空标签,只维护主表信息
+            case T9:  //空标签,无单独维护
             case T10: //组合,无单独维护
                 break;
             default:
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请选择标签显示类型");
         }
+
+        //保存诊断类型
+        saveDisType(param, questionSaveVO.getDisTypeVO().getType());
     }
 
 
@@ -136,11 +144,38 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         String person = UserUtils.getCurrentPrincipleID();
         param.setNow(DateUtil.now());
         param.setPerson(person);
-        param.setSaveOrUpdate("save");
+        param.setInsertOrUpdate(InsertOrUpdateEnum.Insert.getKey());
         return param;
     }
 
 
+    /**
+     * 保存诊断类型
+     *
+     * @param param
+     * @param disType
+     */
+    public void saveDisType(CommonParam param, Integer disType) {
+        if (param.getQuestionInfo().getType() == QuestionTypeEnum.Disease.getKey()) {
+            DisType bean = disTypeFacade.getOne(new QueryWrapper<DisType>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("dis_id", param.getQuestionInfo().getId()));
+            if (bean == null) {
+                bean = new DisType();
+            }
+            if (InsertOrUpdateEnum.Insert.getKey() == param.getInsertOrUpdate()) {
+                bean.setGmtCreate(param.getNow());
+                bean.setCreator(param.getPerson());
+            }
+            bean.setType(disType);
+            bean.setDisId(param.getQuestionInfo().getId());
+            bean.setModifier(param.getPerson());
+            bean.setGmtModified(param.getNow());
+            disTypeFacade.saveOrUpdate(bean);
+        }
+    }
+
+
     /**
      * 保存映射关系
      *
@@ -210,11 +245,11 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
     public void deleteMapping(Long questionId, CommonParam param) {
         questionMappingFacade.update(new QuestionMapping(),
                 new UpdateWrapper<QuestionMapping>()
-                    .eq("parent_question", questionId)
-                    .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .set("gmt_modified", param.getNow())
-                    .set("modifier", param.getPerson())
-                    .set("is_deleted", IsDeleteEnum.Y.getKey()));
+                        .eq("parent_question", questionId)
+                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .set("gmt_modified", param.getNow())
+                        .set("modifier", param.getPerson())
+                        .set("is_deleted", IsDeleteEnum.Y.getKey()));
     }
 
 
@@ -350,7 +385,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
             if (questionInfo == null) { //校验
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "标签不存在");
             }
-            param.setSaveOrUpdate("update");
+            param.setInsertOrUpdate(InsertOrUpdateEnum.Update.getKey());
         }
         BeanUtil.copyProperties(questionWrapper, questionInfo);
         List<QuestionInfo> questionInfoList = this.list(new QueryWrapper<QuestionInfo>()
@@ -361,7 +396,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         if (ListUtil.isNotEmpty(questionInfoList)) { //标签type、tagName唯一
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "标签系统名称已重复,无法建立");
         }
-        if ("save".equals(param.getSaveOrUpdate())) {
+        if (InsertOrUpdateEnum.Insert.getKey() == param.getInsertOrUpdate()) {
             questionInfo.setCreator(param.getPerson()); //创建人
             questionInfo.setGmtCreate(param.getNow());//创建时间
         }
@@ -398,7 +433,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
     /**
      * 根据id删除标签
      *
-     * @param ids
+     * @param deleteQuestionVO
      * @return
      */
     public Boolean deleteByIdsFac(DeleteQuestionVO deleteQuestionVO) {
@@ -413,8 +448,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         for (String id : idList) {
             // 查询映射关系中是否存在父级
             List<QuestionInfo> info = this.getParentQuestion(Long.parseLong(id));
-            for(QuestionInfo bean : info) {
-                if(bean.getTagType() != null && bean.getTagType() == TagTypeEnum.T10.getKey()) {
+            for (QuestionInfo bean : info) {
+                if (bean.getTagType() != null && bean.getTagType() == TagTypeEnum.T10.getKey()) {
                     List<QuestionInfo> info2 = this.getParentQuestion(bean.getId());
                     List<String> msg = info2.stream().map(row -> "【" + row.getTagName() + "】").collect(Collectors.toList());
                     errMsg.append(String.join("", msg));
@@ -422,7 +457,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
                     errMsg.append("【").append(bean.getTagName()).append("】");
                 }
             }
-            if(StringUtil.isNotEmpty(errMsg.toString())) {
+            if (StringUtil.isNotEmpty(errMsg.toString())) {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请先删除标签的关联:" + errMsg);
             }
 
@@ -471,6 +506,15 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
                     .set("modifier", person)
                     .set("is_deleted", IsDeleteEnum.Y.getKey()));
 
+            //如果是诊断,删除映射关系
+            if (deleteQuestionVO.getType() == QuestionTypeEnum.Disease.getKey()) {
+                disTypeFacade.update(new DisType(), new UpdateWrapper<DisType>()
+                        .eq("dis_id", id)
+                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .set("gmt_modified", now)
+                        .set("modifier", person)
+                        .set("is_deleted", IsDeleteEnum.Y.getKey()));
+            }
             //TODO 如果是量表,删除量表内容,并删除诊断和量表的关联
 
 
@@ -501,7 +545,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         paramMap.put("notControlType", questionIndexVO.getNotControlType());
         return this.index(paramMap);
     }
-    
+
     /**
      * 别名新增标签检索
      *
@@ -521,15 +565,15 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         paramMap.put("notTagType", questionIndexVO.getNotTagType());
         paramMap.put("notControlType", questionIndexVO.getNotControlType());
         List<QuestionInfo> list = this.index(paramMap);
-        if(ListUtil.isEmpty(list)){
-        	return list;
+        if (ListUtil.isEmpty(list)) {
+            return list;
         }
-        Map<Long,Long> couMap = retrievalMappingFacade.getMapCouByQuesIds(list.stream().map(i->i.getId()).collect(Collectors.toList()));
-        return list.stream().filter(i->{
-        	if(couMap.get(i.getId())!=null){
-        		return false;
-        	}
-        	return true;
+        Map<Long, Long> couMap = retrievalMappingFacade.getMapCouByQuesIds(list.stream().map(i -> i.getId()).collect(Collectors.toList()));
+        return list.stream().filter(i -> {
+            if (couMap.get(i.getId()) != null) {
+                return false;
+            }
+            return true;
         }).collect(Collectors.toList());
     }
 
@@ -561,9 +605,9 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         return getQuestionInfoDTOS;
     }
 
-    public List<Long> getQuestionIdsByType(GetQuestionIdsByTypeVO getQuestionIdsByTypeVO){
+    public List<Long> getQuestionIdsByType(GetQuestionIdsByTypeVO getQuestionIdsByTypeVO) {
         QueryWrapper<QuestionInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("id",getQuestionIdsByTypeVO.getQuestionIds() )
+        queryWrapper.in("id", getQuestionIdsByTypeVO.getQuestionIds())
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("type", getQuestionIdsByTypeVO.getQuestionType());
         List<QuestionInfo> questionInfoList = this.list(queryWrapper);

+ 16 - 0
icssman-service/src/main/java/com/diagbot/mapper/DisTypeMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.DisType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 诊断类型表 Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-03-28
+ */
+public interface DisTypeMapper extends BaseMapper<DisType> {
+
+}

+ 16 - 0
icssman-service/src/main/java/com/diagbot/service/DisTypeService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.DisType;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 诊断类型表 服务类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-03-28
+ */
+public interface DisTypeService extends IService<DisType> {
+
+}

+ 20 - 0
icssman-service/src/main/java/com/diagbot/service/impl/DisTypeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.DisType;
+import com.diagbot.mapper.DisTypeMapper;
+import com.diagbot.service.DisTypeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 诊断类型表 服务实现类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-03-28
+ */
+@Service
+public class DisTypeServiceImpl extends ServiceImpl<DisTypeMapper, DisType> implements DisTypeService {
+
+}

+ 33 - 0
icssman-service/src/main/java/com/diagbot/vo/DisTypeVO.java

@@ -0,0 +1,33 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 诊断类型表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-03-28
+ */
+@Getter
+@Setter
+public class DisTypeVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+//    private Long id;
+//
+//    /**
+//     * 诊断标签id
+//     */
+//    private Long disId;
+
+    /**
+     * 1:慢病,2:急诊
+     */
+    private Integer type;
+}

+ 1 - 1
icssman-service/src/main/java/com/diagbot/vo/QuestionSaveVO.java

@@ -14,5 +14,5 @@ import lombok.Setter;
 public class QuestionSaveVO {
 
     private QuestionWrapper questionWrapper; //标签相关
-    //TODO 同义词
+    private DisTypeVO disTypeVO;  //诊断类型
 }

+ 20 - 0
icssman-service/src/main/java/com/diagbot/web/DisTypeController.java

@@ -0,0 +1,20 @@
+package com.diagbot.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 诊断类型表 前端控制器
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-03-28
+ */
+@Controller
+@RequestMapping("/disType")
+public class DisTypeController {
+
+}

+ 1 - 1
icssman-service/src/main/resources/mapper/DeptVitalMapper.xml

@@ -40,7 +40,7 @@
           <if test="deptVitalPageVO.deptName!=null and deptVitalPageVO.deptName!=''">
               AND a.name like CONCAT("%",#{deptVitalPageVO.deptName},"%")
           </if>
-        order by gmt_modified desc
+        order by b.gmt_modified desc
     </select>
 
 </mapper>

+ 19 - 0
icssman-service/src/main/resources/mapper/DisTypeMapper.xml

@@ -0,0 +1,19 @@
+<?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.DisTypeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.DisType">
+        <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="parent_id" property="parentId" />
+        <result column="type" property="type" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

+ 3 - 1
icssman-service/src/main/resources/mapper/QuestionInfoMapper.xml

@@ -161,7 +161,9 @@
     </select>
 
     <select id="getList" resultType="com.diagbot.dto.QuestionPageDTO">
-        SELECT a.* FROM `icss_question_info` a WHERE a.is_deleted = 'N'
+        SELECT a.*, b.type dis_type FROM `icss_question_info` a
+            left join icss_dis_type b on a.id = b.dis_id
+        WHERE a.is_deleted = 'N'
         <if test="type != null and type != ''">
             AND a.type = #{type}
         </if>

+ 2 - 2
icssman-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -49,14 +49,14 @@ public class CodeGeneration {
         dsc.setDriverName("com.mysql.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("lantone");
-        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-icss?useUnicode=true&characterEncoding=utf-8");
+        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-icssman?useUnicode=true&characterEncoding=utf-8");
         mpg.setDataSource(dsc);
 
         // 策略配置
         StrategyConfig strategy = new StrategyConfig();
         strategy.setTablePrefix(new String[] { "icss_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "icss_module_detail" }); // 需要生成的表
+        strategy.setInclude(new String[] { "icss_dis_type" }); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);