zhoutg 5 gadi atpakaļ
vecāks
revīzija
79cdba9d2b

+ 19 - 0
docs/029.20200109模板新需求/init.sql

@@ -0,0 +1,19 @@
+-- 更新icss_template_info的doctor_id
+update `sys-icss`.icss_template_info set doctor_id = CONCAT('-',doctor_id)
+where doctor_id in
+	(SELECT id FROM `sys-tran`.`tran_doctor_info` where hospital_code = 'LT');
+
+-- 更新icss_template_info的hospital_id
+update `sys-icss`.icss_template_info set hospital_id = CONCAT('-',hospital_id)
+where hospital_id in
+	(SELECT id FROM `sys-tran`.`tran_hospital_info` where code = 'LT');
+
+-- 更新icss_template_info的hospital_dept_id
+update `sys-icss`.icss_template_info set hospital_dept_id = CONCAT('-',hospital_dept_id)
+where hospital_dept_id in
+	(SELECT id FROM `sys-tran`.`tran_hospital_dept` where hospital_code = 'LT');
+
+
+update `sys-tran`.`tran_doctor_info` set id=CONCAT('-',id)  where hospital_code = 'LT';
+update `sys-tran`.`tran_hospital_info` set id=CONCAT('-',id)  where code = 'LT';
+update `sys-tran`.`tran_hospital_dept` set id=CONCAT('-',id)  where hospital_code = 'LT';

+ 14 - 0
icss-service/src/main/java/com/diagbot/facade/ClassifyMappingFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+import com.diagbot.service.impl.ClassifyMappingServiceImpl;
+import com.diagbot.service.impl.FolderMappingServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author zhoutg
+ * @Description: 模板分类映射
+ * @date 2018年11月16日 上午11:24:36
+ */
+@Component
+public class ClassifyMappingFacade extends ClassifyMappingServiceImpl {
+
+}

+ 0 - 14
icss-service/src/main/java/com/diagbot/facade/FolderMappingFacade.java

@@ -1,21 +1,7 @@
 package com.diagbot.facade;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.client.TranServiceClient;
