Parcourir la source

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

rengb il y a 3 ans
Parent
commit
29652582aa
32 fichiers modifiés avec 902 ajouts et 88 suppressions
  1. 46 0
      daqe-center/src/main/java/com/lantone/daqe/dto/GetOfficialCapacityPageDTO.java
  2. 41 0
      daqe-center/src/main/java/com/lantone/daqe/dto/GetRecordTemplatePageDTO.java
  3. 0 6
      daqe-center/src/main/java/com/lantone/daqe/entity/RecordTemplate.java
  4. 38 18
      daqe-center/src/main/java/com/lantone/daqe/facade/DiseaseManagementFacade.java
  5. 31 0
      daqe-center/src/main/java/com/lantone/daqe/facade/DrugManagementFacade.java
  6. 86 0
      daqe-center/src/main/java/com/lantone/daqe/facade/OfficialCapacityManagementFacade.java
  7. 31 0
      daqe-center/src/main/java/com/lantone/daqe/facade/OperationManagementFacade.java
  8. 68 0
      daqe-center/src/main/java/com/lantone/daqe/facade/RecordTemplateManagementFacade.java
  9. 6 0
      daqe-center/src/main/java/com/lantone/daqe/facade/base/DiseaseInfoFacade.java
  10. 6 0
      daqe-center/src/main/java/com/lantone/daqe/facade/base/DrugInfoFacade.java
  11. 6 0
      daqe-center/src/main/java/com/lantone/daqe/facade/base/OperationInfoFacade.java
  12. 40 0
      daqe-center/src/main/java/com/lantone/daqe/vo/AddDiseaseVO.java
  13. 0 28
      daqe-center/src/main/java/com/lantone/daqe/vo/AddDiseaseVo.java
  14. 40 0
      daqe-center/src/main/java/com/lantone/daqe/vo/AddDrugVO.java
  15. 36 0
      daqe-center/src/main/java/com/lantone/daqe/vo/AddOperationVO.java
  16. 27 0
      daqe-center/src/main/java/com/lantone/daqe/vo/DelDiseaseByIdVO.java
  17. 0 24
      daqe-center/src/main/java/com/lantone/daqe/vo/DelDiseaseByIdVo.java
  18. 27 0
      daqe-center/src/main/java/com/lantone/daqe/vo/DelDrugByIdVO.java
  19. 27 0
      daqe-center/src/main/java/com/lantone/daqe/vo/DelOfficialCapacityByIdVO.java
  20. 27 0
      daqe-center/src/main/java/com/lantone/daqe/vo/DelOperationByIdVO.java
  21. 50 0
      daqe-center/src/main/java/com/lantone/daqe/vo/GetOfficialCapacityPageVO.java
  22. 27 0
      daqe-center/src/main/java/com/lantone/daqe/vo/GetRecordTemplateByIdVO.java
  23. 36 0
      daqe-center/src/main/java/com/lantone/daqe/vo/GetRecordTemplatePageVO.java
  24. 36 0
      daqe-center/src/main/java/com/lantone/daqe/vo/MatchingDiseaseVO.java
  25. 7 2
      daqe-center/src/main/java/com/lantone/daqe/vo/UpDiseaseByIdVo.java
  26. 19 10
      daqe-center/src/main/java/com/lantone/daqe/web/DiseaseManagementController.java
  27. 16 0
      daqe-center/src/main/java/com/lantone/daqe/web/DrugManagementController.java
  28. 56 0
      daqe-center/src/main/java/com/lantone/daqe/web/OfficialCapacityManagementController.java
  29. 16 0
      daqe-center/src/main/java/com/lantone/daqe/web/OperationManagementController.java
  30. 56 0
      daqe-center/src/main/java/com/lantone/daqe/web/RecordTemplateManagementController.java
  31. BIN
      document/开发规范/JAVA代码样式风格统一设置(for idea).docx
  32. BIN
      document/开发规范/表设计规则.docx

+ 46 - 0
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 17:47
+ */
+@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;
+
+}

+ 41 - 0
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 17:47
+ */
+@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;
+
+
+}

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

