add

研究队列手术问卷历史记录

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/controller/vo/BizReasearchQueuePushVO.java

@@ -37,7 +37,4 @@ public class BizReasearchQueuePushVO implements Serializable {
 
     /** 手术结束时间 */
     private Date clinicEndTime;
-
-    @ApiModelProperty("微信openId")
-    private String wxMpOpenId;
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/repository/BizReasearchQueueClinicRepository.java

@@ -25,8 +25,7 @@ import java.util.List;
 public interface BizReasearchQueueClinicRepository extends BaseMapper<BizReasearchQueueClinicPO> {
     List<BizReasearchQueueClinicVO> stdSelectBizReasearchQueueClinicList(@Param("query") BizReasearchQueueClinicQueryDTO query);
 
-
-    BizMpPublishInfoDTO selectPushInfo(@Param("id") String id);
+    BizMpPublishInfoDTO selectPushInfo(@Param("id") String queueClinicId);
 
     BizReasearchQueuePushVO stdSelectBizReasearchQueueClinicById(@Param("id") String id);
 }

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

@@ -49,6 +49,15 @@
         <result property="queueId" column="queue_id" />
     </resultMap>
 
+    <resultMap id="reasearchQueuePush" type="cn.tr.module.smart.common.controller.vo.BizReasearchQueuePushVO">
+        <result property="id" column="id" />
+        <result property="clinicRoomId" column="clinic_room_id" />
+        <result property="status" column="status" />
+        <result property="timePointsFormat" column="time_points_format" typeHandler="cn.tr.module.smart.common.config.handler.JsonbLongListTypeHandler"/>
+        <result property="lastPushInterval" column="last_push_interval"/>
+        <result property="clinicEndTime" column="clinic_end_time"/>
+    </resultMap>
+
     <select id="stdSelectBizReasearchQueueClinicList" resultMap="stdResult">
         SELECT
         brqc.id,
@@ -75,7 +84,41 @@
 
 
     <select id="selectPushInfo" resultMap="pushInfo">
+        select
+        bcr.id as clinic_id,
+        bcr.clinic_name as clinic_name,
+        bcr.clinic_start_time as clinic_start_time,
+        bcr.patient_code as patient_code,
+        bcr.patient_name as patient_name,
+        bcr.clinic_status as clinic_status,
+        st.id as tenant_id,
+        st.name as tenant_name,
+        bwump.from_user as open_id,
+        brqc.queue_id as queue_id
+        from
+        biz_reasearch_queue_clinic brqc
+        join biz_clinic_room as bcr on bcr.id = brqc.clinic_room_id
+        join sys_tenant as st on st.id=bcr.tenant_id
+        join biz_clinic_room_wx_user as bcrwu on bcrwu.clinic_room_id = bcr.id
+        join biz_wx_user as bwu on bwu.id = bcrwu.wx_user_id
+        join biz_wx_user_mp_care as bwump on bwump.union_id=bwu.union_id
+        where brqc.id = #{id}
+    </select>
 
-
+    <select id="stdSelectBizReasearchQueueClinicById" resultMap="reasearchQueuePush">
+        SELECT
+        brqc.id,
+        brqc.clinic_room_id,
+        brq.status,
+        brq.time_points_format,
+        brqc.push_count,
+        brqc.last_push_time,
+        brqc.last_push_interval,
+        bcr.clinic_end_time
+        FROM
+        biz_reasearch_queue_clinic brqc
+        JOIN biz_reasearch_queue brq ON brq.id = brqc.queue_id
+        join biz_clinic_room as bcr on bcr.id = brqc.clinic_room_id
+        where brqc.id = #{id}
     </select>
 </mapper>