1、术语关联映射

cdssman-service/src/main/java/com/diagbot/client/CdssClient.java

@@ -98,6 +98,20 @@ public interface CdssClient {
                                  @RequestParam("type") Integer type,
                                  @RequestParam("uesrId") String userId);
 
+    /**
+     * 数据导入
+     *
+     * @param file
+     * @param hospitalId
+     * @param type
+     * @param userId
+     */
+    @PostMapping(value = "/tran/mappingConfig/importExcel_remote", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    RespDTO<List<MappingConfigWrapper>> importExcel_remote(@RequestPart("file") MultipartFile file,
+                                 @RequestParam("hospitalId") Long hospitalId,
+                                 @RequestParam("type") Integer type,
+                                 @RequestParam("uesrId") String userId);
+
 
     /**
      * 数据导出_远程调用

cdssman-service/src/main/java/com/diagbot/client/hystrix/CdssHystrix.java

@@ -11,7 +11,9 @@ import com.diagbot.vo.MappingConfigPageVO;
 import com.diagbot.vo.MappingConfigVO;
 import feign.FeignException;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
@@ -71,6 +73,23 @@ public class CdssHystrix implements CdssClient {
         return null;
     }
 
+    /**
+     * 数据导入
+     *
+     * @param file
+     * @param hospitalId
+     * @param type
+     * @param userId
+     */
+    @Override
+    public RespDTO<List<MappingConfigWrapper>> importExcel_remote(@RequestPart("file") MultipartFile file,
+                                                    @RequestParam("hospitalId") Long hospitalId,
+                                                    @RequestParam("type") Integer type,
+                                                    @RequestParam("uesrId") String userId){
+        log.error("【hystrix】调用{}异常", "importExcel_remote");
+        return null;
+    }
+
     @Override
     public RespDTO<List<MappingConfigWrapper>> exportExcel_remote(@RequestBody @Valid MappingConfigPageVO mappingConfigPageVO) {
         log.error("【hystrix】调用{}异常", "exportExcel_remote");

cdssman-service/src/main/java/com/diagbot/dto/IndexBatchDTO.java

@@ -12,6 +12,7 @@ import lombok.Setter;
 @Setter
 public class IndexBatchDTO {
     private Long id;
+    private Integer status;
     private String name;
     private String code;
     private String synonyms;

cdssman-service/src/main/java/com/diagbot/entity/wrapper/AnesthesiaConfigWrapper.java

@@ -0,0 +1,23 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.AnesthesiaConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 15:13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class AnesthesiaConfigWrapper extends AnesthesiaConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, orderNum = "99")
+    private String status;
+}

cdssman-service/src/main/java/com/diagbot/entity/wrapper/DeptConfigWrapper.java

@@ -0,0 +1,24 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.DeptConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 14:53
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class DeptConfigWrapper extends DeptConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, orderNum = "99")
+    private String status;
+}

cdssman-service/src/main/java/com/diagbot/entity/wrapper/DiseaseConfigWrapper.java

@@ -0,0 +1,23 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.DiseaseConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 15:00
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class DiseaseConfigWrapper extends DiseaseConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, orderNum = "99")
+    private String status;
+}

cdssman-service/src/main/java/com/diagbot/entity/wrapper/DrugConfigWrapper.java

@@ -0,0 +1,28 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.DrugConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 15:02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class DrugConfigWrapper extends DrugConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, orderNum = "99")
+    private String status;
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准剂型状态", width = 40, orderNum = "100")
+    private String formStatus;
+}

cdssman-service/src/main/java/com/diagbot/entity/wrapper/LisConfigWrapper.java

@@ -0,0 +1,23 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.LisConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 15:09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class LisConfigWrapper extends LisConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, orderNum = "99")
+    private String status;
+}

cdssman-service/src/main/java/com/diagbot/entity/wrapper/MappingConfigWrapper.java

