Merge branch 'dev/20220228_v3.0.1通用版_渠道管理第一期' into debug

daqe-center/src/main/java/com/lantone/daqe/dto/GetColumnDTO.java

@@ -0,0 +1,37 @@
+package com.lantone.daqe.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 获取数据库表中列数据信息-接口出参
+ * @author： zhanghang
+ * @time: 2022/3/1 10:30
+ */
+@ApiModel(value = "下拉框获取数据库表中列数据信息-接口出参")
+@Getter
+@Setter
+public class GetColumnDTO implements Serializable {
+
+
+    private static final long serialVersionUID = 2674023248290037231L;
+    @ApiModelProperty(value = "表的列信息ID")
+    private Long id;
+
+    @ApiModelProperty(value = "表名称（中文）")
+    private String tableCname;
+
+    @ApiModelProperty(value = "表名称（英文）")
+    private String tableEname;
+
+    @ApiModelProperty(value = "字段名称（中文）")
+    private String columnCname;
+
+    @ApiModelProperty(value = "字段名称（英文）")
+    private String columnEname;
+
+}

daqe-center/src/main/java/com/lantone/daqe/dto/GetFieldCalibrationPageDTO.java

@@ -8,44 +8,41 @@ import lombok.Setter;
 import java.io.Serializable;
 
 /**
- * @Description:
+ * @Description: 获取字段校验规则维护数据-接口出参
  * @author： zhanghang
  * @time: 2022/3/1 10:30
  */
 @ApiModel(value = "获取字段校验规则维护数据-接口出参")
 @Getter
 @Setter