@@ -56,12 +56,6 @@ public class RecordTemplate implements Serializable {
     @TableField("parent_code")
     private String parentCode;
 
-    /**
-     * 父模板名称
-     */
-    @TableField("parent_name")
-    private String parentName;
-
     /**
      * 是否删除,N:未删除,Y:删除
      */

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

@@ -3,15 +3,18 @@ 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.exception.Asserts;
 import com.lantone.common.util.BeanUtil;
 import com.lantone.common.util.StringUtil;
 import com.lantone.daqe.dto.GetDiseasePageDTO;
 import com.lantone.daqe.entity.DiseaseInfo;
 import com.lantone.daqe.facade.base.DiseaseInfoFacade;
-import com.lantone.daqe.vo.AddDiseaseVo;
-import com.lantone.daqe.vo.DelDiseaseByIdVo;
+import com.lantone.daqe.vo.AddDiseaseVO;
+import com.lantone.daqe.vo.DelDiseaseByIdVO;
 import com.lantone.daqe.vo.GetDiseasePageVO;
-import com.lantone.daqe.vo.UpDiseaseByIdVo;
+import com.lantone.daqe.vo.MatchingDiseaseVO;
+import com.lantone.daqe.vo.UpDiseaseByIdVO;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -33,7 +36,6 @@ public class DiseaseManagementFacade {
 
         QueryWrapper<DiseaseInfo> diseaseInfoQueryWrapper = new QueryWrapper<>();
         diseaseInfoQueryWrapper.eq(getDiseasePageVO.getHospitalId() != null, "hospital_id", getDiseasePageVO.getHospitalId());
-        diseaseInfoQueryWrapper.like(StringUtil.isNotBlank(getDiseasePageVO.getCode()), "code", getDiseasePageVO.getCode());
         diseaseInfoQueryWrapper.like(StringUtil.isNotBlank(getDiseasePageVO.getName()), "name", getDiseasePageVO.getName());
         diseaseInfoQueryWrapper.like(StringUtil.isNotBlank(getDiseasePageVO.getStandard()), "standard", getDiseasePageVO.getStandard());
         diseaseInfoQueryWrapper.like(StringUtil.isNotBlank(getDiseasePageVO.getIcd10()), "icd10", getDiseasePageVO.getIcd10());
@@ -57,33 +59,51 @@ public class DiseaseManagementFacade {
     }
 
     /**
-     * @param addDiseaseVo
-     * @Description新增诊断
-     * @Return java.lang.Boolean
+     * 新增诊断 业务处理
+     *
+     * @param addDiseaseVO
+     * @return 是否新增成功
      */
-    public Boolean addDisease(AddDiseaseVo addDiseaseVo) {
-
-        return false;
+    public Boolean addDisease(AddDiseaseVO addDiseaseVO) {
+        DiseaseInfo diseaseInfo = new DiseaseInfo();
+        BeanUtil.copyProperties(addDiseaseVO, diseaseInfo);
+        if (diseaseInfoFacade.isExist(diseaseInfo)) {
+            Asserts.fail("该诊断已存在!");
+        }
+        return diseaseInfoFacade.save(diseaseInfo);
     }
 
     /**
-     * @param upDiseaseByIdVo
+     * @param upDiseaseByIdVO
      * @Description修改诊断
      * @Return java.lang.Boolean
      */
-    public Boolean upDiseaseById(UpDiseaseByIdVo upDiseaseByIdVo) {
+    public Boolean upDiseaseById(UpDiseaseByIdVO upDiseaseByIdVO) {
 
         return false;
     }
 
     /**
-     * @param delDiseaseByIdVo
-     * @Description删除诊断
-     * @Return java.lang.Boolean
+     * 通过id删除诊断
+     *
+     * @param delDiseaseByIdVO
+     * @return 是否删除成功
      */
-    public Boolean delDiseaseById(DelDiseaseByIdVo delDiseaseByIdVo) {
-
-        return false;
+    public Boolean delDiseaseById(DelDiseaseByIdVO delDiseaseByIdVO) {
+        if (diseaseInfoFacade.getById(delDiseaseByIdVO.getId()) == null) {
+            Asserts.fail("该诊断不存在!");
+        }
+        return diseaseInfoFacade.removeById(delDiseaseByIdVO.getId());
     }
 
+    /**
+     * @param matchingDiseaseVO
+     * @Description
+     * @Return java.lang.Boolean
+     */
+    public Boolean matchingDisease(MatchingDiseaseVO matchingDiseaseVO) {
+        DiseaseInfo diseaseInfo = new DiseaseInfo();
+        BeanUtils.copyProperties(matchingDiseaseVO, diseaseInfo);
+        return diseaseInfoFacade.updateById(diseaseInfo);
+    }
 }

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

@@ -3,11 +3,14 @@ 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.exception.Asserts;
 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.AddDrugVO;
+import com.lantone.daqe.vo.DelDrugByIdVO;
 import com.lantone.daqe.vo.GetDrugPageVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -54,4 +57,32 @@ public class DrugManagementFacade {
         return getDrugPageDTOPage;
     }
 
+    /**
+     * 新增药品 业务处理
+     *
+     * @param addDrugVO
+     * @return 是否新增成功
+     */
+    public boolean addDrug(AddDrugVO addDrugVO) {
+        DrugInfo drugInfo = new DrugInfo();
+        BeanUtil.copyProperties(addDrugVO, drugInfo);
+        if (drugInfoFacade.isExist(drugInfo)) {
+            Asserts.fail("该诊断已存在!");
+        }
+        return drugInfoFacade.save(drugInfo);
+    }
+
+    /**
+     * 通过id删除药品
+     *
+     * @param delDrugByIdVO
+     * @return 是否删除成功
+     */
+    public Boolean delDrugById(DelDrugByIdVO delDrugByIdVO) {
+        if (drugInfoFacade.getById(delDrugByIdVO.getId()) == null) {
+            Asserts.fail("该药品不存在!");
+        }
+        return drugInfoFacade.removeById(delDrugByIdVO.getId());
+    }
+
 }

+ 86 - 0
daqe-center/src/main/java/com/lantone/daqe/facade/OfficialCapacityManagementFacade.java

@@ -0,0 +1,86 @@
+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 17:47
+ */
+
+@Component
+public class OfficialCapacityManagementFacade {
+
+    @Autowired
+    private OfficialCapacityFacade officialCapacityFacade;
+
+    /**
+     * 获取职务职称变更记录分页列表数据
+     *
+     * @param getOfficialCapacityPageVO
+     * @return: 职务职称变更记录
+     */
+    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;
+    }
+
+    /**
+     * 根据ID删除该条职务职称变更记录
+     *
+     * @param delOfficialCapacityByIdVO
+     * @return: 是否成功
+     */
+    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())
+        );
+    }
+
+}

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

