Merge branch 'master' into innerDevelop

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -144,6 +144,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 //.antMatchers("/graph/conceptInfo/changeStatus").permitAll()
                 .antMatchers("/graph/conceptInfo/isExist").permitAll()
                 .antMatchers("/graph/conceptInfo/getRecordById").permitAll()
+                .antMatchers("/graph/conceptInfo/updateHasInfoStatusBatch").permitAll()
                 .antMatchers("/sys/planDetail/getPlanDetailDatas").permitAll()
                 //.antMatchers("/sys/planDetail/savePlanDetails").permitAll()
                 //.antMatchers("/sys/planDetail/cancelPlanDetails").permitAll()
@@ -156,6 +157,8 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/sys/file/deleteRemoteFile").permitAll()
                 .antMatchers("/sys/mrqc/caseWritingPrompt").permitAll()
                 .antMatchers("/demo/testcaseInfo/testcaseProcess").permitAll()
+                .antMatchers("/demo/mrtestInfo/importExcel").permitAll()
+                .antMatchers("/demo/mrtestInfo/mrTestProcess").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -186,6 +186,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 //|| matchers("/graph/conceptInfo/changeStatus", request)
                 || matchers("/graph/conceptInfo/isExist", request)
                 || matchers("/graph/conceptInfo/getRecordById", request)
+                || matchers("/graph/conceptInfo/updateHasInfoStatusBatch", request)
                 || matchers("/sys/planDetail/getPlanDetailDatas", request)
                 /*|| matchers("/sys/planDetail/savePlanDetails", request)
                 || matchers("/sys/planDetail/cancelPlanDetails", request)
@@ -198,6 +199,8 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/sys/file/deleteRemoteFile", request)
                 || matchers("/sys/mrqc/caseWritingPrompt", request)
                 || matchers("/demo/testcaseInfo/testcaseProcess", request)
+                || matchers("/demo/mrtestInfo/importExcel", request)
+                || matchers("/demo/mrtestInfo/mrTestProcess", request)
                 || matchers("/", request)) {
             return true;
         }

src/main/java/com/diagbot/entity/DrugConfig.java

@@ -85,7 +85,7 @@ public class DrugConfig implements Serializable {
     /**
      * 剂型
      */
