多余类删除

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

@@ -12,7 +12,6 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DoctorInfo;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.service.impl.DoctorInfoServiceImpl;
 import com.diagbot.vo.DoctorInfoVO;
 
 /**
@@ -21,7 +20,7 @@ import com.diagbot.vo.DoctorInfoVO;
  * @time: 2018/11/19 19:49
  */
 @Component
-public class DoctorInfoFacade extends DoctorInfoServiceImpl {
+public class DoctorInfoFacade {
     @Autowired
     private TranServiceClient tranServiceClient;
     /**

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

@@ -11,7 +11,6 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.HospitalDept;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.service.impl.HospitalDeptServiceImpl;
 
 /**
  * @author rgb
@@ -19,7 +18,7 @@ import com.diagbot.service.impl.HospitalDeptServiceImpl;
  * @time 2018年12月11日上午11:32:13
  */
 @Component
-public class HospitalDeptFacade extends HospitalDeptServiceImpl {
+public class HospitalDeptFacade {
 	
 	@Autowired
     private TranServiceClient tranServiceClient;

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

@@ -10,7 +10,6 @@ import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.service.impl.HospitalInfoServiceImpl;
 import com.diagbot.vo.HospitalInfoVO;
 
 /**
@@ -19,7 +18,7 @@ import com.diagbot.vo.HospitalInfoVO;
  * @time: 2018/11/22 13:43
  */
 @Component
-public class HospitalInfoFacade extends HospitalInfoServiceImpl {
+public class HospitalInfoFacade {
 
     @Autowired
     TranServiceClient tranServiceClient;

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

@@ -18,7 +18,6 @@ import com.diagbot.entity.PatientInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.service.impl.PatientInfoServiceImpl;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.PatientInfoVO;
 
@@ -28,7 +27,7 @@ import com.diagbot.vo.PatientInfoVO;
  * @time: 2018/11/19 13:19
  */
 @Component
-public class PatientInfoFacade extends PatientInfoServiceImpl {
+public class PatientInfoFacade {
 
     @Autowired
     private DoctorPageModeFacade doctorPageModeFacade;

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

@@ -1,28 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.DoctorInfoDTO;
-import com.diagbot.entity.DoctorInfo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 医生信息表 Mapper 接口
- * </p>
- *
- * @author rengb
- * @since 2018-11-19
- */
-public interface DoctorInfoMapper extends BaseMapper<DoctorInfo> {
-
-    /**
-     *  获取医生信息
-     * @param doctorCode
-     * @param hospitalCode
-     * @param deptCode
-     * @return
-     */
-    public List<DoctorInfoDTO> getDoctorInfos(@Param("doctorCode") String doctorCode, @Param("hospitalCode")String hospitalCode, @Param("deptCode")String deptCode);
-}

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

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.HospitalDept;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 医院科室信息表 Mapper 接口
- * </p>
- *
- * @author rengb
- * @since 2018-11-19
- */
-public interface HospitalDeptMapper extends BaseMapper<HospitalDept> {
-
-}

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

@@ -1,30 +0,0 @@
-package com.diagbot.mapper;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.HospitalInfoDTO;
-import com.diagbot.entity.HospitalInfo;
-import com.diagbot.vo.HospitalInfoVO;
-
-/**
- * <p>
- * 医院信息表 Mapper 接口
- * </p>
- *
- * @author rengb
- * @since 2018-11-19
- */
-public interface HospitalInfoMapper extends BaseMapper<HospitalInfo> {
-
-
-    /**
-     * 获取医院信息
-     * @param hospitalInfoVO
-     * @return
-     */
-    List<HospitalInfoDTO> getHospitalInfos(HospitalInfoVO hospitalInfoVO);
-    
-    
-    
-}

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

@@ -1,30 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.GetTopPatientInfoDTO;
-import com.diagbot.dto.PatientInfoDTO;
-import com.diagbot.entity.PatientInfo;
-import com.diagbot.vo.GetTopPatientInfoVO;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * @Description: 患者信息
- * @Author: wangyu
- * @Date: 13:09 2018/11/19
- */
-public interface PatientInfoMapper extends BaseMapper<PatientInfo> {
-    /**
-     * 获取患者信息
-     * @param patientCode,hospitalCode
-     * @return
-     */
-    public PatientInfoDTO getPatientInfos(@Param("patientCode") String patientCode, @Param("hospitalCode") String hospitalCode);
-    
-    /**
-     * 顶部病人医生科室信息查询
-     * @param getTopPatientInfoVO
-     * @return
-     */
-    GetTopPatientInfoDTO getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO);
-}

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

@@ -1,29 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.dto.DoctorInfoDTO;
-import com.diagbot.entity.DoctorInfo;
-
-import java.util.List;
-
-/**
- * <p>
- * 医生信息表 服务类
- * </p>
- *
- * @author rengb
- * @since 2018-11-19
- */
-public interface DoctorInfoService extends IService<DoctorInfo> {
-
-
-    /**
-     * 获取医生信息
-     *
-     * @param doctorCode
-     * @param hospitalCode
-     * @param deptCode
-     * @return
-     */
-    public List<DoctorInfoDTO> getDoctorInfos(String doctorCode, String hospitalCode, String deptCode);
-}

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

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.HospitalDept;
-
-/**
- * <p>
- * 医院科室信息表 服务类
- * </p>
- *
- * @author rengb
- * @since 2018-11-19
- */
-public interface HospitalDeptService extends IService<HospitalDept> {
-
-}

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

@@ -1,27 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.dto.HospitalInfoDTO;
-import com.diagbot.entity.HospitalInfo;
-import com.diagbot.vo.HospitalInfoVO;
-
-import java.util.List;
-
-/**
- * <p>
- * 医院信息表 服务类
- * </p>
- *
- * @author rengb
- * @since 2018-11-19
- */
-public interface HospitalInfoService extends IService<HospitalInfo> {
-
-    /**
-     * 获取医院信息
-     *
-     * @param hospitalInfoVO
-     * @return
-     */
-    public List<HospitalInfoDTO> getHospitalInfos(HospitalInfoVO hospitalInfoVO);
-}

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

@@ -1,20 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.dto.PatientInfoDTO;
-import com.diagbot.entity.PatientInfo;
-
-import java.util.List;
-
-/**
- * <p>
- * 患者信息表 服务类
- * </p>
- *
- * @author wangyu
- * @since 2018-11-19
- */
-public interface PatientInfoService extends IService<PatientInfo> {
-
-    public PatientInfoDTO getPatientInfos(String patientCode, String hospitalCode);
-}

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

@@ -1,27 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.dto.DoctorInfoDTO;
-import com.diagbot.entity.DoctorInfo;
-import com.diagbot.mapper.DoctorInfoMapper;
-import com.diagbot.service.DoctorInfoService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 医生信息表 服务实现类
- * </p>
- *
- * @author rengb
- * @since 2018-11-19
- */
-@Service
-public class DoctorInfoServiceImpl extends ServiceImpl<DoctorInfoMapper, DoctorInfo> implements DoctorInfoService {
-
-    @Override
-    public List<DoctorInfoDTO> getDoctorInfos(String doctorCode, String hospitalCode, String deptCode) {
-        return baseMapper.getDoctorInfos(doctorCode, hospitalCode, deptCode);
-    }
-}

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

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.HospitalDept;
-import com.diagbot.mapper.HospitalDeptMapper;
-import com.diagbot.service.HospitalDeptService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 医院科室信息表 服务实现类
- * </p>
- *
- * @author rengb
- * @since 2018-11-19
- */
-@Service
-public class HospitalDeptServiceImpl extends ServiceImpl<HospitalDeptMapper, HospitalDept> implements HospitalDeptService {
-
-}

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

@@ -1,28 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.dto.HospitalInfoDTO;
-import com.diagbot.entity.HospitalInfo;
-import com.diagbot.mapper.HospitalInfoMapper;
-import com.diagbot.service.HospitalInfoService;
-import com.diagbot.vo.HospitalInfoVO;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 医院信息表 服务实现类
- * </p>
- *
- * @author rengb
- * @since 2018-11-19
- */
-@Service
-public class HospitalInfoServiceImpl extends ServiceImpl<HospitalInfoMapper, HospitalInfo> implements HospitalInfoService {
-
-    @Override
-    public List<HospitalInfoDTO> getHospitalInfos(HospitalInfoVO hospitalInfoVO) {
-        return baseMapper.getHospitalInfos(hospitalInfoVO);
-    }
-}

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

@@ -1,27 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.dto.PatientInfoDTO;
-import com.diagbot.entity.PatientInfo;
-import com.diagbot.mapper.PatientInfoMapper;
-import com.diagbot.service.PatientInfoService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 患者信息表 服务实现类
- * </p>
- *
- * @author wangyu
- * @since 2018-11-19
- */
-@Service
-public class PatientInfoServiceImpl extends ServiceImpl<PatientInfoMapper, PatientInfo> implements PatientInfoService {
-
-    @Override
-    public PatientInfoDTO getPatientInfos(String patientCode, String hospitalCode) {
-        return baseMapper.getPatientInfos(patientCode, hospitalCode);
-    }
-}

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

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.DoctorInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <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" />
-    </resultMap>
-
-    <select id="getDoctorInfos" resultType="com.diagbot.dto.DoctorInfoDTO">
-        SELECT a.* FROM `tran_doctor_info` a
-        LEFT JOIN tran_hospital_dept b ON a.hospital_dept_code = b.`code`
-        WHERE a.is_deleted = 'N' AND b.is_deleted = 'N'
-        AND a.`code` = #{doctorCode} AND b.hospital_code = #{hospitalCode} AND b.`code` = #{deptCode}
-    </select>
-</mapper>

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

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.HospitalDeptMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.HospitalDept">
-        <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="code" property="code" />
-        <result column="name" property="name" />
-        <result column="hospital_code" property="hospitalCode" />
-        <result column="hospital_name" property="hospitalName" />
-        <result column="dept_id" property="deptId" />
-        <result column="status" property="status" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-</mapper>

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

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.HospitalInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.HospitalInfo">
-        <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="code" property="code" />
-        <result column="name" property="name" />
-        <result column="address" property="address" />
-        <result column="spell" property="spell" />
-        <result column="status" property="status" />
-        <result column="order_no" property="orderNo" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-    <select id="getHospitalInfos"  resultType="com.diagbot.dto.HospitalInfoDTO">
-        select * from tran_hospital_info i where i.status = 1 and i.is_deleted = 'N'
-        <if test="id != null and id != ''">
-            and i.id = #{id}
-        </if>
-        <if test="code != null and code != ''">
-            and i.code = #{code}
-        </if>
-    </select>
-</mapper>

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

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.PatientInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.PatientInfo">
-        <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="code" property="code" />
-        <result column="name" property="name" />
-        <result column="sex" property="sex" />
-        <result column="birthday" property="birthday" />
-        <result column="id_type" property="idType" />
-        <result column="id_no" property="idNo" />
-        <result column="address" property="address" />
-        <result column="phone" property="phone" />
-        <result column="identity_num" property="identityNum" />
-        <result column="postcode" property="postcode" />
-        <result column="contacts" property="contacts" />
-        <result column="contact_phone" property="contactPhone" />
-        <result column="work_unit" property="workUnit" />
-        <result column="operation" property="operation" />
-        <result column="country" property="country" />
-        <result column="nationality" property="nationality" />
-        <result column="matrimony" property="matrimony" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-    <select id="getPatientInfos" resultType="com.diagbot.dto.PatientInfoDTO">
-        SELECT a.* FROM `tran_patient_info` a
-        LEFT JOIN tran_hospital_info b ON a.hospital_code = b.`code`
-        WHERE a.is_deleted = 'N' AND b.is_deleted = 'N'
-        AND a.`code` = #{patientCode} AND b.`code` = #{hospitalCode}
-    </select>
-    
-    <select id="getTopPatientInfo" parameterType="com.diagbot.vo.GetTopPatientInfoVO" resultType="com.diagbot.dto.GetTopPatientInfoDTO">
-   		SELECT
-		a.id as hospitalId,
-		a.`code` as hospitalCode,
-		a.`name` as hospitalName,
-		b.id as hospitalDeptId,
-		b.dept_id as selfDeptId,
-		b.`code` as hospitalDeptCode,
-		b.`name` as hospitalDeptName,
-		c.id as doctorId,
-		c.`code` as doctorCode,
-		c.`name` as doctorName,
-		d.id as patientId,
-		d.`code` as patientCode,
-		d.`name` as patientName,
-		case when d.sex=1 then '男' when d.sex=2 then '女' else '未知' end as patientSex,
-		d.id_no as patientIdNo,
-		d.birthday as birthday
-		FROM tran_hospital_info a LEFT JOIN tran_hospital_dept b 
-		ON a.`code`=b.hospital_code and b.`status`=1 and b.is_deleted='N' and b.`code`=#{hospitalDeptCode} 	
-		LEFT JOIN tran_doctor_info c 
-		ON b.hospital_code=c.hospital_code and b.`code`=c.hospital_dept_code and c.is_deleted='N' and c.`code`=#{doctorCode}
-		LEFT JOIN tran_patient_info d 
-		ON a.code=d.hospital_code and d.is_deleted='N' and d.`code`=#{patientCode}
-		WHERE a.is_deleted='N' 
-		AND a.`status`=1
-		AND a.`code`=#{hospitalCode} 
-    </select>
-</mapper>