权限管理模块-新增获取医生列表

common/src/main/java/com/lantone/common/dto/DoctorDTO.java

@@ -0,0 +1,82 @@
+package com.lantone.common.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 医生表
+ * </p>
+ */
+@Data
+public class DoctorDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private Long id;
+
+    /**
+     * 医生编码
+     */
+    private String code;
+
+    /**
+     * 医生姓名
+     */
+    private String name;
+
+    /**
+     * 手机号
+     */
+    private String mobilePhone;
+
+    /**
+     * 职称
+     */
+    private String professor;
+
+    /**
+     * 职业医师资格（0：无，1：有）
+     */
+    private String occup;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 关联标志位 true 关联
+     */
+    private boolean relationStatus;
+
+}

common/src/main/java/com/lantone/common/vo/DeptVO.java

@@ -0,0 +1,55 @@
+package com.lantone.common.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName: DeptVO
+ * @Description: 科室返回对象
+ * @Author songxl
+ * @Date 2021/7/27
+ * @Version 1.0
+ */
+@Data
+public class DeptVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    @ApiModelProperty(value = "医院ID")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "医院科室编码")
+    private String code;
+
+    @ApiModelProperty(value = "科室名称")
+    private String name;
+
+    @ApiModelProperty(value = "类别")
+    private String type;
+
+    @ApiModelProperty(value = "首字母拼音")
+    private String spell;
+
+    @ApiModelProperty(value = "区域类别")
+    private String station;
+
+    @ApiModelProperty(value = "排序")
+    private String orderNo;
+
+    @ApiModelProperty(value = "创建用户编号")
+    private Long creator;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
+    private String isDeleted;
+    /**
+     * 关联标志位 true 关联
+     */
+    private boolean relationStatus;
+}

common/src/main/java/com/lantone/common/vo/HospitalVO.java

@@ -0,0 +1,66 @@
+package com.lantone.common.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName: HospitalVO
+ * @Description: 用户组织对象
+ * @Author songxl
+ * @Date 2021/7/27
+ * @Version 1.0
+ */
+@Data
+public class HospitalVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "编号")
+    private Long id;
+
+    private Long parentId;
+
+    @ApiModelProperty(value = "医院编码")
+    private String orgCode;
+
+    @ApiModelProperty(value = "父级编码")
+    private String parentCode;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "归属区域")
+    private String region;
+
+    @ApiModelProperty(value = "组织类型（0:AI病案质控平台 1:集团医院 2:医共 3:医联 4:医院）")
+    private String type;
+
+    @ApiModelProperty(value = "排序")
+    private String orderNo;
+
+    @ApiModelProperty(value = "状态 0:禁用，1：启用")
+    private String status;
+
+    @ApiModelProperty(value = "创建者编号")
+    private Long creator;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
+    private String isDeleted;
+
+
+    @ApiModelProperty(value = "用户在该组织下的角色列表")
+    private List<RoleVO> roles;
+    @ApiModelProperty(value = "该医院的科室列表")
+    private List<DeptVO> depts;
+
+    @ApiModelProperty(value = "该虚拟医院的医院列表")
+    private List<HospitalVO> hospitalDTOS;
+    @ApiModelProperty(value = "关联标志位 true 关联")
+    private boolean relationStatus;
+}

gateway-service/src/main/resources/bootstrap.yml

@@ -85,16 +85,8 @@ secure:
       - "/user-auth/oauth/token"
       - "/user-auth/rsa/publicKey"
       - "/security-center/userAdmin/login"
-      - "/sys/user/getJwt"
-      - "/sys/user/getJwtNoPass"
-      - "/sys/user/refreshJwt"
-      - "/sys/user/checkToken"
-      - "/sys/dictionaryInfo/getDictionary"
-      - "/oauth/token"
-      - "/oauth/check_token"
-      - "/cache/clear"
-      - "/data/auth/getDataAuthById"
-      - "/data/auth/addAuth"
-      - "/data/auth/updateAuth"
-      - "/data/auth/disableAuth"
-      - "/data/auth/deleteAuth"
+      - "/security-center/data/auth/getDataAuthById"
+      - "/security-center/data/auth/addAuth"
+      - "/security-center/data/auth/updateAuth"
+      - "/security-center/data/auth/disableAuth"
+      - "/security-center/data/auth/deleteAuth"

security-center/src/main/java/com/lantone/security/facade/DataAuthHandleFacade.java

@@ -2,9 +2,11 @@ package com.lantone.security.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.lantone.common.dto.DataAuthDTO;
 import com.lantone.common.dto.DataAuthDetailDTO;
 import com.lantone.common.dto.DeptDTO;
+import com.lantone.common.dto.DoctorDTO;
 import com.lantone.common.dto.HospitalDTO;
 import com.lantone.common.dto.RoleDTO;
 import com.lantone.common.dto.ServiceRoleDataAuthDetailDTO;
@@ -14,6 +16,7 @@ import com.lantone.common.util.DateUtil;
 import com.lantone.common.util.ListUtil;
 import com.lantone.common.util.StringUtil;
 import com.lantone.common.vo.DataAuthDetailVO;
+import com.lantone.common.vo.HospitalVO;
 import com.lantone.common.vo.RoleVO;
 import com.lantone.common.vo.ServiceDataAuthVO;
 import com.lantone.common.vo.SysServiceVO;
@@ -539,4 +542,8 @@ public class DataAuthHandleFacade extends DataAuthServiceImpl {
         }
         return hospitalDTOS;
     }
+
+    public IPage<DoctorDTO> getDoctorPage(HospitalVO hospitalVO) {
+        return null;
+    }
 }

security-center/src/main/java/com/lantone/security/web/DataAuthController.java

@@ -1,7 +1,10 @@
 package com.lantone.security.web;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
 import com.lantone.common.dto.DataAuthDTO;
+import com.lantone.common.dto.DoctorDTO;
+import com.lantone.common.vo.HospitalVO;
 import com.lantone.common.vo.ServiceDataAuthVO;
 import com.lantone.security.facade.DataAuthHandleFacade;
 import io.swagger.annotations.Api;
@@ -80,4 +83,15 @@ public class DataAuthController {
     public CommonResult<DataAuthDTO> getDataAuthById(@RequestBody ServiceDataAuthVO serviceDataAuthVO) {
         return CommonResult.success(dataAuthHandleFacade.getDataAuthById(serviceDataAuthVO));
     }
+
+
+    @ApiOperation(value = "通过医院id或科室id获取医生列表[by:songxl]",
+            notes = "id:医院编号，必填<br>" +
+                    "roles:角色列表，必填<br>" +
+                    "type:操作码 1：新增；2：修改；3：删除；5:启用禁用")
+    @PostMapping("/getDoctorPage")
+    @ApiIgnore
+    public CommonResult<IPage<DoctorDTO>> getDoctorPage(@RequestBody HospitalVO hospitalVO) {
+        return CommonResult.success(dataAuthHandleFacade.getDoctorPage(hospitalVO));
+    }
 }