Ver código fonte

代码修正

gaodm 5 anos atrás
pai
commit
c5e1809e5c

+ 25 - 33
icss-service/src/main/java/com/diagbot/facade/TemplateAdminFacade.java

@@ -3,7 +3,6 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.HospitalDeptInfoAllDTO;
 import com.diagbot.dto.RespDTO;
@@ -25,7 +24,6 @@ import com.diagbot.vo.HospitalCodeVo;
 import com.diagbot.vo.TemplateAdminIdsVO;
 import com.diagbot.vo.TemplateIdVO;
 import com.diagbot.vo.TemplateInfoAdminPageVO;
-import com.diagbot.vo.TemplateInfoPageVO;
 import com.diagbot.vo.TemplateInfoRevampVO;
 import com.diagbot.vo.TemplateInfoTypeVO;
 import com.diagbot.vo.TemplateInfosVO;
@@ -50,17 +48,16 @@ public class TemplateAdminFacade extends TemplateInfoServiceImpl {
     TranServiceClient tranServiceClient;
 
     /**
-     *
      * @param templateInfoRevampVO
      * @return
      */
     public boolean updateByIdUsName(TemplateInfoRevampVO templateInfoRevampVO) {
         //检验权限
-        HospitalCodeSetVO hospitalCodeSetVO =new HospitalCodeSetVO();
+        HospitalCodeSetVO hospitalCodeSetVO = new HospitalCodeSetVO();
         hospitalCodeSetVO.setDoctorId(templateInfoRevampVO.getDoctorId());
         hospitalCodeSetVO.setHospitalId(templateInfoRevampVO.getHospitalId());
         boolean res = getadminCheck(hospitalCodeSetVO);
-        if(!res){
+        if (!res) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "暂无修改权限");
         }
         //1.先判断数据是否存在有效
@@ -82,11 +79,11 @@ public class TemplateAdminFacade extends TemplateInfoServiceImpl {
         if (sumA == 0) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "个人模板无权修改");
         }
-        //2.再判断该医生下模板名是否重复重在
+        //2.再判断该科室下模板名是否重复重在
         QueryWrapper<TemplateInfo> templates = new QueryWrapper<>();
         Map<String, Object> mapAll = new HashMap<>();
         mapAll.put("hospital_dept_id", templateInfoRevampVO.getHospitalDeptId());
-        mapAll.put("doctor_id", templateInfoRevampVO.getDoctorId());
+        //mapAll.put("doctor_id", templateInfoRevampVO.getDoctorId());
         mapAll.put("hospital_id", templateInfoRevampVO.getHospitalId());
         mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
         mapAll.put("template_type", TemplateTypeEnum.AdminTemplate.getKey());
@@ -111,25 +108,24 @@ public class TemplateAdminFacade extends TemplateInfoServiceImpl {
     }
 
     /**
-     *
      * @param templateInfosVO
      * @return
      */
     public boolean saveTemplateInfo(TemplateInfosVO templateInfosVO) {
         //检验权限
-        HospitalCodeSetVO hospitalCodeSetVO =new HospitalCodeSetVO();
+        HospitalCodeSetVO hospitalCodeSetVO = new HospitalCodeSetVO();
         hospitalCodeSetVO.setDoctorId(templateInfosVO.getDoctorId());
         hospitalCodeSetVO.setHospitalId(templateInfosVO.getHospitalId());
         boolean res = getadminCheck(hospitalCodeSetVO);
-        if(!res){
+        if (!res) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "暂无修改权限");
         }
-        //1.判断该医生下是否存在模板名相同的数据
+        //1.判断同科室下是否存在模板名相同的数据
         TemplateInfo templateInfo = new TemplateInfo();
         QueryWrapper<TemplateInfo> templateInfoFand = new QueryWrapper<>();
         Map<String, Object> mapAll = new HashMap<>();
         mapAll.put("hospital_dept_id", templateInfosVO.getHospitalDeptId());
-        mapAll.put("doctor_id", templateInfosVO.getDoctorId());
+        //mapAll.put("doctor_id", templateInfosVO.getDoctorId());
         mapAll.put("hospital_id", templateInfosVO.getHospitalId());
         mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
         mapAll.put("template_type", TemplateTypeEnum.AdminTemplate.getKey());
