Browse Source

管理员身份验证和根据医院code获取所有科室

wangfeng 5 years ago
parent
commit
a27569ee3c

+ 18 - 0
tran-service/src/main/java/com/diagbot/dto/DoctorInfoFindDTO.java

@@ -0,0 +1,18 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2019-12-09 19:26
+ */
+@Getter
+@Setter
+public class DoctorInfoFindDTO {
+    private Long hospitalId;
+    private String hospitalCode;
+    private Long doctorId;
+    private String doctorCode;
+}

+ 40 - 0
tran-service/src/main/java/com/diagbot/dto/HospitalDeptInfoAllDTO.java

@@ -0,0 +1,40 @@
+package com.diagbot.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2019-12-09 14:31
+ */
+@Setter
+@Getter
+public class HospitalDeptInfoAllDTO {
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 朗通科室名称
+     */
+    private String conceptDeptName;
+    /**
+     * 医院科室编码
+     */
+    private String code;
+
+    /**
+     * 医院科室名称
+     */
+    private String name;
+
+
+}

+ 19 - 0
tran-service/src/main/java/com/diagbot/facade/HospitalDeptFacade.java

@@ -2,6 +2,7 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.HospitalDeptDTO;
+import com.diagbot.dto.HospitalDeptInfoAllDTO;
 import com.diagbot.dto.HospitalDeptInfoDTO;
 import com.diagbot.entity.HospitalDept;
 import com.diagbot.enums.IsDeleteEnum;
@@ -10,8 +11,10 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.HospitalDeptServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.vo.HospitalCodeVo;
 import com.diagbot.vo.HospitalDeptInfoVO;
 import com.diagbot.vo.HospitalDeptVO;
 import com.google.common.collect.Lists;
@@ -93,4 +96,20 @@ public class HospitalDeptFacade extends HospitalDeptServiceImpl {
         }
         return retMap;
     }
+
+    /**
+     *
+     * @param hospitalCodeVo
+     * @return
+     */
+    public List<HospitalDeptInfoAllDTO> getHospitalDeptInfoAll(HospitalCodeVo hospitalCodeVo) {
+        QueryWrapper<HospitalDept> hospitalDeptQueryWrapper = new QueryWrapper<>();
+        hospitalDeptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_code", hospitalCodeVo.getHospitalCode())
+                .eq("status", StatusEnum.Enable.getKey())
+                .like("concept_dept_name", hospitalCodeVo.getDeptInfoName());
+        List<HospitalDept> hospitalDeptList = this.list(hospitalDeptQueryWrapper);
+        List<HospitalDeptInfoAllDTO> data = BeanUtil.listCopyTo(hospitalDeptList, HospitalDeptInfoAllDTO.class);
+        return data;
+    }
 }

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

@@ -1,6 +1,8 @@
 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;
 import com.diagbot.dto.SysHospitalDeptInfoDTO;
@@ -11,11 +13,14 @@ 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;
 import com.diagbot.vo.HospitalSetVO;
 import com.diagbot.vo.SysHospitalCodeVO;
 import com.diagbot.vo.SysHospitalInfoVO;
@@ -23,6 +28,7 @@ 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;
@@ -38,7 +44,8 @@ public class SysSetFacade extends SysSetServiceImpl {
 
     @Autowired
     private HospitalInfoFacade hospitalInfoFacade;
-
+    @Autowired
+    DoctorInfoService doctorInfoService;
     /**
      * @param hospitalSetVO
      * @return
@@ -147,4 +154,30 @@ public class SysSetFacade extends SysSetServiceImpl {
         return getHospitalRankInfoDTO;
     }
 
+    /**
+     *
+     * @param hospitalCodeSetVO
+     * @return
+     */
+    public Boolean getAdminCheckout(HospitalCodeSetVO hospitalCodeSetVO) {
+        boolean res = false;
+        DoctorInfoFindDTO data = doctorInfoService.findDoctorInfo(hospitalCodeSetVO);
+        if(data==null){
+            throw new CommonException(CommonErrorCode.RPC_ERROR, "该用户不存在");
+        }
+        QueryWrapper<SysSet> sysSetInfo = new QueryWrapper<>();
+        sysSetInfo.eq("is_deleted", IsDeleteEnum.N.getKey());
+        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();
+        List<String> listCode = Lists.newArrayList(sysSetInfoData.getValue().split(","));
+        for(String code :listCode){
+            if (code.equals(data.getDoctorCode())){
+                res = true;
+            }
+        }
+        return  res;
+    }
 }

