日志版本修改

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.TemplateFolderDTO;
 import com.diagbot.dto.TemplateInfoDTO;
 import com.diagbot.dto.TemplateInfoNormDTO;
-import com.diagbot.dto.TemplateNormsDTO;
 import com.diagbot.entity.FolderMapping;
 import com.diagbot.entity.TemplateFolder;
 import com.diagbot.entity.TemplateInfo;
@@ -18,6 +17,7 @@ import com.diagbot.service.impl.TemplateFolderServiceImpl;
 import com.diagbot.service.impl.TemplateInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
 import com.diagbot.util.GsonUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.HospitalCodeSetVO;
@@ -34,7 +34,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @author wangfeng
@@ -56,7 +55,8 @@ public class TemplateNormFacade extends TemplateInfoServiceImpl {
     FolderMappingServiceImpl folderMappingServiceImpl;
 
     /**
-     *根据模板id修改模板名称和文件夹名称
+     * 根据模板id修改模板名称和文件夹名称
+     *
      * @param templateNormUpVO
      * @return
      */
@@ -113,14 +113,14 @@ public class TemplateNormFacade extends TemplateInfoServiceImpl {
             throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
         }
         //更新关系
-        if(res){
+        if (res) {
             Long orderNo = folderMappingServiceImpl.getMaxOrderNo(templateNormUpVO.getFolderId());
-            Long num = orderNo == null?0:orderNo;
+            Long num = orderNo == null ? 0 : orderNo;
             res = folderMappingFacade.update(new UpdateWrapper<FolderMapping>()
-                    .eq("template_id",templateNormUpVO.getId())
+                    .eq("template_id", templateNormUpVO.getId())
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .set("folder_id", templateNormUpVO.getFolderId())
-                    .set("order_no",num));
+                    .set("order_no", num));
         }
         return res;
 
@@ -128,6 +128,7 @@ public class TemplateNormFacade extends TemplateInfoServiceImpl {
 
     /**
      * 保存病历模板
+     *
      * @param templateNormsVO
      * @return
      */
@@ -177,10 +178,10 @@ public class TemplateNormFacade extends TemplateInfoServiceImpl {
         //将id转为负数
         Long num = (templateInfo.getId() > 0) ? -templateInfo.getId() : templateInfo.getId();
         res = update(new UpdateWrapper<TemplateInfo>()
-                .in("id",templateInfo.getId())
+                .in("id", templateInfo.getId())
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .set("id", num));
-        if(res){
+        if (res) {
             FolderMapping folderMapping = new FolderMapping();
             folderMapping.setFolderId(templateNormsVO.getFolderId());
             folderMapping.setTemplateId(num);
@@ -194,6 +195,7 @@ public class TemplateNormFacade extends TemplateInfoServiceImpl {
 
     /**
      * 根据模板id批量删除病历模板
+     *
      * @param templateNormsIdsVO
      * @return
      */
@@ -228,17 +230,18 @@ public class TemplateNormFacade extends TemplateInfoServiceImpl {
                 .set("gmt_modified", DateUtil.now());
         res = update(new TemplateInfo(), templateInfoNew);
         //删除模板和文件的绑定关系
-        if(res){
-          res = folderMappingFacade.update(new UpdateWrapper<FolderMapping>()
-                  .in("template_id",ListUtil.arrayToList(splitIds))
-                  .eq("is_deleted", IsDeleteEnum.N.getKey())
-                  .set("is_deleted", IsDeleteEnum.Y.getKey()));
+        if (res) {
+            res = folderMappingFacade.update(new UpdateWrapper<FolderMapping>()
+                    .in("template_id", ListUtil.arrayToList(splitIds))
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .set("is_deleted", IsDeleteEnum.Y.getKey()));
         }
         return res;
     }
 
     /**
-     *查询标准模板列表
+     * 查询标准模板列表
+     *
      * @param templateNormsParamVO
      * @return
      */
@@ -251,22 +254,18 @@ public class TemplateNormFacade extends TemplateInfoServiceImpl {
                 .eq("template_type", TemplateTypeEnum.AdminTemplate.getKey())
                 //.eq("doctor_id", templateNormsParamVO.getDoctorId())
                 .orderByAsc("order_no");
-        List<TemplateFolder> datas= templateFolderServiceImpl.list(templateFolderQuery);
+        List<TemplateFolder> datas = templateFolderServiceImpl.list(templateFolderQuery);
         List<TemplateFolderDTO> data = new ArrayList<TemplateFolderDTO>();
         //过滤
         data = BeanUtil.listCopyTo(datas, TemplateFolderDTO.class);
         //再获取模板
         List<TemplateInfoNormDTO> templateDatas = templateInfoServiceImpl.getStandardTemplates(templateNormsParamVO);
+        Map<Long, List<TemplateInfoNormDTO>> map
+                = EntityUtil.makeEntityListMap(templateDatas, "folderId");
         //把模板放进文件夹中
-        if(data.size()>0){
-            for(TemplateFolderDTO ts:data){
-                List<TemplateInfoNormDTO> templateList = new ArrayList<TemplateInfoNormDTO>();
-                for(TemplateInfoNormDTO t:templateDatas){
-                    if (ts.getId().equals(t.getFolderId())){
-                        templateList.add(t);
-                    }
-                }
-                ts.setTemplateInfo(templateList);
+        if (data.size() > 0) {
+            for (TemplateFolderDTO ts : data) {
+                ts.setTemplateInfo(map.get(ts.getId()));
             }
         }
 
@@ -275,6 +274,7 @@ public class TemplateNormFacade extends TemplateInfoServiceImpl {
 
     /**
      * 根据模板id获取病历模板内容
+     *
      * @param templateIdVO
      * @return
      */
@@ -297,6 +297,7 @@ public class TemplateNormFacade extends TemplateInfoServiceImpl {
 
     /**
      * 模糊查询模板
+     *
      * @param templateNormsFindVO
      * @return
      */