@@ -3,11 +3,14 @@ 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.exception.Asserts;
 import com.lantone.common.util.BeanUtil;
 import com.lantone.common.util.StringUtil;
 import com.lantone.daqe.dto.GetOperationPageDTO;
 import com.lantone.daqe.entity.OperationInfo;
 import com.lantone.daqe.facade.base.OperationInfoFacade;
+import com.lantone.daqe.vo.AddOperationVO;
+import com.lantone.daqe.vo.DelOperationByIdVO;
 import com.lantone.daqe.vo.GetOperationPageVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -52,4 +55,32 @@ public class OperationManagementFacade {
         return getOperationPageDTOPage;
     }
 
+    /**
+     * 新增手术 业务处理
+     *
+     * @param addOperationVO
+     * @return 是否新增成功
+     */
+    public boolean addOperation(AddOperationVO addOperationVO) {
+        OperationInfo operationInfo = new OperationInfo();
+        BeanUtil.copyProperties(addOperationVO, operationInfo);
+        if (operationInfoFacade.isExist(operationInfo)) {
+            Asserts.fail("该诊断已存在!");
+        }
+        return operationInfoFacade.save(operationInfo);
+    }
+
+    /**
+     * 通过id删除手术
+     *
+     * @param delOperationByIdVO
+     * @return 是否删除成功
+     */
+    public Boolean delOperationById(DelOperationByIdVO delOperationByIdVO) {
+        if (operationInfoFacade.getById(delOperationByIdVO.getId()) == null) {
+            Asserts.fail("该药品不存在!");
+        }
+        return operationInfoFacade.removeById(delOperationByIdVO.getId());
+    }
+
 }

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