-import com.diagbot.entity.TemplateFolder;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.FolderMappingServiceImpl;
-import com.diagbot.service.impl.TemplateFolderServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.vo.TemplateFolderDelVO;
-import com.diagbot.vo.TemplateFolderVO;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Date;
-
 /**
  * @author zhoutg
  * @Description: 模板文件夹映射

+ 120 - 0
icss-service/src/main/java/com/diagbot/facade/TemplateClassifyAdminFacade.java

@@ -0,0 +1,120 @@
+package com.diagbot.facade;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.entity.ClassifyMapping;
+import com.diagbot.entity.FolderMapping;
+import com.diagbot.entity.TemplateClassify;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.TemplateClassifyServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.vo.HospitalCodeSetVO;
+import com.diagbot.vo.TemplateClassifyDelVO;
+import com.diagbot.vo.TemplateClassifyListVO;
+import com.diagbot.vo.TemplateClassifyVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author zhoutg
+ * @Description: 模板分类
+ * @date 2018年11月16日 上午11:24:36
+ */
+@Component
+public class TemplateClassifyAdminFacade extends TemplateClassifyServiceImpl {
+
+    @Autowired
+    ClassifyMappingFacade classifyMappingFacade;
+    @Autowired
+    AdminCheckFacade adminCheckFacade;
+
+    /**
+     * 分类新增或更新
+     *
+     * @param templateClassifyVO
+     */
+    public void saveOrUpdate(TemplateClassifyVO templateClassifyVO) {
+        HospitalCodeSetVO hospitalCodeSetVO = new HospitalCodeSetVO();
+        hospitalCodeSetVO.setDoctorId(templateClassifyVO.getDoctorId());
+        hospitalCodeSetVO.setHospitalId(templateClassifyVO.getHospitalId());
+        boolean res = adminCheckFacade.getadminCheck(hospitalCodeSetVO);
+        if (!res) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "暂无修改权限");
+        }
+        boolean add = true;
+        if (templateClassifyVO.getId() != null) {
+            add = false;
+        }
+        int count = this.count(new QueryWrapper<TemplateClassify>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("name", templateClassifyVO.getName())
+                .eq("hospital_id", templateClassifyVO.getHospitalId())
+//                .eq("doctor_id", templateClassifyVO.getDoctorId())
+                .ne(!add, "id", templateClassifyVO.getId())
+        );
+        if (count > 0) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该分类已存在");
+        }
+        TemplateClassify templateClassify = new TemplateClassify();
+        BeanUtil.copyProperties(templateClassifyVO, templateClassify);
+        Date date = DateUtil.now();
+        if (add) {
+            templateClassify.setGmtCreate(date);
+            templateClassify.setCreator(templateClassifyVO.getDoctorId().toString());
+        }
+        templateClassify.setGmtModified(date);
+        templateClassify.setModifier(templateClassifyVO.getDoctorId().toString());
+        this.saveOrUpdate(templateClassify);
+    }
+
+
+    /**
+     * 分类删除
+     *
+     * @param templateClassifyDelVO
+     */
+    public void delete(TemplateClassifyDelVO templateClassifyDelVO) {
+        // 校验权限
+        HospitalCodeSetVO hospitalCodeSetVO = new HospitalCodeSetVO();
+        hospitalCodeSetVO.setDoctorId(templateClassifyDelVO.getDoctorId());
+        hospitalCodeSetVO.setHospitalId(templateClassifyDelVO.getHospitalId());
+        boolean res = adminCheckFacade.getadminCheck(hospitalCodeSetVO);
+        if (!res) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "暂无删除权限");
+        }
+        int count = classifyMappingFacade.count(new QueryWrapper<ClassifyMapping>()
+            .eq("is_deleted", IsDeleteEnum.N.getKey())
+            .eq("folder_id", templateClassifyDelVO.getClassifyId())
+        );
+        if (count > 0) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请先删除当前分类下的模板");
+        }
+        // 删除
+        this.update(new UpdateWrapper<TemplateClassify>()
+            .eq("id", templateClassifyDelVO.getClassifyId())
+            .set("is_deleted", IsDeleteEnum.Y.getKey())
+            .set("gmt_modified", DateUtil.now())
+            .set("modifier", templateClassifyDelVO.getDoctorId())
+        );
+    }
+
+
+    /**
+     * 分类列表
+     *
+     * @param templateClassifyListVO
+     */
+    public List<TemplateClassify> list(TemplateClassifyListVO templateClassifyListVO) {
+        return this.list(new QueryWrapper<TemplateClassify>()
+            .eq("is_deleted", IsDeleteEnum.N.getKey())
+//            .eq("doctor_id", templateClassifyListVO.getDoctorId())
+            .eq("hospital_id", templateClassifyListVO.getHospitalId())
+            .orderByDesc("gmt_modified")
+        );
+    }
+}

+ 108 - 0
icss-service/src/main/java/com/diagbot/facade/TemplateClassifyFacade.java