-public class GetFieldCalibrationPageDTO implements Serializable {
+public class GetColumnVerifyPageDTO implements Serializable {
 
 
     private static final long serialVersionUID = 8948737933723938941L;
-    @ApiModelProperty(value = "组织机构ID")
-    private Long hospitalId;
-
-    @ApiModelProperty(value = "序号")
-    private Long id;
+    @ApiModelProperty(value = "表的列信息ID")
+    private Long columnId;
 
     @ApiModelProperty(value = "表名称（中文）")
-    private String tableNameChinese;
+    private String tableCname;
 
     @ApiModelProperty(value = "表名称（英文）")
-    private String tableNameEnglish;
+    private String tableEname;
 
     @ApiModelProperty(value = "字段名称（中文）")
-    private String fieldNameChinese;
+    private String columnCname;
 
     @ApiModelProperty(value = "字段名称（英文）")
-    private String fieldNameEnglish;
+    private String columnEname;
 
-    @ApiModelProperty(value = "是否必填")
-    private String ifRequired;
+    @ApiModelProperty(value = "是否必填,0:否，1:是")
+    private String isRequired;
 
     @ApiModelProperty(value = "标准值")
-    private String standardValue;
+    private String standardvalue;
 
     @ApiModelProperty(value = "正则式名称")
-    private String regularName;
+    private String regular;
 
     @ApiModelProperty(value = "说明")
-    private String instructions;
+    private String description;
 }

daqe-center/src/main/java/com/lantone/daqe/dto/GetRegularDTO.java

@@ -0,0 +1,28 @@
+package com.lantone.daqe.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 下拉框获取正则式名称-接口出参
+ * @author： zhanghang
+ * @time: 2022/3/1 10:30
+ */
+@ApiModel(value = "下拉框获取正则式名称-接口出参")
+@Getter
+@Setter
+public class GetRegularDTO implements Serializable {
+
+
+    private static final long serialVersionUID = -5997528961753345251L;
+    @ApiModelProperty(value = "正则ID")
+    private Long id;
+
+    @ApiModelProperty(value = "正则名称")
+    private String name;
+
+}

daqe-center/src/main/java/com/lantone/daqe/facade/ColumnVerifyManagementFacade.java

@@ -0,0 +1,75 @@
+package com.lantone.daqe.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.common.enums.IsDeleteEnum;
+import com.lantone.common.util.BeanUtil;
+import com.lantone.daqe.dto.GetColumnDTO;
+import com.lantone.daqe.dto.GetColumnVerifyPageDTO;
+import com.lantone.daqe.dto.GetRegularDTO;
+import com.lantone.daqe.entity.ColumnInfo;
+import com.lantone.daqe.entity.RegularInfo;
+import com.lantone.daqe.facade.base.ColumnInfoFacade;
+import com.lantone.daqe.facade.base.ColumnVerifyFacade;
+import com.lantone.daqe.facade.base.RegularInfoFacade;
+import com.lantone.daqe.vo.GetColumnVerifyPageVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description: 字段校验规则维护AIP
+ * @author： zhanghang
+ * @time: 2022/3/1 10:14
+ */
+
+@Component
+public class ColumnVerifyManagementFacade {
+
+    @Autowired
+    ColumnVerifyFacade columnVerifyFacade;
+
+    @Autowired
+    ColumnInfoFacade columnInfoFacade;
+    @Autowired
+    RegularInfoFacade regularInfoFacade;
+
+    /**
+     * 获取字段校验规则分页列表数据
+     *
+     * @param getColumnVerifyPageVO
+     * @return: 字段校验规则分页数据
+     */
+    public IPage<GetColumnVerifyPageDTO> getColumnVerifyPage(GetColumnVerifyPageVO getColumnVerifyPageVO) {
+        return columnVerifyFacade.getBaseMapper().getColumnVerifyPage(getColumnVerifyPageVO);
+    }
+
+    /**
+     * 下拉框获取数据库表中列数据信息
+     *
+     * @param
+     * @return: 数据库表中列数据信息
+     */
+    public List<GetColumnDTO> getColumn() {
+        List<ColumnInfo> columnInfoList = columnInfoFacade.getBaseMapper().selectList(new QueryWrapper<ColumnInfo>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+        );
+        List<GetColumnDTO> getColumnDTOList = BeanUtil.listCopyTo(columnInfoList, GetColumnDTO.class);
+        return getColumnDTOList;
+    }
+
+    /**
+     * 下拉框获取正则式名称
+     *
+     * @param
+     * @return: 正则式名称
+     */
+    public List<GetRegularDTO> getRegular() {
+        List<RegularInfo> regularInfoList = regularInfoFacade.getBaseMapper().selectList(new QueryWrapper<RegularInfo>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+        );
+        List<GetRegularDTO> regularDTOList = BeanUtil.listCopyTo(regularInfoList, GetRegularDTO.class);
+        return regularDTOList;
+    }
+}

daqe-center/src/main/java/com/lantone/daqe/facade/DiseaseManagementFacade.java

@@ -113,10 +113,7 @@ public class DiseaseManagementFacade {
      * @return 是否删除成功
      */
     public Boolean delDiseaseById(DelDiseaseByIdVO delDiseaseByIdVO) {
-        if (diseaseInfoFacade.getById(delDiseaseByIdVO.getId()) == null) {
-            Asserts.fail("该诊断不存在！");
-        }
-        return diseaseInfoFacade.removeById(delDiseaseByIdVO.getId());
+        return diseaseInfoFacade.removeByIds(delDiseaseByIdVO.getIds());
     }
 
     /**
@@ -175,7 +172,7 @@ public class DiseaseManagementFacade {
      * 数据校验
      *
      * @param diagnoseExcelVOS 导入数据
-     * @param errExports 导出异常
+     * @param errExports       导出异常
      * @Return java.lang.Boolean
      */
     private Boolean checkData(List<ImportDiseaseVO> diagnoseExcelVOS, List<ExportImportDiseaseErrDTO> errExports) {

daqe-center/src/main/java/com/lantone/daqe/facade/DrugManagementFacade.java

@@ -13,7 +13,6 @@ import com.lantone.daqe.dto.ExportImportDrugErrDTO;
 import com.lantone.daqe.dto.GetDrugPageDTO;
 import com.lantone.daqe.dto.GetMatchingDrugPageDTO;
 import com.lantone.daqe.entity.DrugInfo;
-import com.lantone.daqe.entity.OperationInfo;
 import com.lantone.daqe.facade.base.DrugInfoFacade;
 import com.lantone.daqe.service.impl.DrugInfoServiceImpl;
 import com.lantone.daqe.util.ExcelUtils;
@@ -117,10 +116,7 @@ public class DrugManagementFacade {
      * @return 是否删除成功
      */
     public Boolean delDrugById(DelDrugByIdVO delDrugByIdVO) {
-        if (drugInfoFacade.getById(delDrugByIdVO.getId()) == null) {
-            Asserts.fail("该药品不存在！");
-        }
-        return drugInfoFacade.removeById(delDrugByIdVO.getId());
+        return drugInfoFacade.removeByIds(delDrugByIdVO.getIds());
     }
 
     /**
@@ -138,7 +134,7 @@ public class DrugManagementFacade {
     }
 
     /**
-     *药品匹配信息导入
+     * 药品匹配信息导入
      *
      * @param response
      * @param file
@@ -162,8 +158,8 @@ public class DrugManagementFacade {
             //导入数据转换
             temp.stream().forEach(importDrugVO -> {
                 DrugInfo drugInfo = new DrugInfo();
-                BeanUtils.copyProperties(importDrugVO,drugInfo);
-                drugInfo.setStandard(importDrugVO.getStandard()+"_"+importDrugVO.getForm());
+                BeanUtils.copyProperties(importDrugVO, drugInfo);
+                drugInfo.setStandard(importDrugVO.getStandard() + "_" + importDrugVO.getForm());
             });
             boolean out = drugInfoServiceImpl.saveBatch(insert);
             CommonResult<String> outMsg = null;
@@ -187,7 +183,7 @@ public class DrugManagementFacade {
      * 数据校验
      *
      * @param importDrugVOS 导入数据
-     * @param errExports 导出异常i
+     * @param errExports    导出异常i
      * @Return java.lang.Boolean
      */
     private Boolean checkData(List<ImportDrugVO> importDrugVOS, List<ExportImportDrugErrDTO> errExports) {
@@ -225,7 +221,22 @@ public class DrugManagementFacade {
         return tempMap.values().stream().collect(Collectors.toList());
     }
 
+    /**
+     * 获取药品匹配分页列表
+     *
+     * @param getMatchingDrugPageVO
+     * @Return com.baomidou.mybatisplus.core.metadata.IPage<com.lantone.daqe.dto.GetMatchingDrugPageDTO>
+     */
     public IPage<GetMatchingDrugPageDTO> getMatchingDrugPage(GetMatchingDrugPageVO getMatchingDrugPageVO) {
-        return drugInfoServiceImpl.getBaseMapper().getMatchingDrugPage(getMatchingDrugPageVO);
+
+        List<GetMatchingDrugPageDTO> getMatchingDrugPageDTOList = new ArrayList<>();
+        //数据整理组装
+        IPage<GetMatchingDrugPageDTO> drugPages = drugInfoServiceImpl.getBaseMapper().getMatchingDrugPage(getMatchingDrugPageVO);
+        for (GetMatchingDrugPageDTO drug : drugPages.getRecords()) {
+            //目前先按照_切割
+            drug.setForm(drug.getStandard().split("_")[1]);
+            getMatchingDrugPageDTOList.add(drug);
+        }
+        return drugPages.setRecords(getMatchingDrugPageDTOList);
     }
 }

daqe-center/src/main/java/com/lantone/daqe/facade/FieldCalibrationManagementFacade.java

@@ -1,26 +0,0 @@
-package com.lantone.daqe.facade;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.lantone.daqe.dto.GetFieldCalibrationPageDTO;
-import com.lantone.daqe.vo.GetFieldCalibrationPageVO;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 字段校验规则维护AIP
- * @author： zhanghang
- * @time: 2022/3/1 10:14
- */
-
-@Component
-public class FieldCalibrationManagementFacade {
-
-    /**
-     * 获取字段校验规则分页列表数据
-     *
-     * @param getFieldCalibrationPageVO
-     * @return: 字段校验规则分页数据
-     */
-    public IPage<GetFieldCalibrationPageDTO> getFieldCalibrationPage(GetFieldCalibrationPageVO getFieldCalibrationPageVO) {
-        return null;
-    }
-}

daqe-center/src/main/java/com/lantone/daqe/facade/OperationManagementFacade.java

@@ -114,10 +114,7 @@ public class OperationManagementFacade {
      * @return 是否删除成功
      */
     public Boolean delOperationById(DelOperationByIdVO delOperationByIdVO) {
-        if (operationInfoFacade.getById(delOperationByIdVO.getId()) == null) {
-            Asserts.fail("该药品不存在！");
-        }
-        return operationInfoFacade.removeById(delOperationByIdVO.getId());
+        return operationInfoFacade.removeByIds(delOperationByIdVO.getIds());
     }
 
     /**

daqe-center/src/main/java/com/lantone/daqe/facade/RegularManagementFacade.java

@@ -135,19 +135,35 @@ public class RegularManagementFacade {
      * @return 是否删除成功
      */
     public Boolean delRegularById(DelRegularByIdVO delRegularByIdVO) {
-        if (regularInfoFacade.getById(delRegularByIdVO.getId()) == null) {
+        Boolean flag = false;
+        for (Long id : delRegularByIdVO.getIds()) {
+            flag = delRegularById(id, delRegularByIdVO.getHospitalId());
+        }
+        return flag;
+    }
+
+    /**
+     *通过id删除正则式
+     *
+     * @param id
+     * @param hospitalId
+     * @Return java.lang.Boolean
+     */
+    private Boolean delRegularById(Long id, Long hospitalId) {
+
+        if (regularInfoFacade.getById(id) == null) {
             Asserts.fail("该正则式不存在！");
         }
-        if (regularInfoFacade.removeById(delRegularByIdVO.getId())) {
+        if (regularInfoFacade.removeById(id)) {
             //删除表字段的实际值与正则式关联关系
             if (regularMappingFacade.update(new UpdateWrapper<RegularMapping>()
-                    .eq("regular_id", delRegularByIdVO.getId())
+                    .eq("regular_id", id)
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .set("is_deleted", IsDeleteEnum.Y.getKey()))) {
                 //删除表字段的正则式校验结果表中的正则式
                 return regularResultFacade.update(new UpdateWrapper<RegularResult>()
-                        .eq(delRegularByIdVO.getHospitalId() != null, "hospital_id", delRegularByIdVO.getHospitalId())
-                        .eq("regular_id", delRegularByIdVO.getId())
+                        .eq(hospitalId != null, "hospital_id", hospitalId)
+                        .eq("regular_id", id)
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
                         .set("is_deleted", IsDeleteEnum.Y.getKey()));
             }

daqe-center/src/main/java/com/lantone/daqe/mapper/ColumnVerifyMapper.java

@@ -1,7 +1,11 @@
 package com.lantone.daqe.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.daqe.dto.GetColumnVerifyPageDTO;
 import com.lantone.daqe.entity.ColumnVerify;
+import com.lantone.daqe.vo.GetColumnVerifyPageVO;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -9,5 +13,5 @@ import com.lantone.daqe.entity.ColumnVerify;
  * </p>
  */
 public interface ColumnVerifyMapper extends BaseMapper<ColumnVerify> {
-
+    IPage<GetColumnVerifyPageDTO> getColumnVerifyPage(@Param("getColumnVerifyPageVO") GetColumnVerifyPageVO getColumnVerifyPageVO);
 }

daqe-center/src/main/java/com/lantone/daqe/mapper/DrugInfoMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.daqe.dto.GetMatchingDrugPageDTO;
 import com.lantone.daqe.entity.DrugInfo;
 import com.lantone.daqe.vo.GetMatchingDrugPageVO;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,5 +14,5 @@ import com.lantone.daqe.vo.GetMatchingDrugPageVO;
  */
 public interface DrugInfoMapper extends BaseMapper<DrugInfo> {
 
-    IPage<GetMatchingDrugPageDTO> getMatchingDrugPage(GetMatchingDrugPageVO getMatchingDrugPageVO);
+    IPage<GetMatchingDrugPageDTO> getMatchingDrugPage(@Param("getMatchingDrugPageVO") GetMatchingDrugPageVO getMatchingDrugPageVO);
 }

daqe-center/src/main/java/com/lantone/daqe/vo/AddColumnVerifyVO.java

@@ -0,0 +1,32 @@
+package com.lantone.daqe.vo;
+
+import com.lantone.daqe.entity.ColumnInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description: 新增字段校验规则-接口入参
+ * @author： zhanghang
+ * @time: 2022/3/4 16:03
+ */
+@ApiModel(value = "新增字段校验规则-接口入参")
+@Getter
+@Setter
+public class AddColumnVerifyVO implements Serializable {
+    private static final long serialVersionUID = -7833991160014144645L;
+
+
+    @ApiModelProperty(value = "表字段信息", required = true )
+    @NotNull(message = "表信息不能为空")
+    List<ColumnInfo> columnList;
+
+    @ApiModelProperty(value = "是否必填,0:否，1:是")
+    String isRequired;
+
+}

daqe-center/src/main/java/com/lantone/daqe/vo/DelDiseaseByIdVO.java

@@ -5,8 +5,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description: 通过id删除诊断-接口入参
@@ -20,8 +21,8 @@ public class DelDiseaseByIdVO implements Serializable {
 
     private static final long serialVersionUID = 5262000808815034181L;
 
-    @ApiModelProperty(value = "主键", required = true)
-    @NotNull(message = "主键不能为空")
-    private Long id;
+    @ApiModelProperty(value = "主键集合", required = true)
+    @NotEmpty(message = "主键集合不能为空")
+    private List<Long> ids;
 
 }

daqe-center/src/main/java/com/lantone/daqe/vo/DelDrugByIdVO.java

@@ -5,8 +5,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description: 通过id删除药品-接口入参
@@ -20,8 +21,8 @@ public class DelDrugByIdVO implements Serializable {
 
     private static final long serialVersionUID = 5262000808815034181L;
 
-    @ApiModelProperty(value = "主键", required = true)
-    @NotNull(message = "主键不能为空")
-    private Long id;
+    @ApiModelProperty(value = "主键集合", required = true)
+    @NotEmpty(message = "主键集合不能为空")
+    private List<Long> ids;
 
 }

daqe-center/src/main/java/com/lantone/daqe/vo/DelOperationByIdVO.java

@@ -5,8 +5,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description: 通过id删除手术-接口入参
@@ -20,8 +21,8 @@ public class DelOperationByIdVO implements Serializable {
 
     private static final long serialVersionUID = 5262000808815034181L;
 
-    @ApiModelProperty(value = "主键", required = true)
-    @NotNull(message = "主键不能为空")
-    private Long id;
+    @ApiModelProperty(value = "主键集合", required = true)
+    @NotEmpty(message = "主键集合不能为空")
+    private List<Long> ids;
 
 }

daqe-center/src/main/java/com/lantone/daqe/vo/DelRegularByIdVO.java

@@ -5,8 +5,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description: 通过id删除正则式-接口入参
@@ -24,8 +25,8 @@ public class DelRegularByIdVO implements Serializable {
     private Long hospitalId;
 
     @ApiModelProperty(value = "主键", required = true)
-    @NotNull(message = "主键不能为空")
-    private Long id;
+    @NotEmpty(message = "主键不能为空")
+    private List<Long> ids;
 
 
 }

daqe-center/src/main/java/com/lantone/daqe/vo/GetFieldCalibrationPageVO.java

@@ -7,33 +7,33 @@ import lombok.Getter;
 import lombok.Setter;
 
 /**
- * @Description:
+ * @Description: 获取字段校验规则维护数据-接口入参
  * @author： zhanghang
  * @time: 2022/3/1 10:30
  */
 @ApiModel(value = "获取字段校验规则维护数据-接口入参")
 @Getter
 @Setter
-public class GetFieldCalibrationPageVO extends Page {
+public class GetColumnVerifyPageVO extends Page {
     private static final long serialVersionUID = 3787530642894987524L;
 
     @ApiModelProperty(value = "组织机构ID")
     private Long hospitalId;
 
     @ApiModelProperty(value = "表名称（中文）")
-    private String tableNameChinese;
+    private String tableCname;
 
     @ApiModelProperty(value = "表名称（英文）")
-    private String tableNameEnglish;
+    private String tableEname;
 
     @ApiModelProperty(value = "字段名称（中文）")
-    private String fieldNameChinese;
+    private String columnCname;
 
     @ApiModelProperty(value = "字段名称（英文）")
-    private String fieldNameEnglish;
+    private String columnEname;
 
-    @ApiModelProperty(value = "是否必填")
-    private String ifRequired;
+    @ApiModelProperty(value = "是否必填,0:否，1:是")
+    private String isRequired;
 
     @ApiModelProperty(value = "标准值")
     private String standardValue;

daqe-center/src/main/java/com/lantone/daqe/web/ColumnVerifyManagementController.java

@@ -0,0 +1,60 @@
+package com.lantone.daqe.web;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.common.api.CommonResult;
+import com.lantone.daqe.dto.GetColumnDTO;
+import com.lantone.daqe.dto.GetColumnVerifyPageDTO;
+import com.lantone.daqe.dto.GetRegularDTO;
+import com.lantone.daqe.facade.ColumnVerifyManagementFacade;
+import com.lantone.daqe.vo.AddColumnVerifyVO;
+import com.lantone.daqe.vo.GetColumnVerifyPageVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+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.RestController;
+
+import java.util.List;
+
+/**
+ * @Description: 字段校验规则维护API
+ * @author： zhanghang
+ * @time: 2022/3/1 10:14
+ */
+
+@RestController
+@Api(value = "字段校验规则维护API", tags = { "字段校验规则维护API" })
+@RequestMapping("/fieldCalibrationManagement")
+public class ColumnVerifyManagementController {
+
+    @Autowired
+    private ColumnVerifyManagementFacade columnVerifyManagementFacade;
+
+
+    @ApiOperation(value = "获取字段校验规则维护分页列表 [by:zhanghang]")
+    @PostMapping("/getColumnVerifyPage")
+    public CommonResult<IPage<GetColumnVerifyPageDTO>> getColumnVerifyPage(@RequestBody GetColumnVerifyPageVO getColumnVerifyPageVO) {
+        return CommonResult.success(columnVerifyManagementFacade.getColumnVerifyPage(getColumnVerifyPageVO));
+    }
+
+    @ApiOperation(value = "下拉框获取数据库表中列数据信息 [by:zhanghang]")
+    @PostMapping("/getColumn")
+    public CommonResult<List<GetColumnDTO>> getColumn() {
+        return CommonResult.success(columnVerifyManagementFacade.getColumn());
+    }
+
+    @ApiOperation(value = "下拉框获取正则式名称 [by:zhanghang]")
+    @PostMapping("/getRegular")
+    public CommonResult<List<GetRegularDTO>> getRegular() {
+        return CommonResult.success(columnVerifyManagementFacade.getRegular());
+    }
+
+
+    @ApiOperation(value = "新增字段校验规则 [by:zhanghang]")
+    @PostMapping("/addColumnVerify")
+    public CommonResult<Boolean> addColumnVerify(@RequestBody AddColumnVerifyVO addColumnVerifyVO) {
+        return CommonResult.success(null);
+    }
+}

daqe-center/src/main/java/com/lantone/daqe/web/FieldCalibrationManagementController.java

@@ -1,36 +0,0 @@
-package com.lantone.daqe.web;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.lantone.common.api.CommonResult;
-import com.lantone.daqe.dto.GetFieldCalibrationPageDTO;
-import com.lantone.daqe.facade.FieldCalibrationManagementFacade;
-import com.lantone.daqe.vo.GetFieldCalibrationPageVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-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.RestController;
-
-/**
- * @Description: 字段校验规则维护API
- * @author： zhanghang
- * @time: 2022/3/1 10:14
- */
-
-@RestController
-@Api(value = "字段校验规则维护API", tags = { "字段校验规则维护API" })
-@RequestMapping("/fieldCalibrationManagement")
-public class FieldCalibrationManagementController {
-
-    @Autowired
-    private FieldCalibrationManagementFacade fieldCalibrationManagementFacade;
-
-
-    @ApiOperation(value = "获取字段校验规则维护分页列表 [by:zhanghang]")
-    @PostMapping("/getFieldCalibrationPage")
-    public CommonResult<IPage<GetFieldCalibrationPageDTO>> getFieldCalibrationPage(@RequestBody GetFieldCalibrationPageVO getFieldCalibrationPageVO) {
-        return CommonResult.success(fieldCalibrationManagementFacade.getFieldCalibrationPage(getFieldCalibrationPageVO));
-    }
-}

daqe-center/src/main/resources/mapper/ColumnVerifyMapper.xml

@@ -2,4 +2,63 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.daqe.mapper.ColumnVerifyMapper">
 
+    <select id="getColumnVerifyPage" resultType="com.lantone.daqe.dto.GetColumnVerifyPageDTO">
+        SELECT * from(
+        SELECT
+        a.column_id,
+        a.table_cname,
+        a.table_ename,
+        a.column_cname,
+        a.column_ename,
+        GROUP_CONCAT(a.isRequired SEPARATOR ';') isRequired,
+        GROUP_CONCAT(a.standardvalue SEPARATOR ';') standardvalue,
+        GROUP_CONCAT(a.regular SEPARATOR ';') regular,
+        a.description
+        FROM
+        (
+        SELECT
+        dcv.column_id,
+        dcv.table_cname,
+        dcv.table_ename,
+        dcv.column_cname,
+        dcv.column_ename,
+        dcv.type,
+        dcv.description,
+        CASE dcv.type WHEN 1 THEN dcv.verify_val ELSE NULL END isRequired,
+        CASE dcv.type WHEN 2 THEN dcv.verify_val ELSE NULL END standardvalue,
+        CASE dcv.type WHEN 3 THEN dcv.verify_val ELSE NULL END regular
+        FROM
+        dc_column_verify dcv
+        WHERE
+        dcv.is_deleted = 'N'
+        <if test="getColumnVerifyPageVO.tableCname != null and getColumnVerifyPageVO.tableCname != ''">
+            AND dcv.table_cname = #{getColumnVerifyPageVO.tableCname}
+        </if>
+        <if test="getColumnVerifyPageVO.tableEname != null and getColumnVerifyPageVO.tableEname != ''">
+            AND dcv.table_ename = #{getColumnVerifyPageVO.tableEname}
+        </if>
+        <if test="getColumnVerifyPageVO.columnCname != null and getColumnVerifyPageVO.columnCname != ''">
+            AND dcv.column_cname = #{getColumnVerifyPageVO.columnCname}
+        </if>
+        <if test="getColumnVerifyPageVO.columnEname != null and getColumnVerifyPageVO.columnEname != ''">
+            AND dcv.column_ename= #{getColumnVerifyPageVO.columnEname}
+        </if>
+        ) a
+
+        GROUP BY
+        a.column_id
+        )a
+        where
+        1=1
+        <if test="getColumnVerifyPageVO.isRequired != null and getColumnVerifyPageVO.isRequired != ''">
+            AND a.column_ename = #{getColumnVerifyPageVO.columnEname}
+        </if>
+        <if test="getColumnVerifyPageVO.regularName != null and getColumnVerifyPageVO.regularName != ''">
+            AND a.regular = #{getColumnVerifyPageVO.regularName}
+        </if>
+        <if test="getColumnVerifyPageVO.standardValue != null and getColumnVerifyPageVO.standardValue != ''">
+            AND a.standardvalue LIKE CONCAT('%',#{getColumnVerifyPageVO.regularName},'%')
+        </if>
+    </select>
+
 </mapper>

daqe-center/src/main/resources/mapper/DiseaseInfoMapper.xml

@@ -24,7 +24,7 @@
             AND id = #{getMatchingDiseasePageVO.id}
         </if>
         <if test="getMatchingDiseasePageVO.name != null and getMatchingDiseasePageVO.name != ''">
-            AND `name` LIKE like CONCAT('%',#{getMatchingDiseasePageVO.name},'%')
+            AND `name` LIKE  CONCAT('%',#{getMatchingDiseasePageVO.name},'%')
         </if>
     </select>
 </mapper>

daqe-center/src/main/resources/mapper/DrugInfoMapper.xml

@@ -2,5 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.daqe.mapper.DrugInfoMapper">
 
-    <select id="getMatchingDrugPage" resultType="com.lantone.daqe.dto.GetMatchingDrugPageDTO"></select>
+    <select id="getMatchingDrugPage" resultType="com.lantone.daqe.dto.GetMatchingDrugPageDTO">
+        SELECT
+            standard,
+            synonym
+        FROM
+        `hos_drug_info`
+        WHERE
+        1=1
+        <if test="getMatchingDrugPageVO.hospitalId != null">
+            hospital_id = #{getMatchingDrugPageVO.hospitalId}
+        </if>
+        <if test="getMatchingDrugPageVO.id != null">
+            AND id = #{getMatchingDrugPageVO.id}
+        </if>
+        <if test="getMatchingDrugPageVO.name != null and getMatchingDrugPageVO.name != ''">
+            AND `name` LIKE CONCAT('%',#{getMatchingDrugPageVO.name},'%')
+        </if>
+
+    </select>
 </mapper>

daqe-center/src/main/resources/mapper/OperationInfoMapper.xml

@@ -24,7 +24,7 @@
             AND id = #{getMatchingOperationVO.id}
         </if>
         <if test="getMatchingOperationVO.name != null and getMatchingOperationVO.name != ''">
-            AND `name` LIKE like CONCAT('%',#{getMatchingOperationVO.name},'%')
+            AND `name` LIKE CONCAT('%',#{getMatchingOperationVO.name},'%')
         </if>
     </select>
 </mapper>