-    @Excel(name = "药品剂型(不填、注射剂、片剂、缓释剂、胶囊剂、滴丸剂)", width = 60, orderNum = "3", isImportField = "true")
+    @Excel(name = "药品剂型", width = 60, orderNum = "3", isImportField = "true")
     private String form;
 
     public Long getId() {

src/main/java/com/diagbot/entity/MrtestInfo.java

@@ -0,0 +1,305 @@
+package com.diagbot.entity;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+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 gaodm
+ * @since 2020-10-26
+ */
+@TableName("demo_mrtest_info")
+public class MrtestInfo 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
+     */
+    @Excel(name = "医院id", isImportField = "true")
+    private Long hospitalId;
+
+    /**
+     * 接口类型 1:开单提醒，2：推理接口
+     */
+    private Integer type;
+
+    /**
+     * 病历号
+     */
+    @Excel(name = "病历号", isImportField = "true")
+    private String mrCode;
+
+    /**
+     * 字段来源
+     */
+    @Excel(name = "字段来源", isImportField = "true")
+    private String textSource;
+
+    /**
+     * 原始文本
+     */
+    @Excel(name = "原始文本", isImportField = "true")
+    private String text;
+
+    /**
+     * 原始词
+     */
+    @Excel(name = "原始词", isImportField = "true")
+    private String word;
+
+    /**
+     * 替换后文本
+     */
+    @Excel(name = "替换后文本", isImportField = "true")
+    private String replaceText;
+
+    /**
+     * 替换词
+     */
+    @Excel(name = "替换词", isImportField = "true")
+    private String replaceWord;
+
+    /**
+     * 开单项类型
+     */
+    @Excel(name = "开单项类型", isImportField = "true")
+    private String billType;
+
+    /**
+     * 开单项
+     */
+    @Excel(name = "开单项", isImportField = "true")
+    private String billName;
+
+    /**
+     * 结果
+     */
+    private String result;
+
+    /**
+     * 是否通过 0:未通过，1：未通过
+     */
+    private Integer pass;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    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 getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getMrCode() {
+        return mrCode;
+    }
+
+    public void setMrCode(String mrCode) {
+        this.mrCode = mrCode;
+    }
+
+    public String getTextSource() {
+        return textSource;
+    }
+
+    public void setTextSource(String textSource) {
+        this.textSource = textSource;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public String getWord() {
+        return word;
+    }
+
+    public void setWord(String word) {
+        this.word = word;
+    }
+
+    public String getReplaceText() {
+        return replaceText;
+    }
+
+    public void setReplaceText(String replaceText) {
+        this.replaceText = replaceText;
+    }
+
+    public String getReplaceWord() {
+        return replaceWord;
+    }
+
+    public void setReplaceWord(String replaceWord) {
+        this.replaceWord = replaceWord;
+    }
+
+    public String getBillType() {
+        return billType;
+    }
+
+    public void setBillType(String billType) {
+        this.billType = billType;
+    }
+
+    public String getBillName() {
+        return billName;
+    }
+
+    public void setBillName(String billName) {
+        this.billName = billName;
+    }
+
+    public String getResult() {
+        return result;
+    }
+
+    public void setResult(String result) {
+        this.result = result;
+    }
+
+    public Integer getPass() {
+        return pass;
+    }
+
+    public void setPass(Integer pass) {
+        this.pass = pass;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "MrtestInfo{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", hospitalId=" + hospitalId +
+                ", type=" + type +
+                ", mrCode=" + mrCode +
+                ", textSource=" + textSource +
+                ", text=" + text +
+                ", word=" + word +
+                ", replaceText=" + replaceText +
+                ", replaceWord=" + replaceWord +
+                ", billType=" + billType +
+                ", billName=" + billName +
+                ", result=" + result +
+                ", pass=" + pass +
+                ", remark=" + remark +
+                "}";
+    }
+}

src/main/java/com/diagbot/enums/StaticTypeEnum.java

@@ -1,13 +1,16 @@
+/*
 package com.diagbot.enums;
 
 import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
+*/
 /**
  * @Description:
  * @Author:zhaops
  * @time: 2020/8/18 16:30
- */
+ *//*
+
 public enum StaticTypeEnum implements KeyedNamed {
     All(0, "全部"),
     Disease(1, "诊断"),
@@ -15,8 +18,8 @@ public enum StaticTypeEnum implements KeyedNamed {
     LisPack(3, "检验套餐"),
     Lis(4, "检验细项"),
     Pacs(5, "检查"),
-    Opeartion(6, "手术和操作"),
-    PacsSubName(7, "检查子项");
+    PacsSubName(6, "检查子项"),
+    Opeartion(7, "手术和操作");
 
     @Setter
     private int key;
@@ -66,4 +69,4 @@ public enum StaticTypeEnum implements KeyedNamed {
     public String getName() {
         return name;
     }
-}
+}*/

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

@@ -15,7 +15,6 @@ import com.diagbot.dto.StaticKnowledgeIndexDTO;
 import com.diagbot.entity.ConceptDetail;
 import com.diagbot.entity.ConceptInfo;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.StaticTypeEnum;
 import com.diagbot.enums.StatusEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -38,7 +37,6 @@ import com.diagbot.vo.StaticKnowledgeHISVO;
 import com.diagbot.vo.StaticKnowledgeIndexVO;
 import com.diagbot.vo.StaticKnowledgeVO;
 import com.google.common.collect.Lists;
-import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
@@ -127,6 +125,8 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
         List<DictionaryInfoDTO> dicStaticIndexList = dictionaryFacade.getListByGroupType(7);
         //页面术语类型和图谱映射
         List<DictionaryInfoDTO> dicTypeMappingList = dictionaryFacade.getListByGroupType(8);
+        //静态知识类型
+        List<DictionaryInfoDTO> dicStaticTypeList = dictionaryFacade.getListByGroupType(10);
 
         List<StaticKnowledgeIndexDTO> staticKnowledgeIndexDTOList = Lists.newLinkedList();
         RespDTO<List<StaticKnowledgeIndexDTO>> respDTO = cdssCoreClient.staticKnowledgeIndex(staticKnowledgeIndexVO);
@@ -204,20 +204,24 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
             //排序
             Map<String, List<StaticKnowledgeIndexDTO>> map
                     = EntityUtil.makeEntityListMap(staticKnowledgeIndexDTOList, "typeName");
+            Map<Integer, String> staticTypeDicMap =
+                    EntityUtil.makeMapWithKeyValue(dicStaticTypeList, "val", "name");
             for (DictionaryInfoDTO dic : dicStaticIndexList) {
                 if (dic.getName().equals("检验")) {
-                    if (map.containsKey(StaticTypeEnum.LisPack.getName())) {
-                        retList.addAll(map.get(StaticTypeEnum.LisPack.getName()));
+                    //3-检验套餐、4-检验细项
+                    if (map.containsKey(staticTypeDicMap.get("3"))) {
+                        retList.addAll(map.get(staticTypeDicMap.get("3")));
                     }
-                    if (map.containsKey(StaticTypeEnum.Lis.getName())) {
-                        retList.addAll(map.get(StaticTypeEnum.Lis.getName()));
+                    if (map.containsKey(staticTypeDicMap.get("4"))) {
+                        retList.addAll(map.get(staticTypeDicMap.get("4")));
                     }
                 } else if (dic.getName().equals("检查")) {
-                    if (map.containsKey(StaticTypeEnum.Pacs.getName())) {
-                        retList.addAll(map.get(StaticTypeEnum.Pacs.getName()));
+                    //5-检查、6-检查子项
+                    if (map.containsKey(staticTypeDicMap.get("5"))) {
+                        retList.addAll(map.get(staticTypeDicMap.get("5")));
                     }
-                    if (map.containsKey(StaticTypeEnum.PacsSubName.getName())) {
-                        retList.addAll(map.get(StaticTypeEnum.PacsSubName.getName()));
+                    if (map.containsKey(staticTypeDicMap.get("6"))) {
+                        retList.addAll(map.get(staticTypeDicMap.get("6")));
                     }
                 } else if (map.containsKey(dic.getName())) {
                     retList.addAll(map.get(dic.getName()));
@@ -236,7 +240,10 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
      */
     public StaticKnowledgeDTO getStaticKnowledge(StaticKnowledgeVO staticKnowledgeVO) {
         StaticKnowledgeDTO staticKnowledgeDTO = new StaticKnowledgeDTO();
-        String typeName = StaticTypeEnum.getName(staticKnowledgeVO.getType());
+        List<DictionaryInfoDTO> dicStaticTypeList = dictionaryFacade.getListByGroupType(10);
+        Map<String, String> dicStaticTypeValNameMap =
+                EntityUtil.makeMapWithKeyValue(dicStaticTypeList, "val", "name");
+        String typeName = dicStaticTypeValNameMap.get(staticKnowledgeVO.getType().toString());
         List<DictionaryInfoDTO> dicList = dictionaryFacade.getListByGroupType(8);
         typeName = convertTypeName(typeName, 1, dicList);
 
@@ -334,16 +341,17 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
     public List<StaticKnowledgeHISDTO> getStaticKnowledgeForHIS(StaticKnowledgeHISVO staticKnowledgeHISVO) {
 
         List<StaticKnowledgeHISDTO> retList = Lists.newArrayList();
-        String typeName = StaticTypeEnum.getName(staticKnowledgeHISVO.getType());
+        List<DictionaryInfoDTO> dicStaticTypeList = dictionaryFacade.getListByGroupType(10);
+        Map<String, String> dicStaticTypeValNameMap =
+                EntityUtil.makeMapWithKeyValue(dicStaticTypeList, "val", "name");
+        String typeName = dicStaticTypeValNameMap.get(staticKnowledgeHISVO.getType().toString());
         List<DictionaryInfoDTO> dicList = dictionaryFacade.getListByGroupType(8);
         typeName = convertTypeName(typeName, 1, dicList);
-
         //术语映射
         List<String> uniqueNameList = getUniqueNames(staticKnowledgeHISVO);
         if (ListUtil.isEmpty(uniqueNameList)) {
             return retList;
         }
-
         QueryWrapper<ConceptInfo> conceptInfoQueryWrapper = new QueryWrapper<>();
         conceptInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .in("name", uniqueNameList)
@@ -537,9 +545,14 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
      */
     public IPage<ConceptInfoDTO> getPage(ConceptInfoPageVO conceptInfoPageVO) {
         List<DictionaryInfoDTO> dicList = dictionaryFacade.getListByGroupType(8);
+        List<DictionaryInfoDTO> dicStaticTypeList = dictionaryFacade.getListByGroupType(10);
+        Map<Integer, String> dicStaticTypeValNameMap =
+                EntityUtil.makeMapWithKeyValue(dicStaticTypeList, "val", "name");
+        Map<String, Integer> dicStaticTypeNameValMap =
+                EntityUtil.makeMapWithKeyValue(dicStaticTypeList, "name", "val");
         if (StringUtil.isNotBlank(conceptInfoPageVO.getType())) {
             String typeName
-                    = convertTypeName(StaticTypeEnum.getName(Integer.valueOf(conceptInfoPageVO.getType())), 1, dicList);
+                    = convertTypeName(dicStaticTypeValNameMap.get(conceptInfoPageVO.getType()), 1, dicList);
             conceptInfoPageVO.setTypeName(typeName);
         }
         IPage<ConceptInfoDTO> page = super.getPage(conceptInfoPageVO);
@@ -548,7 +561,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
             records.forEach(record -> {
                 String typeName = convertTypeName(record.getType(), 2, dicList);
                 record.setTypeName(typeName);
-                record.setType(String.valueOf(StaticTypeEnum.getKey(typeName)));
+                record.setType(String.valueOf(dicStaticTypeNameValMap.get(typeName)));
             });
         }
         page.setRecords(records);
@@ -564,9 +577,14 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
     public Boolean saveOrUpdateRecord(ConceptInfoVO conceptInfoVO) {
         String userId = SysUserUtils.getCurrentPrincipleID();
         Date now = DateUtil.now();
+        //术语类型映射
         List<DictionaryInfoDTO> dicList = dictionaryFacade.getListByGroupType(8);
+        //静态知识类型
+        List<DictionaryInfoDTO> dicStaticTypeList = dictionaryFacade.getListByGroupType(10);
+        Map<Integer, String> dicStaticTypeValNameMap =
+                EntityUtil.makeMapWithKeyValue(dicStaticTypeList, "val", "name");
         //术语类型转换
-        String typeName = convertTypeName(StaticTypeEnum.getName(Integer.valueOf(conceptInfoVO.getType())), 1, dicList);
+        String typeName = convertTypeName(dicStaticTypeValNameMap.get(conceptInfoVO.getType()), 1, dicList);
         conceptInfoVO.setTypeName(typeName);
         ConceptInfo conceptInfo = new ConceptInfo();
 
@@ -683,8 +701,12 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
      */
     public Boolean isExist(ConceptInfoVO conceptInfoVO) {
         List<DictionaryInfoDTO> dicList = dictionaryFacade.getListByGroupType(8);
+        //静态知识类型
+        List<DictionaryInfoDTO> dicStaticTypeList = dictionaryFacade.getListByGroupType(10);
+        Map<Integer, String> dicStaticTypeValNameMap =
+                EntityUtil.makeMapWithKeyValue(dicStaticTypeList, "val", "name");
         //术语类型转换
-        String typeName = convertTypeName(StaticTypeEnum.getName(Integer.valueOf(conceptInfoVO.getType())), 1, dicList);
+        String typeName = convertTypeName(dicStaticTypeValNameMap.get(conceptInfoVO.getType()), 1, dicList);
         conceptInfoVO.setTypeName(typeName);
         QueryWrapper<ConceptInfo> conceptInfoQueryWrapper = new QueryWrapper<>();
         conceptInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -712,6 +734,12 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
      */
     public ConceptInfoDTO getRecordById(IdVO idVO) {
         List<DictionaryInfoDTO> dicList = dictionaryFacade.getListByGroupType(8);
+        //静态知识类型
+        List<DictionaryInfoDTO> dicStaticTypeList = dictionaryFacade.getListByGroupType(10);
+        Map<Integer, String> dicStaticTypeValNameMap =
+                EntityUtil.makeMapWithKeyValue(dicStaticTypeList, "val", "name");
+        Map<String, Integer> dicStaticTypeNameValMap =
+                EntityUtil.makeMapWithKeyValue(dicStaticTypeList, "name", "val");
         ConceptInfoDTO conceptInfoDTO = new ConceptInfoDTO();
         ConceptInfo conceptInfo = this.getById(idVO.getId());
         if (conceptInfo == null) {
@@ -729,7 +757,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
             //启用状态、修改人、修改时间为明细的内容
             String typeName = convertTypeName(conceptInfoDTO.getType(), 2, dicList);
             conceptInfoDTO.setTypeName(typeName);
-            conceptInfoDTO.setType(String.valueOf(StaticTypeEnum.getKey(typeName)));
+            conceptInfoDTO.setType(String.valueOf(dicStaticTypeNameValMap.get(typeName)));
             conceptInfoDTO.setModifier(conceptDetailList.get(0).getModifier());
             conceptInfoDTO.setGmtModified(conceptDetailList.get(0).getGmtModified());
         }
@@ -746,7 +774,8 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
         Map<String, List<ConceptDetail>> retMap = new HashMap<>();
         List<DictionaryInfoDTO> dicList = dictionaryFacade.getListByGroupType(8);
         QueryWrapper<ConceptInfo> conceptInfoQueryWrapper = new QueryWrapper<>();
-        conceptInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+        conceptInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("status", 1);
         if (ListUtil.isNotEmpty(nameList)) {
             conceptInfoQueryWrapper.in("name", nameList);
         }
@@ -761,7 +790,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
             QueryWrapper<ConceptDetail> conceptDetailQueryWrapper = new QueryWrapper<>();
             conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                     .in("concept_id", conceptIds);
-            if(ListUtil.isNotEmpty(contentTypes)) {
+            if (ListUtil.isNotEmpty(contentTypes)) {
                 conceptDetailQueryWrapper.and(sql -> {
                     for (int i = 0; i < contentTypes.size(); i++) {
                         if (i > 0) {
@@ -783,4 +812,41 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
         }
         return retMap;
     }
+
+    /**
+     * 批量更新静态知识标志
+     * @return
+     */
+    public Boolean updateHasInfoStatusBatch() {
+        QueryWrapper<ConceptInfo> conceptInfoQueryWrapper = new QueryWrapper<ConceptInfo>();
+        conceptInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+        List<ConceptInfo> conceptInfoList = this.list(conceptInfoQueryWrapper);
+        if (ListUtil.isEmpty(conceptInfoList)) {
+            return true;
+        }
+
+        QueryWrapper<ConceptDetail> conceptDetailQueryWrapper = new QueryWrapper<ConceptDetail>();
+        conceptDetailQueryWrapper.select("distinct concept_id");
+        conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+        List<ConceptDetail> conceptDetailList = conceptDetailFacade.list(conceptDetailQueryWrapper);
+        Map<Long, List<ConceptDetail>> detailMap =
+                EntityUtil.makeEntityListMap(conceptDetailList, "conceptId");
+
+        List<ConceptInfo> modifyList = Lists.newLinkedList();
+        conceptInfoList.forEach(item -> {
+            if (detailMap.containsKey(item.getId())) {
+                modifyList.add(item);
+            }
+        });
+
+        for (ConceptInfo conceptInfo : modifyList) {
+            //TODO 更新图谱是否有静态信息
+            HasStaticKnowledgeVO hasStaticKnowledgeVO = new HasStaticKnowledgeVO();
+            hasStaticKnowledgeVO.setName(conceptInfo.getName());
+            hasStaticKnowledgeVO.setType(conceptInfo.getType());
+            hasStaticKnowledgeVO.setHasInfo(1);
+            RespDTO<Boolean> respDTO = cdssCoreClient.updateHasInfoStatus(hasStaticKnowledgeVO);
+        }
+        return true;
+    }
 }

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

@@ -255,7 +255,7 @@ public class DrugConfigFacade {
      * @param file
      */
     public void importExcel(MultipartFile file) {
-        List<DrugConfig> drugConfigList = ExcelUtils.importExcel(file, 0, 1, DrugConfig.class);
+        List<DrugConfig> drugConfigList = ExcelUtils.importExcel(file, 1, 1, DrugConfig.class);
         if (ListUtil.isNotEmpty(drugConfigList)) {
             importExcelRecords(drugConfigList);
         } else {
@@ -577,7 +577,7 @@ public class DrugConfigFacade {
                 .orderByDesc("gmt_modified");
         List<DrugConfig> records = drugConfigService.list(queryWrapper);
         String fileName = "药品映射.xls";
-        ExcelUtils.exportExcel(records, null, "sheet1", DrugConfig.class, fileName, response, 12.8f);
+        ExcelUtils.exportExcel(records,  getFrom(), "sheet1", DrugConfig.class, fileName, response, 12.8f);
     }
 
     /**
@@ -587,6 +587,31 @@ public class DrugConfigFacade {
      */
     public void exportExcelModule(HttpServletResponse response) {
         String fileName = "药品映射模板.xls";
-        ExcelUtils.exportExcel(new ArrayList<>(), null, "sheet1", DrugConfig.class, fileName, response, 12.8f);
+        ExcelUtils.exportExcel(new ArrayList<>(), getFrom(), "sheet1", DrugConfig.class, fileName, response, 12.8f);
+    }
+
+    /**
+     * 剂型说明
+     *
+     * @return
+     */
+    private String getFrom() {
+        String from = "药品模板——药品剂型填写说明[不填";
+        //药品剂型
+        List<DictionaryInfoDTO> dicTypeMappingList = dictionaryFacade.getListByGroupType(9);
+        List<String> formList = dicTypeMappingList.stream()
+                .filter(i -> StringUtil.isNotBlank(i.getName()))
+                .map(i -> i.getName())
+                .distinct()
+                .collect(Collectors.toList());
+        if (ListUtil.isNotEmpty(formList)) {
+            for (String s : formList) {
+                if (StringUtil.isNotBlank(s)) {
+                    from += "、" + s;
+                }
+            }
+        }
+        from += "]";
+        return from;
     }
 }

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

@@ -0,0 +1,132 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.biz.push.entity.Item;
+import com.diagbot.biz.push.entity.Pacs;
+import com.diagbot.client.CdssCoreClient;
+import com.diagbot.dto.IndicationDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MrtestInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.MrtestInfoServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.ExcelUtils;
+import com.diagbot.util.GsonUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.IndicationPushVO;
+import com.diagbot.vo.MrtestInfoVO;
+import com.diagbot.vo.SearchData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/10/26 12:11
+ */
+@Component
+public class MrtestInfoFacade extends MrtestInfoServiceImpl {
+    @Autowired
+    @Qualifier("mrtestInfoServiceImpl")
+    private MrtestInfoServiceImpl mrtestInfoService;
+    @Autowired
+    private CdssCoreClient cdssCoreClient;
+    @Autowired
+    private AssembleFacade assembleFacade;
+
+    public void importExcel(MultipartFile file) {
+        List<MrtestInfo> mrtestInfoList = ExcelUtils.importExcel(file, 0, 1, MrtestInfo.class);
+        if (ListUtil.isNotEmpty(mrtestInfoList)) {
+            mrtestInfoService.saveBatch(mrtestInfoList);
+        } else {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "校验失败，导入数据不能为空");
+        }
+    }
+
+    public Boolean mrTestProcess(MrtestInfoVO mrtestInfoVO) {
+        List<MrtestInfo> mrtestInfoList
+                = mrtestInfoService.list(
+                new QueryWrapper<MrtestInfo>()
+                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .eq((null != mrtestInfoVO && null != mrtestInfoVO.getHospitalId()),
+                                "hospital_id", mrtestInfoVO.getHospitalId())
+        );
+
+        if (ListUtil.isEmpty(mrtestInfoList)) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS);
+        } else {
+            Date now = DateUtil.now();
+            for (MrtestInfo mrtestInfo : mrtestInfoList) {
+                //只处理目前存在的类型
+                if (mrtestInfo.getType().equals(1)) {
+                    if (mrtestInfo.getTextSource().equals("现病史")) {
+                        if (StringUtil.isNotBlank(mrtestInfo.getReplaceText())) {
+                            if (StringUtil.isNotBlank(mrtestInfo.getBillName())) {
+                                IndicationPushVO indicationPushVO = new IndicationPushVO();
+                                indicationPushVO.setHospitalId(mrtestInfo.getHospitalId());
+                                indicationPushVO.setSex(1);
+                                indicationPushVO.setAge("20");
+                                indicationPushVO.setRuleType("2");
+                                if ("医保手术和操作名称".equals(mrtestInfo.getBillType())) {
+                                    List<Item> operationOrder = new ArrayList<>();
+                                    Item item = new Item();
+                                    item.setName(mrtestInfo.getBillName());
+                                    operationOrder.add(item);
+                                    indicationPushVO.setOperationOrder(operationOrder);
+                                } else if ("辅助检查名称".equals(mrtestInfo.getBillType())
+                                        || "辅助检查子项目名称".equals(mrtestInfo.getBillType())) {
+                                    List<Pacs> pacsOrder = new ArrayList<>();
+                                    Pacs pacs = new Pacs();
+                                    pacs.setName(mrtestInfo.getBillName());
+                                    pacsOrder.add(pacs);
+                                    indicationPushVO.setPacsOrder(pacsOrder);
+                                } else {
+                                    mrtestInfo.setGmtModified(now);
+                                    mrtestInfo.setResult("");
+                                    mrtestInfo.setPass(0);
+                                    mrtestInfo.setRemark("处理对象外数据");
+                                    continue;
+                                }
+
+                                SearchData searchData = new SearchData();
+                                BeanUtil.copyProperties(indicationPushVO, searchData);
+                                //入参映射
+                                searchData = assembleFacade.assembleData(searchData);
+                                BeanUtil.copyProperties(searchData, indicationPushVO);
+                                RespDTO<IndicationDTO> resp = cdssCoreClient.indication(indicationPushVO);
+                                if (null != resp && null != resp.data) {
+                                    mrtestInfo.setGmtModified(now);
+                                    mrtestInfo.setResult(GsonUtil.toJson(resp.data.getBillMsgList()));
+                                    mrtestInfo.setPass(0);
+                                    mrtestInfo.setRemark("提醒接口有返回结果");
+                                } else {
+                                    mrtestInfo.setGmtModified(now);
+                                    mrtestInfo.setResult("");
+                                    mrtestInfo.setPass(0);
+                                    mrtestInfo.setRemark("提醒接口无返回结果");
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    mrtestInfo.setGmtModified(now);
+                    mrtestInfo.setResult("");
+                    mrtestInfo.setPass(0);
+                    mrtestInfo.setRemark("处理对象外数据");
+                }
+            }
+            mrtestInfoService.updateBatchById(mrtestInfoList);
+        }
+        return true;
+    }
+}

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

@@ -2,6 +2,7 @@ package com.diagbot.facade;
 
 import com.diagbot.client.CdssCoreClient;
 import com.diagbot.dto.BillMsg;
+import com.diagbot.dto.DictionaryInfoDTO;
 import com.diagbot.dto.IndicationDTO;
 import com.diagbot.dto.PushBaseDTO;
 import com.diagbot.dto.PushDTO;
@@ -9,8 +10,8 @@ import com.diagbot.dto.PushPlanDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.TreatDTO;
 import com.diagbot.entity.ConceptDetail;
-import com.diagbot.enums.StaticTypeEnum;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.StringUtil;
@@ -43,6 +44,8 @@ public class PushFacade {
     private CdssCoreClient cdssCoreClient;
     @Autowired
     private ConceptInfoFacade conceptInfoFacade;
+    @Autowired
+    private DictionaryFacade dictionaryFacade;
 
     /**
      * 基础推理-症状、查体、化验、辅检、诊断
@@ -124,6 +127,13 @@ public class PushFacade {
     public PushDTO getStaticKnoledge(PushDTO pushDTO) {
         List<String> conceptNameList = Lists.newLinkedList();
         List<PushBaseDTO> conceptBaseList = Lists.newArrayList();
+        //静态知识类型
+        List<DictionaryInfoDTO> dicStaticTypeList = dictionaryFacade.getListByGroupType(10);
+        Map<Integer, String> dicStaticTypeValNameMap =
+                EntityUtil.makeMapWithKeyValue(dicStaticTypeList, "val", "name");
+        Map<String, Integer> dicStaticTypeNameValMap =
+                EntityUtil.makeMapWithKeyValue(dicStaticTypeList, "name", "val");
+
         if (ListUtil.isNotEmpty(pushDTO.getLis())) {
             conceptBaseList.addAll(pushDTO.getLis());
         }
@@ -153,7 +163,7 @@ public class PushFacade {
                 for (Map.Entry<String, List<PushBaseDTO>> entry : pushDTO.getDis().entrySet()) {
                     if (ListUtil.isNotEmpty(entry.getValue())) {
                         entry.getValue().forEach(item -> {
-                            if (conceptDetailMap.containsKey(item.getName() + "_" + StaticTypeEnum.getName(1))) {
+                            if (conceptDetailMap.containsKey(item.getName() + "_" + dicStaticTypeValNameMap.get("1"))) {
                                 item.setHasInfo(1);
                             }
                         });
@@ -162,28 +172,33 @@ public class PushFacade {
             }
             if (ListUtil.isNotEmpty(pushDTO.getLis())) {
                 pushDTO.getLis().forEach(item -> {
-                    if (conceptDetailMap.containsKey(item.getName() + "_" + StaticTypeEnum.getName(3))) {
+                    if (conceptDetailMap.containsKey(item.getName() + "_" + dicStaticTypeValNameMap.get("3"))) {
                         item.setHasInfo(1);
                     }
                 });
             }
             if (ListUtil.isNotEmpty(pushDTO.getPacs())) {
                 pushDTO.getPacs().forEach(item -> {
-                    if (conceptDetailMap.containsKey(item.getName() + "_" + StaticTypeEnum.getName(5))) {
+                    if (conceptDetailMap.containsKey(item.getName() + "_" + dicStaticTypeValNameMap.get("5"))) {
                         item.setHasInfo(1);
                     }
+                    /*if (item.getHasInfo().equals(0)) {
+                        if (conceptDetailMap.containsKey(item.getName() + "_" + dicStaticTypeValNameMap.get("6))) {
+                            item.setHasInfo(1);
+                        }
+                    }*/
                 });
             }
             if (ListUtil.isNotEmpty(pushDTO.getMedicines())) {
                 pushDTO.getMedicines().forEach(item -> {
-                    if (conceptDetailMap.containsKey(item.getName() + "_" + StaticTypeEnum.getName(2))) {
+                    if (conceptDetailMap.containsKey(item.getName() + "_" + dicStaticTypeValNameMap.get("2"))) {
                         item.setHasInfo(1);
                     }
                 });
             }
             if (ListUtil.isNotEmpty(pushDTO.getOperations())) {
                 pushDTO.getOperations().forEach(item -> {
-                    if (conceptDetailMap.containsKey(item.getName() + "_" + StaticTypeEnum.getName(6))) {
+                    if (conceptDetailMap.containsKey(item.getName() + "_" + dicStaticTypeValNameMap.get("7"))) {
                         item.setHasInfo(1);
                     }
                 });
@@ -201,6 +216,12 @@ public class PushFacade {
      */
     public List<TreatDTO> retGeneraTreat(PushDTO pushDTO, Long hospitalId) {
         List<TreatDTO> retGeneraTreat = pushDTO.getTreat();
+        //静态知识类型
+        List<DictionaryInfoDTO> dicStaticTypeList = dictionaryFacade.getListByGroupType(10);
+        Map<Integer, String> dicStaticTypeValNameMap =
+                EntityUtil.makeMapWithKeyValue(dicStaticTypeList, "val", "name");
+        Map<String, Integer> dicStaticTypeNameValMap =
+                EntityUtil.makeMapWithKeyValue(dicStaticTypeList, "name", "val");
         if (ListUtil.isNotEmpty(retGeneraTreat)) {
             List<String> conceptNameList = retGeneraTreat.stream()
                     .filter(i -> StringUtil.isNotBlank(i.getUniqueName()))
@@ -212,7 +233,7 @@ public class PushFacade {
             }
             for (TreatDTO treatDTO : retGeneraTreat) {
                 if (StringUtil.isNotBlank(treatDTO.getUniqueName())) {
-                    String key = treatDTO.getUniqueName() + "_" + StaticTypeEnum.getName(1);
+                    String key = treatDTO.getUniqueName() + "_" + dicStaticTypeValNameMap.get("1");
                     if (conceptDetailMap.containsKey(key)) {
                         List<ConceptDetail> conceptDetailList = conceptDetailMap.get(key);
                         treatDTO.setGeneraTreat(conceptDetailList

src/main/java/com/diagbot/mapper/MrtestInfoMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.MrtestInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 病历测试表 Mapper 接口
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-10-26
+ */
+public interface MrtestInfoMapper extends BaseMapper<MrtestInfo> {
+
+}

src/main/java/com/diagbot/service/MrtestInfoService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.MrtestInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 病历测试表 服务类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-10-26
+ */
+public interface MrtestInfoService extends IService<MrtestInfo> {
+
+}

src/main/java/com/diagbot/service/impl/MrtestInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.MrtestInfo;
+import com.diagbot.mapper.MrtestInfoMapper;
+import com.diagbot.service.MrtestInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 病历测试表 服务实现类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-10-26
+ */
+@Service
+public class MrtestInfoServiceImpl extends ServiceImpl<MrtestInfoMapper, MrtestInfo> implements MrtestInfoService {
+
+}

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

@@ -0,0 +1,15 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/10/26 12:26
+ */
+@Getter
+@Setter
+public class MrtestInfoVO {
+    private Long hospitalId;
+}

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

@@ -22,7 +22,7 @@ public class StaticKnowledgeVO {
     /**
      * 术语类型
      */
-    @NotNull(message = "请输入术语类型")
+    @NotNull(message = "请输入术语类型：1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作")
     private Integer type;
     /**
      * 内容类型：1-化验、辅检、手术和操作、诊断、药品静态信息，2-注意事项，3-临床路径，4-治疗方案

src/main/java/com/diagbot/web/ConceptInfoController.java

@@ -67,7 +67,7 @@ public class ConceptInfoController {
     }
 
     @ApiOperation(value = "页面获取静态知识[zhaops]",
-            notes = "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验明细、5-检查、6-手术和操作 <br>" +
+            notes = "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作 <br>" +
                     "contentTypes： 内容类型（多选）：1-静态信息、2-注意事项、3-临床路径、4-治疗方案<br>" +
                     "name： 标准术语名称<br>")
     @PostMapping("/getStaticKnowledge")
@@ -78,7 +78,7 @@ public class ConceptInfoController {
     }
 
     @ApiOperation(value = "对接获取静态知识[zhaops]",
-            notes = "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验明细、5-检查、6-手术和操作 <br>" +
+            notes = "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作 <br>" +
                     "contentTypes： 内容类型（多选）：1-静态信息、2-注意事项、3-临床路径、4-治疗方案 <br>" +
                     "hisName： HIS大项名称<br>" +
                     "hisDetailName： HIS小项名称<br>")
@@ -90,7 +90,7 @@ public class ConceptInfoController {
     }
 
     @ApiOperation(value = "获取静态知识列表[zhaops]",
-            notes = "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验明细、5-检查、6-手术和操作 <br>" +
+            notes = "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作 <br>" +
                     "name： 术语名称<br>" +
                     "isDeleted： 启用状态：N-启用中、Y-已删除<br>")
     @PostMapping("/getPage")
@@ -103,7 +103,7 @@ public class ConceptInfoController {
     @ApiOperation(value = "保存静态知识-新增或修改[zhaops]",
             notes = "id： id <br>" +
                     "name： 术语名称 <br>" +
-                    "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验明细、5-检查、6-手术和操作 <br>" +
+                    "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作 <br>" +
                     "clinicalPathwayName： 临床路径名称<br>" +
                     "noticeName： 注意事项名称<br>" +
                     "details： 明细<br>")
@@ -128,7 +128,7 @@ public class ConceptInfoController {
 
     @ApiOperation(value = "静态知识是否存在[zhaops]",
             notes = "name： 术语名称 <br>" +
-                    "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验明细、5-检查、6-手术和操作 <br>")
+                    "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作 <br>")
     @PostMapping("/isExist")
     @SysLogger("isExist")
     public RespDTO<Boolean> isExist(@Valid @RequestBody ConceptInfoVO conceptInfoVO) {
@@ -144,4 +144,13 @@ public class ConceptInfoController {
         ConceptInfoDTO data = conceptInfoFacade.getRecordById(idVO);
         return RespDTO.onSuc(data);
     }
+
+    @ApiOperation(value = "批量更新静态知识标志[zhaops]",
+            notes = "")
+    @PostMapping("/updateHasInfoStatusBatch")
+    @SysLogger("updateHasInfoStatusBatch")
+    public RespDTO<Boolean> updateHasInfoStatusBatch() {
+        Boolean data = conceptInfoFacade.updateHasInfoStatusBatch();
+        return RespDTO.onSuc(data);
+    }
 }

src/main/java/com/diagbot/web/MrtestInfoController.java

@@ -0,0 +1,57 @@
+package com.diagbot.web;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.MrtestInfoFacade;
+import com.diagbot.vo.MrtestInfoVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * <p>
+ * 病历测试表 前端控制器
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-10-26
+ */
+@RestController
+@RequestMapping("/demo/mrtestInfo")
+@Api(value = "病历测试API", tags = { "病历测试API" })
+@SuppressWarnings("unchecked")
+public class MrtestInfoController {
+    @Autowired
+    private MrtestInfoFacade mrtestInfoFacade;
+
+    /**
+     * 数据导入
+     *
+     * @param file
+     * @return
+     */
+    @ApiOperation(value = "数据导入[by:gaodm]",
+            notes = "")
+    @PostMapping("/importExcel")
+    @SysLogger("importExcel")
+    @Transactional
+    public void importExcel(@RequestParam("file") MultipartFile file) {
+        mrtestInfoFacade.importExcel(file);
+    }
+
+    @ApiOperation(value = "执行病历测试[by:gaodm]",
+            notes = "hospitalId：医院id（可不填）;")
+    @PostMapping("/mrTestProcess")
+    @SysLogger("mrTestProcess")
+    @Transactional
+    public RespDTO<Boolean> mrTestProcess(@RequestBody MrtestInfoVO mrtestInfoVO) {
+        return RespDTO.onSuc(mrtestInfoFacade.mrTestProcess(mrtestInfoVO));
+    }
+}

src/main/resources/mapper/MrtestInfoMapper.xml

@@ -0,0 +1,28 @@
+<?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.MrtestInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.MrtestInfo">
+        <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="hospital_id" property="hospitalId" />
+        <result column="type" property="type" />
+        <result column="mr_code" property="mrCode" />
+        <result column="text_source" property="textSource" />
+        <result column="text" property="text" />
+        <result column="word" property="word" />
+        <result column="replace_text" property="replaceText" />
+        <result column="replace_word" property="replaceWord" />
+        <result column="bill_type" property="billType" />
+        <result column="bill_name" property="billName" />
+        <result column="result" property="result" />
+        <result column="pass" property="pass" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

src/test/java/com/diagbot/CodeGeneration.java

@@ -56,7 +56,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
         strategy.setTablePrefix(new String[] { "demo_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "demo_testcase_info"}); // 需要生成的表
+        strategy.setInclude(new String[] { "demo_mrtest_info"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);