@@ -0,0 +1,108 @@
+package com.diagbot.facade;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.client.TranServiceClient;
+import com.diagbot.entity.ClassifyMapping;
+import com.diagbot.entity.FolderMapping;
+import com.diagbot.entity.TemplateClassify;
+import com.diagbot.entity.TemplateFolder;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.TemplateClassifyServiceImpl;
+import com.diagbot.service.impl.TemplateFolderServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.vo.TemplateClassifyDelVO;
+import com.diagbot.vo.TemplateClassifyListVO;
+import com.diagbot.vo.TemplateClassifyVO;
+import com.diagbot.vo.TemplateFolderDelVO;
+import com.diagbot.vo.TemplateFolderListVO;
+import com.diagbot.vo.TemplateFolderVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author zhoutg
+ * @Description: 模板类型
+ * @date 2018年11月16日 上午11:24:36
+ */
+@Component
+public class TemplateClassifyFacade extends TemplateClassifyServiceImpl {
+
+    @Autowired
+    ClassifyMappingFacade classifyMappingFacade;
+
+    /**
+     * 分类新增或更新
+     *
+     * @param templateClassifyVO
+     */
+    public void saveOrUpdate(TemplateClassifyVO templateClassifyVO) {
+        boolean add = true;
+        if (templateClassifyVO.getId() != null) {
+            add = false;
+        }
+        int count = this.count(new QueryWrapper<TemplateClassify>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("name", templateClassifyVO.getName())
+                .eq("hospital_id", templateClassifyVO.getHospitalId())
+                .eq("doctor_id", templateClassifyVO.getDoctorId())
+                .ne(!add, "id", templateClassifyVO.getId())
+        );
+        if (count > 0) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该分类已存在");
+        }
+        TemplateClassify templateClassify = new TemplateClassify();
+        BeanUtil.copyProperties(templateClassifyVO, templateClassify);
+        Date date = DateUtil.now();
+        if (add) {
+            templateClassify.setGmtCreate(date);
+            templateClassify.setCreator(templateClassifyVO.getDoctorId().toString());
+        }
+        templateClassify.setGmtModified(date);
+        templateClassify.setModifier(templateClassifyVO.getDoctorId().toString());
+        this.saveOrUpdate(templateClassify);
+    }
+
+
+    /**
+     * 分类删除
+     *
+     * @param templateClassifyDelVO
+     */
+    public void delete(TemplateClassifyDelVO templateClassifyDelVO) {
+        int count = classifyMappingFacade.count(new QueryWrapper<ClassifyMapping>()
+            .eq("is_deleted", IsDeleteEnum.N.getKey())
+            .eq("classify_id", templateClassifyDelVO.getClassifyId())
+        );
+        if (count > 0) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请先删除当前分类下的模板");
+        }
+        // 删除
+        this.update(new UpdateWrapper<TemplateClassify>()
+            .eq("id", templateClassifyDelVO.getClassifyId())
+            .set("is_deleted", IsDeleteEnum.Y.getKey())
+            .set("gmt_modified", DateUtil.now())
+            .set("modifier", templateClassifyDelVO.getDoctorId())
+        );
+    }
+
+
+    /**
+     * 分类列表
+     *
+     * @param templateClassifyListVO
+     */
+    public List<TemplateClassify> list(TemplateClassifyListVO templateClassifyListVO) {
+        return this.list(new QueryWrapper<TemplateClassify>()
+            .eq("is_deleted", IsDeleteEnum.N.getKey())
+            .eq("doctor_id", templateClassifyListVO.getDoctorId())
+            .eq("hospital_id", templateClassifyListVO.getHospitalId())
+            .orderByDesc("gmt_modified")
+        );
+    }
+}

+ 120 - 0
icss-service/src/main/java/com/diagbot/facade/TemplateFolderAdminFacade.java

