diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ProcessRecordServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ProcessRecordServiceImpl.java index ed8bc4b2..e087dff4 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ProcessRecordServiceImpl.java +++ b/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 page = processService.queryProcessRecordPage(studentName, medicalRecNo, diseaseList, pageNum, pageSize); if (CollUtil.isNotEmpty(page.getRecords())) { HashSet diseaseIdSet = new HashSet<>(); diff --git a/virtual-patient-model/src/main/resources/mapper/DiagnosisQaRecordMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiagnosisQaRecordMapper.xml index 304820ac..82324b53 100644 --- a/virtual-patient-model/src/main/resources/mapper/DiagnosisQaRecordMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/DiagnosisQaRecordMapper.xml @@ -11,7 +11,6 @@ - diff --git a/virtual-patient-model/src/main/resources/mapper/ProcessMapper.xml b/virtual-patient-model/src/main/resources/mapper/ProcessMapper.xml index cf722369..0550ca21 100644 --- a/virtual-patient-model/src/main/resources/mapper/ProcessMapper.xml +++ b/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 = ]]> 1 and t3.name like concat("%",#{studentName}, "%")