研究队列bug修复

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

@@ -1,6 +1,7 @@
 package cn.tr.module.smart.common.controller;
 
 import cn.tr.module.smart.common.controller.vo.BizReasearchQueueClinicVO;
+import cn.tr.module.smart.common.controller.vo.BizReasearchQueueQuestionAnswerVO;
 import cn.tr.module.smart.common.dto.BizReasearchQueueAddClinicDTO;
 import cn.tr.module.smart.common.dto.BizReasearchQueueClinicQuestionAnswerRecordQueryDTO;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -58,7 +59,7 @@ public class BizReasearchQueueClinicController extends BaseController{
     @ApiOperationSupport(author = "lf",order = 5)
     @ApiOperation(value="查看研究队列中的手术填写的术后问卷记录",notes = "权限： 无")
     @PostMapping("/questionAnswerList")
-    public CommonResult<Object> questionAnswerList(@RequestBody BizReasearchQueueClinicQuestionAnswerRecordQueryDTO source) {
+    public CommonResult<List<BizReasearchQueueQuestionAnswerVO> > questionAnswerList(@RequestBody BizReasearchQueueClinicQuestionAnswerRecordQueryDTO source) {
         return CommonResult.success(bizReasearchQueueClinicService.stdSelectQuestionAnswerList(source));
     }
 }

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

@@ -34,14 +34,17 @@ public class BizReasearchQueueVO implements Serializable {
     @ApiModelProperty(value = "队列名称", position = 2)
     private String name;
 
-    @ApiModelProperty(value = "问卷名称",position = 3)
+    @ApiModelProperty(value = "问卷id",position = 3)
+    private String questionGroupId;
+
+    @ApiModelProperty(value = "问卷名称",position = 4)
     private String questionGroupName;
 
-    @ApiModelProperty(value = "推送时间",position = 4)
+    @ApiModelProperty(value = "推送时间",position = 5)
     private String timePointsShow;
 
     /** 队列内手术数量 */
-    @ApiModelProperty(value = "队列人数", position = 5)
+    @ApiModelProperty(value = "队列人数", position = 6)
     private Integer clinicCount;
 
     @ApiModelProperty("创建日期")

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

@@ -20,4 +20,6 @@ import java.util.List;
 @Mapper
 public interface BizReasearchQueueRepository extends BaseMapper<BizReasearchQueuePO> {
     List<BizReasearchQueueVO> stdSelectBizReasearchQueueList(@Param("query") BizReasearchQueueQueryDTO query);
+
+    BizReasearchQueueVO stdSelectBizReasearchQueueById(@Param("id") String id);
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizReasearchQueueServiceImpl.java

@@ -44,7 +44,7 @@ public class BizReasearchQueueServiceImpl implements IBizReasearchQueueService {
     @Override
     public List<BizReasearchQueueVO> stdSelectBizReasearchQueueList(BizReasearchQueueQueryDTO query){
         return baseRepository.stdSelectBizReasearchQueueList(query);
-    };
+    }
 
     /**
      * 根据id查询研究队列
@@ -54,8 +54,8 @@ public class BizReasearchQueueServiceImpl implements IBizReasearchQueueService {
      */
     @Override
     public BizReasearchQueueVO selectBizReasearchQueueById(String id){
-        return null;
-    };
+        return baseRepository.stdSelectBizReasearchQueueById(id);
+    }
 
     /**
      * 编辑研究队列
@@ -76,7 +76,7 @@ public class BizReasearchQueueServiceImpl implements IBizReasearchQueueService {
         updateSource.setTimePointsShow(formatTimePoints(updateSource.getTimePoints()));
         updateSource.setTimePointsFormat(calculateAndSetTimePointsFormat(updateSource.getTimePoints()));
         return baseRepository.updateById(updateSource)!=0;
-    };
+    }
 
     /**
      * 新增研究队列
@@ -94,7 +94,7 @@ public class BizReasearchQueueServiceImpl implements IBizReasearchQueueService {
         insertSource.setTimePointsShow(formatTimePoints(insertSource.getTimePoints()));
         insertSource.setTimePointsFormat(calculateAndSetTimePointsFormat(insertSource.getTimePoints()));
         return baseRepository.insert(insertSource)!=0;
-    };
+    }
 
     /**
      * 删除研究队列详情

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

@@ -7,6 +7,7 @@
     <resultMap id="stdResult" type="cn.tr.module.smart.common.controller.vo.BizReasearchQueueVO">
         <result property="id" column="id" />
         <result property="name" column="name" />
+        <result property="questionGroupId" column="question_group_id" />
         <result property="questionGroupName" column="question_group_name" />
         <result property="timePointsShow" column="time_points_show" />
         <result property="clinicCount" column="clinic_count" />
@@ -19,6 +20,7 @@
         SELECT
         brq.id as id,
         brq.name as  name,
+        bqg.id as question_group_id,
         bqg.name as question_group_name,
         brq.time_points_show as time_points_show,
         brq.clinic_count as clinic_count,
@@ -27,21 +29,36 @@
         FROM
         biz_reasearch_queue as brq
         left join biz_question_group as bqg on brq.bind_question_id = bqg.id
-        WHERE
-        1=1
-        <if test="query.name != null and query.name != ''">
-            AND brq.name LIKE CONCAT('%',#{query.name},'%')
-        </if>
-        <if test="query.status != null and query.status != ''">
-            AND brq.status = #{query.status}
-        </if>
-        <if test="query.createTime != null and query.createTime.size() > 0">
-            <if test="query.createTime.size() == 1">
-                AND brq.create_time >= #{query.createTime[0]}
+        <where>
+            <if test="query.name != null and query.name != ''">
+                AND brq.name LIKE CONCAT('%',#{query.name},'%')
             </if>
-            <if test="query.createTime.size() == 2">
-                AND brq.create_time BETWEEN #{query.createTime[0]} AND #{query.createTime[1]}
+            <if test="query.status != null and query.status != ''">
+                AND brq.status = #{query.status}
             </if>
-        </if>
+            <if test="query.createTime != null and query.createTime.size() > 0">
+                <if test="query.createTime.size() == 1">
+                    AND brq.create_time >= #{query.createTime[0]}
+                </if>
+                <if test="query.createTime.size() == 2">
+                    AND brq.create_time BETWEEN #{query.createTime[0]} AND #{query.createTime[1]}
+                </if>
+            </if>
+        </where>
+    </select>
+    <select id="stdSelectBizReasearchQueueById"  resultMap="stdResult">
+        SELECT
+        brq.id as id,
+        brq.name as  name,
+        bqg.id as question_group_id,
+        bqg.name as question_group_name,
+        brq.time_points_show as time_points_show,
+        brq.clinic_count as clinic_count,
+        brq.create_time as create_time,
+        brq.status as  status
+        FROM
+        biz_reasearch_queue as brq
+        left join biz_question_group as bqg on brq.bind_question_id = bqg.id
+        WHERE brq.id = #{id}
     </select>
 </mapper>