@@ -0,0 +1,120 @@
+package com.diagbot.facade;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.client.TranServiceClient;
+import com.diagbot.entity.FolderMapping;
+import com.diagbot.entity.TemplateFolder;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.TemplateFolderServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.vo.HospitalCodeSetVO;
+import com.diagbot.vo.TemplateFolderDelVO;
+import com.diagbot.vo.TemplateFolderListVO;
+import com.diagbot.vo.TemplateFolderVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author zhoutg
+ * @Description: 病历模板文件夹管理员
+ * @date 2018年11月16日 上午11:24:36
+ */
+@Component
+public class TemplateFolderAdminFacade extends TemplateFolderServiceImpl {
+
+    @Autowired
+    AdminCheckFacade adminCheckFacade;
+    @Autowired
+    FolderMappingFacade folderMappingFacade;
+
+    /**
+     * 文件夹新增或更新
+     *
+     * @param templateFolderVO
+     */
+    public void saveOrUpdate(TemplateFolderVO templateFolderVO) {
+        HospitalCodeSetVO hospitalCodeSetVO = new HospitalCodeSetVO();
+        hospitalCodeSetVO.setDoctorId(templateFolderVO.getDoctorId());
+        hospitalCodeSetVO.setHospitalId(templateFolderVO.getHospitalId());
+        boolean res = adminCheckFacade.getadminCheck(hospitalCodeSetVO);
+        if (!res) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "暂无修改权限");
+        }
+        boolean add = true;
+        if (templateFolderVO.getId() != null) {
+            add = false;
+        }
+        int count = this.count(new QueryWrapper<TemplateFolder>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("name", templateFolderVO.getName())
+                .eq("hospital_id", templateFolderVO.getHospitalId())
+                // .eq("doctor_id", templateFolderVO.getDoctorId())
+                .ne(!add, "id", templateFolderVO.getId())
+        );
+        if (count > 0) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该文件夹已存在");
+        }
+        TemplateFolder templateFolder = new TemplateFolder();
+        BeanUtil.copyProperties(templateFolderVO, templateFolder);
+        Date date = DateUtil.now();
+        if (add) {
+            templateFolder.setGmtCreate(date);
+            templateFolder.setCreator(templateFolderVO.getDoctorId().toString());
+        }
+        templateFolder.setGmtModified(date);
+        templateFolder.setModifier(templateFolderVO.getDoctorId().toString());
+        this.saveOrUpdate(templateFolder);
+    }
+
+
+    /**
+     * 文件夹删除
+     *
+     * @param templateFolderDelVO
+     */
+    public void delete(TemplateFolderDelVO templateFolderDelVO) {
+        // 校验权限
+        HospitalCodeSetVO hospitalCodeSetVO = new HospitalCodeSetVO();
+        hospitalCodeSetVO.setDoctorId(templateFolderDelVO.getDoctorId());
+        hospitalCodeSetVO.setHospitalId(templateFolderDelVO.getHospitalId());
+        boolean res = adminCheckFacade.getadminCheck(hospitalCodeSetVO);
+        if (!res) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "暂无删除权限");
+        }
+        int count = folderMappingFacade.count(new QueryWrapper<FolderMapping>()
+            .eq("is_deleted", IsDeleteEnum.N.getKey())
+            .eq("folder_id", templateFolderDelVO.getFolderId())
+        );
+        if (count > 0) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请先删除当前文件夹下的模板");
+        }
+        // 删除
+        this.update(new UpdateWrapper<TemplateFolder>()
+            .eq("id", templateFolderDelVO.getFolderId())
+            .set("is_deleted", IsDeleteEnum.Y.getKey())
+            .set("gmt_modified", DateUtil.now())
+            .set("modifier", templateFolderDelVO.getDoctorId())
+        );
+    }
+
+
+    /**
+     * 文件夹列表
+     *
+     * @param templateFolderListVO
+     */
+    public List<TemplateFolder> list(TemplateFolderListVO templateFolderListVO) {
+        return this.list(new QueryWrapper<TemplateFolder>()
+            .eq("is_deleted", IsDeleteEnum.N.getKey())
+            //.eq("doctor_id", templateFolderListVO.getDoctorId())
+            .eq("hospital_id", templateFolderListVO.getHospitalId())
+            .orderByDesc("gmt_modified")
+        );
+    }
+}

+ 1 - 4
icss-service/src/main/java/com/diagbot/facade/TemplateFolderFacade.java

@@ -1,11 +1,9 @@
 package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.diagbot.client.TranServiceClient;
 import com.diagbot.entity.FolderMapping;
 import com.diagbot.entity.TemplateFolder;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.TemplateTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.TemplateFolderServiceImpl;
