Merge branch 'develop' into dev/mix20200217_config

icss-service/src/main/java/com/diagbot/dto/TemplateInfoNormDTO.java

@@ -24,6 +24,7 @@ public class TemplateInfoNormDTO {
     private Long doctorId;//医生id
     private Long hospitalId;//医院id
     private Long hospitalDeptId;//部门id
+    private String hospitalDeptName;//科室名
     private Integer sex;//性别
     private String type;//模板类型
     private String  preview;//预览文字

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

@@ -85,12 +85,17 @@ public class TemplateFolderAdminFacade extends TemplateFolderServiceImpl {
         }
         templateFolder.setGmtModified(date);
         templateFolder.setModifier(templateFolderVO.getDoctorId().toString());
+        //获取文件夹最大数
+        Integer orderNo =templateFolderService.getMaxNo(templateFolderVO.getHospitalId());
+        Integer num = orderNo == null ? 0 :  orderNo;
+        //templateFolder.setOrderNo(num);
         this.saveOrUpdate(templateFolder);
-        // 如果是新增，id改为负数
+        // 如果是新增，id改为负数,且文件夹放最后。
         if (add) {
             this.update(new UpdateWrapper<TemplateFolder>()
                     .eq("id", templateFolder.getId())
                     .set("id", Long.parseLong("-" + templateFolder.getId()))
+                    .set("order_no",num)
             );
         }
     }

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

@@ -2,6 +2,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.dto.HospitalDeptInfoAllDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.TemplateFolderDTO;
 import com.diagbot.dto.TemplateInfoDTO;
 import com.diagbot.dto.TemplateInfoNormDTO;
@@ -20,7 +23,9 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.GsonUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.HospitalCodeSetVO;
+import com.diagbot.vo.HospitalCodeVo;
 import com.diagbot.vo.TemplateIdVO;
 import com.diagbot.vo.TemplateNormUpVO;
 import com.diagbot.vo.TemplateNormsFindVO;
@@ -34,6 +39,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author wangfeng
@@ -41,7 +47,7 @@ import java.util.Map;
  * @date 2020-01-10 14:25
  */
 @Component