@@ -0,0 +1,68 @@
+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 17:47
+ */
+@Component
+public class RecordTemplateManagementFacade {
+
+    @Autowired
+    private RecordTemplateFacade recordTemplateFacade;
+
+    /**
+     * 获取文书模板信息分页列表数据
+     *
+     * @param getRecordTemplatePageVO
+     * @return: 文书模板信息分页数据
+     */
+    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;
+    }
+
+    /**
+     * 根据ID获取具体的模板内容
+     *
+     * @param getRecordTemplateByIdVO
+     * @return: 模板具体的内容
+     */
+    public RecordTemplate getRecordTemplateById(GetRecordTemplateByIdVO getRecordTemplateByIdVO) {
+        RecordTemplate recordTemplate = recordTemplateFacade.getOne(new QueryWrapper<RecordTemplate>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", getRecordTemplateByIdVO.getId())
+        );
+        return recordTemplate;
+    }
+}

+ 6 - 0
daqe-center/src/main/java/com/lantone/daqe/facade/base/DiseaseInfoFacade.java

@@ -1,5 +1,6 @@
 package com.lantone.daqe.facade.base;
 
+import com.lantone.daqe.entity.DiseaseInfo;
 import com.lantone.daqe.service.impl.DiseaseInfoServiceImpl;
 import org.springframework.stereotype.Component;
 
@@ -11,4 +12,9 @@ import org.springframework.stereotype.Component;
 @Component
 public class DiseaseInfoFacade extends DiseaseInfoServiceImpl {
 
+    public boolean isExist(DiseaseInfo diseaseInfo){
+        boolean flag = false;
+        return flag;
+    }
+
 }

+ 6 - 0
daqe-center/src/main/java/com/lantone/daqe/facade/base/DrugInfoFacade.java

@@ -1,5 +1,6 @@
 package com.lantone.daqe.facade.base;
 
+import com.lantone.daqe.entity.DrugInfo;
 import com.lantone.daqe.service.impl.DrugInfoServiceImpl;
 import org.springframework.stereotype.Component;
 
@@ -11,4 +12,9 @@ import org.springframework.stereotype.Component;
 @Component
 public class DrugInfoFacade extends DrugInfoServiceImpl {
 
+    public boolean isExist(DrugInfo drugInfo) {
+        boolean flag = false;
+        return flag;
+    }
+
 }

+ 6 - 0
daqe-center/src/main/java/com/lantone/daqe/facade/base/OperationInfoFacade.java

@@ -1,5 +1,6 @@
 package com.lantone.daqe.facade.base;
 
+import com.lantone.daqe.entity.OperationInfo;
 import com.lantone.daqe.service.impl.OperationInfoServiceImpl;
 import org.springframework.stereotype.Component;
 
@@ -11,4 +12,9 @@ import org.springframework.stereotype.Component;
 @Component
 public class OperationInfoFacade extends OperationInfoServiceImpl {
 
+    public boolean isExist(OperationInfo operationInfo) {
+        boolean flag = false;
+        return flag;
+    }
+
 }

+ 40 - 0
daqe-center/src/main/java/com/lantone/daqe/vo/AddDiseaseVO.java

@@ -0,0 +1,40 @@
+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.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Description: 新增诊断-接口入参
+ * @author: songxl
+ * @time: 2022/2/28 11:15
+ */
+@ApiModel(value = "新增诊断-接口入参")
+@Getter
+@Setter
+public class AddDiseaseVO implements Serializable {
+
+    private static final long serialVersionUID = -345554179620072672L;
+
+    @ApiModelProperty(value = "组织机构ID", required = true)
+    @NotNull(message = "组织机构ID不能为空")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "医院诊断代码", required = true)
+    @NotBlank(message = "医院诊断代码不能为空")
+    private String code;
+
+    @ApiModelProperty(value = "医院诊断名称", required = true)
+    @NotBlank(message = "医院诊断名称不能为空")
+    private String name;
+
+    @ApiModelProperty(value = "ICD-10编码", required = true)
+    @NotBlank(message = "ICD-10编码不能为空")
+    private String icd10;
+
+}

