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

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

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

@@ -19,9 +19,15 @@ public class GetDiseasePageDTO implements Serializable {
 
     private static final long serialVersionUID = -1129177776572833627L;
 
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
     @ApiModelProperty(value = "组织机构ID")
     private Long hospitalId;
-    
+
+    @ApiModelProperty(value = "医院诊断代码")
+    private String code;
+
     @ApiModelProperty(value = "医院诊断名称")
     private String name;
 

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

@@ -0,0 +1,46 @@
+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: rengb
+ * @time: 2022/2/27 14:30
+ */
+@ApiModel(value = "获取药品分页列表-接口出参")
+@Getter
+@Setter
+public class GetDrugPageDTO implements Serializable {
+
+    private static final long serialVersionUID = -3423432863909470619L;
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "组织机构ID")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "医院药品代码")
+    private String code;
+
+    @ApiModelProperty(value = "医院药品名称")
+    private String name;
+
+    @ApiModelProperty(value = "国药准字")
+    private String approvalNum;
+
+    @ApiModelProperty(value = "标准药品名称")
+    private String standard;
+
+    @ApiModelProperty(value = "药品剂型")
+    private String dosageForm;
+
+    @ApiModelProperty(value = "已/未匹配")
+    private String isMapping;
+
+}

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

@@ -0,0 +1,46 @@
+package com.lantone.daqe.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 获取职务职称变更记录-接口出参
+ * @author: zhanghang
+ * @time: 2022/2/28
+ */
+@ApiModel(value = "获取职务职称变更记录-接口出参")
+@Getter
+@Setter
+public class GetOfficialCapacityPageDTO implements Serializable {
+
+
+    private static final long serialVersionUID = -5020172914749530114L;
+    @ApiModelProperty(value = "组织机构ID")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "职务/职称名称")
+    private String name;
+
+    @ApiModelProperty(value = "类型：1-职务；2-职称")
+    private String type;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "职位/职称变更时间")
+    private Date changeTime;
+
+    @ApiModelProperty(value = "医生姓名")
+    private String doctorName;
+
+    @ApiModelProperty(value = "工号")
+    private String doctorCode;
+
+    @ApiModelProperty(value = "科室名称")
+    private String deptName;
+
+}

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

@@ -18,7 +18,10 @@ import java.io.Serializable;
 public class GetOperationPageDTO implements Serializable {
 
     private static final long serialVersionUID = -4850779079703241414L;
-    
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
     @ApiModelProperty(value = "组织机构ID")
     private Long hospitalId;
 

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

@@ -0,0 +1,41 @@
+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/2/28
+ */
+@ApiModel(value = "获取文书模块信息-接口出参")
+@Getter
+@Setter
+public class GetRecordTemplatePageDTO implements Serializable {
+
+
+    private static final long serialVersionUID = 8095973115574155886L;
+    @ApiModelProperty(value = "主键")
+    private Long Id;
+
+    @ApiModelProperty(value = "组织机构ID")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "医院模板ID")
+    private String code;
+
+    @ApiModelProperty(value = "医院模板名称")
+    private String name;
+
+    @ApiModelProperty(value = "医院父类模板ID")
+    private String parentCode;
+
+    @ApiModelProperty(value = "医院父类模板名称")
+    private String parentName;
+
+
+}

daqe-center/src/main/java/com/lantone/daqe/entity/BlocklossResult.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

daqe-center/src/main/java/com/lantone/daqe/entity/DiseaseInfo.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -28,6 +26,12 @@ public class DiseaseInfo implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 组织机构ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
     /**
      * 医院诊断代码
      */
