Merge remote-tracking branch 'origin/dev/icss' into dev/icss

icss-service/src/main/java/com/diagbot/dto/GetTopPatientInfoDTO.java

@@ -0,0 +1,94 @@
+/**
+ * 
+ */
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rgb
+ * @time 2018年11月19日下午4:57:43
+ */
+@Getter
+@Setter
+public class GetTopPatientInfoDTO {
+	
+	/**
+	 * 医院id
+	 */
+	private Long hospitalId;
+	
+	/**
+     * 医院编码
+     */
+    private String hospitalCode;
+
+    /**
+     * 医院名称
+     */
+    private String hospitalName;
+    
+    /**
+	 * 医院科室id
+	 */
+	private Long hospitalDeptId;
+    
+    
+    /**
+     * 医院科室编码
+     */
+    private String hospitalDeptCode;
+
+    /**
+     * 医院科室名称
+     */
+    private String hospitalDeptName;
+    
+    /**
+	 * 医生id
+	 */
+	private Long doctorId;
+	
+	/**
+     * 医生编码
+     */
+    private String doctorCode;
+
+    /**
+     * 医生姓名
+     */
+    private String doctorName;
+    
+    /**
+   	 * 病人id
+   	 */
+   	private Long patientId;
+   	
+   	/**
+     * 病人编号
+     */
+    private String patientCode;
+
+    /**
+     * 病人姓名
+     */
+    private String patientName;
+
+    /**
+     * 病人性别
+     */
+    private String patientSex;
+    
+    /**
+     * 病人年龄
+     */
+    private Integer patientAge;
+    
+    /**
+     * 病人证件号码
+     */
+    private String patientIdNo;
+
+}

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

@@ -1,15 +1,18 @@
 package com.diagbot.facade;
 
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.dto.RespDTO;
 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;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
 
 /**
  * @Description: 患者业务逻辑
@@ -32,4 +35,16 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
         }
         return RespDTO.onSuc(patientInfoDTOList);
     }
+    
+    /**
+     * 页面顶部病人医生科室信息查询
+     * @param patientInfoVO
+     * @return
+     */
+    public RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
+    	return RespDTO.onSuc(baseMapper.getTopPatientInfo(getTopPatientInfoVO));
+    }
+    
+    
+    
 }

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

@@ -1,11 +1,15 @@
 package com.diagbot.mapper;
 
-import com.diagbot.dto.PatientInfoDTO;
-import com.diagbot.entity.PatientInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.List;
+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;
 
 /**
  * @Description: 患者信息
@@ -19,4 +23,11 @@ public interface PatientInfoMapper extends BaseMapper<PatientInfo> {
      * @return
      */
     public List<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/vo/GetTopPatientInfoVO.java

@@ -0,0 +1,44 @@
+/**
+ * 
+ */
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rgb
+ * @time 2018年11月19日下午4:58:37
+ */
+@Getter
+@Setter
+public class GetTopPatientInfoVO {
+	
+	/**
+	 * 医院编号
+	 */
+	@NotBlank(message="医院编号必填")
+	private String hospitalCode;
+	
+	/**
+	 * 医院科室编号
+	 */
+	@NotBlank(message="医院科室编号必填")
+	private String hospitalDeptCode;
+	
+	/**
+	 * 医院医生编号
+	 */
+	@NotBlank(message="医院医生编号必填")
+	private String doctorCode;
+	
+	/**
+	 * 医院患者编号
+	 */
+	@NotBlank(message="医院患者编号必填")
+	private String patientCode;
+
+}

icss-service/src/main/java/com/diagbot/web/PatientInfoController.java

@@ -1,20 +1,24 @@
 package com.diagbot.web;
 
 
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.PatientInfoFacade;
+import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.PatientInfoVO;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
 
 /**
  * <p>
@@ -39,4 +43,17 @@ public class PatientInfoController {
     public RespDTO<List<PatientInfoDTO>> getPatientInfo(@RequestBody PatientInfoVO patientInfoVO) {
         return patientInfoFacade.getPatientInfo(patientInfoVO);
     }
+    
+    
+    @ApiOperation(value = "页面顶部病人医生科室信息——查询[by:rengb]",
+            notes = "hospitalCode：医院编号，必填<br>" +
+            		"hospitalDeptCode：医院科室编号，必填<br>" +
+            		"doctorCode：医院医生编号，必填<br>" +
+                    "patientCode:医院患者编号，必填<br>")
+    @PostMapping("/getTopPatientInfo")
+    @SysLogger("getTopPatientInfo")
+    public RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
+        return patientInfoFacade.getTopPatientInfo(getTopPatientInfoVO);
+    }
+    
 }