@@ -28,8 +26,6 @@ import java.util.List;
 @Component
 public class TemplateFolderFacade extends TemplateFolderServiceImpl {
 
-    @Autowired
-    TranServiceClient tranServiceClient;
     @Autowired
     FolderMappingFacade folderMappingFacade;
 
@@ -84,6 +80,7 @@ public class TemplateFolderFacade extends TemplateFolderServiceImpl {
             .eq("id", templateFolderDelVO.getFolderId())
             .set("is_deleted", IsDeleteEnum.Y.getKey())
             .set("gmt_modified", DateUtil.now())
+            .set("modifier", templateFolderDelVO.getDoctorId())
         );
     }
 

+ 29 - 0
icss-service/src/main/java/com/diagbot/vo/TemplateClassifyDelVO.java

@@ -0,0 +1,29 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 模板文件夹表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-01-09
+ */
+@Setter
+@Getter
+public class TemplateClassifyDelVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @NotNull(message = "请输入分类id")
+    private Long classifyId;
+    @NotNull(message = "请输入医院编码")
+    private Long hospitalId;
+    @NotNull(message = "请输入医生编码")
+    private Long doctorId;
+}

+ 32 - 0
icss-service/src/main/java/com/diagbot/vo/TemplateClassifyListVO.java

@@ -0,0 +1,32 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 模板文件夹表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-01-09
+ */
+@Setter
+@Getter
+public class TemplateClassifyListVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 医院id
+     */
+    private Long hospitalId;
+
+    /**
+     * 医生id
+     */
+    private Long doctorId;
+
+}

+ 51 - 0
icss-service/src/main/java/com/diagbot/vo/TemplateClassifyVO.java

@@ -0,0 +1,51 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 模板分类表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-01-09
+ */
+@Setter
+@Getter
+public class TemplateClassifyVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 医院id
+     */
+    private Long hospitalId;
+
+    /**
+     * 医生id
+     */
+    private Long doctorId;
+
+    /**
+     * 模板类型(个人1,管理员2)
+     */
+    private Integer templateType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

+ 7 - 4
icss-service/src/main/java/com/diagbot/vo/TemplateFolderDelVO.java

@@ -3,11 +3,12 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
  * <p>
- * 模板文件夹
+ * 模板分类
  * </p>
  *
  * @author zhoutg
@@ -19,8 +20,10 @@ public class TemplateFolderDelVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 主键
-     */
+    @NotNull(message = "请输入文件夹id")
     private Long folderId;
+    @NotNull(message = "请输入医院编码")
+    private Long hospitalId;
+    @NotNull(message = "请输入医生编码")
+    private Long doctorId;
 }

+ 1 - 1
icss-service/src/main/java/com/diagbot/vo/TemplateFolderListVO.java

