From 9ff5a9b1a3ce92b7bf4fcd3a8fdabbb1739cfe4b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 05 二月 2026 17:39:07 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java |   84 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 69 insertions(+), 15 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 f80b863..f443fa2 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
@@ -1,26 +1,29 @@
 package com.ruoyi.project.service.impl;
 
-import java.util.List;
-
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
+import com.ruoyi.project.domain.ServiceMedicalevaluationorgan;
+import com.ruoyi.project.domain.dto.MedicalevaluationBaseInfoDTO;
+import com.ruoyi.project.domain.ServiceMedicalevaluation;
 import com.ruoyi.project.domain.vo.MedicalEvaluationVO;
+import com.ruoyi.project.domain.vo.MedicalEvaluationWithBaseInfoVO;
+import com.ruoyi.project.domain.vo.ServiceMedicalevaluationVO;
+import com.ruoyi.project.mapper.ServiceDonatebaseinfoMapper;
+import com.ruoyi.project.mapper.ServiceMedicalevaluationMapper;
+import com.ruoyi.project.mapper.ServiceMedicalevaluationorganMapper;
+import com.ruoyi.project.service.IServiceMedicalevaluationService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import java.util.ArrayList;
-import java.util.Map;
-
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.project.mapper.ServiceMedicalevaluationMapper;
-import com.ruoyi.project.domain.ServiceMedicalevaluation;
-import com.ruoyi.project.service.IServiceMedicalevaluationService;
+import java.util.List;
 
 /**
  * 鍖诲璇勪及Service涓氬姟灞傚鐞�
@@ -34,6 +37,12 @@
 
     @Autowired
     ServiceMedicalevaluationMapper serviceMedicalevaluationMapper;
+
+    @Autowired
+    ServiceMedicalevaluationorganMapper serviceMedicalevaluationorganMapper;
+
+    @Autowired
+    ServiceDonatebaseinfoMapper serviceDonatebaseinfoMapper;
 
 
     /**
@@ -51,10 +60,44 @@
         if (StringUtils.isNotNull(serviceMedicalevaluation.getInfoid())) {
             wrappers.eq(ServiceMedicalevaluation::getInfoid, serviceMedicalevaluation.getInfoid());
         }
+        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());
         }
+        if (StringUtils.isNotBlank(serviceMedicalevaluation.getCaseNo())) {
+            wrappers.eq(ServiceMedicalevaluation::getCaseNo, serviceMedicalevaluation.getCaseNo());
+        }
         return this.list(wrappers);
+    }
+
+    @Override
+    public Boolean add(ServiceMedicalevaluationVO serviceMedicalevaluationVO) {
+        ServiceMedicalevaluation serviceMedicalevaluation = DtoConversionUtils.sourceToTarget(serviceMedicalevaluationVO, ServiceMedicalevaluation.class);
+        boolean save = save(serviceMedicalevaluation);
+        if(save && CollectionUtils.isNotEmpty(serviceMedicalevaluationVO.getServiceMedicalevaluationorganList())){
+            for (ServiceMedicalevaluationorgan serviceMedicalevaluationorgan:serviceMedicalevaluationVO.getServiceMedicalevaluationorganList()) {
+                serviceMedicalevaluationorgan.setInfoid(serviceMedicalevaluation.getInfoid());
+                serviceMedicalevaluationorgan.setMedicalId(serviceMedicalevaluation.getId());
+                serviceMedicalevaluationorganMapper.insert(serviceMedicalevaluationorgan);
+            }
+        }
+        return save;
+    }
+
+    @Override
+    public Boolean edit(ServiceMedicalevaluationVO serviceMedicalevaluationVO) {
+        ServiceMedicalevaluation serviceMedicalevaluation = DtoConversionUtils.sourceToTarget(serviceMedicalevaluationVO, ServiceMedicalevaluation.class);
+        boolean update = updateById(serviceMedicalevaluation);
+        if(update && CollectionUtils.isNotEmpty(serviceMedicalevaluationVO.getServiceMedicalevaluationorganList())){
+            for (ServiceMedicalevaluationorgan serviceMedicalevaluationorgan:serviceMedicalevaluationVO.getServiceMedicalevaluationorganList()) {
+                serviceMedicalevaluationorganMapper.updateById(serviceMedicalevaluationorgan);
+            }
+        }
+        return update;
     }
 
     @Override
@@ -78,9 +121,20 @@
     }
 
     @Override
-    public List<ServiceMedicalevaluation> selectServiceMedicalevaluationList(ServiceMedicalevaluation serviceMedicalevaluation) {
+    public List<MedicalevaluationBaseInfoDTO> medevaluateBaseInfolist(MedicalEvaluationWithBaseInfoVO medicalEvaluationWithBaseInfoVO) {
+        List<MedicalevaluationBaseInfoDTO> medicalevaluationBaseInfoDTOS = serviceMedicalevaluationMapper.selectEvaluateBaseInfoList(medicalEvaluationWithBaseInfoVO);
 
-        return serviceMedicalevaluationMapper.selectServiceMedicalevaluationList(serviceMedicalevaluation);
+        //鍒ゆ柇pgaeNun鏄负浜嗚鏌ヨtotal涓嶅啀鏌ヨserviceMedicalevaluationorgan
+        if (medicalEvaluationWithBaseInfoVO.getPageNum() != null) {
+            for (MedicalevaluationBaseInfoDTO medicalevaluationBaseInfoDTO : medicalevaluationBaseInfoDTOS) {
+                ServiceMedicalevaluationorgan serviceMedicalevaluationorgan = new ServiceMedicalevaluationorgan();
+                serviceMedicalevaluationorgan.setInfoid(medicalevaluationBaseInfoDTO.getInfoid());
+                List<ServiceMedicalevaluationorgan> serviceMedicalevaluationorgans = serviceMedicalevaluationorganMapper.selectServiceMedicalevaluationorganList(serviceMedicalevaluationorgan);
+                if (CollectionUtils.isNotEmpty(serviceMedicalevaluationorgans))
+                    medicalevaluationBaseInfoDTO.setServiceMedicalevaluationorgans(serviceMedicalevaluationorgans);
+            }
+        }
+        return medicalevaluationBaseInfoDTOS;
     }
 
 }

--
Gitblit v1.9.3