@@ -16,17 +16,41 @@ import lombok.ToString;
 @ToString(callSuper = true)
 public class MappingConfigWrapper extends MappingConfig {
     private String uniqueName;
+    private Integer status;
     private String form;
+    private Integer formStatus;
     private String code;
     /**
      * 国药准字
      */
     private String approval;
 
+   /* @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        MappingConfigWrapper mappingConfigWrapper = (MappingConfigWrapper) o;
+        return super.equals(o)
+                && Objects.equals(uniqueName, mappingConfigWrapper.uniqueName)
+                && Objects.equals(form, mappingConfigWrapper.form)
+                && Objects.equals(code, mappingConfigWrapper.code);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(uniqueName, form, code) + super.hashCode();
+    }*/
+
     public static boolean nonNull(MappingConfigWrapper o) {
         return !(o == null
                 || (StringUtil.isBlank(o.uniqueName)
+                && o.status == null
                 && StringUtil.isBlank(o.form)
+                && o.formStatus == null
                 && StringUtil.isBlank(o.code)
                 && StringUtil.isBlank(o.approval)))
                 || MappingConfig.nonNull(o);

cdssman-service/src/main/java/com/diagbot/entity/wrapper/NurseConfigWrapper.java

@@ -0,0 +1,23 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.NurseConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 15:12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class NurseConfigWrapper extends NurseConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, orderNum = "99")
+    private String status;
+}

cdssman-service/src/main/java/com/diagbot/entity/wrapper/OperationConfigWrapper.java

@@ -0,0 +1,23 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.OperationConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 15:08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class OperationConfigWrapper extends OperationConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, orderNum = "99")
+    private String status;
+}

cdssman-service/src/main/java/com/diagbot/entity/wrapper/PacsConfigWrapper.java

@@ -0,0 +1,23 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.PacsConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 15:10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class PacsConfigWrapper extends PacsConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, orderNum = "99")
+    private String status;
+}

cdssman-service/src/main/java/com/diagbot/entity/wrapper/ScaleConfigWrapper.java

@@ -0,0 +1,23 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.ScaleConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 15:15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ScaleConfigWrapper extends ScaleConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, orderNum = "99")
+    private String status;
+}

cdssman-service/src/main/java/com/diagbot/entity/wrapper/TcmdiseaseConfigWrapper.java

@@ -0,0 +1,23 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.TcmdiseaseConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 15:17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class TcmdiseaseConfigWrapper extends TcmdiseaseConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, orderNum = "99")
+    private String status;
+}

cdssman-service/src/main/java/com/diagbot/entity/wrapper/TcmsyndromeConfigWrapper.java

@@ -0,0 +1,23 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.TcmsyndromeConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 15:18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class TcmsyndromeConfigWrapper extends TcmsyndromeConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, orderNum = "99")
+    private String status;
+}

cdssman-service/src/main/java/com/diagbot/entity/wrapper/TransfusionConfigWrapper.java

@@ -0,0 +1,23 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.TransfusionConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 15:18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class TransfusionConfigWrapper extends TransfusionConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, orderNum = "99")
+    private String status;
+}

cdssman-service/src/main/java/com/diagbot/facade/MappingConfigFacade.java

@@ -21,7 +21,19 @@ import com.diagbot.entity.ScaleConfig;
 import com.diagbot.entity.TcmdiseaseConfig;
 import com.diagbot.entity.TcmsyndromeConfig;
 import com.diagbot.entity.TransfusionConfig;
+import com.diagbot.entity.wrapper.AnesthesiaConfigWrapper;
+import com.diagbot.entity.wrapper.DeptConfigWrapper;
+import com.diagbot.entity.wrapper.DiseaseConfigWrapper;
+import com.diagbot.entity.wrapper.DrugConfigWrapper;
+import com.diagbot.entity.wrapper.LisConfigWrapper;
 import com.diagbot.entity.wrapper.MappingConfigWrapper;
+import com.diagbot.entity.wrapper.NurseConfigWrapper;
+import com.diagbot.entity.wrapper.OperationConfigWrapper;
+import com.diagbot.entity.wrapper.PacsConfigWrapper;
+import com.diagbot.entity.wrapper.ScaleConfigWrapper;
+import com.diagbot.entity.wrapper.TcmdiseaseConfigWrapper;
+import com.diagbot.entity.wrapper.TcmsyndromeConfigWrapper;
+import com.diagbot.entity.wrapper.TransfusionConfigWrapper;
 import com.diagbot.enums.ConceptTypeEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.MatchSourceEnum;