@@ -47,7 +51,7 @@ public class DiseaseInfo implements Serializable {
     private String icd10;
 
     /**
-     * 标准词
+     * 标准词，规范：标准词名称_特性1名称:特性1值_特性2名称:特性2值
      */
     @TableField("standard")
     private String standard;

daqe-center/src/main/java/com/lantone/daqe/entity/DrugInfo.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -28,6 +26,12 @@ public class DrugInfo implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 组织机构ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
     /**
      * 医院药品代码
      */
@@ -41,7 +45,13 @@ public class DrugInfo implements Serializable {
     private String name;
 
     /**
-     * 标准词
+     * 国药准字
+     */
+    @TableField("approval_num")
+    private String approvalNum;
+
+    /**
+     * 标准词，规范：标准词名称_特性1名称:特性1值_特性2名称:特性2值
      */
     @TableField("standard")
     private String standard;

daqe-center/src/main/java/com/lantone/daqe/entity/NonnullInfo.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

daqe-center/src/main/java/com/lantone/daqe/entity/NonnullResult.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

daqe-center/src/main/java/com/lantone/daqe/entity/OfficialCapacity.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -28,6 +26,12 @@ public class OfficialCapacity implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 组织机构ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
     /**
      * 职务/职称名称
      */

daqe-center/src/main/java/com/lantone/daqe/entity/OperationInfo.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -28,6 +26,12 @@ public class OperationInfo implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 组织机构ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
     /**
      * 医院手术代码
      */
@@ -41,7 +45,7 @@ public class OperationInfo implements Serializable {
     private String name;
 
     /**
-     * 标准词
+     * 标准词，规范：标准词名称_特性1名称:特性1值_特性2名称:特性2值
      */
     @TableField("standard")
     private String standard;

daqe-center/src/main/java/com/lantone/daqe/entity/RecordTemplate.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -28,6 +26,12 @@ public class RecordTemplate implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 组织机构ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
     /**
      * 模板代码
      */

daqe-center/src/main/java/com/lantone/daqe/entity/RegularInfo.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

daqe-center/src/main/java/com/lantone/daqe/entity/RegularMapping.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

daqe-center/src/main/java/com/lantone/daqe/entity/RegularResult.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

daqe-center/src/main/java/com/lantone/daqe/entity/StandardvalueInfo.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

daqe-center/src/main/java/com/lantone/daqe/entity/StandardvalueMapping.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

daqe-center/src/main/java/com/lantone/daqe/entity/StandardvalueResult.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

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

@@ -58,9 +58,8 @@ public class DiseaseManagementFacade {
     }
 
     /**
-     *@Description新增诊断
-     *
      * @param addDiseaseVo
+     * @Description新增诊断
      * @Return java.lang.Boolean
      */
     public Boolean addDisease(AddDiseaseVo addDiseaseVo) {
@@ -69,9 +68,8 @@ public class DiseaseManagementFacade {
     }
 
     /**
-     *@Description修改诊断
-     *
      * @param upDiseaseByIdVo
+     * @Description修改诊断
      * @Return java.lang.Boolean
      */
     public Boolean upDiseaseById(UpDiseaseByIdVo upDiseaseByIdVo) {
@@ -80,9 +78,8 @@ public class DiseaseManagementFacade {
     }
 
     /**
-     *@Description删除诊断
-     *
      * @param delDiseaseByIdVo
+     * @Description删除诊断
      * @Return java.lang.Boolean
      */
     public Boolean delDiseaseById(DelDiseaseByIdVo delDiseaseByIdVo) {
@@ -90,6 +87,7 @@ public class DiseaseManagementFacade {
         return false;
     }
 
+
     /**
      *@Description
      *

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

@@ -0,0 +1,57 @@
+package com.lantone.daqe.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.lantone.common.util.BeanUtil;
+import com.lantone.common.util.StringUtil;
+import com.lantone.daqe.dto.GetDrugPageDTO;
+import com.lantone.daqe.entity.DrugInfo;
+import com.lantone.daqe.facade.base.DrugInfoFacade;
+import com.lantone.daqe.vo.GetDrugPageVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description: 药品管理-业务处理类
+ * @author: rengb
+ * @time: 2021/7/20 12:39
+ */
+@Component
+public class DrugManagementFacade {
+
+    @Autowired
+    private DrugInfoFacade drugInfoFacade;
+
+    public IPage<GetDrugPageDTO> getDrugPage(GetDrugPageVO getDrugPageVO) {
+        Page<GetDrugPageDTO> getDrugPageDTOPage = new Page<>();
+
+        QueryWrapper<DrugInfo> drugInfoQueryWrapper = new QueryWrapper<>();
+        drugInfoQueryWrapper.eq(getDrugPageVO.getHospitalId() != null, "hospital_id", getDrugPageVO.getHospitalId());
+        drugInfoQueryWrapper.like(StringUtil.isNotBlank(getDrugPageVO.getCode()), "code", getDrugPageVO.getCode());
+        drugInfoQueryWrapper.like(StringUtil.isNotBlank(getDrugPageVO.getName()), "name", getDrugPageVO.getName());
+        drugInfoQueryWrapper.like(StringUtil.isNotBlank(getDrugPageVO.getApprovalNum()), "approval_num", getDrugPageVO.getApprovalNum());
+        drugInfoQueryWrapper.like(StringUtil.isNotBlank(getDrugPageVO.getStandard()), "standard", getDrugPageVO.getStandard());
+        drugInfoQueryWrapper.like(StringUtil.isNotBlank(getDrugPageVO.getDosageForm()), "standard", getDrugPageVO.getDosageForm());
+        if (StringUtil.isNotBlank(getDrugPageVO.getIsMapping())) {
+            if (getDrugPageVO.getIsMapping().equals("0")) {
+                drugInfoQueryWrapper.isNull("standard");
+            } else if (getDrugPageVO.getIsMapping().equals("1")) {
+                drugInfoQueryWrapper.isNotNull("standard");
+            }
+        }
+        Page<DrugInfo> drugInfoPage = new Page<>(getDrugPageVO.getCurrent(), getDrugPageVO.getSize());
+        drugInfoFacade.page(drugInfoPage, drugInfoQueryWrapper);
+        BeanUtil.copyProperties(drugInfoPage, getDrugPageDTOPage);
+        List<GetDrugPageDTO> getDrugPageDTOList = BeanUtil.listCopyTo(drugInfoPage.getRecords(), GetDrugPageDTO.class);
+        getDrugPageDTOList.forEach(i -> {
+            i.setIsMapping(StringUtil.isBlank(i.getIsMapping()) ? "未匹配" : "已匹配");
+        });
+
+        getDrugPageDTOPage.setRecords(getDrugPageDTOList);
+        return getDrugPageDTOPage;
+    }
+
+}

daqe-center/src/main/java/com/lantone/daqe/facade/OfficialCapacityManagementFacade.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.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.lantone.common.enums.IsDeleteEnum;
+import com.lantone.common.util.BeanUtil;
+import com.lantone.common.util.StringUtil;
+import com.lantone.daqe.dto.GetOfficialCapacityPageDTO;
+import com.lantone.daqe.entity.OfficialCapacity;
+import com.lantone.daqe.facade.base.OfficialCapacityFacade;
+import com.lantone.daqe.vo.DelOfficialCapacityByIdVO;
+import com.lantone.daqe.vo.GetOfficialCapacityPageVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: 职务职称变更记录-业务处理类
+ * @author: zhanghang
+ * @time: 2022/2/28
+ */
+
+@Component
+public class OfficialCapacityManagementFacade {
+
+    @Autowired
+    private OfficialCapacityFacade officialCapacityFacade;
+
+
+    public IPage<GetOfficialCapacityPageDTO> getOfficialCapacityPage(GetOfficialCapacityPageVO getOfficialCapacityPageVO) {
+        Page<GetOfficialCapacityPageDTO> getOfficialCapacityPageDTOPage = new Page<>();
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String startDate = null;
+        String endDate = null;
+        if (getOfficialCapacityPageVO.getChangeTimeStart() != null) {
+            startDate = sdf.format(getOfficialCapacityPageVO.getChangeTimeStart());
+        }
+        if (getOfficialCapacityPageVO.getChangeTimeEnd() != null) {
+            endDate = sdf.format(getOfficialCapacityPageVO.getChangeTimeStart());
+        }
+        QueryWrapper<OfficialCapacity> officialCapacityQueryWrapper = new QueryWrapper<>();
+        officialCapacityQueryWrapper.eq(getOfficialCapacityPageVO.getHospitalId() != null, "hospital_id", getOfficialCapacityPageVO.getHospitalId());
+        officialCapacityQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+        officialCapacityQueryWrapper.ge(StringUtil.isNotBlank(startDate), "change_time", getOfficialCapacityPageVO.getChangeTimeStart());
+        officialCapacityQueryWrapper.le(StringUtil.isNotBlank(endDate), "change_time", getOfficialCapacityPageVO.getChangeTimeEnd());
+        officialCapacityQueryWrapper.like(StringUtil.isNotBlank(getOfficialCapacityPageVO.getType()), "type", getOfficialCapacityPageVO.getType());
+        officialCapacityQueryWrapper.like(StringUtil.isNotBlank(getOfficialCapacityPageVO.getName()), "name", getOfficialCapacityPageVO.getName());
+        officialCapacityQueryWrapper.like(StringUtil.isNotBlank(getOfficialCapacityPageVO.getDoctorName()), "doctor_name", getOfficialCapacityPageVO.getDoctorName());
+        officialCapacityQueryWrapper.like(StringUtil.isNotBlank(getOfficialCapacityPageVO.getDoctorCode()), "doctor_code", getOfficialCapacityPageVO.getDoctorCode());
+        officialCapacityQueryWrapper.like(StringUtil.isNotBlank(getOfficialCapacityPageVO.getDeptName()), "dept_name", getOfficialCapacityPageVO.getDeptName());
+        Page<OfficialCapacity> officialCapacityPage = new Page<>(getOfficialCapacityPageVO.getCurrent(), getOfficialCapacityPageVO.getSize());
+        officialCapacityFacade.page(officialCapacityPage, officialCapacityQueryWrapper);
+        BeanUtil.copyProperties(officialCapacityPage, getOfficialCapacityPageDTOPage);
+        List<GetOfficialCapacityPageDTO> getOfficialCapacityPageDTOList = BeanUtil.listCopyTo(officialCapacityPage.getRecords(), GetOfficialCapacityPageDTO.class);
+
+        getOfficialCapacityPageDTOPage.setRecords(getOfficialCapacityPageDTOList);
+        return getOfficialCapacityPageDTOPage;
+    }
+
+    public Boolean delOfficialCapacityPage(DelOfficialCapacityByIdVO delOfficialCapacityByIdVO) {
+        OfficialCapacity officialCapacity = new OfficialCapacity();
+        officialCapacity.setIsDeleted(IsDeleteEnum.Y.getKey());
+        officialCapacity.setGmtModified(new Date());
+        return officialCapacityFacade.update(officialCapacity, new QueryWrapper<OfficialCapacity>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", delOfficialCapacityByIdVO.getId())
+        );
+    }
+
+}

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

@@ -30,6 +30,7 @@ public class OperationManagementFacade {
 
         QueryWrapper<OperationInfo> operationInfoQueryWrapper = new QueryWrapper<>();
         operationInfoQueryWrapper.eq(getOperationPageVO.getHospitalId() != null, "hospital_id", getOperationPageVO.getHospitalId());
+        operationInfoQueryWrapper.like(StringUtil.isNotBlank(getOperationPageVO.getCode()), "code", getOperationPageVO.getCode());
         operationInfoQueryWrapper.like(StringUtil.isNotBlank(getOperationPageVO.getName()), "name", getOperationPageVO.getName());
         operationInfoQueryWrapper.like(StringUtil.isNotBlank(getOperationPageVO.getStandard()), "standard", getOperationPageVO.getStandard());
         if (StringUtil.isNotBlank(getOperationPageVO.getIsMapping())) {

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

@@ -0,0 +1,57 @@
+package com.lantone.daqe.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.lantone.common.enums.IsDeleteEnum;
+import com.lantone.common.util.BeanUtil;
+import com.lantone.common.util.StringUtil;
+import com.lantone.daqe.dto.GetRecordTemplatePageDTO;
+import com.lantone.daqe.entity.RecordTemplate;
+import com.lantone.daqe.facade.base.RecordTemplateFacade;
+import com.lantone.daqe.vo.GetRecordTemplateByIdVO;
+import com.lantone.daqe.vo.GetRecordTemplatePageVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description: 文书模板维护-业务处理类
+ * @author: zhanghang
+ * @time: 2022/2/28
+ */
+
+@Component
+public class RecordTemplateManagementFacade {
+
+    @Autowired
+    private RecordTemplateFacade recordTemplateFacade;
+
+    public IPage<GetRecordTemplatePageDTO> getRecordTemplatePage(GetRecordTemplatePageVO getRecordTemplatePageVO) {
+        Page<GetRecordTemplatePageDTO> getRecordTemplatePageDTOPage = new Page<>();
+
+        QueryWrapper<RecordTemplate> recordTemplateQueryWrapper = new QueryWrapper<>();
+        recordTemplateQueryWrapper.eq(getRecordTemplatePageVO.getHospitalId() != null, "hospital_id", getRecordTemplatePageVO.getHospitalId());
+        recordTemplateQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+        recordTemplateQueryWrapper.like(StringUtil.isNotBlank(getRecordTemplatePageVO.getCode()), "code", getRecordTemplatePageVO.getCode());
+        recordTemplateQueryWrapper.like(StringUtil.isNotBlank(getRecordTemplatePageVO.getName()), "name", getRecordTemplatePageVO.getName());
+        recordTemplateQueryWrapper.like(StringUtil.isNotBlank(getRecordTemplatePageVO.getParentCode()), "parent_code", getRecordTemplatePageVO.getParentCode());
+        recordTemplateQueryWrapper.like(StringUtil.isNotBlank(getRecordTemplatePageVO.getParentName()), "parent_name", getRecordTemplatePageVO.getParentName());
+        Page<RecordTemplate> recordTemplatePage = new Page<>(getRecordTemplatePageVO.getCurrent(), getRecordTemplatePageVO.getSize());
+        recordTemplateFacade.page(recordTemplatePage, recordTemplateQueryWrapper);
+        BeanUtil.copyProperties(recordTemplatePage, getRecordTemplatePageDTOPage);
+        List<GetRecordTemplatePageDTO> getRecordTemplatePageDTOList = BeanUtil.listCopyTo(recordTemplatePage.getRecords(), GetRecordTemplatePageDTO.class);
+
+        getRecordTemplatePageDTOPage.setRecords(getRecordTemplatePageDTOList);
+        return getRecordTemplatePageDTOPage;
+    }
+
+    public RecordTemplate getRecordTemplateById(GetRecordTemplateByIdVO getRecordTemplateByIdVO) {
+        RecordTemplate recordTemplate = recordTemplateFacade.getOne(new QueryWrapper<RecordTemplate>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", getRecordTemplateByIdVO.getId())
+        );
+        return recordTemplate;
+    }
+}

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

@@ -0,0 +1,27 @@
+package com.lantone.daqe.vo;
+
+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;
+
+/**
+ * @Description: 删除职务职称变更记录-接口入参
+ * @author: zhanghang
+ * @time: 2022/2/28
+ */
+@ApiModel(value = "删除职务职称变更记录-接口入参")
+@Getter
+@Setter
+public class DelOfficialCapacityByIdVO implements Serializable {
+
+    private static final long serialVersionUID = 730596041870962141L;
+
+    @ApiModelProperty(value = "记录ID", required = true)
+    @NotNull(message = "记录ID不能为空")
+    private Long id;
+
+}

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

@@ -21,6 +21,9 @@ public class GetDiseasePageVO extends Page {
     @ApiModelProperty(value = "组织机构ID")
     private Long hospitalId;
 
+    @ApiModelProperty(value = "医院诊断代码")
+    private String code;
+
     @ApiModelProperty(value = "医院诊断名称")
     private String name;
 

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

@@ -0,0 +1,42 @@
+package com.lantone.daqe.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 获取药品分页列表-接口入参
+ * @author: rengb
+ * @time: 2022/2/27 11:15
+ */
+@ApiModel(value = "获取药品分页列表-接口入参")
+@Getter
+@Setter
+public class GetDrugPageVO extends Page {
+
+    private static final long serialVersionUID = -6386361872296743955L;
+
+    @ApiModelProperty(value = "组织机构ID")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "医院药品代码")
+    private String code;
+
+    @ApiModelProperty(value = "医院药品名称")
+    private String name;
+
+    @ApiModelProperty(value = "国药准字")
+    private String approvalNum;
+
+    @ApiModelProperty(value = "标准药品名称")
+    private String standard;
+
+    @ApiModelProperty(value = "药品剂型")
+    private String dosageForm;
+
+    @ApiModelProperty(value = "是否匹配，1-已匹配，0-未匹配")
+    private String isMapping;
+
+}

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

@@ -0,0 +1,50 @@
+package com.lantone.daqe.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @Description: 获取职务职称变更记录-接口入参
+ * @author: zhanghang
+ * @time: 2022/2/28
+ */
+@ApiModel(value = "获取职务职称变更记录-接口入参")
+@Getter
+@Setter
+public class GetOfficialCapacityPageVO extends Page {
+
+
+    private static final long serialVersionUID = -8083355835387307637L;
+    @ApiModelProperty(value = "组织机构ID")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "职务/职称名称")
+    private String name;
+
+    @ApiModelProperty(value = "类型：1-职务；2-职称")
+    private String type;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "职位/职称变更开始时间")
+    private Date changeTimeStart;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "职位/职称变更结束时间")
+    private Date changeTimeEnd;
+
+    @ApiModelProperty(value = "医生姓名")
+    private String doctorName;
+
+    @ApiModelProperty(value = "工号")
+    private String doctorCode;
+
+    @ApiModelProperty(value = "科室名称")
+    private String deptName;
+
+}

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

@@ -0,0 +1,27 @@
+package com.lantone.daqe.vo;
+
+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;
+
+/**
+ * @Description: 获取文书模块信息-接口入参
+ * @author: zhanghang
+ * @time: 2022/2/28
+ */
+@ApiModel(value = "获取文书模块信息-接口入参")
+@Getter
+@Setter
+public class GetRecordTemplateByIdVO implements Serializable {
+
+    private static final long serialVersionUID = 1063331959327198657L;
+
+    @ApiModelProperty(value = "模板ID", required = true)
+    @NotNull(message = "模板ID不能为空")
+    private Long id;
+
+}

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

@@ -0,0 +1,36 @@
+package com.lantone.daqe.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 获取文书模块分页列表-接口入参
+ * @author: zhanghang
+ * @time: 2022/2/28
+ */
+@ApiModel(value = "获取文书模块分页列表-接口入参")
+@Getter
+@Setter
+public class GetRecordTemplatePageVO extends Page {
+
+
+    private static final long serialVersionUID = -1132470088350385050L;
+    @ApiModelProperty(value = "组织机构ID")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "医院模板ID")
+    private String code;
+
+    @ApiModelProperty(value = "医院模板名称")
+    private String name;
+
+    @ApiModelProperty(value = "医院父类模板ID")
+    private String parentCode;
+
+    @ApiModelProperty(value = "医院父类模板名称")
+    private String parentName;
+
+}

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

@@ -36,7 +36,6 @@ public class DiseaseManagementController {
         return CommonResult.success(diseaseManagementFacade.getDiseasePage(getDiseasePageVO));
     }
 
-
     @ApiOperation(value = "新增诊断 [by:songxl]")
     @PostMapping("/addDisease")
     public CommonResult<Boolean> addDisease(@RequestBody AddDiseaseVo addDiseaseVo) {

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

@@ -0,0 +1,35 @@
+package com.lantone.daqe.web;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.common.api.CommonResult;
+import com.lantone.daqe.dto.GetDrugPageDTO;
+import com.lantone.daqe.facade.DrugManagementFacade;
+import com.lantone.daqe.vo.GetDrugPageVO;
+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: songxl
+ * @time: 2021/7/20 12:39
+ */
+@RestController
+@Api(value = "药品管理API", tags = { "药品管理API" })
+@RequestMapping("/drugManage")
+public class DrugManagementController {
+
+    @Autowired
+    private DrugManagementFacade drugManagementFacade;
+
+    @ApiOperation(value = "获取药品分页列表 [by:songxl]")
+    @PostMapping("/getDrugPage")
+    public CommonResult<IPage<GetDrugPageDTO>> getDrugPage(@RequestBody GetDrugPageVO getDrugPageVO) {
+        return CommonResult.success(drugManagementFacade.getDrugPage(getDrugPageVO));
+    }
+
+}

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

@@ -0,0 +1,44 @@
+package com.lantone.daqe.web;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.common.api.CommonResult;
+import com.lantone.daqe.dto.GetOfficialCapacityPageDTO;
+import com.lantone.daqe.facade.OfficialCapacityManagementFacade;
+import com.lantone.daqe.vo.DelOfficialCapacityByIdVO;
+import com.lantone.daqe.vo.GetOfficialCapacityPageVO;
+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/2/28
+ */
+
+@RestController
+@Api(value = "职务职称变更记录API", tags = {"职务职称变更记录API"})
+@RequestMapping("/officialCapacityManage")
+public class OfficialCapacityManagementController {
+
+    @Autowired
+    private OfficialCapacityManagementFacade officialCapacityManagementFacade;
+
+    @ApiOperation(value = "获取职务职称变更记录 [by:zhanghang]")
+    @PostMapping("/getOfficialCapacityPage")
+    public CommonResult<IPage<GetOfficialCapacityPageDTO>> getOfficialCapacityPage(@RequestBody GetOfficialCapacityPageVO getOfficialCapacityPageVO) {
+        return CommonResult.success(officialCapacityManagementFacade.getOfficialCapacityPage(getOfficialCapacityPageVO));
+    }
+
+    @ApiOperation(value = "删除职务职称变更记录 [by:zhanghang]")
+    @PostMapping("/delOfficialCapacityPage")
+    public CommonResult<Boolean> delOfficialCapacityPage(@RequestBody DelOfficialCapacityByIdVO delOfficialCapacityByIdVO) {
+        return CommonResult.success(officialCapacityManagementFacade.delOfficialCapacityPage(delOfficialCapacityByIdVO));
+    }
+
+}

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

@@ -0,0 +1,45 @@
+package com.lantone.daqe.web;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.common.api.CommonResult;
+import com.lantone.daqe.dto.GetRecordTemplatePageDTO;
+import com.lantone.daqe.entity.RecordTemplate;
+import com.lantone.daqe.facade.RecordTemplateManagementFacade;
+import com.lantone.daqe.vo.GetRecordTemplateByIdVO;
+import com.lantone.daqe.vo.GetRecordTemplatePageVO;
+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/2/28
+ */
+
+@RestController
+@Api(value = "文书模板维护API", tags = {"文书模板维护API"})
+@RequestMapping("/recordTemplateManage")
+public class RecordTemplateManagementController {
+
+    @Autowired
+    private RecordTemplateManagementFacade recordTemplateManagementFacade;
+
+    @ApiOperation(value = "获取文书模板分页列表 [by:zhanghang]")
+    @PostMapping("/getRecordTemplatePage")
+    public CommonResult<IPage<GetRecordTemplatePageDTO>> getRecordTemplatePage(@RequestBody GetRecordTemplatePageVO getRecordTemplatePageVO) {
+        return CommonResult.success(recordTemplateManagementFacade.getRecordTemplatePage(getRecordTemplatePageVO));
+    }
+
+    @ApiOperation(value = "查看文书模板信息 [by:zhanghang]")
+    @PostMapping("/getRecordTemplateManage")
+    public CommonResult<RecordTemplate> getRecordTemplateManage(@RequestBody GetRecordTemplateByIdVO getRecordTemplateByIdVO) {
+        return CommonResult.success(recordTemplateManagementFacade.getRecordTemplateById(getRecordTemplateByIdVO));
+    }
+
+}

daqe-center/src/main/resources/mapper/base/BaseDiseaseInfoMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.DiseaseInfo">
         <id column="id" property="id"/>
+        <result column="hospital_id" property="hospitalId"/>
         <result column="code" property="code"/>
         <result column="name" property="name"/>
         <result column="icd10" property="icd10"/>

daqe-center/src/main/resources/mapper/base/BaseDrugInfoMapper.xml

@@ -5,8 +5,10 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.DrugInfo">
         <id column="id" property="id"/>
+        <result column="hospital_id" property="hospitalId"/>
         <result column="code" property="code"/>
         <result column="name" property="name"/>
+        <result column="approval_num" property="approvalNum"/>
         <result column="standard" property="standard"/>
         <result column="synonym" property="synonym"/>
         <result column="is_deleted" property="isDeleted"/>

daqe-center/src/main/resources/mapper/base/BaseOfficialCapacityMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.OfficialCapacity">
         <id column="id" property="id"/>
+        <result column="hospital_id" property="hospitalId"/>
         <result column="name" property="name"/>
         <result column="type" property="type"/>
         <result column="change_time" property="changeTime"/>

daqe-center/src/main/resources/mapper/base/BaseOperationInfoMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.OperationInfo">
         <id column="id" property="id"/>
+        <result column="hospital_id" property="hospitalId"/>
         <result column="code" property="code"/>
         <result column="name" property="name"/>
         <result column="standard" property="standard"/>

daqe-center/src/main/resources/mapper/base/BaseRecordTemplateMapper.xml

@@ -5,10 +5,12 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.RecordTemplate">
         <id column="id" property="id"/>
+        <result column="hospital_id" property="hospitalId"/>
         <result column="code" property="code"/>
         <result column="name" property="name"/>
         <result column="content" property="content"/>
         <result column="parent_code" property="parentCode"/>
+        <result column="parent_name" property="parentName"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>

dblayer-mbg/src/main/resources/freemarker/entity.java.ftl

@@ -7,8 +7,8 @@ import ${pkg};
 </#list>
 <#if entityLombokModel>
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+<#--import io.swagger.annotations.ApiModel;-->
+<#--import io.swagger.annotations.ApiModelProperty;-->
 <#--import lombok.EqualsAndHashCode;-->
 <#--import lombok.experimental.Accessors;-->
 </#if>

security-center/src/main/java/com/lantone/security/entity/AbnormalLog.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/DataAuth.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/DataAuthDetail.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/Dept.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/DeptDoctor.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/DeptMedoup.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/DeptUser.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/DictionaryInfo.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/Doctor.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/Hospital.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/HospitalSet.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/HospitalUser.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/LoginLog.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/Medoup.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/MedoupDoctor.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/Menu.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/MenuResource.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/Notice.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/NoticeUser.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/OperationLog.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/Region.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/RegionDept.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/Resource.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/Role.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/RoleSoftware.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/RoleSoftwareDataAuth.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/RoleSoftwareMenu.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/RoleSoftwareResource.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/Software.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/SoftwareDataAuth.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/SoftwareMenu.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/SoftwareResource.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/User.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;

security-center/src/main/java/com/lantone/security/entity/UserRole.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;