+ 10 - 0
tran-service/src/main/java/com/diagbot/mapper/DoctorInfoMapper.java

@@ -2,7 +2,9 @@ package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.diagbot.dto.DoctorInfoDTO;
+import com.diagbot.dto.DoctorInfoFindDTO;
 import com.diagbot.entity.DoctorInfo;
+import com.diagbot.vo.HospitalCodeSetVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -25,4 +27,12 @@ public interface DoctorInfoMapper extends BaseMapper<DoctorInfo> {
      * @return
      */
     public List<DoctorInfoDTO> getDoctorInfos(@Param("doctorCode") String doctorCode, @Param("hospitalCode") String hospitalCode, @Param("deptCode") String deptCode);
+
+    /**
+     *
+     * @param hospitalCodeSetVO
+     * @return
+     */
+    public DoctorInfoFindDTO findDoctorInfo(HospitalCodeSetVO hospitalCodeSetVO);
+
 }

+ 4 - 0
tran-service/src/main/java/com/diagbot/service/DoctorInfoService.java

@@ -2,7 +2,9 @@ package com.diagbot.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.DoctorInfoDTO;
+import com.diagbot.dto.DoctorInfoFindDTO;
 import com.diagbot.entity.DoctorInfo;
+import com.diagbot.vo.HospitalCodeSetVO;
 
 import java.util.List;
 
@@ -26,4 +28,6 @@ public interface DoctorInfoService extends IService<DoctorInfo> {
      * @return
      */
     public List<DoctorInfoDTO> getDoctorInfos(String doctorCode, String hospitalCode, String deptCode);
+
+    public DoctorInfoFindDTO findDoctorInfo(HospitalCodeSetVO hospitalCodeSetVO);
 }

+ 2 - 0
tran-service/src/main/java/com/diagbot/service/SysSetService.java

@@ -21,4 +21,6 @@ public interface SysSetService extends IService<SysSet> {
 	public List<SysSet> querySysSetInfo(HospitalSetVO hospitalSetVO);
 
 	public List<SysHospitalDeptInfoDTO>  getjuniorHospitalData(SysHospitalInfoVO sysHospitalInfoVO);
+
+
 }

+ 7 - 0
tran-service/src/main/java/com/diagbot/service/impl/DoctorInfoServiceImpl.java

@@ -2,9 +2,11 @@ package com.diagbot.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.DoctorInfoDTO;
+import com.diagbot.dto.DoctorInfoFindDTO;
 import com.diagbot.entity.DoctorInfo;
 import com.diagbot.mapper.DoctorInfoMapper;
 import com.diagbot.service.DoctorInfoService;
+import com.diagbot.vo.HospitalCodeSetVO;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -24,4 +26,9 @@ public class DoctorInfoServiceImpl extends ServiceImpl<DoctorInfoMapper, DoctorI
     public List<DoctorInfoDTO> getDoctorInfos(String doctorCode, String hospitalCode, String deptCode) {
         return baseMapper.getDoctorInfos(doctorCode, hospitalCode, deptCode);
     }