+ 0 - 28
daqe-center/src/main/java/com/lantone/daqe/vo/AddDiseaseVo.java

@@ -1,28 +0,0 @@
-package com.lantone.daqe.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-
-/**
- * @Description:新增诊断-接口入参
- * @Author songxl
- * @Date 2022/2/28
- */
-@Data
-public class AddDiseaseVo implements Serializable {
-    private static final long serialVersionUID = -1337085237395181794L;
-
-    @ApiModelProperty(value = "组织机构ID", hidden = true)
-    private Long hospitalId;
-
-    @ApiModelProperty(value = "医院诊断名称", required = true)
-    @NotBlank(message = "医院诊断名称不能为空")
-    private String name;
-
-    @ApiModelProperty(value = "ICD-10编码")
-    private String icd10;
-
-}

+ 40 - 0
daqe-center/src/main/java/com/lantone/daqe/vo/AddDrugVO.java

@@ -0,0 +1,40 @@
+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.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Description: 新增药品-接口入参
+ * @author: songxl
+ * @time: 2022/2/28 11:15
+ */
+@ApiModel(value = "新增药品-接口入参")
+@Getter
+@Setter
+public class AddDrugVO implements Serializable {
+
+    private static final long serialVersionUID = -345554179620072672L;
+
+    @ApiModelProperty(value = "组织机构ID", required = true)
+    @NotNull(message = "组织机构ID不能为空")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "医院药品代码", required = true)
+    @NotBlank(message = "医院药品代码不能为空")
+    private String code;
+
+    @ApiModelProperty(value = "医院药品名称", required = true)
+    @NotBlank(message = "医院药品名称不能为空")
+    private String name;
+
+    @ApiModelProperty(value = "国药准字", required = true)
+    @NotBlank(message = "国药准字不能为空")
+    private String approvalNum;
+
+}

+ 36 - 0
daqe-center/src/main/java/com/lantone/daqe/vo/AddOperationVO.java

@@ -0,0 +1,36 @@
+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.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Description: 新增手术-接口入参
+ * @author: songxl
+ * @time: 2022/2/28 11:15
+ */
+@ApiModel(value = "新增手术-接口入参")
+@Getter
+@Setter
+public class AddOperationVO implements Serializable {
+
+    private static final long serialVersionUID = -345554179620072672L;
+
+    @ApiModelProperty(value = "组织机构ID", required = true)
+    @NotNull(message = "组织机构ID不能为空")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "手术和操作代码", required = true)
+    @NotBlank(message = "手术和操作代码不能为空")
+    private String code;
+
+    @ApiModelProperty(value = "医院手术/操作名称", required = true)
+    @NotBlank(message = "医院手术/操作名称不能为空")
+    private String name;
+
+}

+ 27 - 0
daqe-center/src/main/java/com/lantone/daqe/vo/DelDiseaseByIdVO.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: 通过id删除诊断-接口入参
+ * @author: songxl
+ * @time: 2021/2/28 11:15
+ */
+@ApiModel(value = "通过id删除诊断-接口入参")
+@Getter
+@Setter
+public class DelDiseaseByIdVO implements Serializable {
+
+    private static final long serialVersionUID = 5262000808815034181L;
+
+    @ApiModelProperty(value = "主键", required = true)
+    @NotNull(message = "主键不能为空")
+    private Long id;
+
+}

+ 0 - 24
daqe-center/src/main/java/com/lantone/daqe/vo/DelDiseaseByIdVo.java

@@ -1,24 +0,0 @@
-package com.lantone.daqe.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-/**
- * @Description:删除诊断-接口入参
- * @Author songxl
- * @Date 2022/2/28
- */
-@Data
-public class DelDiseaseByIdVo implements Serializable {
-    private static final long serialVersionUID = 5262000808815034181L;
-
-    @ApiModelProperty(value = "诊断ID", required = true)
-    @NotNull(message = "诊断ID不能为空")
-    private Long id;
-
-
-}

