模板接口

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

@@ -15,6 +15,7 @@ import com.diagbot.vo.HospitalCodeSetVO;
 import com.diagbot.vo.TemplateFolderDelVO;
 import com.diagbot.vo.TemplateFolderListVO;
 import com.diagbot.vo.TemplateFolderVO;
+import freemarker.template.Template;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -53,11 +54,12 @@ public class TemplateFolderAdminFacade extends TemplateFolderServiceImpl {
             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())
+            .eq("is_deleted", IsDeleteEnum.N.getKey())
+            .eq("name", templateFolderVO.getName())
+            .eq("hospital_id", templateFolderVO.getHospitalId())
+            .eq("template_type", TemplateTypeEnum.AdminTemplate.getKey())
+            // .eq("doctor_id", templateFolderVO.getDoctorId())
+            .ne(!add, "id", templateFolderVO.getId())
         );
         if (count > 0) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该文件夹已存在");
@@ -102,6 +104,7 @@ public class TemplateFolderAdminFacade extends TemplateFolderServiceImpl {
             .set("is_deleted", IsDeleteEnum.Y.getKey())
             .set("gmt_modified", DateUtil.now())
             .set("modifier", templateFolderDelVO.getDoctorId())
+            .set("doctor_id", templateFolderDelVO.getDoctorId())
         );
     }
 
@@ -121,10 +124,10 @@ public class TemplateFolderAdminFacade extends TemplateFolderServiceImpl {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "暂无获取文件夹列表权限");
         }
         int count = this.count(new QueryWrapper<TemplateFolder>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                //.eq("doctor_id", templateFolderListVO.getDoctorId())
-                .eq("hospital_id", templateFolderListVO.getHospitalId())
-                .orderByDesc("gmt_modified")
+            .eq("is_deleted", IsDeleteEnum.N.getKey())
+            //.eq("doctor_id", templateFolderListVO.getDoctorId())
+            .eq("hospital_id", templateFolderListVO.getHospitalId())
+            .eq("template_type", TemplateTypeEnum.AdminTemplate.getKey())
         );
         // 如果没有文件夹，新建一个“未分类文件夹”
         if (0 == count) {
@@ -133,11 +136,12 @@ public class TemplateFolderAdminFacade extends TemplateFolderServiceImpl {
             templateFolder.setCreator(templateFolderListVO.getDoctorId().toString());
             templateFolder.setModifier(templateFolderListVO.getDoctorId().toString());
             templateFolder.setDoctorId(templateFolderListVO.getDoctorId());
+            templateFolder.setHospitalId(templateFolderListVO.getHospitalId());
             Date date = DateUtil.now();
             templateFolder.setGmtCreate(date);
             templateFolder.setGmtModified(date);
             templateFolder.setName("未分类文件夹");
-            templateFolder.setOrderNo(999999);
+            templateFolder.setOrderNo(99999);
             templateFolder.setTemplateType(TemplateTypeEnum.AdminTemplate.getKey());
             this.save(templateFolder);
             List<TemplateFolder> data = new ArrayList<>();

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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;
@@ -15,6 +16,7 @@ import com.diagbot.vo.TemplateFolderVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -40,11 +42,12 @@ public class TemplateFolderFacade extends TemplateFolderServiceImpl {
             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())
+            .eq("is_deleted", IsDeleteEnum.N.getKey())
+            .eq("name", templateFolderVO.getName())
+            .eq("hospital_id", templateFolderVO.getHospitalId())
+            .eq("template_type", TemplateTypeEnum.PersonalTemplate.getKey())
+            .eq("doctor_id", templateFolderVO.getDoctorId())
+            .ne(!add, "id", templateFolderVO.getId())
         );
         if (count > 0) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该文件夹已存在");
@@ -81,6 +84,7 @@ public class TemplateFolderFacade extends TemplateFolderServiceImpl {
             .set("is_deleted", IsDeleteEnum.Y.getKey())
             .set("gmt_modified", DateUtil.now())
             .set("modifier", templateFolderDelVO.getDoctorId())
+            .set("doctor_id", templateFolderDelVO.getDoctorId())
         );
     }
 
@@ -91,6 +95,31 @@ public class TemplateFolderFacade extends TemplateFolderServiceImpl {
      * @param templateFolderListVO
      */
     public List<TemplateFolder> list(TemplateFolderListVO templateFolderListVO) {
+        int count = this.count(new QueryWrapper<TemplateFolder>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("doctor_id", templateFolderListVO.getDoctorId())
+                .eq("hospital_id", templateFolderListVO.getHospitalId())
+                .eq("template_type", TemplateTypeEnum.PersonalTemplate.getKey())
+        );
+        // 如果没有文件夹，新建一个“未分类文件夹”
+        if (0 == count) {
+            TemplateFolder templateFolder = new TemplateFolder();
+            templateFolder.setIsDeleted(IsDeleteEnum.N.getKey());
+            templateFolder.setCreator(templateFolderListVO.getDoctorId().toString());
+            templateFolder.setModifier(templateFolderListVO.getDoctorId().toString());
+            templateFolder.setDoctorId(templateFolderListVO.getDoctorId());
+            templateFolder.setHospitalId(templateFolderListVO.getHospitalId());
+            Date date = DateUtil.now();
+            templateFolder.setGmtCreate(date);
+            templateFolder.setGmtModified(date);
+            templateFolder.setName("未分类文件夹");
+            templateFolder.setOrderNo(99999);
+            templateFolder.setTemplateType(TemplateTypeEnum.PersonalTemplate.getKey());
+            this.save(templateFolder);
+            List<TemplateFolder> data = new ArrayList<>();
+            data.add(templateFolder);
+            return data;
+        }
         return this.list(new QueryWrapper<TemplateFolder>()
             .eq("is_deleted", IsDeleteEnum.N.getKey())
             .eq("doctor_id", templateFolderListVO.getDoctorId())

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

@@ -22,8 +22,8 @@ public class TemplateFolderDelVO implements Serializable {
 
     @NotNull(message = "请输入文件夹id")
     private Long folderId;
-    @NotNull(message = "请输入医院编码")
+    @NotNull(message = "请输入医院id")
     private Long hospitalId;
-    @NotNull(message = "请输入医生编码")
+    @NotNull(message = "请输入医生id")
     private Long doctorId;
 }