+
+    @Override
+    public DoctorInfoFindDTO findDoctorInfo(HospitalCodeSetVO hospitalCodeSetVO) {
+        return baseMapper.findDoctorInfo(hospitalCodeSetVO);
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2019-12-09 14:02
+ */
+@Setter
+@Getter
+public class HospitalCodeSetVO {
+    @NotNull(message = "请输入医院编码")
+    private Long hospitalId;
+    @NotNull(message = "请输入医生编码")
+    private Long doctorId;
+}

+ 19 - 0
tran-service/src/main/java/com/diagbot/vo/HospitalCodeVo.java

@@ -0,0 +1,19 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2019-12-09 14:31
+ */
+@Setter
+@Getter
+public class HospitalCodeVo {
+    @NotNull(message = "请输入医院编码")
+    private String hospitalCode;
+    private String deptInfoName;
+}

+ 10 - 1
tran-service/src/main/java/com/diagbot/web/HospitalDeptInfoController.java

@@ -6,6 +6,8 @@ import java.util.Map;
 import javax.validation.Valid;
 
 import com.diagbot.dto.HospitalDeptDTO;
+import com.diagbot.dto.HospitalDeptInfoAllDTO;
+import com.diagbot.vo.HospitalCodeVo;
 import com.diagbot.vo.HospitalDeptVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,7 +35,6 @@ import springfox.documentation.annotations.ApiIgnore;
 @RequestMapping("/hospitalDeptInfo")
 @Api(value = "医院信息API", tags = { "医院信息API" })
 @SuppressWarnings("unchecked")
-@ApiIgnore
 public class HospitalDeptInfoController {
 
     @Autowired
@@ -65,4 +66,12 @@ public class HospitalDeptInfoController {
         Map<String, List<HospitalDeptDTO>> data = hospitalDeptFacade.hospitalDeptByConceptNames(hospitalDeptVO);
         return RespDTO.onSuc(data);
     }
+
+    @ApiOperation(value = "根据医院编码搜索医院所有科室信息[by:wangfeng] ", notes = "hospitalCode:医院编码<br>")
+    @PostMapping("/getHospitalDeptInfoAll")
+    @SysLogger("getHospitalDeptInfoAll")
+    public RespDTO<List<HospitalDeptInfoAllDTO>> getHospitalDeptInfoAll(@RequestBody @Valid HospitalCodeVo hospitalCodeVo) {
+        List<HospitalDeptInfoAllDTO> data = hospitalDeptFacade.getHospitalDeptInfoAll(hospitalCodeVo);
+        return RespDTO.onSuc(data);
+    }
 }

+ 9 - 0
tran-service/src/main/java/com/diagbot/web/SysSetController.java

@@ -7,6 +7,7 @@ import com.diagbot.dto.SysHospitalDTO;
 import com.diagbot.dto.SysSetInfoDTO;
 import com.diagbot.facade.SysSetFacade;
 import com.diagbot.vo.GetHospitalRankInfoVO;
+import com.diagbot.vo.HospitalCodeSetVO;
 import com.diagbot.vo.HospitalSetVO;
 import com.diagbot.vo.SysHospitalCodeVO;
 import io.swagger.annotations.Api;
@@ -37,6 +38,8 @@ public class SysSetController {
     @Autowired
     SysSetFacade sysSetFacade;
 
+
+
     @ApiOperation(value = "根据医院编码获取配置信息[by:wangfeng]", notes = "hospitalCode :医院code  必填<br> ")
     @PostMapping("/getSysSetInfoDatas")
     @SysLogger("getSysSetInfoDatas")
@@ -61,4 +64,10 @@ public class SysSetController {
         return RespDTO.onSuc(sysSetFacade.getHospitalRankInfo(getHospitalRankInfoVO));
     }
 
+    @ApiOperation(value = "获取校验管理员身份[by:wangfeng]")
+    @PostMapping("/getAdminCheckout")
+    @SysLogger("getAdminCheckout")
+    public RespDTO<Boolean> getAdminCheckout(@Valid @RequestBody HospitalCodeSetVO hospitalCodeSetVO){
+        return RespDTO.onSuc(sysSetFacade.getAdminCheckout(hospitalCodeSetVO));
+    }
 }

+ 31 - 16
tran-service/src/main/resources/mapper/DoctorInfoMapper.xml

@@ -4,22 +4,22 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.DoctorInfo">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="hospital_code" property="hospitalCode" />
-        <result column="hospital_dept_code" property="hospitalDeptCode" />
-        <result column="code" property="code" />
-        <result column="name" property="name" />
-        <result column="sex" property="sex" />
-        <result column="id_type" property="idType" />
-        <result column="id_no" property="idNo" />
-        <result column="address" property="address" />
-        <result column="phone" property="phone" />
-        <result column="remark" property="remark" />
+        <id column="id" property="id"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="hospital_code" property="hospitalCode"/>
+        <result column="hospital_dept_code" property="hospitalDeptCode"/>
+        <result column="code" property="code"/>
+        <result column="name" property="name"/>
+        <result column="sex" property="sex"/>
+        <result column="id_type" property="idType"/>
+        <result column="id_no" property="idNo"/>
+        <result column="address" property="address"/>
+        <result column="phone" property="phone"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
     <select id="getDoctorInfos" resultType="com.diagbot.dto.DoctorInfoDTO">
@@ -32,4 +32,19 @@
             AND b.`code` = #{deptCode}
         </if>
     </select>
+    <select id="findDoctorInfo" resultType="com.diagbot.dto.DoctorInfoFindDTO">
+        SELECT a.id AS hospitalId ,
+        a.code AS hospitalCode ,
+        b.id AS doctorId ,
+        b.code AS doctorCode
+        FROM tran_doctor_info a
+        JOIN tran_hospital_info b ON a.hospital_code = b.code
+        WHERE a.is_deleted = 'N' AND b.is_deleted = 'N'
+        <if test="hospitalId != null ">
+          a.id = #{hospitalId}
+        </if>
+        <if test="doctorId != null ">
+        AND b.id = #{doctorId}
+        </if>
+    </select>
 </mapper>