病人信息修改

icss-service/src/main/java/com/diagbot/entity/DoctorInfo.java

@@ -11,8 +11,8 @@ import java.io.Serializable;
  * 医生信息表
  * </p>
  *
- * @author rengb
- * @since 2018-11-19
+ * @author wangyu
+ * @since 2018-11-20
  */
 @TableName("tran_doctor_info")
 public class DoctorInfo implements Serializable {
@@ -51,14 +51,14 @@ public class DoctorInfo implements Serializable {
     private String modifier;
 
     /**
-     * 医院id
+     * 医院编码
      */
-    private Long hospitalId;
+    private String hospitalCode;
 
     /**
-     * 医院科室id
+     * 医院科室编码
      */
-    private Long hospitalDeptId;
+    private String hospitalDeptCode;
 
     /**
      * 医院医生编码
@@ -142,19 +142,19 @@ public class DoctorInfo implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
-    public Long getHospitalId() {
-        return hospitalId;
+    public String getHospitalCode() {
+        return hospitalCode;
     }
 
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
+    public void setHospitalCode(String hospitalCode) {
+        this.hospitalCode = hospitalCode;
     }
-    public Long getHospitalDeptId() {
-        return hospitalDeptId;
+    public String getHospitalDeptCode() {
+        return hospitalDeptCode;
     }
 
-    public void setHospitalDeptId(Long hospitalDeptId) {
-        this.hospitalDeptId = hospitalDeptId;
+    public void setHospitalDeptCode(String hospitalDeptCode) {
+        this.hospitalDeptCode = hospitalDeptCode;
     }
     public String getCode() {
         return code;
@@ -222,8 +222,8 @@ public class DoctorInfo implements Serializable {
         ", gmtModified=" + gmtModified +
         ", creator=" + creator +
         ", modifier=" + modifier +
-        ", hospitalId=" + hospitalId +
-        ", hospitalDeptId=" + hospitalDeptId +
+        ", hospitalCode=" + hospitalCode +
+        ", hospitalDeptCode=" + hospitalDeptCode +
         ", code=" + code +
         ", name=" + name +
         ", sex=" + sex +

icss-service/src/main/java/com/diagbot/entity/PatientInfo.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * <p>
@@ -13,9 +12,9 @@ import java.util.Date;
  * </p>
  *
  * @author wangyu
- * @since 2018-11-19
+ * @since 2018-11-20
  */
-@TableName("icss_patient_info")
+@TableName("tran_patient_info")
 public class PatientInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -34,12 +33,12 @@ public class PatientInfo implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -52,9 +51,9 @@ public class PatientInfo implements Serializable {
     private String modifier;
 
     /**
-     * 医院id
+     * 医院编码
      */
-    private Long hospitalId;
+    private String hospitalCode;
 
     /**
      * 医院患者编号
@@ -160,18 +159,18 @@ public class PatientInfo implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -188,12 +187,12 @@ public class PatientInfo implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
-    public Long getHospitalId() {
-        return hospitalId;
+    public String getHospitalCode() {
+        return hospitalCode;
     }
 
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
+    public void setHospitalCode(String hospitalCode) {
+        this.hospitalCode = hospitalCode;
     }
     public String getCode() {
         return code;
@@ -331,7 +330,7 @@ public class PatientInfo implements Serializable {
         ", gmtModified=" + gmtModified +
         ", creator=" + creator +
         ", modifier=" + modifier +
-        ", hospitalId=" + hospitalId +
+        ", hospitalCode=" + hospitalCode +
         ", code=" + code +
         ", name=" + name +
         ", sex=" + sex +

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

@@ -10,8 +10,8 @@
         <result column="gmt_modified" property="gmtModified" />
         <result column="creator" property="creator" />
         <result column="modifier" property="modifier" />
-        <result column="hospital_id" property="hospitalId" />
-        <result column="hospital_dept_id" property="hospitalDeptId" />
+        <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" />

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

@@ -10,7 +10,7 @@
         <result column="gmt_modified" property="gmtModified" />
         <result column="creator" property="creator" />
         <result column="modifier" property="modifier" />
-        <result column="hospital_id" property="hospitalId" />
+        <result column="hospital_code" property="hospitalCode" />
         <result column="code" property="code" />
         <result column="name" property="name" />
         <result column="sex" property="sex" />
@@ -39,7 +39,7 @@
     </select>
     
     <select id="getTopPatientInfo" parameterType="com.diagbot.vo.GetTopPatientInfoVO" resultType="com.diagbot.dto.GetTopPatientInfoDTO">
-    	SELECT
+   		SELECT
 		a.id as hospitalId,
 		a.`code` as hospitalCode,
 		a.`name` as hospitalName,
@@ -57,11 +57,13 @@
 		ROUND(DATEDIFF(CURDATE(), d.birthday)/365.2422) as patientAge
 		FROM tran_hospital_info a JOIN tran_hospital_dept b 
 		ON a.`code`=b.hospital_code
-		JOIN tran_doctor_info c ON b.id=c.hospital_dept_id
-		JOIN tran_patient_info d ON c.hospital_id=d.hospital_id
+		JOIN tran_doctor_info c 
+		ON b.hospital_code=c.hospital_code and b.`code`=c.hospital_dept_code
+		JOIN tran_patient_info d 
+		ON c.hospital_code=d.hospital_code
 		WHERE a.is_deleted='N' AND b.is_deleted='N'
 		AND c.is_deleted='N' AND d.is_deleted='N'
-		AND a.`status`=1 AND b.`status`=1
+		AND a.`status`=1 AND b.`status`=1	
 		AND a.`code`=#{hospitalCode} AND b.`code`=#{hospitalDeptCode} 
 		AND c.`code`=#{doctorCode} AND d.`code`=#{patientCode}
     </select>