bugfix

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ProcessRecordServiceImpl.java

@@ -2,23 +2,22 @@ package com.supervision.manage.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.supervision.exception.BusinessException;
+import com.supervision.manage.service.ProcessRecordService;
 import com.supervision.model.Disease;
+import com.supervision.model.Process;
 import com.supervision.model.ProcessEvaluation;
 import com.supervision.service.DiseaseService;
 import com.supervision.service.ProcessEvaluationService;
-import com.supervision.vo.result.ProcessRecordVO;
-import com.supervision.manage.service.ProcessRecordService;
 import com.supervision.service.ProcessService;
+import com.supervision.vo.result.ProcessRecordVO;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.supervision.model.Process;
 
 import java.util.*;
 import java.util.function.Function;
@@ -55,6 +54,7 @@ public class ProcessRecordServiceImpl implements ProcessRecordService {
 
             }
         }
+        // 只查询待处置以上的,即1:待处置 2:已评估
         IPage<ProcessRecordVO> page = processService.queryProcessRecordPage(studentName, medicalRecNo, diseaseList, pageNum, pageSize);
         if (CollUtil.isNotEmpty(page.getRecords())) {
             HashSet<String> diseaseIdSet = new HashSet<>();

virtual-patient-model/src/main/resources/mapper/DiagnosisQaRecordMapper.xml

@@ -11,7 +11,6 @@
         <result property="question" column="question" jdbcType="VARCHAR"/>
         <result property="questionLibraryId" column="question_library_id" jdbcType="VARCHAR"/>
         <result property="answer" column="answer" jdbcType="VARCHAR"/>
-        <result property="feedbackItem" column="feedback_item" jdbcType="INTEGER"/>
         <result property="feedbackType" column="feedback_type" jdbcType="INTEGER"/>
         <result property="feedbackRemark" column="feedback_remark" jdbcType="VARCHAR"/>
         <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>

virtual-patient-model/src/main/resources/mapper/ProcessMapper.xml

@@ -85,6 +85,7 @@
         left join vp_user t3 on t1.user_id = t3.id
         left join vp_disease t4 on t1.disease_id = t4.id
         where 1 = 1
+        and t1. status  <![CDATA[ >= ]]>  1
         <if test="studentName != null and studentName != ''">
             and t3.name like concat("%",#{studentName}, "%")
         </if>