From 0bb9f6c3e894e56ff58d335110fbe4cfa87b64b2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 28 一月 2026 14:17:19 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java
index 886e747..ad934c0 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java
@@ -58,10 +58,10 @@
if (StringUtils.isNotNull(serviceMedicalevaluation.getInfoid())) {
wrappers.eq(ServiceMedicalevaluation::getInfoid, serviceMedicalevaluation.getInfoid());
}
- if (StringUtils.isNotNull(serviceMedicalevaluation.getFirstAssessState())) {
- wrappers.eq(ServiceMedicalevaluation::getFirstAssessState, serviceMedicalevaluation.getFirstAssessState());
- } if (StringUtils.isNotNull(serviceMedicalevaluation.getSecondAssessState())) {
- wrappers.eq(ServiceMedicalevaluation::getSecondAssessState, serviceMedicalevaluation.getSecondAssessState());
+ if (StringUtils.isNotNull(serviceMedicalevaluation.getAssessState())) {
+ wrappers.eq(ServiceMedicalevaluation::getAssessState, serviceMedicalevaluation.getAssessState());
+ } if (StringUtils.isNotNull(serviceMedicalevaluation.getAssessTime())) {
+ wrappers.eq(ServiceMedicalevaluation::getAssessTime, serviceMedicalevaluation.getAssessTime());
}
if (StringUtils.isNotBlank(serviceMedicalevaluation.getDonorno())) {
wrappers.eq(ServiceMedicalevaluation::getDonorno, serviceMedicalevaluation.getDonorno());
@@ -103,7 +103,7 @@
serviceMedicalevaluationorgan.setInfoid(medicalevaluationBaseInfoDTO.getInfoid());
List<ServiceMedicalevaluationorgan> serviceMedicalevaluationorgans = serviceMedicalevaluationorganMapper.selectServiceMedicalevaluationorganList(serviceMedicalevaluationorgan);
if (CollectionUtils.isNotEmpty(serviceMedicalevaluationorgans))
- medicalevaluationBaseInfoDTO.setServiceMedicalevaluationorgan(serviceMedicalevaluationorgans.get(0));
+ medicalevaluationBaseInfoDTO.setServiceMedicalevaluationorgans(serviceMedicalevaluationorgans);
}
}
return medicalevaluationBaseInfoDTOS;
--
Gitblit v1.9.3