Merge remote-tracking branch 'origin/master'

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/dto/BizClinicRoomDTO.java

@@ -72,6 +72,6 @@ public class BizClinicRoomDTO extends BaseDTO  {
     private Date lastQuestionTime;
 
     @ApiModelProperty(value = "泵信息", position = 23)
-    private Object pump;
+    private Object pumpInfo;
 
 }

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

@@ -93,19 +93,17 @@
         bcr.patient_name,
         bcr.patient_age,
         bcr.patient_gender,
-        bp.patient_code,
+        bcr.patient_code,
         bcr.follow_up_count,
         bcr.assess_count
         FROM biz_clinic_room bcr
-        join biz_patient bp
-        on bcr.patient_id = bp.id
         <where>
             <if test="source.clinicStatus != null and source.clinicStatus != ''">
                 and bcr.clinic_status = #{source.clinicStatus ,jdbcType=VARCHAR}
             </if>
             <if test="source.queryCondition != null and source.queryCondition != ''">
                 and bcr.patient_code LIKE concat('%',#{source.queryCondition,jdbcType=VARCHAR},'%')
-                or bp.patient_name like concat('%',#{source.queryCondition,jdbcType=VARCHAR},'%')
+                or bcr.patient_name like concat('%',#{source.queryCondition,jdbcType=VARCHAR},'%')
             </if>
         </where>
     </select>