+ 27 - 0
daqe-center/src/main/java/com/lantone/daqe/vo/DelDrugByIdVO.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: 通过id删除药品-接口入参
+ * @author: songxl
+ * @time: 2021/2/28 11:15
+ */
+@ApiModel(value = "通过id删除药品-接口入参")
+@Getter
+@Setter
+public class DelDrugByIdVO implements Serializable {
+
+    private static final long serialVersionUID = 5262000808815034181L;
+
+    @ApiModelProperty(value = "主键", required = true)
+    @NotNull(message = "主键不能为空")
+    private Long id;
+
+}

+ 27 - 0
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 17:47
+ */
+@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;
+
+}

+ 27 - 0
daqe-center/src/main/java/com/lantone/daqe/vo/DelOperationByIdVO.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: 通过id删除手术-接口入参
+ * @author: songxl
+ * @time: 2021/2/28 11:15
+ */
+@ApiModel(value = "通过id删除手术-接口入参")
+@Getter
+@Setter
+public class DelOperationByIdVO implements Serializable {
+
+    private static final long serialVersionUID = 5262000808815034181L;
+
+    @ApiModelProperty(value = "主键", required = true)
+    @NotNull(message = "主键不能为空")
+    private Long id;
+
+}

+ 50 - 0
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 17:47
+ */
+@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;
+
+}

+ 27 - 0
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 17:47
+ */
+@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;
+
+}

+ 36 - 0
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 17:47
+ */
+@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;
+
+}

+ 36 - 0
daqe-center/src/main/java/com/lantone/daqe/vo/MatchingDiseaseVO.java

@@ -0,0 +1,36 @@
+package com.lantone.daqe.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Description:匹配诊断-接口入参
+ * @Author songxl
+ * @Date 2022/2/28
+ */
+@ApiModel(value = "匹配诊断-接口入参")
+@Getter
+@Setter
+public class MatchingDiseaseVO implements Serializable {
+    private static final long serialVersionUID = 5734204802934710700L;
+
+    @ApiModelProperty(value = "诊断ID", required = true)
+    @NotNull(message = "诊断ID不能为空")
+    private Long id;
+
+    @ApiModelProperty(value = "ICD-10编码")
+    private String icd10;
+
+    @ApiModelProperty(value = "标准词")
+    private String standard;
+
+    @ApiModelProperty(value = "同义词")
+    private String synonym;
+
+}

+ 7 - 2
daqe-center/src/main/java/com/lantone/daqe/vo/UpDiseaseByIdVo.java

@@ -1,7 +1,10 @@
 package com.lantone.daqe.vo;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -12,8 +15,10 @@ import java.io.Serializable;
  * @Author songxl
  * @Date 2022/2/28
  */