@@ -153,7 +149,7 @@ public class TemplateAdminFacade extends TemplateInfoServiceImpl {
         templateInfo.setName(templateInfosVO.getModeName());//模板名称
         templateInfo.setType(templateInfosVO.getModeType());//类型
         templateInfo.setTemplateType(TemplateTypeEnum.AdminTemplate.getKey());//模板类型
-         res = save(templateInfo);
+        res = save(templateInfo);
         if (!res) {
             throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
         }
@@ -162,17 +158,16 @@ public class TemplateAdminFacade extends TemplateInfoServiceImpl {
     }
 
     /**
-     *
      * @param templateAdminIdsVO
      * @return
      */
     public boolean cancelTemplateInfo(TemplateAdminIdsVO templateAdminIdsVO) {
         //检验权限
-        HospitalCodeSetVO hospitalCodeSetVO =new HospitalCodeSetVO();
+        HospitalCodeSetVO hospitalCodeSetVO = new HospitalCodeSetVO();
         hospitalCodeSetVO.setDoctorId(templateAdminIdsVO.getDoctorId());
         hospitalCodeSetVO.setHospitalId(templateAdminIdsVO.getHospitalId());
         boolean res = getadminCheck(hospitalCodeSetVO);
-        if(!res){
+        if (!res) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "暂无删除权限");
         }
         //1.获取传入的ids数据
@@ -191,46 +186,45 @@ public class TemplateAdminFacade extends TemplateInfoServiceImpl {
         templateInfoNew
                 .in("id", ListUtil.arrayToList(splitIds))
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("template_type",TemplateTypeEnum.AdminTemplate.getKey())
+                .eq("template_type", TemplateTypeEnum.AdminTemplate.getKey())
                 .set("is_deleted", IsDeleteEnum.Y.getKey())
                 //.set("modifier",UserUtils.getCurrentPrincipleID())
                 .set("gmt_modified", DateUtil.now());
-         res = update(new TemplateInfo(), templateInfoNew);
+        res = update(new TemplateInfo(), templateInfoNew);
 
         return res;
     }
 
     /**
-     *
      * @param templateInfoPageVO
      * @return
      */
     public IPage<TemplateInfoPageDTO> getTemplatePageAlls(TemplateInfoAdminPageVO templateInfoPageVO) {
         //检验权限
-        HospitalCodeSetVO hospitalCodeSetVO =new HospitalCodeSetVO();
+        HospitalCodeSetVO hospitalCodeSetVO = new HospitalCodeSetVO();
         hospitalCodeSetVO.setDoctorId(templateInfoPageVO.getDoctorId());
         hospitalCodeSetVO.setHospitalId(templateInfoPageVO.getHospitalId());
         boolean res = getadminCheck(hospitalCodeSetVO);
-        if(!res){
+        if (!res) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "暂无权限");
         }
-        HospitalCodeVo hospitalCodeVo =new HospitalCodeVo();
+        HospitalCodeVo hospitalCodeVo = new HospitalCodeVo();
         hospitalCodeVo.setHospitalCode(templateInfoPageVO.getHospitalCode());
         hospitalCodeVo.setDeptInfoName("");
         hospitalCodeVo.setThirdpartyName("");
         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));
+        Map<Long, HospitalDeptInfoAllDTO> deptMap = deptInfo.stream().collect(Collectors.toMap(HospitalDeptInfoAllDTO::getId, i -> i));
         TemplateInfoTypeVO adminVO = new TemplateInfoTypeVO();
         BeanUtil.copyProperties(templateInfoPageVO, adminVO);
         adminVO.setDoctorId(null);
         adminVO.setTemplateType(TemplateTypeEnum.AdminTemplate.getKey());
         IPage<TemplateInfoPageDTO> adminTemplate = getTemplatePages(adminVO);
-        if(adminTemplate.getRecords().size()>0){
-            adminTemplate.getRecords().forEach(i->{
+        if (adminTemplate.getRecords().size() > 0) {
+            adminTemplate.getRecords().forEach(i -> {
                 HospitalDeptInfoAllDTO data = deptMap.get(i.getHospitalDeptId());
-                if(data!=null){
+                if (data != null) {
                     i.setConceptDeptName(data.getConceptDeptName());
                     i.setThirdpartyName(data.getName());
                 }
@@ -238,11 +232,10 @@ public class TemplateAdminFacade extends TemplateInfoServiceImpl {
             });
         }
 
-        return  adminTemplate;
+        return adminTemplate;
     }
 
     /**
-     *
      * @param templateIdVO
      * @return
      */
@@ -252,10 +245,10 @@ public class TemplateAdminFacade extends TemplateInfoServiceImpl {
         templateInfoQuery
                 .eq("id", templateIdVO.getId())
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("template_type",TemplateTypeEnum.AdminTemplate.getKey());
+                .eq("template_type", TemplateTypeEnum.AdminTemplate.getKey());
         TemplateInfoDTO data = new TemplateInfoDTO();
         TemplateInfo datas = getOne(templateInfoQuery, false);
-        if(datas==null){
+        if (datas == null) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该模板不存在!");
         }
         //过滤
@@ -265,14 +258,13 @@ public class TemplateAdminFacade extends TemplateInfoServiceImpl {
 
 
     /**
-     *
      * @param hospitalCodeSetVO
      * @return
      */
-    public boolean getadminCheck(HospitalCodeSetVO hospitalCodeSetVO){
+    public boolean getadminCheck(HospitalCodeSetVO hospitalCodeSetVO) {
         hospitalCodeSetVO.setShowError(true);
         RespDTO<Boolean> datas = tranServiceClient.getAdminCheckout(hospitalCodeSetVO);
         RespDTOUtil.respNGDeal(datas, datas.msg);
-        return  datas.data;
+        return datas.data;
     }
 }