Merge remote-tracking branch 'origin/master'

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/app/controller/vo/WxDoctorClinicRoomThumbnailVO.java

@@ -44,6 +44,12 @@ public class WxDoctorClinicRoomThumbnailVO implements Serializable {
     @ApiModelProperty(value = "患者性别", position = 8)
     private String patientGender;
 
-    @ApiModelProperty("患者头像")
+    @ApiModelProperty(value = "患者头像", position = 9)
     private String patientAvatar;
+
+    @ApiModelProperty(value = "医生ID", position = 10)
+    private String doctorId;
+
+    @ApiModelProperty(value = "患者ID", position = 11)
+    private String patientId;
 }

tr-modules/tr-module-smartFollowUp/src/main/resources/mapper/smart/BizClinicRoomMapper.xml

@@ -65,6 +65,8 @@
         <result property="patientAge" column="patient_age"/>
         <result property="patientGender" column="patient_gender"/>
         <result property="patientAvatar" column="patient_avatar"/>
+        <result property="patientId" column="patient_id"/>
+        <result property="doctorId" column="doctor_id"/>
     </resultMap>
 
     <select id="stdSelectWxAppletClinicList" resultMap="stdWxAppletDetailResult">
@@ -274,10 +276,14 @@
         bcr.patient_name as patient_name,
         bcr.patient_gender as patient_gender,
         bcr.patient_age as patient_age,
-        bcr.image_url as patient_avatar
+        bcr.image_url as patient_avatar,
+        bcrdu.user_id as doctor_id,
+        bcrwu.wx_user_id as patient_id
         from
         biz_patient as bp
         join biz_clinic_room as bcr on bp.current_clinic_id  = bcr.id
+        left join biz_clinic_room_wx_user as bcrwu on bcr.id = bcrwu.clinic_room_id
+        left join biz_clinic_room_doctor_user as bcrdu on bcr.id = bcrdu.clinic_room_id
         <where>
             bp.deleted = 0 and bcr.deleted = 0 and bp.patient_code like concat('%',#{query.patientCode},'%')
         </where>