-@Data
-public class UpDiseaseByIdVo implements Serializable {
+@ApiModel(value = "修改诊断-接口入参")
+@Getter
+@Setter
+public class UpDiseaseByIdVO implements Serializable {
     private static final long serialVersionUID = 5262000808815034181L;
 
     @ApiModelProperty(value = "诊断ID", required = true)

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

@@ -4,10 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
 import com.lantone.daqe.dto.GetDiseasePageDTO;
 import com.lantone.daqe.facade.DiseaseManagementFacade;
-import com.lantone.daqe.vo.AddDiseaseVo;
-import com.lantone.daqe.vo.DelDiseaseByIdVo;
+import com.lantone.daqe.vo.AddDiseaseVO;
+import com.lantone.daqe.vo.DelDiseaseByIdVO;
 import com.lantone.daqe.vo.GetDiseasePageVO;
-import com.lantone.daqe.vo.UpDiseaseByIdVo;
+import com.lantone.daqe.vo.MatchingDiseaseVO;
+import com.lantone.daqe.vo.UpDiseaseByIdVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+
 /**
  * @Description: 诊断管理API
  * @author: songxl
@@ -37,19 +40,25 @@ public class DiseaseManagementController {
 
     @ApiOperation(value = "新增诊断 [by:songxl]")
     @PostMapping("/addDisease")
-    public CommonResult<Boolean> addDisease(@RequestBody AddDiseaseVo addDiseaseVo) {
-        return CommonResult.success(diseaseManagementFacade.addDisease(addDiseaseVo));
+    public CommonResult<Boolean> addDisease(@RequestBody @Valid AddDiseaseVO addDiseaseVO) {
+        return CommonResult.success(diseaseManagementFacade.addDisease(addDiseaseVO));
     }
 
     @ApiOperation(value = "修改诊断 [by:songxl]")
     @PostMapping("/upDiseaseById")
-    public CommonResult<Boolean> upDiseaseById(@RequestBody UpDiseaseByIdVo upDiseaseByIdVo) {
-        return CommonResult.success(diseaseManagementFacade.upDiseaseById(upDiseaseByIdVo));
+    public CommonResult<Boolean> upDiseaseById(@RequestBody UpDiseaseByIdVO upDiseaseByIdVO) {
+        return CommonResult.success(diseaseManagementFacade.upDiseaseById(upDiseaseByIdVO));
     }
 
-    @ApiOperation(value = "删除诊断 [by:songxl]")
+    @ApiOperation(value = "通过id删除诊断 [by:songxl]")
     @PostMapping("/delDiseaseById")
-    public CommonResult<Boolean> delDiseaseById(@RequestBody DelDiseaseByIdVo delDiseaseByIdVo) {
-        return CommonResult.success(diseaseManagementFacade.delDiseaseById(delDiseaseByIdVo));
+    public CommonResult<Boolean> delDiseaseById(@RequestBody @Valid DelDiseaseByIdVO delDiseaseByIdVO) {
+        return CommonResult.success(diseaseManagementFacade.delDiseaseById(delDiseaseByIdVO));
+    }
+
+    @ApiOperation(value = "匹配诊断 [by:songxl]")
+    @PostMapping("/matchingDisease")
+    public CommonResult<Boolean> matchingDisease(@RequestBody MatchingDiseaseVO matchingDiseaseVO) {
+        return CommonResult.success(diseaseManagementFacade.matchingDisease(matchingDiseaseVO));
     }
 }

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

@@ -4,6 +4,8 @@ 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.AddDrugVO;
+import com.lantone.daqe.vo.DelDrugByIdVO;
 import com.lantone.daqe.vo.GetDrugPageVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+
 /**
  * @Description: 药品管理API
  * @author: songxl
@@ -32,4 +36,16 @@ public class DrugManagementController {
         return CommonResult.success(drugManagementFacade.getDrugPage(getDrugPageVO));
     }
 
+    @ApiOperation(value = "新增药品 [by:songxl]")
+    @PostMapping("/addDrug")
+    public CommonResult<Boolean> addDrug(@RequestBody @Valid AddDrugVO addDrugVO) {
+        return CommonResult.success(drugManagementFacade.addDrug(addDrugVO));
+    }
+
+    @ApiOperation(value = "通过id删除药品 [by:songxl]")
+    @PostMapping("/delDrugById")
+    public CommonResult<Boolean> delDrugById(@RequestBody @Valid DelDrugByIdVO delDrugByIdVO) {
+        return CommonResult.success(drugManagementFacade.delDrugById(delDrugByIdVO));
+    }
+
 }

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

@@ -0,0 +1,56 @@
+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 17:47
+ */
+
+@RestController
+@Api(value = "职务职称变更记录API", tags = { "职务职称变更记录API" })
+@RequestMapping("/officialCapacityManage")
+public class OfficialCapacityManagementController {
+
+    @Autowired
+    private OfficialCapacityManagementFacade officialCapacityManagementFacade;
+
+    /**
+     * 获取获取职务职称变更记录分页列表数据
+     *
+     * @param getOfficialCapacityPageVO
+     * @return: 职务职称变更记录分页数据
+     */
+    @ApiOperation(value = "获取职务职称变更记录 [by:zhanghang]")
+    @PostMapping("/getOfficialCapacityPage")
+    public CommonResult<IPage<GetOfficialCapacityPageDTO>> getOfficialCapacityPage(@RequestBody GetOfficialCapacityPageVO getOfficialCapacityPageVO) {
+        return CommonResult.success(officialCapacityManagementFacade.getOfficialCapacityPage(getOfficialCapacityPageVO));
+    }
+
+    /**
+     * 删除职务职称变更记录
+     *
+     * @param delOfficialCapacityByIdVO
+     * @return: 是否成功
+     */
+    @ApiOperation(value = "删除职务职称变更记录 [by:zhanghang]")
+    @PostMapping("/delOfficialCapacityPage")
+    public CommonResult<Boolean> delOfficialCapacityPage(@RequestBody DelOfficialCapacityByIdVO delOfficialCapacityByIdVO) {
+        return CommonResult.success(officialCapacityManagementFacade.delOfficialCapacityPage(delOfficialCapacityByIdVO));
+    }
+
+}

+ 16 - 0
daqe-center/src/main/java/com/lantone/daqe/web/OperationManagementController.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
 import com.lantone.daqe.dto.GetOperationPageDTO;
 import com.lantone.daqe.facade.OperationManagementFacade;
+import com.lantone.daqe.vo.AddOperationVO;
+import com.lantone.daqe.vo.DelOperationByIdVO;
 import com.lantone.daqe.vo.GetOperationPageVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+
 /**
  * @Description: 手术管理API
  * @author: songxl
@@ -32,4 +36,16 @@ public class OperationManagementController {
         return CommonResult.success(operationManagementFacade.getOperationPage(getOperationPageVO));
     }
 
+    @ApiOperation(value = "新增手术 [by:songxl]")
+    @PostMapping("/addOperation")
+    public CommonResult<Boolean> addOperation(@RequestBody @Valid AddOperationVO addOperationVO) {
+        return CommonResult.success(operationManagementFacade.addOperation(addOperationVO));
+    }
+
+    @ApiOperation(value = "通过id删除手术 [by:songxl]")
+    @PostMapping("/delOperationById")
+    public CommonResult<Boolean> delOperationById(@RequestBody @Valid DelOperationByIdVO delOperationByIdVO) {
+        return CommonResult.success(operationManagementFacade.delOperationById(delOperationByIdVO));
+    }
+
 }

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

@@ -0,0 +1,56 @@
+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 17:47
+ */
+@RestController
+@Api(value = "文书模板维护API", tags = { "文书模板维护API" })
+@RequestMapping("/recordTemplateManage")
+public class RecordTemplateManagementController {
+
+    @Autowired
+    private RecordTemplateManagementFacade recordTemplateManagementFacade;
+
+    /**
+     * 获取文书模板信息分页列表数据
+     *
+     * @param getRecordTemplatePageVO
+     * @return: 文书模板信息分页数据
+     */
+    @ApiOperation(value = "获取文书模板分页列表 [by:zhanghang]")
+    @PostMapping("/getRecordTemplatePage")
+    public CommonResult<IPage<GetRecordTemplatePageDTO>> getRecordTemplatePage(@RequestBody GetRecordTemplatePageVO getRecordTemplatePageVO) {
+        return CommonResult.success(recordTemplateManagementFacade.getRecordTemplatePage(getRecordTemplatePageVO));
+    }
+
+    /**
+     * 根据ID获取具体的模板内容
+     *
+     * @param getRecordTemplateByIdVO
+     * @return: 模板具体的内容
+     */
+    @ApiOperation(value = "查看文书模板信息 [by:zhanghang]")
+    @PostMapping("/getRecordTemplateManage")
+    public CommonResult<RecordTemplate> getRecordTemplateManage(@RequestBody GetRecordTemplateByIdVO getRecordTemplateByIdVO) {
+        return CommonResult.success(recordTemplateManagementFacade.getRecordTemplateById(getRecordTemplateByIdVO));
+    }
+
+}

BIN
document/开发规范/JAVA代码样式风格统一设置(for idea).docx


BIN
document/开发规范/表设计规则.docx