@@ -72,69 +84,130 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
      * @param response
      * @param type
      * @param extFileName
+     * @param mode        1：模板导出、2：关联关系
      */
-    public void exportExcel(HttpServletResponse response, List<?> list, Integer type, String extFileName) {
+    public void exportExcel(HttpServletResponse response, List<?> list, Integer type, String extFileName, Integer mode) {
         String fileName = extFileName + ".xls";
         switch (type) {
             case 1:
                 fileName = "检验" + fileName;
-                List<LisConfig> lisConfigList = BeanUtil.listCopyTo(list, LisConfig.class);
-                ExcelUtils.exportExcel(lisConfigList, null, "sheet1", LisConfig.class, fileName, response, 12.8f);
+                if (mode.equals(1)) {
+                    List<LisConfig> lisConfigList = BeanUtil.listCopyTo(list, LisConfig.class);
+                    ExcelUtils.exportExcel(lisConfigList, null, "sheet1", LisConfig.class, fileName, response, 12.8f);
+                } else if (mode.equals(2)) {
+                    List<LisConfigWrapper> lisConfigList = BeanUtil.listCopyTo(list, LisConfigWrapper.class);
+                    ExcelUtils.exportExcel(lisConfigList, null, "sheet1", LisConfigWrapper.class, fileName, response, 12.8f);
+                }
                 break;
             case 3:
                 fileName = "检查" + fileName;
-                List<PacsConfig> pacsConfigList = BeanUtil.listCopyTo(list, PacsConfig.class);
-                ExcelUtils.exportExcel(pacsConfigList, null, "sheet1", PacsConfig.class, fileName, response, 12.8f);
+                if (mode.equals(1)) {
+                    List<PacsConfig> pacsConfigList = BeanUtil.listCopyTo(list, PacsConfig.class);
+                    ExcelUtils.exportExcel(pacsConfigList, null, "sheet1", PacsConfig.class, fileName, response, 12.8f);
+                } else if (mode.equals(2)) {
+                    List<PacsConfigWrapper> pacsConfigWrapperList = BeanUtil.listCopyTo(list, PacsConfigWrapper.class);
+                    ExcelUtils.exportExcel(pacsConfigWrapperList, null, "sheet1", PacsConfigWrapper.class, fileName, response, 12.8f);
+                }
                 break;
             case 4:
                 fileName = "诊断" + fileName;
-                List<DiseaseConfig> diseaseConfigList = BeanUtil.listCopyTo(list, DiseaseConfig.class);
-                ExcelUtils.exportExcel(diseaseConfigList, null, "sheet1", DiseaseConfig.class, fileName, response, 12.8f);
+                if (mode.equals(1)) {
+                    List<DiseaseConfig> diseaseConfigList = BeanUtil.listCopyTo(list, DiseaseConfig.class);
+                    ExcelUtils.exportExcel(diseaseConfigList, null, "sheet1", DiseaseConfig.class, fileName, response, 12.8f);
+                } else if (mode.equals(2)) {
+                    List<DiseaseConfigWrapper> diseaseConfigList = BeanUtil.listCopyTo(list, DiseaseConfigWrapper.class);
+                    ExcelUtils.exportExcel(diseaseConfigList, null, "sheet1", DiseaseConfigWrapper.class, fileName, response, 12.8f);
+                }
                 break;
             case 5:
                 fileName = "药品" + fileName;
-                List<DrugConfig> drugConfigList = BeanUtil.listCopyTo(list, DrugConfig.class);
-                ExcelUtils.exportExcel(drugConfigList, getForm(), "sheet1", DrugConfig.class, fileName, response, 12.8f);
+                if (mode.equals(1)) {
+                    List<DrugConfig> drugConfigList = BeanUtil.listCopyTo(list, DrugConfig.class);
+                    ExcelUtils.exportExcel(drugConfigList, getForm(), "sheet1", DrugConfig.class, fileName, response, 12.8f);
+                } else if (mode.equals(2)) {
+                    List<DrugConfigWrapper> drugConfigList = BeanUtil.listCopyTo(list, DrugConfigWrapper.class);
+                    ExcelUtils.exportExcel(drugConfigList, getForm(), "sheet1", DrugConfigWrapper.class, fileName, response, 12.8f);
+                }
                 break;
             case 6:
                 fileName = "手术和操作" + fileName;
-                List<OperationConfig> operationConfigList = BeanUtil.listCopyTo(list, OperationConfig.class);
-                ExcelUtils.exportExcel(operationConfigList, null, "sheet1", OperationConfig.class, fileName, response, 12.8f);
+                if (mode.equals(1)) {
+                    List<OperationConfig> operationConfigList = BeanUtil.listCopyTo(list, OperationConfig.class);
+                    ExcelUtils.exportExcel(operationConfigList, null, "sheet1", OperationConfig.class, fileName, response, 12.8f);
+                } else if (mode.equals(2)) {
+                    List<OperationConfigWrapper> operationConfigList = BeanUtil.listCopyTo(list, OperationConfigWrapper.class);
+                    ExcelUtils.exportExcel(operationConfigList, null, "sheet1", OperationConfigWrapper.class, fileName, response, 12.8f);
+                }
                 break;
             case 7:
                 fileName = "科室" + fileName;
-                List<DeptConfig> deptConfigList = BeanUtil.listCopyTo(list, DeptConfig.class);
-                ExcelUtils.exportExcel(deptConfigList, null, "sheet1", DeptConfig.class, fileName, response, 12.8f);
+                if (mode.equals(1)) {
+                    List<DeptConfig> deptConfigList = BeanUtil.listCopyTo(list, DeptConfig.class);
+                    ExcelUtils.exportExcel(deptConfigList, null, "sheet1", DeptConfig.class, fileName, response, 12.8f);
+                } else if (mode.equals(2)) {
+                    List<DeptConfigWrapper> deptConfigList = BeanUtil.listCopyTo(list, DeptConfigWrapper.class);
+                    ExcelUtils.exportExcel(deptConfigList, null, "sheet1", DeptConfigWrapper.class, fileName, response, 12.8f);
+                }
                 break;
             case 8:
                 fileName = "输血" + fileName;
-                List<TransfusionConfig> transfusionConfigList = BeanUtil.listCopyTo(list, TransfusionConfig.class);
-                ExcelUtils.exportExcel(transfusionConfigList, null, "sheet1", TransfusionConfig.class, fileName, response, 12.8f);
+                if (mode.equals(1)) {
+                    List<TransfusionConfig> transfusionConfigList = BeanUtil.listCopyTo(list, TransfusionConfig.class);
+                    ExcelUtils.exportExcel(transfusionConfigList, null, "sheet1", TransfusionConfig.class, fileName, response, 12.8f);
+                } else if (mode.equals(2)) {
+                    List<TransfusionConfigWrapper> transfusionConfigList = BeanUtil.listCopyTo(list, TransfusionConfigWrapper.class);
+                    ExcelUtils.exportExcel(transfusionConfigList, null, "sheet1", TransfusionConfigWrapper.class, fileName, response, 12.8f);
+                }
                 break;
             case 10:
                 fileName = "量表" + fileName;
-                List<ScaleConfig> scaleConfigList = BeanUtil.listCopyTo(list, ScaleConfig.class);
-                ExcelUtils.exportExcel(scaleConfigList, null, "sheet1", ScaleConfig.class, fileName, response, 12.8f);
+                if (mode.equals(1)) {
+                    List<ScaleConfig> scaleConfigList = BeanUtil.listCopyTo(list, ScaleConfig.class);
+                    ExcelUtils.exportExcel(scaleConfigList, null, "sheet1", ScaleConfig.class, fileName, response, 12.8f);
+                } else if (mode.equals(2)) {
+                    List<ScaleConfigWrapper> scaleConfigList = BeanUtil.listCopyTo(list, ScaleConfigWrapper.class);
+                    ExcelUtils.exportExcel(scaleConfigList, null, "sheet1", ScaleConfigWrapper.class, fileName, response, 12.8f);
+                }
                 break;
             case 11:
                 fileName = "护理" + fileName;
-                List<NurseConfig> nurseConfigList = BeanUtil.listCopyTo(list, NurseConfig.class);
-                ExcelUtils.exportExcel(nurseConfigList, null, "sheet1", NurseConfig.class, fileName, response, 12.8f);
+                if (mode.equals(1)) {
+                    List<NurseConfig> nurseConfigList = BeanUtil.listCopyTo(list, NurseConfig.class);
+                    ExcelUtils.exportExcel(nurseConfigList, null, "sheet1", NurseConfig.class, fileName, response, 12.8f);
+                } else if (mode.equals(2)) {
+                    List<NurseConfigWrapper> nurseConfigList = BeanUtil.listCopyTo(list, NurseConfigWrapper.class);
+                    ExcelUtils.exportExcel(nurseConfigList, null, "sheet1", NurseConfigWrapper.class, fileName, response, 12.8f);
+                }
                 break;
             case 12:
                 fileName = "中医疾病" + fileName;
-                List<TcmdiseaseConfig> tcmdiseaseConfigList = BeanUtil.listCopyTo(list, TcmdiseaseConfig.class);
-                ExcelUtils.exportExcel(tcmdiseaseConfigList, null, "sheet1", TcmdiseaseConfig.class, fileName, response, 12.8f);
+                if (mode.equals(1)) {
+                    List<TcmdiseaseConfig> tcmdiseaseConfigList = BeanUtil.listCopyTo(list, TcmdiseaseConfig.class);
+                    ExcelUtils.exportExcel(tcmdiseaseConfigList, null, "sheet1", TcmdiseaseConfig.class, fileName, response, 12.8f);
+                } else if (mode.equals(2)) {
+                    List<TcmdiseaseConfigWrapper> tcmdiseaseConfigList = BeanUtil.listCopyTo(list, TcmdiseaseConfigWrapper.class);
+                    ExcelUtils.exportExcel(tcmdiseaseConfigList, null, "sheet1", TcmdiseaseConfigWrapper.class, fileName, response, 12.8f);
+                }
                 break;
             case 13:
                 fileName = "中医证候" + fileName;
-                List<TcmsyndromeConfig> tcmsyndromeConfigList = BeanUtil.listCopyTo(list, TcmsyndromeConfig.class);
-                ExcelUtils.exportExcel(tcmsyndromeConfigList, null, "sheet1", TcmsyndromeConfig.class, fileName, response, 12.8f);
+                if (mode.equals(1)) {
+                    List<TcmsyndromeConfig> tcmsyndromeConfigList = BeanUtil.listCopyTo(list, TcmsyndromeConfig.class);
+                    ExcelUtils.exportExcel(tcmsyndromeConfigList, null, "sheet1", TcmsyndromeConfig.class, fileName, response, 12.8f);
+                } else if (mode.equals(2)) {
+                    List<TcmsyndromeConfigWrapper> tcmsyndromeConfigList = BeanUtil.listCopyTo(list, TcmsyndromeConfigWrapper.class);
+                    ExcelUtils.exportExcel(tcmsyndromeConfigList, null, "sheet1", TcmsyndromeConfigWrapper.class, fileName, response, 12.8f);
+                }
                 break;
             case 14:
                 fileName = "麻醉" + fileName;
-                List<AnesthesiaConfig> anesthesiaConfigList = BeanUtil.listCopyTo(list, AnesthesiaConfig.class);
-                ExcelUtils.exportExcel(anesthesiaConfigList, null, "sheet1", AnesthesiaConfig.class, fileName, response, 12.8f);
+                if (mode.equals(1)) {
+                    List<AnesthesiaConfig> anesthesiaConfigList = BeanUtil.listCopyTo(list, AnesthesiaConfig.class);
+                    ExcelUtils.exportExcel(anesthesiaConfigList, null, "sheet1", AnesthesiaConfig.class, fileName, response, 12.8f);
+                } else if (mode.equals(2)) {
+                    List<AnesthesiaConfigWrapper> anesthesiaConfigList = BeanUtil.listCopyTo(list, AnesthesiaConfigWrapper.class);
+                    ExcelUtils.exportExcel(anesthesiaConfigList, null, "sheet1", AnesthesiaConfigWrapper.class, fileName, response, 12.8f);
+                }
                 break;
             default:
                 break;
@@ -189,7 +262,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
      * @param response
      */
     public void exportExcelModule(HttpServletResponse response, MappingConfigVO mappingConfigVO) {
-        exportExcel(response, new ArrayList<>(), mappingConfigVO.getType(), "导入模板");
+        exportExcel(response, new ArrayList<>(), mappingConfigVO.getType(), "导入模板", 1);
     }
 
     /**
@@ -200,7 +273,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
     public void exportExcel(HttpServletResponse response, MappingConfigPageVO mappingConfigPageVO) {
         RespDTO<List<MappingConfigWrapper>> respDTO = cdssClient.exportExcel_remote(mappingConfigPageVO);
         if (RespDTOUtil.respIsOK(respDTO)) {
-            exportExcel(response, respDTO.data, mappingConfigPageVO.getType(), "映射");
+            exportExcel(response, respDTO.data, mappingConfigPageVO.getType(), "映射", 2);
         } else {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, respDTO.msg);
         }
@@ -232,7 +305,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
 
         RespDTO<List<MappingConfigWrapper>> respDTO = cdssClient.precDataMatch_remote(file, type);
         if (RespDTOUtil.respIsOK(respDTO)) {
-            exportExcel(response, respDTO.data, type, "关联数据（预匹配）");
+            exportExcel(response, respDTO.data, type, "关联数据（预匹配）", 1);
         } else {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, respDTO.msg);
         }
@@ -268,19 +341,13 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
      * @param hospitalId
      * @param type
      */
-    public Boolean importExcel(MultipartFile file, Long hospitalId, Integer type, String userId) {
+    public void importExcel(HttpServletResponse response, MultipartFile file, Long hospitalId, Integer type, String userId) {
         if (StringUtil.isBlank(userId)) {
             userId = UserUtils.getCurrentPrincipleID();
         }
-        RespDTO<Boolean> respDTO = cdssClient.importExcel(file, hospitalId, type, userId);
+        RespDTO<List<MappingConfigWrapper>> respDTO = cdssClient.importExcel_remote(file, hospitalId, type, userId);
         if (RespDTOUtil.respIsOK(respDTO)) {
-            return respDTO.data;
-        } else {
-            if (respDTO.code.equals(CommonErrorCode.NOT_EXISTS.getCode())) {
-                throw new CommonException(CommonErrorCode.NOT_EXISTS, respDTO.msg);
-            } else {
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, respDTO.msg);
-            }
+            exportExcel(response, respDTO.data, type, "非标准词", 1);
         }
     }
 

cdssman-service/src/main/java/com/diagbot/vo/ConceptVO.java

@@ -3,7 +3,6 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -18,4 +17,5 @@ public class ConceptVO {
     private List<String> names;
     private Integer type;
     private Integer source;
+    private Integer status;
 }

cdssman-service/src/main/java/com/diagbot/vo/FilterVO.java

@@ -15,4 +15,5 @@ import javax.validation.constraints.NotBlank;
 public class FilterVO {
     @NotBlank(message = "请输入检索内容")
     private String inputStr;
+    private Integer status;
 }

cdssman-service/src/main/java/com/diagbot/vo/MappingConfigPageVO.java

@@ -71,4 +71,14 @@ public class MappingConfigPageVO extends Page {
      */
     @ApiModelProperty(hidden = true)
     private Integer isMultiple;
+
+    /**
+     * 标准术语启用禁用状态
+     */
+    private Integer status;
+
+    /**
+     * 剂型启用禁用状态
+     */
+    private Integer formStatus;
 }

cdssman-service/src/main/java/com/diagbot/web/MappingConfigController.java

@@ -95,12 +95,11 @@ public class MappingConfigController {
     @PostMapping(value = "/importExcel", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @SysLogger("importExcel")
     @Transactional
-    public RespDTO<Boolean> importExcel(@RequestParam("file") MultipartFile file,
+    public void importExcel(HttpServletResponse response,@RequestParam("file") MultipartFile file,
                             @RequestParam("hospitalId") Long hospitalId,
                             @RequestParam("type") Integer type,
                             @RequestParam("uesrId") String userId) {
-        Boolean data = mappingConfigFacade.importExcel(file, hospitalId, type, userId);
-        return RespDTO.onSuc(data);
+        mappingConfigFacade.importExcel(response, file, hospitalId, type, userId);
     }