@@ -7,7 +7,7 @@ import java.io.Serializable;
 
 /**
  * <p>
- * 模板文件夹
+ * 模板分类
  * </p>
  *
  * @author zhoutg

+ 52 - 0
icss-service/src/main/java/com/diagbot/web/TemplateClassifyController.java

@@ -1,10 +1,29 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.TemplateClassify;
+import com.diagbot.entity.TemplateFolder;
+import com.diagbot.facade.TemplateClassifyFacade;
+import com.diagbot.facade.TemplateFolderFacade;
+import com.diagbot.vo.TemplateClassifyDelVO;
+import com.diagbot.vo.TemplateClassifyListVO;
+import com.diagbot.vo.TemplateClassifyVO;
+import com.diagbot.vo.TemplateFolderDelVO;
+import com.diagbot.vo.TemplateFolderListVO;
+import com.diagbot.vo.TemplateFolderVO;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
 
+import java.util.List;
+
 /**
  * <p>
  * 模板分类表 前端控制器
@@ -17,4 +36,37 @@ import org.springframework.stereotype.Controller;
 @RequestMapping("/templateClassify")
 public class TemplateClassifyController {
 
+    @Autowired
+    TemplateClassifyFacade templateClassifyFacade;
+
+    @ApiOperation(value = "分类新增或更新[by:zhoutg]",
+            notes = "")
+    @PostMapping("/saveOrUpdate")
+    @SysLogger("saveOrUpdate")
+    @Transactional
+    public RespDTO<Boolean> saveOrUpdate(@RequestBody TemplateClassifyVO templateClassifyVO) {
+        templateClassifyFacade.saveOrUpdate(templateClassifyVO);
+        return RespDTO.onSuc(true);
+    }
+
+
+    @ApiOperation(value = "文件夹删除[by:zhoutg]",
+            notes = "folderId: 文件夹id<br>")
+    @PostMapping("/detele")
+    @SysLogger("detele")
+    @Transactional
+    public RespDTO<Boolean> detele(@RequestBody TemplateClassifyDelVO templateClassifyDelVO) {
+        templateClassifyFacade.delete(templateClassifyDelVO);
+        return RespDTO.onSuc(true);
+    }
+
+
+    @ApiOperation(value = "文件夹列表[by:zhoutg]",
+            notes = "")
+    @PostMapping("/list")
+    @SysLogger("list")
+    public RespDTO<List<TemplateClassify>> list(@RequestBody TemplateClassifyListVO templateClassifyListVO) {
+        List<TemplateClassify> data = templateClassifyFacade.list(templateClassifyListVO);
+        return RespDTO.onSuc(data);
+    }
 }

+ 68 - 0
icss-service/src/main/java/com/diagbot/web/TemplateFolderAdminController.java

@@ -0,0 +1,68 @@
+package com.diagbot.web;
+
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.TemplateFolder;
+import com.diagbot.facade.TemplateFolderFacade;
+import com.diagbot.vo.TemplateFolderDelVO;
+import com.diagbot.vo.TemplateFolderListVO;
+import com.diagbot.vo.TemplateFolderVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 模板文件夹表 前端控制器
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-01-09
+ */
+@RestController
+@RequestMapping("/templateFolderAdmin")
+@Api(value = "病历模板文件夹管理员API", tags = { "病历模板文件夹管理员API" })
+public class TemplateFolderAdminController {
+
+    @Autowired
+    TemplateFolderFacade templateFolderFacade;
+
+    @ApiOperation(value = "文件夹新增或更新[by:zhoutg]",
+            notes = "")
+    @PostMapping("/saveOrUpdate")
+    @SysLogger("saveOrUpdate")
+    @Transactional
+    public RespDTO<Boolean> saveOrUpdate(@RequestBody TemplateFolderVO templateFolderVO) {
+        templateFolderFacade.saveOrUpdate(templateFolderVO);
+        return RespDTO.onSuc(true);
+    }
+
+
+    @ApiOperation(value = "文件夹删除[by:zhoutg]",
+            notes = "folderId: 文件夹id<br>")
+    @PostMapping("/detele")
+    @SysLogger("detele")
+    @Transactional
+    public RespDTO<Boolean> detele(@RequestBody TemplateFolderDelVO templateFolderDelVO) {
+        templateFolderFacade.delete(templateFolderDelVO);
+        return RespDTO.onSuc(true);
+    }
+
+
+    @ApiOperation(value = "文件夹列表[by:zhoutg]",
+            notes = "")
+    @PostMapping("/list")
+    @SysLogger("list")
+    public RespDTO<List<TemplateFolder>> list(@RequestBody TemplateFolderListVO templateFoldeListVO) {
+        List<TemplateFolder> data = templateFolderFacade.list(templateFoldeListVO);
+        return RespDTO.onSuc(data);
+    }
+}

+ 1 - 1
icss-service/src/main/java/com/diagbot/web/TemplateFolderController.java

@@ -30,7 +30,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/templateFolder")
-@Api(value = "病历模板文件夹API", tags = { "病历模板文件夹API" })
+@Api(value = "病历模板文件夹医生端API", tags = { "病历模板文件夹医生端API" })
 public class TemplateFolderController {
 
     @Autowired