-public class TemplateNormFacade extends TemplateInfoServiceImpl {
+public class TemplateNormFacade<tranServiceClient> extends TemplateInfoServiceImpl {
 
     @Autowired
     TemplateFolderServiceImpl templateFolderServiceImpl;
@@ -53,7 +59,8 @@ public class TemplateNormFacade extends TemplateInfoServiceImpl {
     FolderMappingFacade folderMappingFacade;
     @Autowired
     FolderMappingServiceImpl folderMappingServiceImpl;
-
+    @Autowired
+    TranServiceClient tranServiceClient;
     /**
      * 根据模板id修改模板名称和文件夹名称
      *
@@ -111,6 +118,7 @@ public class TemplateNormFacade extends TemplateInfoServiceImpl {
         templateInfo.setName(templateNormUpVO.getModeName());//模板名称
         templateInfo.setGmtModified(DateUtil.now());//修改时间
         templateInfo.setSpell(templateNormUpVO.getSpell());
+        templateInfo.setSex(templateNormUpVO.getSex());
         res = updateById(templateInfo);
         if (!res) {
             throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
@@ -118,12 +126,12 @@ public class TemplateNormFacade extends TemplateInfoServiceImpl {
         //更新关系
         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("is_deleted", IsDeleteEnum.N.getKey())
                     .set("folder_id", templateNormUpVO.getFolderId())
-                    .set("order_no", num));
+                    .set("order_no", orderNo));
         }
         return res;
 
@@ -190,6 +198,8 @@ public class TemplateNormFacade extends TemplateInfoServiceImpl {
             folderMapping.setTemplateId(num);
             folderMapping.setCreator(templateNormsVO.getDoctorId().toString());
             folderMapping.setGmtCreate(DateUtil.now());
+            Long orderNo = folderMappingServiceImpl.getMaxOrderNo(templateNormsVO.getFolderId());
+            folderMapping.setOrderNo(orderNo);
             res = folderMappingFacade.save(folderMapping);
         }
 
@@ -264,6 +274,21 @@ public class TemplateNormFacade extends TemplateInfoServiceImpl {
         TemplateNormsParamVO templateNormsParamVO = new TemplateNormsParamVO();
         templateNormsParamVO.setHospitalId(-9L);
         List<TemplateInfoNormDTO> templateDatas = templateInfoServiceImpl.getStandardTemplates(templateNormsParamVO);
+        HospitalCodeVo hospitalCodeVo = new HospitalCodeVo();
+        hospitalCodeVo.setHospitalCode("LT");
+        RespDTO<List<HospitalDeptInfoAllDTO>> deptInfoDTO = tranServiceClient.getHospitalDeptInfoAll(hospitalCodeVo);
+        RespDTOUtil.respNGDeal(deptInfoDTO, deptInfoDTO.msg);
+        List<HospitalDeptInfoAllDTO> deptInfo = deptInfoDTO.data;
+        Map<Long, HospitalDeptInfoAllDTO> deptMap = deptInfo.stream().collect(Collectors.toMap(HospitalDeptInfoAllDTO::getId, i -> i));
+        if (templateDatas.size() > 0) {
+            templateDatas.forEach(i -> {
+                HospitalDeptInfoAllDTO dataDept = deptMap.get(i.getHospitalDeptId());
+                if (dataDept != null) {
+                    i.setHospitalDeptName(dataDept.getConceptDeptName());
+                }
+
+            });
+        }
         Map<Long, List<TemplateInfoNormDTO>> map
                 = EntityUtil.makeEntityListMap(templateDatas, "folderId");
         //把模板放进文件夹中

icss-service/src/main/java/com/diagbot/mapper/TemplateFolderMapper.java

@@ -12,5 +12,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2020-01-09
  */
 public interface TemplateFolderMapper extends BaseMapper<TemplateFolder> {
-
+    public Integer  getMaxNo(Long hospitald);
 }

icss-service/src/main/java/com/diagbot/service/TemplateFolderService.java

@@ -12,5 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2020-01-09
  */
 public interface TemplateFolderService extends IService<TemplateFolder> {
-
+    public Integer  getMaxNo(Long hospitald);
 }

icss-service/src/main/java/com/diagbot/service/impl/TemplateFolderServiceImpl.java

@@ -17,4 +17,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class TemplateFolderServiceImpl extends ServiceImpl<TemplateFolderMapper, TemplateFolder> implements TemplateFolderService {
 
+    @Override
+    public Integer getMaxNo(Long hospitald) {
+        return baseMapper.getMaxNo(hospitald);
+    }
 }

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

@@ -36,5 +36,7 @@ public class TemplateNormUpVO {
      */
     @NotNull(message = "请输入文件Id")
     private Long folderId;
+    @NotNull(message = "请输入性别")
+    private Integer sex;//性别
 
 }

icss-service/src/main/resources/mapper/FolderMappingMapper.xml

@@ -17,7 +17,7 @@
     </resultMap>
 
     <select id="getMaxOrderNo" resultType="Long">
-        SELECT MAX(order_no)+1 FROM icss_folder_mapping WHERE is_deleted ="N"
+        SELECT IFNULL(MAX(order_no)+1, 0) FROM icss_folder_mapping WHERE is_deleted ="N"
         <if test="folderId != null ">
            AND folder_id = #{folderId}
         </if>

icss-service/src/main/resources/mapper/TemplateFolderMapper.xml

@@ -18,4 +18,12 @@
         <result column="remark" property="remark" />
     </resultMap>
 
+    <select id="getMaxNo" resultType="Integer">
+     SELECT MAX(order_no)+1 FROM icss_template_folder WHERE is_deleted ="N"
+        <if test="hospitald != null ">
+      AND hospital_id = #{hospitald}
+        </if>
+      AND template_type = 2
+      and order_no != 99999
+    </select>
 </mapper>