管理员设置

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

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -17,4 +18,7 @@ public class HospitalCodeSetVO {
     private Long hospitalId;
     @NotNull(message = "请输入医生编码")
     private Long doctorId;
+    //是否显示错误
+    @ApiModelProperty(hidden = true)
+    private Boolean showError;
 }

tran-service/src/main/java/com/diagbot/facade/SysSetFacade.java

@@ -1,7 +1,6 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.DoctorInfoDTO;
 import com.diagbot.dto.DoctorInfoFindDTO;
 import com.diagbot.dto.GetHospitalRankInfoDTO;
 import com.diagbot.dto.SysHospitalDTO;
@@ -13,11 +12,9 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.service.DoctorInfoService;
 import com.diagbot.service.impl.SysSetServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.IntegerUtil;
-import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.GetHospitalRankInfoVO;
 import com.diagbot.vo.HospitalCodeSetVO;
@@ -28,7 +25,6 @@ import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.swing.text.Utilities;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -46,6 +42,7 @@ public class SysSetFacade extends SysSetServiceImpl {
     private HospitalInfoFacade hospitalInfoFacade;
     @Autowired
     DoctorInfoFacade doctorInfoFacade;
+
     /**
      * @param hospitalSetVO
      * @return
@@ -155,14 +152,13 @@ public class SysSetFacade extends SysSetServiceImpl {
     }
 
     /**
-     *
      * @param hospitalCodeSetVO
      * @return
      */
     public Boolean getAdminCheckout(HospitalCodeSetVO hospitalCodeSetVO) {
         boolean res = false;
         DoctorInfoFindDTO data = doctorInfoFacade.findDoctorInfo(hospitalCodeSetVO);
-        if(data==null){
+        if (data == null) {
             throw new CommonException(CommonErrorCode.RPC_ERROR, "该用户不存在");
         }
         QueryWrapper<SysSet> sysSetInfo = new QueryWrapper<>();
@@ -170,17 +166,15 @@ public class SysSetFacade extends SysSetServiceImpl {
         sysSetInfo.eq("hospital_code", data.getHospitalCode());
         sysSetInfo.eq("code", "template_admin");
         sysSetInfo.eq("sys_type", SysTypeEnum.ICSS_SERVICE.getKey());
-        SysSet sysSetInfoData = getOne(sysSetInfo, false);
-        SysHospitalInfoVO sysHospitalInfoVO = new SysHospitalInfoVO();
-        if(sysSetInfoData==null){
-            throw new CommonException(CommonErrorCode.RPC_ERROR, "该医院暂无模板管理者配置信息");
-        }
-        List<String> listCode = Lists.newArrayList(sysSetInfoData.getValue().split(","));
-        for(String code :listCode){
-            if (code.equals(data.getDoctorCode())){
-                res = true;
+        sysSetInfo.apply("find_in_set({0}, value)", data.getDoctorCode());
+        if (this.count(sysSetInfo) < 1) {
+            res = false;
+            if (hospitalCodeSetVO.getShowError()){
+                throw new CommonException(CommonErrorCode.RPC_ERROR, "该医院暂无模板管理者配置信息");
             }
+        } else {
+            res = true;
         }
-        return  res;
+        return res;
     }
 }

tran-service/src/main/java/com/diagbot/vo/HospitalCodeSetVO.java

@@ -17,4 +17,6 @@ public class HospitalCodeSetVO {
     private Long hospitalId;
     @NotNull(message = "请输入医生编码")
     private Long doctorId;
+    //是否显示错误
+    private Boolean showError = true;
 }