From 29f287cf6e4869d7bbc283991458e09a03b59c52 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 21 一月 2026 14:29:55 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/WitnessBaseInfoDTO.java | 159 +
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/DingTalkServiceImpl.java | 149
ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml | 109
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm | 114
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceEthicalreviewinitiateService.java | 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatemaintenanceServiceImpl.java | 77
ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml | 48
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceMedicalevaluationVO.java | 105
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java | 54
ruoyi-generator/src/main/resources/vm/java/controller.java.vm | 77
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DeathBaseInfoVO.java | 190 +
ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml | 1
ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml | 282 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DeathBaseInfoDTO.java | 188 +
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoService.java | 20
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java | 130 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MedicalevaluationBaseInfoDTO.java | 154 +
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDeathinfoService.java | 37
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceRelativesconfirmationServiceImpl.java | 11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java | 87
ruoyi-generator/src/main/resources/vm/java/service.java.vm | 14
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDeathinfo.java | 103
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/ServiceDonatebaseinfoDTO.java | 626 +++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationCompletionBaseInfoDTO.java | 122 +
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceMedicalevaluationMapper.java | 12
ruoyi-admin/src/main/resources/application.yml | 2
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java | 61
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ReviewInitiateBaseInfoVO.java | 149 +
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java | 28
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationwitnessBaseInfoVO.java | 253 ++
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonateorganBaseInfoDTO.java | 156 +
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonationwitnessService.java | 13
ruoyi-admin/src/main/resources/application-srm.yml | 160
ruoyi-admin/src/main/resources/logback.xml | 106
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewinitiateServiceImpl.java | 11
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationwitnessBaseInfoDTO.java | 368 +++
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonatemaintenanceVO.java | 74
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java | 173 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorganBase.java | 70
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceMedicalevaluationService.java | 11
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java | 6
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceRelativesconfirmationService.java | 8
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceEthicalreviewinitiateMapper.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java | 43
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceMedicalevaluation.java | 9
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonatebaseinfoProgressVO.java | 71
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml | 62
pom.xml | 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java | 36
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceRelativesconfirmationMapper.java | 4
ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml | 68
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java | 60
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java | 5
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonatebaseinfoProgressDTO.java | 196 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/ReviewInitiateBaseInfoDTO.java | 153 +
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonatebaseinfoMapper.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java | 33
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 137
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitness.java | 38
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java | 5
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateorganBaseInfoVO.java | 153 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationorganController.java | 2
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java | 9
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java | 176 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationCompletionBaseInfoVO.java | 122 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java | 6
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonationwitnessMapper.java | 13
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDeathinfoController.java | 115
ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml | 36
ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationorganMapper.xml | 2
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganBaseService.java | 42
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatemaintenanceService.java | 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganBaseController.java | 135 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/RelativeConfirmationBaseInfoVO.java | 164 +
ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml | 9
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonateorganBaseMapper.java | 30
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceOrganallocation.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDeathinfoServiceImpl.java | 152 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportFileController.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDeathinfoMapper.java | 29
ruoyi-admin/src/main/resources/application-druid.yml | 6
ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml | 138 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java | 32
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java | 94
88 files changed, 6,214 insertions(+), 737 deletions(-)
diff --git a/pom.xml b/pom.xml
index 18a7da9..456fb48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -256,6 +256,13 @@
<version>4.5</version>
</dependency>
+ <!-- Janino for logback conditional configuration -->
+ <dependency>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>janino</artifactId>
+ <version>3.0.8</version>
+ </dependency>
+
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDeathinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDeathinfoController.java
new file mode 100644
index 0000000..d277f37
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDeathinfoController.java
@@ -0,0 +1,115 @@
+package com.ruoyi.web.controller.project;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.domain.ServiceDeathinfo;
+import com.ruoyi.project.domain.dto.DeathBaseInfoDTO;
+import com.ruoyi.project.domain.dto.DonateorganBaseInfoDTO;
+import com.ruoyi.project.domain.vo.DeathBaseInfoVO;
+import com.ruoyi.project.service.IServiceDeathinfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鎮ｈ�呮浜′俊鎭疌ontroller
+ *
+ * @author ls
+ * @date 2026-01-20
+ */
+@Api(description = "鎮ｈ�呮浜′俊鎭�")
+@RestController
+@RequestMapping("/project/deathinfo")
+public class ServiceDeathinfoController extends BaseController {
+ @Autowired
+ private IServiceDeathinfoService serviceDeathinfoService;
+
+ /**
+ * 鏌ヨ鎮ｈ�呮浜′俊鎭垪琛�
+ */
+ @ApiOperation("鏌ヨ鎮ｈ�呮浜″熀鏈俊鎭�")
+ @PostMapping("/queryDathInfoBaseInfo")
+ public Map<String, Object> queryDathInfoBaseInfo(@RequestBody DeathBaseInfoVO deathBaseInfoVO) {
+ Integer offset = PageUtils.getOffset(deathBaseInfoVO.getPageNum(), deathBaseInfoVO.getPageSize());
+ deathBaseInfoVO.setPageNum(offset);
+ List<DeathBaseInfoDTO> deathBaseInfoDTOS = serviceDeathinfoService.dathInfoBaseInfoList(deathBaseInfoVO);
+
+ //鑾峰彇鎬绘暟
+ deathBaseInfoVO.setPageNum(null);
+ deathBaseInfoVO.setPageSize(null);
+ Integer totalCount = 0;
+ List<DeathBaseInfoDTO> total = serviceDeathinfoService.dathInfoBaseInfoList(deathBaseInfoVO);
+ if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
+ return getDataTable(deathBaseInfoDTOS, totalCount);
+ }
+
+ /**
+ * 瀵煎嚭鎮ｈ�呮浜′俊鎭垪琛�
+ */
+ @ApiOperation("瀵煎嚭鎮ｈ�呮浜′俊鎭垪琛�")
+ // @PreAuthorize("@ss.hasPermi('project:deathinfo:export')")
+ @Log(title = "鎮ｈ�呮浜′俊鎭�", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ public AjaxResult export(ServiceDeathinfo serviceDeathinfo) {
+ List<ServiceDeathinfo> list = serviceDeathinfoService.exportQueryList(serviceDeathinfo);
+ ExcelUtil<ServiceDeathinfo> util = new ExcelUtil<ServiceDeathinfo>(ServiceDeathinfo.class);
+ return util.exportExcel(list, "鎮ｈ�呮浜′俊鎭暟鎹�");
+ }
+
+ /**
+ * 鑾峰彇鎮ｈ�呮浜′俊鎭缁嗕俊鎭�
+ */
+ @ApiOperation("鑾峰彇鎮ｈ�呮浜′俊鎭缁嗕俊鎭�")
+ // @PreAuthorize("@ss.hasPermi('project:deathinfo:query')")
+ @GetMapping(value = "/getInfo/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return AjaxResult.success(serviceDeathinfoService.getById(id));
+ }
+
+ /**
+ * 鏂板鎮ｈ�呮浜′俊鎭�
+ */
+ @ApiOperation("鏂板鎮ｈ�呮浜′俊鎭�")
+ // @PreAuthorize("@ss.hasPermi('project:deathinfo:add')")
+ @Log(title = "鎮ｈ�呮浜′俊鎭�", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ @RepeatSubmit
+ public AjaxResult add(@RequestBody ServiceDeathinfo serviceDeathinfo) {
+ return toAjax(serviceDeathinfoService.save(serviceDeathinfo));
+ }
+
+ /**
+ * 淇敼鎮ｈ�呮浜′俊鎭�
+ */
+ @ApiOperation("淇敼鎮ｈ�呮浜′俊鎭�")
+ // @PreAuthorize("@ss.hasPermi('project:deathinfo:edit')")
+ @Log(title = "鎮ｈ�呮浜′俊鎭�", businessType = BusinessType.UPDATE)
+ @PostMapping("/edit")
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceDeathinfo serviceDeathinfo) {
+ return toAjax(serviceDeathinfoService.updateById(serviceDeathinfo));
+ }
+
+ /**
+ * 鍒犻櫎鎮ｈ�呮浜′俊鎭�
+ */
+ @ApiOperation("鍒犻櫎鎮ｈ�呮浜′俊鎭�")
+ // @PreAuthorize("@ss.hasPermi('project:deathinfo:remove')")
+ @Log(title = "鎮ｈ�呮浜′俊鎭�", businessType = BusinessType.DELETE)
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(serviceDeathinfoService.removeByIds(Arrays.asList(ids)));
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
index 64bbab9..c438790 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
@@ -11,12 +11,15 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.config.ServerConfig;
import com.ruoyi.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.ServiceDonationwitness;
+import com.ruoyi.project.domain.dto.DonatebaseinfoProgressDTO;
+import com.ruoyi.project.domain.dto.ReviewInitiateBaseInfoDTO;
+import com.ruoyi.project.domain.vo.DonatebaseinfoProgressVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.service.IServiceDonatebaseinfoService;
import com.ruoyi.project.service.IServiceDonationwitnessService;
@@ -37,6 +40,7 @@
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.*;
+import java.util.stream.Collectors;
/**
@@ -93,6 +97,32 @@
return getDataTable(list);
}
+ @ApiOperation("鎹愮尞杩涘害鍩烘湰淇℃伅鍒楄〃")
+ @PostMapping("/donateBaseInfoProgressList")
+ public Map<String, Object> donateBaseInfoProgressList(@RequestBody DonatebaseinfoProgressVO donatebaseinfoProgressVO) {
+ log.info("灏忕▼搴忕娼滃湪鎹愮尞淇℃伅鍒楄〃锛歿}", donatebaseinfoProgressVO);
+ Integer offset = PageUtils.getOffset(donatebaseinfoProgressVO.getPageNum(), donatebaseinfoProgressVO.getPageSize());
+ donatebaseinfoProgressVO.setPageNum(offset);
+ List<DonatebaseinfoProgressDTO> donatebaseinfoProgressDTOS = serviceDonatebaseinfoService.donateBaseInfoProgressList(donatebaseinfoProgressVO);
+
+ //鑾峰彇鎬绘暟
+ donatebaseinfoProgressVO.setPageNum(null);
+ donatebaseinfoProgressVO.setPageSize(null);
+ Integer totalCount = 0;
+ List<DonatebaseinfoProgressDTO> total = serviceDonatebaseinfoService.donateBaseInfoProgressList(donatebaseinfoProgressVO);
+
+ //鑾峰彇鎹愮尞杩涚▼杩涘害
+ Map<Integer, Long> terminationCase = total.stream().filter(Objects::nonNull).map(DonatebaseinfoProgressDTO::getTerminationCase).filter(Objects::nonNull).collect(Collectors.groupingBy(type -> type, Collectors.counting()));
+
+ //鏁版嵁灏佽
+ Map<String, Object> map = new HashMap<>();
+ map.put("terminationCase", terminationCase);
+ map.put("donatebaseinfoProgressDTOS", donatebaseinfoProgressDTOS);
+
+ if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
+ return getDataTable(map, totalCount);
+ }
+
/**
* 瀵煎嚭鎹愮尞鍩虹鍒楄〃
*/
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java
index ce38fdf..7796d1d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java
@@ -20,7 +20,6 @@
import com.ruoyi.project.service.IVUserOrgService;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
-import com.sun.org.apache.bcel.internal.generic.NEW;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
@@ -54,7 +53,7 @@
*/
@ApiOperation("鏌ヨ鎹愮尞涓婃姤鍩虹鍒楄〃")
@PostMapping("/list")
- public Map<String, Object> list(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
+ public Map<String, Object> list(@RequestBody ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
Page<ServiceDonatebaseinfoReport> serviceDonatebaseinfoReportPage = serviceDonatebaseinfoReportService.queryList(serviceDonatebaseinfoReport);
return getDataTable(serviceDonatebaseinfoReportPage.getRecords(), (int) serviceDonatebaseinfoReportPage.getTotal());
}
@@ -64,7 +63,7 @@
*/
@ApiOperation("鑾峰彇鍚勭被鍨嬬殑鎬绘暟")
@PostMapping("/getTotal")
- public Map<String, Object> getTotal(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
+ public Map<String, Object> getTotal(@RequestBody ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
//鍘婚厤缃枃浠朵腑锛岃幏鍙栦笂鎶ョ被鍨�
SysConfig config = new SysConfig();
config.setConfigKey("sys.report.type");
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportFileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportFileController.java
index 81a99f4..ee291b0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportFileController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportFileController.java
@@ -36,7 +36,7 @@
@ApiOperation("鏌ヨ妗堜緥涓婃姤闄勪欢鍒楄〃")
// @PreAuthorize("@ss.hasPermi('system:file:list')")
@PostMapping("/list")
- public TableDataInfo list(ServiceDonatebaseinfoReportFile serviceDonatebaseinfoReportFile) {
+ public TableDataInfo list(@RequestBody ServiceDonatebaseinfoReportFile serviceDonatebaseinfoReportFile) {
startPage();
List<ServiceDonatebaseinfoReportFile> list = serviceDonatebaseinfoReportFileService.queryList(serviceDonatebaseinfoReportFile);
return getDataTable(list);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
index 130e095..5d5af86 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
@@ -13,6 +13,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.ServiceDonateorgan;
+import com.ruoyi.project.domain.vo.DonationCompletionBaseInfoVO;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
import com.ruoyi.project.service.IServiceDonatecompletioninfoService;
import com.ruoyi.project.service.IServiceDonatecomporganService;
@@ -39,7 +40,7 @@
* @date 2021-11-19
*/
@Slf4j
-@Api( description = "鎹愮尞瀹屾垚鐧昏绠＄悊")
+@Api(description = "鎹愮尞瀹屾垚鐧昏绠＄悊")
@RestController
@RequestMapping("/project/donatecompletioninfo")
public class ServiceDonatecompletioninfoController extends BaseController {
@@ -59,28 +60,17 @@
configuration.setDefaultEncoding("utf-8");
}
- /**
- * 鏌ヨ鎹愮尞瀹屾垚鍒楄〃
- */
- @ApiOperation("鏌ヨ鎹愮尞瀹屾垚鍒楄〃")
- //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:list')")
- @GetMapping("/list")
- public TableDataInfo list(ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
- log.info("鏌ヨ鎹愮尞瀹屾垚鍒楄〃锛歿}", serviceDonatecompletioninfo);
- startPage();
- List<ServiceDonatecompletioninfo> list = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo);
- return getDataTable(list);
- }
-
- @ApiOperation("鏌ヨ鎹愮尞瀹屾垚鍒楄〃锛堟柊锛�")
- @GetMapping("/listnew")
- @Log(title = "鏌ヨ鎹愮尞瀹屾垚鍒楄〃锛堟柊锛�", businessType = BusinessType.OTHER)
- public TableDataInfo listnew(DonationCompletionVO donationCompletionVO) {
- log.info("鏌ヨ鎹愮尞瀹屾垚鍒楄〃锛堟柊锛夛細{}", donationCompletionVO);
- startPage();
- List<DonationCompletionVO> list = serviceDonatecompletioninfoService.selectVOList(donationCompletionVO);
- return getDataTable(list);
- }
+// /**
+// * 鏌ヨ鎹愮尞瀹屾垚鍒楄〃
+// */
+// @ApiOperation("鏌ヨ鎹愮尞瀹屾垚鍒楄〃")
+// //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:list')")
+// @GetMapping("/list")
+// public Map<String, Object> list(DonationCompletionBaseInfoVO donationCompletionBaseInfoVO) {
+// log.info("鏌ヨ鎹愮尞瀹屾垚鍒楄〃锛歿}", donationCompletionBaseInfoVO);
+// List<ServiceDonatecompletioninfo> list = serviceDonatecompletioninfoService.queryList(donationCompletionBaseInfoVO);
+// return getDataTable(list);
+// }
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java
index 1109d6b..7c31ca2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java
@@ -1,21 +1,23 @@
package com.ruoyi.web.controller.project;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonatemaintenance;
+import com.ruoyi.project.domain.vo.ServiceDonatemaintenanceVO;
import com.ruoyi.project.service.IServiceDonatemaintenanceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
import java.util.List;
+import java.util.Map;
/**
* 渚涗綋缁存姢璁板綍Controller
@@ -30,16 +32,28 @@
@Autowired
private IServiceDonatemaintenanceService serviceDonatemaintenanceService;
+// /**
+// * 鏌ヨ渚涗綋缁存姢璁板綍鍒楄〃
+// */
+// @ApiOperation("鏌ヨ渚涗綋缁存姢璁板綍鍒楄〃")
+// // @PreAuthorize("@ss.hasPermi('system:donatemaintenance:list')")
+// @PostMapping("/list")
+// public Map<String, Object> list(@RequestBody ServiceDonatemaintenance serviceDonatemaintenance) {
+// Page<ServiceDonatemaintenance> serviceDonatemaintenancePage = serviceDonatemaintenanceService.queryList(serviceDonatemaintenance);
+// return getDataTable(serviceDonatemaintenancePage.getRecords(), (int) serviceDonatemaintenancePage.getTotal());
+// }
+
/**
* 鏌ヨ渚涗綋缁存姢璁板綍鍒楄〃
*/
- @ApiOperation("鏌ヨ渚涗綋缁存姢璁板綍鍒楄〃")
+ @ApiOperation("鑾峰彇渚涗綋缁存姢璁板綍鍩烘湰淇℃伅鍒楄〃")
// @PreAuthorize("@ss.hasPermi('system:donatemaintenance:list')")
- @PostMapping("/list")
- public TableDataInfo list(ServiceDonatemaintenance serviceDonatemaintenance) {
- startPage();
- List<ServiceDonatemaintenance> list = serviceDonatemaintenanceService.queryList(serviceDonatemaintenance);
- return getDataTable(list);
+ @PostMapping("/maintenanceBaseInfoList")
+ public Map<String, Object> maintenanceBaseInfoList(@RequestBody ServiceDonatemaintenanceVO serviceDonatemaintenanceVO) {
+ Integer offset = PageUtils.getOffset(serviceDonatemaintenanceVO.getPageNum(), serviceDonatemaintenanceVO.getPageSize());
+ serviceDonatemaintenanceVO.setPageNum(offset);
+ Page serviceDonatemaintenancePage = serviceDonatemaintenanceService.maintenanceBaseInfoList(serviceDonatemaintenanceVO);
+ return getDataTable(serviceDonatemaintenancePage.getRecords(), (int) serviceDonatemaintenancePage.getTotal());
}
/**
@@ -50,7 +64,8 @@
@Log(title = "渚涗綋缁存姢璁板綍", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceDonatemaintenance serviceDonatemaintenance) {
- List<ServiceDonatemaintenance> list = serviceDonatemaintenanceService.queryList(serviceDonatemaintenance);
+ Page<ServiceDonatemaintenance> serviceDonatemaintenancePage = serviceDonatemaintenanceService.queryList(serviceDonatemaintenance);
+ List<ServiceDonatemaintenance> list = serviceDonatemaintenancePage.getRecords();
ExcelUtil<ServiceDonatemaintenance> util = new ExcelUtil<ServiceDonatemaintenance>(ServiceDonatemaintenance.class);
return util.exportExcel(list, "渚涗綋缁存姢璁板綍鏁版嵁");
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganBaseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganBaseController.java
new file mode 100644
index 0000000..9f07d34
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganBaseController.java
@@ -0,0 +1,135 @@
+package com.ruoyi.web.controller.project;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.domain.ServiceDonateorganBase;
+import com.ruoyi.project.domain.dto.DonateorganBaseInfoDTO;
+import com.ruoyi.project.domain.vo.DonateorganBaseInfoVO;
+import com.ruoyi.project.service.IServiceDonateorganBaseService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹Controller
+ *
+ * @author ls
+ * @date 2026-01-17
+ */
+@Api(description = "鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹")
+@RestController
+@RequestMapping("/project/donateorganBase")
+public class ServiceDonateorganBaseController extends BaseController {
+ @Autowired
+ private IServiceDonateorganBaseService serviceDonateorganBaseService;
+
+
+// /**
+// * 鏌ヨ鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹鍒楄〃
+// */
+// @ApiOperation("鏌ヨ鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹鍒楄〃")
+//// @PreAuthorize("@ss.hasPermi('project:base:list')")
+// @PostMapping("/list")
+// public Map<String, Object> list(@RequestBody ServiceDonateorganBase serviceDonateorganBase) {
+// Page<ServiceDonateorganBase> list = serviceDonateorganBaseService.queryList(serviceDonateorganBase);
+// return getDataTable(list.getRecords(), (int) list.getTotal());
+// }
+
+ /**
+ * 鏌ヨ鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹鍒楄〃
+ */
+ @ApiOperation("鏌ヨ鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹鍒楄〃")
+ @PostMapping("/list")
+ public Map<String, Object> list(@RequestBody ServiceDonateorganBase serviceDonateorganBase) {
+ Page<ServiceDonateorganBase> list = serviceDonateorganBaseService.queryList(serviceDonateorganBase);
+ return getDataTable(list.getRecords(), (int) list.getTotal());
+ }
+
+
+ @ApiOperation("鏌ヨ鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹鍒楄〃")
+ @PostMapping("/getDonateorganBaseInfoList")
+ public Map<String, Object> getDonateorganBaseInfoList(@RequestBody DonateorganBaseInfoVO donateorganBaseInfoVO) {
+ Integer offset = PageUtils.getOffset(donateorganBaseInfoVO.getPageNum(), donateorganBaseInfoVO.getPageSize());
+ donateorganBaseInfoVO.setPageNum(offset);
+ List<DonateorganBaseInfoDTO> donateorganBaseInfoDTOS = serviceDonateorganBaseService.getDonateorganBaseInfoList(donateorganBaseInfoVO);
+
+ //鑾峰彇鎬绘暟
+ donateorganBaseInfoVO.setPageNum(null);
+ donateorganBaseInfoVO.setPageSize(null);
+ Integer totalCount = 0;
+ List<DonateorganBaseInfoDTO> total = serviceDonateorganBaseService.getDonateorganBaseInfoList(donateorganBaseInfoVO);
+ if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
+
+ return getDataTable(donateorganBaseInfoDTOS, totalCount);
+ }
+
+ /**
+ * 瀵煎嚭鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹鍒楄〃
+ */
+ @ApiOperation("瀵煎嚭鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹鍒楄〃")
+ // @PreAuthorize("@ss.hasPermi('project:base:export')")
+ @Log(title = "鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ public AjaxResult export(ServiceDonateorganBase serviceDonateorganBase) {
+ List<ServiceDonateorganBase> list = serviceDonateorganBaseService.exportQueryList(serviceDonateorganBase);
+ ExcelUtil<ServiceDonateorganBase> util = new ExcelUtil<ServiceDonateorganBase>(ServiceDonateorganBase.class);
+ return util.exportExcel(list, "鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹璇︾粏淇℃伅
+ */
+ @ApiOperation("鑾峰彇鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹璇︾粏淇℃伅")
+ // @PreAuthorize("@ss.hasPermi('project:base:query')")
+ @GetMapping(value = "/getInfo/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return AjaxResult.success(serviceDonateorganBaseService.getById(id));
+ }
+
+ /**
+ * 鏂板鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹
+ */
+ @ApiOperation("鏂板鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹")
+ // @PreAuthorize("@ss.hasPermi('project:base:add')")
+ @Log(title = "鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ @RepeatSubmit
+ public AjaxResult add(@RequestBody ServiceDonateorganBase serviceDonateorganBase) {
+ return toAjax(serviceDonateorganBaseService.save(serviceDonateorganBase));
+ }
+
+ /**
+ * 淇敼鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹
+ */
+ @ApiOperation("淇敼鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹")
+ // @PreAuthorize("@ss.hasPermi('project:base:edit')")
+ @Log(title = "鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹", businessType = BusinessType.UPDATE)
+ @PostMapping("/edit")
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceDonateorganBase serviceDonateorganBase) {
+ return toAjax(serviceDonateorganBaseService.updateById(serviceDonateorganBase));
+ }
+
+ /**
+ * 鍒犻櫎鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹
+ */
+ @ApiOperation("鍒犻櫎鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹")
+ // @PreAuthorize("@ss.hasPermi('project:base:remove')")
+ @Log(title = "鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹", businessType = BusinessType.DELETE)
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(serviceDonateorganBaseService.removeByIds(Arrays.asList(ids)));
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
index 5599866..7571113 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
@@ -35,7 +35,7 @@
* @date 2021-11-10
*/
@Slf4j
-@Api(description = "鎹愮尞鍣ㄥ畼绠＄悊")
+@Api(description = "鎹愮尞鍣ㄥ畼绠＄悊鍒嗛厤")
@RestController
@RequestMapping("/project/donateorgan")
public class ServiceDonateorganController extends BaseController {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
index e862b61..599b159 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
@@ -4,15 +4,14 @@
import java.text.SimpleDateFormat;
import java.util.*;
-import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.enums.OrganEnum;
import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.bean.DtoConversionUtils;
-import com.ruoyi.project.domain.ServiceDonatebaseinfo;
+import com.ruoyi.project.domain.vo.DonationwitnessBaseInfoVO;
import com.ruoyi.project.domain.ServiceDonateorgan;
-import com.ruoyi.project.domain.ServiceDonationwitnessorgan;
+import com.ruoyi.project.domain.dto.DonationwitnessBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonationWitnessVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.service.IBaseOnlyvalueService;
@@ -41,7 +40,6 @@
import com.ruoyi.project.domain.ServiceDonationwitness;
import com.ruoyi.project.service.IServiceDonationwitnessService;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
/**
* 鎹愮尞瑙佽瘉Controller
@@ -50,7 +48,7 @@
* @date 2021-11-17
*/
@Slf4j
-@Api(description = "鎹愮尞瑙佽瘉绠＄悊")
+@Api(description = "鎹愮尞瑙佽瘉绠＄悊锛堟浜″垽瀹氾級")
@RestController
@RequestMapping("/project/donationwitness")
public class ServiceDonationwitnessController extends BaseController {
@@ -77,25 +75,39 @@
configuration.setDefaultEncoding("utf-8");
}
- /**
- * 鏌ヨ鎹愮尞瑙佽瘉鍒楄〃
- */
- @ApiOperation("鑾峰彇鎹愮尞瑙佽瘉鍒楄〃")
- //// @PreAuthorize("@ss.hasPermi('project:donationwitness:list')")
- @GetMapping("/list")
- public TableDataInfo list(ServiceDonationwitness serviceDonationwitness) {
- startPage();
- List<ServiceDonationwitness> list = serviceDonationwitnessService.queryList(serviceDonationwitness);
- return getDataTable(list);
- }
+// /**
+// * 鏌ヨ鎹愮尞瑙佽瘉鍒楄〃
+// */
+// @ApiOperation("鑾峰彇鎹愮尞瑙佽瘉鍒楄〃")
+// //// @PreAuthorize("@ss.hasPermi('project:donationwitness:list')")
+// @GetMapping("/list")
+// public TableDataInfo list(ServiceDonationwitness serviceDonationwitness) {
+// startPage();
+// List<ServiceDonationwitness> list = serviceDonationwitnessService.queryList(serviceDonationwitness);
+// return getDataTable(list);
+// }
+//
+// @ApiOperation("鑾峰彇鎹愮尞瑙佽瘉鍒楄〃-鏂�")
+// @GetMapping("/listnew")
+// public TableDataInfo listnew(DonationWitnessVO donationWitnessVO) {
+// startPage();
+// List<DonationWitnessVO> list = serviceDonationwitnessService.selectVOList(donationWitnessVO);
+// return getDataTable(list);
+// }
+@ApiOperation("鑾峰彇鎹愮尞瑙佽瘉鍩烘湰淇℃伅(鍣ㄥ畼鑾峰彇)")
+@PostMapping("/getDonationwitnessBaseInfo")
+public Map<String,Object> getDonationwitnessBaseInfo(@RequestBody DonationwitnessBaseInfoVO donationwitnessBaseInfoVO) {
+ Integer offset = PageUtils.getOffset(donationwitnessBaseInfoVO.getPageNum(), donationwitnessBaseInfoVO.getPageSize());
+ donationwitnessBaseInfoVO.setPageNum(offset);
+ List<DonationwitnessBaseInfoDTO> donationwitnessBaseInfo = serviceDonationwitnessService.getDonationwitnessBaseInfo(donationwitnessBaseInfoVO);
- @ApiOperation("鑾峰彇鎹愮尞瑙佽瘉鍒楄〃-鏂�")
- @GetMapping("/listnew")
- public TableDataInfo listnew(DonationWitnessVO donationWitnessVO) {
- startPage();
- List<DonationWitnessVO> list = serviceDonationwitnessService.selectVOList(donationWitnessVO);
- return getDataTable(list);
- }
+ donationwitnessBaseInfoVO.setPageNum(null);
+ donationwitnessBaseInfoVO.setPageSize(null);
+ Integer totalCount = 0;
+ List<DonationwitnessBaseInfoDTO> total = serviceDonationwitnessService.getDonationwitnessBaseInfo(donationwitnessBaseInfoVO);
+ if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
+ return getDataTable(donationwitnessBaseInfo, totalCount);
+}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java
index aa54460..0b804b0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java
@@ -4,18 +4,23 @@
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.domain.dto.ReviewInitiateBaseInfoDTO;
+import com.ruoyi.project.domain.dto.WitnessBaseInfoDTO;
+import com.ruoyi.project.domain.vo.ReviewInitiateBaseInfoVO;
import com.ruoyi.project.domain.ServiceEthicalreviewinitiate;
import com.ruoyi.project.service.IServiceEthicalreviewinitiateService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
/**
* 浼︾悊瀹℃煡鍙戣捣Controller
@@ -25,21 +30,41 @@
*/
@Api(description = "浼︾悊瀹℃煡鍙戣捣")
@RestController
-@RequestMapping("/system/ethicalreviewinitiate")
+@RequestMapping("/project/ethicalreviewinitiate")
public class ServiceEthicalreviewinitiateController extends BaseController {
@Autowired
private IServiceEthicalreviewinitiateService serviceEthicalreviewinitiateService;
+// /**
+// * 鏌ヨ浼︾悊瀹℃煡鍙戣捣鍒楄〃
+// */
+// @ApiOperation("鏌ヨ浼︾悊瀹℃煡鍙戣捣鍒楄〃")
+// // @PreAuthorize("@ss.hasPermi('system:ethicalreviewinitiate:list')")
+// @PostMapping("/list")
+// public TableDataInfo list(ServiceEthicalreviewinitiate serviceEthicalreviewinitiate) {
+// startPage();
+// List<ServiceEthicalreviewinitiate> list = serviceEthicalreviewinitiateService.queryList(serviceEthicalreviewinitiate);
+// return getDataTable(list);
+// }
+
/**
- * 鏌ヨ浼︾悊瀹℃煡鍙戣捣鍒楄〃
+ * 浼︾悊瀹℃煡鍩烘湰淇℃伅闆嗗悎
*/
- @ApiOperation("鏌ヨ浼︾悊瀹℃煡鍙戣捣鍒楄〃")
+ @ApiOperation("浼︾悊瀹℃煡鍩烘湰淇℃伅闆嗗悎")
// @PreAuthorize("@ss.hasPermi('system:ethicalreviewinitiate:list')")
- @PostMapping("/list")
- public TableDataInfo list(ServiceEthicalreviewinitiate serviceEthicalreviewinitiate) {
- startPage();
- List<ServiceEthicalreviewinitiate> list = serviceEthicalreviewinitiateService.queryList(serviceEthicalreviewinitiate);
- return getDataTable(list);
+ @PostMapping("/reviewinitiateBaseInfoList")
+ public Map<String, Object> reviewinitiateBaseInfoList(@RequestBody ReviewInitiateBaseInfoVO reviewInitiateBaseInfoVO) {
+ Integer offset = PageUtils.getOffset(reviewInitiateBaseInfoVO.getPageNum(), reviewInitiateBaseInfoVO.getPageSize());
+ reviewInitiateBaseInfoVO.setPageNum(offset);
+ List<ReviewInitiateBaseInfoDTO> list = serviceEthicalreviewinitiateService.reviewinitiateBaseInfoList(reviewInitiateBaseInfoVO);
+
+ //鑾峰彇鎬绘暟
+ reviewInitiateBaseInfoVO.setPageNum(null);
+ reviewInitiateBaseInfoVO.setPageSize(null);
+ Integer totalCount = 0;
+ List<ReviewInitiateBaseInfoDTO> total = serviceEthicalreviewinitiateService.reviewinitiateBaseInfoList(reviewInitiateBaseInfoVO);
+ if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
+ return getDataTable(list,totalCount);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
index 0abcfe1..e441a2f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
@@ -1,41 +1,27 @@
package com.ruoyi.web.controller.project;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.ruoyi.common.annotation.NotRepeatCommit;
-import com.ruoyi.project.common.CalculateDateUtils;
-import com.ruoyi.project.domain.ServiceDonationwitness;
-import com.ruoyi.project.domain.vo.MedicalEvaluationVO;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.domain.ServiceMedicalevaluation;
+import com.ruoyi.project.domain.dto.MedicalevaluationBaseInfoDTO;
+import com.ruoyi.project.domain.vo.MedicalEvaluationWithBaseInfoVO;
import com.ruoyi.project.service.IServiceDonationwitnessService;
+import com.ruoyi.project.service.IServiceMedicalevaluationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.project.domain.ServiceMedicalevaluation;
-import com.ruoyi.project.service.IServiceMedicalevaluationService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
/**
* 鍖诲璇勪及Controller
@@ -66,39 +52,27 @@
return getDataTable(list);
}
- @ApiOperation("鑾峰彇鍖荤枟璇勪及鍒楄〃鏂�")
- @GetMapping("/listnew")
- public TableDataInfo listnew(MedicalEvaluationVO medicalEvaluationVO) {
- startPage();
- List<MedicalEvaluationVO> list = serviceMedicalevaluationService.selectVOList(medicalEvaluationVO);
- for (MedicalEvaluationVO medicalEvaluationVO1 : list) {
- //鍏堢粰涓勾榫勯粯璁ゅ�硷紙鍥犱负age鏄暟瀛楃被鍨嬶紝涓嶈兘鏀炬í鏉狅紝鎵�浠ュ氨鎵�妯墰鏀惧埌鍗曚綅涓婏級
- medicalEvaluationVO1.setAgeunit("-");
- medicalEvaluationVO1.setAge(null);
- medicalEvaluationVO1.setAge2(null);
- //鑾峰彇姝讳骸鏃堕棿锛屽鏋滆幏鍙栬璇侀噷鏈夋浜℃椂闂达紝鍒欒繘琛岃绠椾粬鐨勫勾榫�
- ServiceDonationwitness sdw = new ServiceDonationwitness();
- sdw.setInfoid(medicalEvaluationVO1.getInfoid());
- List<ServiceDonationwitness> serviceDonationwitnessList = serviceDonationwitnessService.selectServiceDonationwitnessList(sdw);
- if (!CollectionUtils.isEmpty(serviceDonationwitnessList) && medicalEvaluationVO1.getBirthday() != null) {
- Date deathtime = serviceDonationwitnessList.get(0).getDeathtime();
- if (ObjectUtils.isNotEmpty(deathtime)) {
- Map<String, String> map = CalculateDateUtils.calculateAge(medicalEvaluationVO1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), deathtime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
- if (ObjectUtils.isEmpty(map)) {
- log.error("MedicalEvaluationVO鍑虹敓鏃ユ湡锛歿},MedicalEvaluationVO姝讳骸鏃ユ湡锛歿}", medicalEvaluationVO1.getBirthday(), deathtime);
- continue;
- }
- medicalEvaluationVO1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
- medicalEvaluationVO1.setAgeunit(map.get("ageUnit"));
- medicalEvaluationVO1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
- medicalEvaluationVO1.setAgeunit2(map.get("ageUnit2"));
- }
- }
+ /**
+ * 鑾峰彇鍖荤枟璇勪及鎮ｈ�呭熀鏈俊鎭垪琛�
+ */
+ @ApiOperation("鑾峰彇鍖荤枟璇勪及鎮ｈ�呭熀鏈俊鎭垪琛�")
+ //// @PreAuthorize("@ss.hasPermi('project:medicalevaluation:list')")
+ @PostMapping("/evaluateBaseInfolist")
+ public Map<String, Object> evaluateBaseInfolist(@RequestBody MedicalEvaluationWithBaseInfoVO medicalEvaluationWithBaseInfoVO) {
+ Integer offset = PageUtils.getOffset(medicalEvaluationWithBaseInfoVO.getPageNum(), medicalEvaluationWithBaseInfoVO.getPageSize());
+ medicalEvaluationWithBaseInfoVO.setPageNum(offset);
+ List<MedicalevaluationBaseInfoDTO> medicalEvaluationWithBaseInfoVOS = serviceMedicalevaluationService.evaluateBaseInfolist(medicalEvaluationWithBaseInfoVO);
- }
- return getDataTable(list);
+ //鑾峰彇鎬绘暟
+ medicalEvaluationWithBaseInfoVO.setPageNum(null);
+ medicalEvaluationWithBaseInfoVO.setPageSize(null);
+ Integer totalCount = 0;
+ List<MedicalevaluationBaseInfoDTO> total = serviceMedicalevaluationService.evaluateBaseInfolist(medicalEvaluationWithBaseInfoVO);
+ if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
+ return getDataTable(medicalEvaluationWithBaseInfoVOS, totalCount);
}
+
/**
* 瀵煎嚭鍖诲璇勪及鍒楄〃
*/
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationorganController.java
index 33feb3d..9a1ac22 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationorganController.java
@@ -25,7 +25,7 @@
*/
@Api(description = "鎹愮尞鍣ㄥ畼璇勪及")
@RestController
-@RequestMapping("/system/medicalevaluationorgan")
+@RequestMapping("/project/medicalevaluationorgan")
public class ServiceMedicalevaluationorganController extends BaseController
{
@Autowired
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java
index fe1c92a..bc27c58 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java
@@ -26,7 +26,7 @@
* @author ruoyi
* @date 2021-11-10
*/
-@Api(description = "鍣ㄥ畼鍒嗛厤绠＄悊")
+@Api(description = "鍣ㄥ畼鍒嗛厤绠＄悊锛堝仠鐢級")
@RestController
@RequestMapping("/project/organallocation")
public class ServiceOrganallocationController extends BaseController {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
index 548a7d6..a2a4ae2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
@@ -1,45 +1,38 @@
package com.ruoyi.web.controller.project;
-import java.io.*;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.Education;
import com.ruoyi.common.enums.NationalityEnum;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.domain.ServiceRelativesconfirmation;
+import com.ruoyi.project.domain.dto.RelativeConfirmationBaseInfoDTO;
+import com.ruoyi.project.domain.vo.RelativeConfirmationBaseInfoVO;
import com.ruoyi.project.domain.vo.RelativeConfirmationVO;
import com.ruoyi.project.mapper.ServiceDonatebaseinfoMapper;
import com.ruoyi.project.mapper.ServiceRelativesconfirmationMapper;
-import com.ruoyi.project.service.IServiceDonatebaseinfoService;
+import com.ruoyi.project.service.IServiceRelativesconfirmationService;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.project.domain.ServiceRelativesconfirmation;
-import com.ruoyi.project.service.IServiceRelativesconfirmationService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* 鎹愮尞浜插睘纭Controller
@@ -69,23 +62,39 @@
configuration.setDefaultEncoding("utf-8");
}
- /**
- * 鏌ヨ鎹愮尞浜插睘纭鍒楄〃
- */
- @ApiOperation("鑾峰彇浜插睘纭鍒楄〃")
- //// @PreAuthorize("@ss.hasPermi('project:relativesconfirmation:list')")
- @GetMapping("/list")
- public TableDataInfo list(ServiceRelativesconfirmation serviceRelativesconfirmation) {
- startPage();
- List<ServiceRelativesconfirmation> list = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation);
- return getDataTable(list);
- }
+// /**
+// * 鏌ヨ鎹愮尞浜插睘纭鍒楄〃
+// */
+// @ApiOperation("鑾峰彇浜插睘纭鍒楄〃")
+// //// @PreAuthorize("@ss.hasPermi('project:relativesconfirmation:list')")
+// @GetMapping("/list")
+// public TableDataInfo list(ServiceRelativesconfirmation serviceRelativesconfirmation) {
+// startPage();
+// List<ServiceRelativesconfirmation> list = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation);
+// return getDataTable(list);
+// }
+//
+// @GetMapping("/listnew")
+// public TableDataInfo listnew(RelativeConfirmationVO relativeConfirmationVO) {
+// startPage();
+// List<RelativeConfirmationVO> list = serviceRelativesconfirmationService.selectVOList(relativeConfirmationVO);
+// return getDataTable(list);
+// }
- @GetMapping("/listnew")
- public TableDataInfo listnew(RelativeConfirmationVO relativeConfirmationVO) {
- startPage();
- List<RelativeConfirmationVO> list = serviceRelativesconfirmationService.selectVOList(relativeConfirmationVO);
- return getDataTable(list);
+ @ApiOperation("鎹愮尞纭鍩烘湰淇℃伅闆嗗悎")
+ @PostMapping("/confirmationBaseInfoList")
+ public Map<String, Object> confirmationBaseInfoList(@RequestBody RelativeConfirmationBaseInfoVO relativeConfirmationBaseInfoVO) {
+ Integer offset = PageUtils.getOffset(relativeConfirmationBaseInfoVO.getPageNum(), relativeConfirmationBaseInfoVO.getPageSize());
+ relativeConfirmationBaseInfoVO.setPageNum(offset);
+ List<RelativeConfirmationBaseInfoDTO> list = serviceRelativesconfirmationService.confirmationBaseInfoList(relativeConfirmationBaseInfoVO);
+
+ //鑾峰彇鎬绘暟
+ relativeConfirmationBaseInfoVO.setPageNum(null);
+ relativeConfirmationBaseInfoVO.setPageSize(null);
+ Integer totalCount = 0;
+ List<RelativeConfirmationBaseInfoDTO> total = serviceRelativesconfirmationService.confirmationBaseInfoList(relativeConfirmationBaseInfoVO);
+ if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
+ return getDataTable(list, totalCount);
}
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 3aeb86a..5b161c7 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -83,3 +83,9 @@
agentId: 1779052814
dingAppid: dingn8iip5ubj7clrrsv
dingAppSecret: qlEK8D3oOVwGPOTiBQIBYTqQVlAfy9S_qQizEQFjJdSScwemWFryg4gbneu-NqWD
+
+# 閽夐拤API浠ｇ悊閰嶇疆
+dingtalk:
+ proxy:
+ enabled: true # 鏄惁鍚敤浠ｇ悊
+ url: http://127.0.0.1:8800/dingtalk-api # Nginx浠ｇ悊鍦板潃锛岄渶瑕佹浛鎹负瀹為檯鍦板潃
diff --git a/ruoyi-admin/src/main/resources/application-srm.yml b/ruoyi-admin/src/main/resources/application-srm.yml
index 4fa43f7..542d99a 100644
--- a/ruoyi-admin/src/main/resources/application-srm.yml
+++ b/ruoyi-admin/src/main/resources/application-srm.yml
@@ -1,87 +1,93 @@
# 鏁版嵁婧愰厤缃�
spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- # 鍖婚櫌鐜
- url: jdbc:mysql://127.0.0.1:3306/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: opo
- password: Smartor.2025
+ datasource:
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: com.mysql.cj.jdbc.Driver
+ druid:
+ # 涓诲簱鏁版嵁婧�
+ master:
+ # 鍖婚櫌鐜
+ url: jdbc:mysql://127.0.0.1:3306/opo-qd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: root
+ password: Smartor.2025
- # 浠庡簱鏁版嵁婧�
- slave:
- # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
- enabled: false
- url:
- username:
- password:
- # 鍒濆杩炴帴鏁�
- initialSize: 5
- # 鏈�灏忚繛鎺ユ睜鏁伴噺
- minIdle: 10
- # 鏈�澶ц繛鎺ユ睜鏁伴噺
- maxActive: 20
- # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
- maxWait: 60000
- # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
- timeBetweenEvictionRunsMillis: 60000
- # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
- minEvictableIdleTimeMillis: 300000
- # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
- maxEvictableIdleTimeMillis: 900000
- # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
- validationQuery: SELECT 1 FROM DUAL
- testWhileIdle: true
- testOnBorrow: false
- testOnReturn: false
- webStatFilter:
- enabled: true
- statViewServlet:
- # 寮�鍏�
- enabled: false
- # 璁剧疆鐧藉悕鍗曪紝涓嶅～鍒欏厑璁告墍鏈夎闂�
- allow:
- url-pattern: /druid/*
- # 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮�
- login-username: lihu
- login-password: Lihu.7647Sa89.94
- filter:
- stat:
- enabled: true
- # 鎱QL璁板綍
- log-slow-sql: true
- slow-sql-millis: 1000
- merge-sql: true
- wall:
- config:
- multi-statement-allow: true
+ # 浠庡簱鏁版嵁婧�
+ slave:
+ # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
+ enabled: false
+ url:
+ username:
+ password:
+ # 鍒濆杩炴帴鏁�
+ initialSize: 5
+ # 鏈�灏忚繛鎺ユ睜鏁伴噺
+ minIdle: 10
+ # 鏈�澶ц繛鎺ユ睜鏁伴噺
+ maxActive: 20
+ # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
+ maxWait: 60000
+ # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
+ timeBetweenEvictionRunsMillis: 60000
+ # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+ minEvictableIdleTimeMillis: 300000
+ # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+ maxEvictableIdleTimeMillis: 900000
+ # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
+ validationQuery: SELECT 1 FROM DUAL
+ testWhileIdle: true
+ testOnBorrow: false
+ testOnReturn: false
+ webStatFilter:
+ enabled: true
+ statViewServlet:
+ # 寮�鍏�
+ enabled: false
+ # 璁剧疆鐧藉悕鍗曪紝涓嶅～鍒欏厑璁告墍鏈夎闂�
+ allow:
+ url-pattern: /druid/*
+ # 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮�
+ login-username: lihu
+ login-password: Lihu.7647Sa89.94
+ filter:
+ stat:
+ enabled: true
+ # 鎱QL璁板綍
+ log-slow-sql: true
+ slow-sql-millis: 1000
+ merge-sql: true
+ wall:
+ config:
+ multi-statement-allow: true
- # redis 閰嶇疆
- redis:
- # 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細鍖婚櫌鐜
- host: 129.88.242.37
- password: jqserver
- port: 6379
+ # redis 閰嶇疆
+ redis:
+ # 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細鍖婚櫌鐜
+ host: 127.0.0.1
+ password: Smartor
+ port: 6020
- # 鏁版嵁搴撶储寮�
- database: 0
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
+ # 鏁版嵁搴撶储寮�
+ database: 0
+ # 杩炴帴瓒呮椂鏃堕棿
+ timeout: 10s
+ lettuce:
+ pool:
+ # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+ min-idle: 0
+ # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+ max-idle: 8
+ # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
+ max-active: 8
+ # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
+ max-wait: -1ms
#閽夐拤鐨勫瘑閽ワ紙鐪佷汉姘戯級
agentId: 2975938892
dingAppid: dingbxgfddodocmtqqsu
dingAppSecret: sw1NDcgErqWqkaWVo4DPck9EagJ-2yihYNxmhOjXo_F9E6X_-6Cl3LAybqAPt9gi
+
+# 閽夐拤API浠ｇ悊閰嶇疆
+dingtalk:
+ proxy:
+ enabled: true # 鏄惁鍚敤浠ｇ悊
+ url: http://192.168.111.9:9096/dingtalk-api # Nginx浠ｇ悊鍦板潃锛岄渶瑕佹浛鎹负瀹為檯鍦板潃
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 67df68c..a294161 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -24,7 +24,7 @@
# 寮�鍙戠幆澧冮厤缃�
server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负9095
port: 8080
servlet:
# 搴旂敤鐨勮闂矾寰�
diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml
index 2df5a82..a4eacad 100644
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/ruoyi-admin/src/main/resources/logback.xml
@@ -1,31 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
- <!-- 鏃ュ織瀛樻斁璺緞 -->
- <property name="log.path" value="/lihu/opo/logs" />
- <!-- 鏃ュ織杈撳嚭鏍煎紡 -->
- <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+ <!-- 鏍规嵁鎿嶄綔绯荤粺璁剧疆鏃ュ織璺緞 -->
+ <property name="win.log.path" value="/lihu/opo/logs" />
+ <property name="linux.log.path" value="/home/software/lihu/opo/logs" />
- <!-- 鎺у埗鍙拌緭鍑� -->
- <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- </appender>
-
- <!-- 绯荤粺鏃ュ織杈撳嚭 -->
- <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/sys-info.log</file>
+ <!-- 妫�娴嬫搷浣滅郴缁熷苟璁剧疆鏃ュ織璺緞 -->
+ <if condition='property("os.name").toLowerCase().contains("windows")'>
+ <then>
+ <property name="log.path" value="${win.log.path}" />
+ </then>
+ <else>
+ <property name="log.path" value="${linux.log.path}" />
+ </else>
+ </if>
+ <!-- 鏃ュ織杈撳嚭鏍煎紡 -->
+ <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+
+ <!-- 鎺у埗鍙拌緭鍑� -->
+ <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>${log.pattern}</pattern>
+ </encoder>
+ </appender>
+
+ <!-- 绯荤粺鏃ュ織杈撳嚭 -->
+ <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.path}/sys-info.log</file>
<!-- 寰幆鏀跨瓥锛氬熀浜庢椂闂村垱寤烘棩蹇楁枃浠� -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 鏃ュ織鏂囦欢鍚嶆牸寮� -->
- <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
- <maxHistory>60</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
+ <maxHistory>60</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${log.pattern}</pattern>
+ </encoder>
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 杩囨护鐨勭骇鍒� -->
<level>INFO</level>
<!-- 鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛� -->
@@ -33,16 +44,17 @@
<!-- 涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛� -->
<onMismatch>DENY</onMismatch>
</filter>
- </appender>
-
- <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/sys-error.log</file>
+ </appender>
+
+ <!-- 绯荤粺閿欒鏃ュ織杈撳嚭 -->
+ <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.path}/sys-error.log</file>
<!-- 寰幆鏀跨瓥锛氬熀浜庢椂闂村垱寤烘棩蹇楁枃浠� -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 鏃ュ織鏂囦欢鍚嶆牸寮� -->
<fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
- <maxHistory>60</maxHistory>
+ <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
+ <maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
@@ -50,16 +62,16 @@
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 杩囨护鐨勭骇鍒� -->
<level>ERROR</level>
- <!-- 鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛� -->
+ <!-- 鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛� -->
<onMatch>ACCEPT</onMatch>
- <!-- 涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛� -->
+ <!-- 涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛� -->
<onMismatch>DENY</onMismatch>
</filter>
</appender>
-
- <!-- 鐢ㄦ埛璁块棶鏃ュ織杈撳嚭 -->
+
+ <!-- 鐢ㄦ埛璁块棶鏃ュ織杈撳嚭 -->
<appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/sys-user.log</file>
+ <file>${log.path}/sys-user.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 鎸夊ぉ鍥炴粴 daily -->
<fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
@@ -70,24 +82,24 @@
<pattern>${log.pattern}</pattern>
</encoder>
</appender>
-
- <!-- 绯荤粺妯″潡鏃ュ織绾у埆鎺у埗 -->
- <logger name="com.ruoyi" level="info" />
- <!-- Spring鏃ュ織绾у埆鎺у埗 -->
- <logger name="org.springframework" level="warn" />
- <root level="info">
- <appender-ref ref="console" />
- </root>
-
- <!--绯荤粺鎿嶄綔鏃ュ織-->
+ <!-- 绯荤粺妯″潡鏃ュ織绾у埆鎺у埗 -->
+ <logger name="com.ruoyi" level="info" />
+ <!-- Spring鏃ュ織绾у埆鎺у埗 -->
+ <logger name="org.springframework" level="warn" />
+
+ <root level="info">
+ <appender-ref ref="console" />
+ </root>
+
+ <!--绯荤粺鎿嶄綔鏃ュ織-->
<root level="info">
<appender-ref ref="file_info" />
<appender-ref ref="file_error" />
</root>
-
- <!--绯荤粺鐢ㄦ埛鎿嶄綔鏃ュ織-->
+
+ <!--绯荤粺鐢ㄦ埛鎿嶄綔鏃ュ織-->
<logger name="sys-user" level="info">
<appender-ref ref="sys-user"/>
</logger>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
index 2cec013..ab33599 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
@@ -38,4 +38,13 @@
public static void clearPage() {
PageHelper.clearPage();
}
+
+ /**
+ * 璁＄畻鍋忕Щ閲�
+ */
+ public static Integer getOffset(Integer pageNum, Integer pageSize) {
+ if (pageNum == null || pageNum == 0) pageNum = 1;
+ if (pageSize == null) pageSize = 10;
+ return (pageNum - 1) * pageSize;
+ }
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index b8b1fda..ee42021 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -101,7 +101,7 @@
// 杩囨护璇锋眰
.authorizeRequests()
// 瀵逛簬鐧诲綍login 娉ㄥ唽register 楠岃瘉鐮乧aptchaImage 鍏佽鍖垮悕璁块棶
- .antMatchers("/login", "/openidlogin", "/register", "/captchaImage", "/getToken").anonymous()
+ .antMatchers("/login", "/openidlogin", "/register", "/captchaImage", "/getToken","/system/dingtalk/sendNotification").anonymous()
.antMatchers(
HttpMethod.GET,
"/",
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
index 9d346d4..4ac2db5 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
@@ -19,12 +19,11 @@
/**
* 娉ㄥ唽鏍￠獙鏂规硶
- *
+ *
* @author ruoyi
*/
@Component
-public class SysRegisterService
-{
+public class SysRegisterService {
@Autowired
private ISysUserService userService;
@@ -37,54 +36,35 @@
/**
* 娉ㄥ唽
*/
- public String register(RegisterBody registerBody)
- {
+ public String register(RegisterBody registerBody) {
String msg = "", username = registerBody.getUsername(), password = registerBody.getPassword();
boolean captchaOnOff = configService.selectCaptchaOnOff();
// 楠岃瘉鐮佸紑鍏�
- if (captchaOnOff)
- {
+ if (captchaOnOff) {
validateCaptcha(username, registerBody.getCode(), registerBody.getUuid());
}
- if (StringUtils.isEmpty(username))
- {
+ if (StringUtils.isEmpty(username)) {
msg = "鐢ㄦ埛鍚嶄笉鑳戒负绌�";
- }
- else if (StringUtils.isEmpty(password))
- {
+ } else if (StringUtils.isEmpty(password)) {
msg = "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖";
- }
- else if (username.length() < UserConstants.USERNAME_MIN_LENGTH
- || username.length() > UserConstants.USERNAME_MAX_LENGTH)
- {
+ } else if (username.length() < UserConstants.USERNAME_MIN_LENGTH || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
msg = "璐︽埛闀垮害蹇呴』鍦�2鍒�20涓瓧绗︿箣闂�";
- }
- else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
- || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
- {
+ } else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
msg = "瀵嗙爜闀垮害蹇呴』鍦�5鍒�20涓瓧绗︿箣闂�";
- }
- else if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(username)))
- {
+ } else if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(username))) {
msg = "淇濆瓨鐢ㄦ埛'" + username + "'澶辫触锛屾敞鍐岃处鍙峰凡瀛樺湪";
- }
- else
- {
+ } else {
SysUser sysUser = new SysUser();
sysUser.setUserName(username);
sysUser.setNickName(username);
sysUser.setPassword(SecurityUtils.encryptPassword(registerBody.getPassword()));
boolean regFlag = userService.registerUser(sysUser);
- if (!regFlag)
- {
+ if (!regFlag) {
msg = "娉ㄥ唽澶辫触,璇疯仈绯荤郴缁熺鐞嗕汉鍛�";
- }
- else
- {
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.REGISTER,
- MessageUtils.message("user.register.success")));
+ } else {
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.REGISTER, MessageUtils.message("user.register.success")));
}
}
return msg;
@@ -92,23 +72,20 @@
/**
* 鏍￠獙楠岃瘉鐮�
- *
+ *
* @param username 鐢ㄦ埛鍚�
- * @param code 楠岃瘉鐮�
- * @param uuid 鍞竴鏍囪瘑
+ * @param code 楠岃瘉鐮�
+ * @param uuid 鍞竴鏍囪瘑
* @return 缁撴灉
*/
- public void validateCaptcha(String username, String code, String uuid)
- {
+ public void validateCaptcha(String username, String code, String uuid) {
String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
String captcha = redisCache.getCacheObject(verifyKey);
redisCache.deleteObject(verifyKey);
- if (captcha == null)
- {
+ if (captcha == null) {
throw new CaptchaExpireException();
}
- if (!code.equalsIgnoreCase(captcha))
- {
+ if (!code.equalsIgnoreCase(captcha)) {
throw new CaptchaException();
}
}
diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
index 65f948c..da06dbd 100644
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -2,6 +2,7 @@
import java.util.Arrays;
import java.util.List;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -36,31 +37,46 @@
@Api(description = "${functionName}")
@RestController
@RequestMapping("/${moduleName}/${businessName}")
-public class ${ClassName}Controller extends BaseController
-{
+public class ${ClassName}Controller extends BaseController {
@Autowired
private I${ClassName}Service ${className}Service;
- /**
- * 鏌ヨ${functionName}鍒楄〃
- */
- @ApiOperation("鏌ヨ${functionName}鍒楄〃")
- // @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
- @PostMapping("/list")
-#if($table.crud || $table.sub)
- public TableDataInfo list(${ClassName} ${className})
- {
- startPage();
- List<${ClassName}> list = ${className}Service.queryList(${className});
- return getDataTable(list);
+##/**
+## * 鏌ヨ${functionName}鍒楄〃
+## */
+##@ApiOperation("鏌ヨ${functionName}鍒楄〃")
+##// @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
+##@PostMapping("/list")
+## #if($table.crud || $table.sub)
+## public TableDataInfo list(@RequestBody ${ClassName} ${className}) {
+## startPage();
+## List<${ClassName}> list = ${className}Service.queryList(${className});
+## return getDataTable(list);
+## }
+## #elseif($table.tree)
+## public AjaxResult list(${ClassName} ${className}) {
+## List<${ClassName}> list = ${className}Service.queryList(${className});
+## return AjaxResult.success(list);
+## }
+## #end
+
+/**
+ * 鏌ヨ${functionName}鍒楄〃
+ */
+@ApiOperation("鏌ヨ${functionName}鍒楄〃")
+// @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
+@PostMapping("/list")
+ #if($table.crud || $table.sub)
+ public Map<String, Object> list(@RequestBody ${ClassName} ${className}) {
+ Page<${ClassName}> list = ${className}Service.queryList(${className});
+ return getDataTable(list.getRecords(), (int) list.getTotal());
}
-#elseif($table.tree)
- public AjaxResult list(${ClassName} ${className})
- {
- List<${ClassName}> list = ${className}Service.queryList(${className});
- return AjaxResult.success(list);
- }
-#end
+ #elseif($table.tree)
+ public AjaxResult list(${ClassName} ${className}) {
+ List<${ClassName}> list = ${className}Service.queryList(${className});
+ return AjaxResult.success(list);
+ }
+ #end
/**
* 瀵煎嚭${functionName}鍒楄〃
@@ -69,10 +85,9 @@
// @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
@Log(title = "${functionName}", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(${ClassName} ${className})
- {
- List<${ClassName}> list = ${className}Service.queryList(${className});
- ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
+ public AjaxResult export(${ClassName} ${className}) {
+ List<${ClassName}> list = ${className}Service.exportQueryList(${className});
+ ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}. class);
return util.exportExcel(list, "${functionName}鏁版嵁");
}
@@ -82,8 +97,7 @@
@ApiOperation("鑾峰彇${functionName}璇︾粏淇℃伅")
// @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
@GetMapping(value = "/getInfo/{${pkColumn.javaField}}")
- public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
- {
+ public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) {
return AjaxResult.success(${className}Service.getById(${pkColumn.javaField}));
}
@@ -95,8 +109,7 @@
@Log(title = "${functionName}", businessType = BusinessType.INSERT)
@PostMapping("/add")
@RepeatSubmit
- public AjaxResult add(@RequestBody ${ClassName} ${className})
- {
+ public AjaxResult add(@RequestBody ${ClassName} ${className}) {
return toAjax(${className}Service.save(${className}));
}
@@ -108,8 +121,7 @@
@Log(title = "${functionName}", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@RepeatSubmit
- public AjaxResult edit(@RequestBody ${ClassName} ${className})
- {
+ public AjaxResult edit(@RequestBody ${ClassName} ${className}) {
return toAjax(${className}Service.updateById(${className}));
}
@@ -120,8 +132,7 @@
// @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
@Log(title = "${functionName}", businessType = BusinessType.DELETE)
@GetMapping("/remove/{${pkColumn.javaField}s}")
- public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
- {
+ public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
return toAjax(${className}Service.removeByIds(Arrays.asList(${pkColumn.javaField}s)));
}
}
diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
index 2a70486..9f8d1b0 100644
--- a/ruoyi-generator/src/main/resources/vm/java/service.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
@@ -6,7 +6,7 @@
/**
* ${functionName}Service鎺ュ彛
- *
+ *
* @author ${author}
* @date ${datetime}
*/
@@ -15,9 +15,17 @@
/**
* 鏌ヨ${functionName}鍒楄〃
- *
+ *
* @param ${className} ${functionName}
* @return ${functionName}闆嗗悎
*/
- public List<${ClassName}> queryList(${ClassName} ${className});
+ public Page<${ClassName}> queryList(${ClassName} ${className});
+
+ /**
+ * 鏌ヨ${functionName}鍒楄〃
+ *
+ * @param ${className} ${functionName}
+ * @return ${functionName}闆嗗悎
+ */
+ public List<${ClassName}> exportQueryList(${ClassName} ${className});
}
diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
index a4d88bb..e423cfe 100644
--- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -25,23 +25,129 @@
/**
* ${functionName}Service涓氬姟灞傚鐞�
- *
+ *
* @author ${author}
* @date ${datetime}
*/
@Service
-public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service
+public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service
{
+ @Autowired
+ private ${ClassName}Mapper ${className}Mapper;
/**
* 鏌ヨ${functionName}鍒楄〃
- *
+ *
* @param ${className} ${functionName}
* @return ${functionName}
*/
@Override
- public List<${ClassName}> queryList(${ClassName} ${className}) {
+ public Page<${ClassName}> queryList(${ClassName} ${className}) {
+ LambdaQueryWrapper<${ClassName}> wrappers = Wrappers.lambdaQuery();
+ #foreach($column in $columns)
+ #set($queryType=$column.queryType)
+ #set($javaField=$column.javaField)
+ #set($javaType=$column.javaType)
+ #set($columnName=$column.columnName)
+ #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+ #if($column.query)
+ #if($column.queryType == "EQ")
+ #if($javaType == 'String')
+ if (StringUtils.isNotBlank(${className}.get$AttrName())){
+ wrappers.eq(${ClassName}::get$AttrName ,${className}.get$AttrName());
+ }
+ #else
+ if (${className}.get$AttrName() != null){
+ wrappers.eq(${ClassName}::get$AttrName ,${className}.get$AttrName());
+ }
+ #end
+ #elseif($queryType == "NE")
+ #if($javaType == 'String')
+ if (StringUtils.isNotBlank(${className}.get$AttrName())){
+ wrappers.ne(${ClassName}::get$AttrName ,${className}.get$AttrName());
+ }
+ #else
+ if (${className}.get$AttrName() != null){
+ wrappers.ne(${ClassName}::get$AttrName ,${className}.get$AttrName());
+ }
+ #end
+ #elseif($queryType == "GT")
+ #if($javaType == 'String')
+ if (StringUtils.isNotBlank(${className}.get$AttrName())){
+ wrappers.gt(${ClassName}::get$AttrName ,${className}.get$AttrName());
+ }
+ #else
+ if (${className}.get$AttrName() != null){
+ wrappers.gt(${ClassName}::get$AttrName ,${className}.get$AttrName());
+ }
+ #end
+ #elseif($queryType == "GTE")
+ #if($javaType == 'String')
+ if (StringUtils.isNotBlank(${className}.get$AttrName())){
+ wrappers.ge(${ClassName}::get$AttrName ,${className}.get$AttrName());
+ }
+ #else
+ if (${className}.get$AttrName() != null){
+ wrappers.ge(${ClassName}::get$AttrName ,${className}.get$AttrName());
+ }
+ #end
+ #elseif($queryType == "LT")
+ #if($javaType == 'String')
+ if (StringUtils.isNotBlank(${className}.get$AttrName())){
+ wrappers.lt(${ClassName}::get$AttrName ,${className}.get$AttrName());
+ }
+ #else
+ if (${className}.get$AttrName() != null){
+ wrappers.lt(${ClassName}::get$AttrName ,${className}.get$AttrName());
+ }
+ #end
+ #elseif($queryType == "LTE")
+ #if($javaType == 'String')
+ if (StringUtils.isNotBlank(${className}.get$AttrName())){
+ wrappers.le(${ClassName}::get$AttrName ,${className}.get$AttrName());
+ }
+ #else
+ if (${className}.get$AttrName() != null){
+ wrappers.le(${ClassName}::get$AttrName ,${className}.get$AttrName());
+ }
+ #end
+ #elseif($queryType == "LIKE")
+ #if($javaType == 'String')
+ if (StringUtils.isNotBlank(${className}.get$AttrName())){
+ wrappers.like(${ClassName}::get$AttrName ,${className}.get$AttrName());
+ }
+ #else
+ if (${className}.get$AttrName() != null){
+ wrappers.like(${ClassName}::get$AttrName ,${className}.get$AttrName());
+ }
+ #end
+ #elseif($queryType == "BETWEEN")
+ Map<String, Object> params = ${className}.getParams();
+ if (params.get("begin$AttrName") != null && params.get("end$AttrName") != null) {
+ wrappers.between(${ClassName}::get$AttrName ,params.get("begin$AttrName"),params.get("end$AttrName"));
+ }
+ #end
+ #end
+ #end
+
+ int currentPage = (${className}.getPageNum() == null || ${className}.getPageNum() < 1) ? 1 : ${className}.getPageNum();
+ int size = (${className}.getPageSize() == null || ${className}.getPageSize() < 1) ? 10 : ${className}.getPageSize();
+ Page<${ClassName}> page = new Page<>(currentPage, size);
+ List<${ClassName}> ${className}List = ${className}Mapper.selectPage(page, wrappers).getRecords();
+
+ return page.setRecords(${className}List);
+ }
+
+
+ /**
+ * 鏌ヨ${functionName}鍒楄〃
+ *
+ * @param ${className} ${functionName}
+ * @return ${functionName}
+ */
+ @Override
+ public List<${ClassName}> exportQueryList(${ClassName} ${className}) {
LambdaQueryWrapper<${ClassName}> wrappers = Wrappers.lambdaQuery();
#foreach($column in $columns)
#set($queryType=$column.queryType)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDeathinfo.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDeathinfo.java
new file mode 100644
index 0000000..97f022a
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDeathinfo.java
@@ -0,0 +1,103 @@
+package com.ruoyi.project.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 鎮ｈ�呮浜′俊鎭璞� service_deathinfo
+ *
+ * @author ls
+ * @date 2026-01-20
+ */
+@Data
+@ApiModel("鎮ｈ�呮浜′俊鎭�")
+public class ServiceDeathinfo extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** $column.columnComment */
+ @ApiModelProperty("$column.columnComment")
+ //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /** 鍏宠仈service_donatebaseinfo琛ㄧ殑ID */
+ @ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
+ @Excel(name = "鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
+ private Long infoid;
+
+ /** 鎹愮尞鑰呯紪鍙� */
+ @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
+ @Excel(name = "鎹愮尞鑰呯紪鍙�")
+ private String donorno;
+
+ /** 鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛� */
+ @ApiModelProperty("鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�")
+ @Excel(name = "鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�")
+ private String gainhospitalno;
+
+ /** 鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛� */
+ @ApiModelProperty("鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�")
+ @Excel(name = "鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�")
+ private String gainhospitalname;
+
+ /** 姝讳骸鏃堕棿 */
+ @ApiModelProperty("姝讳骸鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "姝讳骸鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date deathtime;
+
+ /** 姝讳骸鍘熷洜 */
+ @ApiModelProperty("姝讳骸鍘熷洜")
+ @Excel(name = "姝讳骸鍘熷洜")
+ private String deathreason;
+
+ /** 姝讳骸鍒ゅ畾鍖荤敓涓� */
+ @ApiModelProperty("姝讳骸鍒ゅ畾鍖荤敓涓�")
+ @Excel(name = "姝讳骸鍒ゅ畾鍖荤敓涓�")
+ private String deathjudgedocto;
+
+ /** 姝讳骸鍒ゅ畾鍖荤敓浜� */
+ @ApiModelProperty("姝讳骸鍒ゅ畾鍖荤敓浜�")
+ @Excel(name = "姝讳骸鍒ゅ畾鍖荤敓浜�")
+ private String deathjudgedoctt;
+
+ /** 姝讳骸璇佹槑闄勪欢璺緞,澶氬紶鐢�;鍙烽殧寮� */
+ @ApiModelProperty("姝讳骸璇佹槑闄勪欢璺緞,澶氬紶鐢�;鍙烽殧寮�")
+ @Excel(name = "姝讳骸璇佹槑闄勪欢璺緞,澶氬紶鐢�;鍙烽殧寮�")
+ private String deathjudgeannex;
+
+ /** 鏄惁榛樺搥缂呮��浠紡 0锛氬惁锛�1锛氭槸 */
+ @ApiModelProperty("鏄惁榛樺搥缂呮��浠紡 0锛氬惁锛�1锛氭槸")
+ @Excel(name = "鏄惁榛樺搥缂呮��浠紡 0锛氬惁锛�1锛氭槸")
+ private Integer isspendremember;
+
+ /** 鏄惁鎭㈠閬椾綋浠 0锛氬惁锛�1锛氭槸 */
+ @ApiModelProperty("鏄惁鎭㈠閬椾綋浠 0锛氬惁锛�1锛氭槸")
+ @Excel(name = "鏄惁鎭㈠閬椾綋浠 0锛氬惁锛�1锛氭槸")
+ private Integer isrestoreremains;
+
+ /** 缂呮��浠紡闄勪欢璺緞,澶氬紶鐢�;鍙烽殧寮� */
+ @ApiModelProperty("缂呮��浠紡闄勪欢璺緞,澶氬紶鐢�;鍙烽殧寮�")
+ @Excel(name = "缂呮��浠紡闄勪欢璺緞,澶氬紶鐢�;鍙烽殧寮�")
+ private String rememberannex;
+
+ /** 璐熻矗浜虹紪鍙� */
+ @ApiModelProperty("璐熻矗浜虹紪鍙�")
+ @Excel(name = "璐熻矗浜虹紪鍙�")
+ private String responsibleuserid;
+
+ /** 璐熻矗浜哄鍚� */
+ @ApiModelProperty("璐熻矗浜哄鍚�")
+ @Excel(name = "璐熻矗浜哄鍚�")
+ private String responsibleusername;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
index 8003453..ffe1940 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
@@ -323,7 +323,7 @@
private Integer terminationCase;
/**
- * 鑱旂郴浜猴紙鍗忚皟鍛樺鍚嶏級
+ * 閮ㄩ棬缂栧彿
*/
@ApiModelProperty("閮ㄩ棬缂栧彿")
@Excel(name = "閮ㄩ棬缂栧彿", readConverterExp = "閮ㄩ棬缂栧彿")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
index 3b36f1b..22ec9ce 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
@@ -33,6 +33,11 @@
private Long id;
/**
+ * 鍏宠仈service_donateorgan_base琛ㄧ殑ID
+ */
+ @ApiModelProperty("鍏宠仈service_donateorgan_base琛ㄧ殑ID锛堝繀濉級")
+ private Long baseId;
+ /**
* 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
*/
@ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
@@ -313,7 +318,6 @@
@ApiModelProperty("绯荤粺缂栧彿")
@Excel(name = "绯荤粺缂栧彿")
private String caseno;
-
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorganBase.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorganBase.java
new file mode 100644
index 0000000..5b77546
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorganBase.java
@@ -0,0 +1,70 @@
+package com.ruoyi.project.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹瀵硅薄 service_donateorgan_base
+ *
+ * @author ls
+ * @date 2026-01-17
+ */
+@Data
+@ApiModel("鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹")
+public class ServiceDonateorganBase extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** $column.columnComment */
+ @ApiModelProperty("$column.columnComment")
+ //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /** 鍏宠仈service_donatebaseinfo琛ㄧ殑ID */
+ @ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
+ @Excel(name = "鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
+ private Long infoid;
+
+ /** 鍒嗛厤鐘舵�侊細0:鏈垎閰嶏紱1锛氬凡鍒嗛厤锛�2浣滃簾 */
+ @ApiModelProperty("鍒嗛厤鐘舵�侊細0:鏈垎閰嶏紱1锛氬凡鍒嗛厤锛�2浣滃簾")
+ @Excel(name = "鍒嗛厤鐘舵�侊細0:鏈垎閰嶏紱1锛氬凡鍒嗛厤锛�2浣滃簾")
+ private Long allocationStatus;
+
+ /** 鍒嗛厤鏃堕棿 */
+ @ApiModelProperty("鍒嗛厤鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍒嗛厤鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date allocationTime;
+
+ /** 鐧昏浜虹紪鍙� */
+ @ApiModelProperty("鐧昏浜虹紪鍙�")
+ @Excel(name = "鐧昏浜虹紪鍙�")
+ private String registrationCode;
+
+ /** 鐧昏浜哄鍚� */
+ @ApiModelProperty("鐧昏浜哄鍚�")
+ @Excel(name = "鐧昏浜哄鍚�")
+ private String registrationName;
+
+ /** 鐧昏鏃堕棿 */
+ @ApiModelProperty("鐧昏鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鐧昏鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date registrationTime;
+
+ /** 棰勮鏃堕棿 */
+ @ApiModelProperty("棰勮鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "棰勮鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date estimatedtime;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitness.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitness.java
index b5934f5..c45ab2f 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitness.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitness.java
@@ -57,38 +57,38 @@
private String gainhospitalname;
/**
- * 姝讳骸鏃堕棿
+ * 姝讳骸鏃堕棿锛堝仠鐢級
*/
- @ApiModelProperty("姝讳骸鏃堕棿")
+ @ApiModelProperty("姝讳骸鏃堕棿锛堝仠鐢級")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "姝讳骸鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date deathtime;
/**
- * 姝讳骸鍘熷洜
+ * 姝讳骸鍘熷洜锛堝仠鐢級
*/
- @ApiModelProperty("姝讳骸鍘熷洜")
- @Excel(name = "姝讳骸鍘熷洜")
+ @ApiModelProperty("姝讳骸鍘熷洜锛堝仠鐢級")
+ @Excel(name = "姝讳骸鍘熷洜锛堝仠鐢級")
private String deathreason;
/**
- * 姝讳骸鍒ゅ畾鍖荤敓涓�
+ * 姝讳骸鍒ゅ畾鍖荤敓涓�锛堝仠鐢級
*/
- @ApiModelProperty("姝讳骸鍒ゅ畾鍖荤敓涓�")
- @Excel(name = "姝讳骸鍒ゅ畾鍖荤敓涓�")
+ @ApiModelProperty("姝讳骸鍒ゅ畾鍖荤敓涓�锛堝仠鐢級")
+ @Excel(name = "姝讳骸鍒ゅ畾鍖荤敓涓�锛堝仠鐢級")
private String deathjudgedocto;
/**
* 姝讳骸鍒ゅ畾鍖荤敓浜�
*/
- @ApiModelProperty("姝讳骸鍒ゅ畾鍖荤敓浜�")
- @Excel(name = "姝讳骸鍒ゅ畾鍖荤敓浜�")
+ @ApiModelProperty("姝讳骸鍒ゅ畾鍖荤敓浜岋紙鍋滅敤锛�")
+ @Excel(name = "姝讳骸鍒ゅ畾鍖荤敓浜岋紙鍋滅敤锛�")
private String deathjudgedoctt;
/**
- * 姝讳骸璇佹槑闄勪欢璺緞
+ * 姝讳骸璇佹槑闄勪欢璺緞锛堝仠鐢級
*/
- @ApiModelProperty("姝讳骸璇佹槑闄勪欢璺緞")
+ @ApiModelProperty("姝讳骸璇佹槑闄勪欢璺緞锛堝仠鐢級")
private String deathjudgeannex;
/**
@@ -115,23 +115,23 @@
private String operationdoctor;
/**
- * 鏄惁榛樺搥缂呮��浠紡
+ * 鏄惁榛樺搥缂呮��浠紡锛堝仠鐢級
*/
- @ApiModelProperty("鏄惁榛樺搥缂呮��浠紡")
- @Excel(name = "鏄惁榛樺搥缂呮��浠紡")
+ @ApiModelProperty("鏄惁榛樺搥缂呮��浠紡锛堝仠鐢級")
+ @Excel(name = "鏄惁榛樺搥缂呮��浠紡锛堝仠鐢級")
private Integer isspendremember;
/**
* 鏄惁鎭㈠閬椾綋浠
*/
- @ApiModelProperty("鏄惁鎭㈠閬椾綋浠")
- @Excel(name = "鏄惁鎭㈠閬椾綋浠")
+ @ApiModelProperty("鏄惁鎭㈠閬椾綋浠锛堝仠鐢級")
+ @Excel(name = "鏄惁鎭㈠閬椾綋浠锛堝仠鐢級")
private Integer isrestoreremains;
/**
- * 缂呮��浠紡闄勪欢璺緞
+ * 缂呮��浠紡闄勪欢璺緞锛堝仠鐢級
*/
- @ApiModelProperty("缂呮��浠紡闄勪欢璺緞")
+ @ApiModelProperty("缂呮��浠紡闄勪欢璺緞锛堝仠鐢級")
private String rememberannex;
/**
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceMedicalevaluation.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceMedicalevaluation.java
index 39097f6..e0726b9 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceMedicalevaluation.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceMedicalevaluation.java
@@ -161,7 +161,13 @@
* 璇勪及鐘舵�侊細 棣栨锛�1.璇勪及閫氳繃 2璇勪及涓嶉�氳繃 鏈�缁堬細3.璇勪及閫氳繃 4璇勪及涓嶉�氳繃
*/
@ApiModelProperty("璇勪及鐘舵�侊細 棣栨锛�1.璇勪及閫氳繃 2璇勪及涓嶉�氳繃 鏈�缁堬細3.璇勪及閫氳繃 4璇勪及涓嶉�氳繃")
- private String assessState;
+ private String firstAssessState;
+
+ /**
+ * 璇勪及鐘舵�侊細 棣栨锛�1.璇勪及閫氳繃 2璇勪及涓嶉�氳繃 鏈�缁堬細3.璇勪及閫氳繃 4璇勪及涓嶉�氳繃
+ */
+ @ApiModelProperty("璇勪及鐘舵�侊細 棣栨锛�1.璇勪及閫氳繃 2璇勪及涓嶉�氳繃 鏈�缁堬細3.璇勪及閫氳繃 4璇勪及涓嶉�氳繃")
+ private String secondAssessState;
/**
@@ -179,7 +185,6 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "浜屾璇勪及鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date assessSecondTime;
-
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceOrganallocation.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceOrganallocation.java
index f489ea9..c398318 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceOrganallocation.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceOrganallocation.java
@@ -20,7 +20,7 @@
* @date 2021-11-10
*/
@Data
-@ApiModel("鍣ㄥ畼鍒嗛厤")
+@ApiModel("鍣ㄥ畼鍒嗛厤锛堝仠鐢級")
public class ServiceOrganallocation extends BaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
index 445c868..79760af 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.domain;
import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -18,180 +19,256 @@
*/
@Data
@ApiModel("鎹愮尞浜插睘纭")
-public class ServiceRelativesconfirmation extends BaseEntity
-{
+public class ServiceRelativesconfirmation extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
@TableId(type = IdType.AUTO)
private Long id;
- /** 鍏宠仈service_donatebaseinfo琛ㄧ殑ID */
+ /**
+ * 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
+ */
@ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
private Long infoid;
- /** 鎹愮尞鑰呯紪鍙� */
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
@ApiModelProperty("鎹愮尞鑰呯紪鍙�")
@Excel(name = "鎹愮尞鑰呯紪鍙�")
private String donorno;
- /** 濮撳悕 */
+ /**
+ * 濮撳悕
+ */
@ApiModelProperty("濮撳悕")
@Excel(name = "濮撳悕")
private String name;
- /** 璇佷欢绫诲瀷 */
+ /**
+ * 璇佷欢绫诲瀷
+ */
@ApiModelProperty("璇佷欢绫诲瀷")
private Long idcardtype;
- /** 璇佷欢鍙风爜 */
+ /**
+ * 璇佷欢鍙风爜
+ */
@ApiModelProperty("璇佷欢鍙风爜")
@Excel(name = "璇佷欢鍙风爜")
private String idcardno;
- /** 鑱旂郴鐢佃瘽 */
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
@ApiModelProperty("鑱旂郴鐢佃瘽")
@Excel(name = "鑱旂郴鐢佃瘽")
private String phone;
- /** 鐜颁綇鍦板潃 */
+ /**
+ * 鐜颁綇鍦板潃
+ */
@ApiModelProperty("鐜颁綇鍦板潃")
@Excel(name = "鐜颁綇鍦板潃")
private String residenceaddress;
- /** 鐜颁綇鍦板潃鐪佷唬鐮� */
+ /**
+ * 鐜颁綇鍦板潃鐪佷唬鐮�
+ */
@ApiModelProperty("鐜颁綇鍦板潃鐪佷唬鐮�")
private String residenceprovince;
- /** 鐜颁綇鍦板潃鐪佸悕绉� */
+ /**
+ * 鐜颁綇鍦板潃鐪佸悕绉�
+ */
@ApiModelProperty("鐜颁綇鍦板潃鐪佸悕绉�")
@Excel(name = "鐜颁綇鍦板潃鐪佸悕绉�")
private String residenceprovincename;
- /** 甯傜紪鍙� */
+ /**
+ * 甯傜紪鍙�
+ */
@ApiModelProperty("甯傜紪鍙�")
private String residencecity;
- /** 甯傚悕绉� */
+ /**
+ * 甯傚悕绉�
+ */
@ApiModelProperty("甯傚悕绉�")
private String residencecityname;
- /** 鎵�灞炶閬擄紙闀囷級鏍规嵁琛屾斂鍖哄垝琛� */
+ /**
+ * 鎵�灞炶閬擄紙闀囷級鏍规嵁琛屾斂鍖哄垝琛�
+ */
@ApiModelProperty("鎵�灞炶閬擄紙闀囷級鏍规嵁琛屾斂鍖哄垝琛�")
private String residencetown;
- /** 鎵�灞炶閬擄紙闀囷級鍚嶇О */
+ /**
+ * 鎵�灞炶閬擄紙闀囷級鍚嶇О
+ */
@ApiModelProperty("鎵�灞炶閬擄紙闀囷級鍚嶇О")
private String residencetownname;
- /** 绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛� */
+ /**
+ * 绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�
+ */
@ApiModelProperty("绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
private String residencecommunity;
- /** 绀惧尯锛堟潙锛夊悕绉� */
+ /**
+ * 绀惧尯锛堟潙锛夊悕绉�
+ */
@ApiModelProperty("绀惧尯锛堟潙锛夊悕绉�")
private String residencecommunityname;
- /** 鎵�灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛� */
+ /**
+ * 鎵�灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�
+ */
@ApiModelProperty("鎵�灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
private String residencecountycode;
- /** 鎵�灞炲尯鍩熷悕绉� */
+ /**
+ * 鎵�灞炲尯鍩熷悕绉�
+ */
@ApiModelProperty("鎵�灞炲尯鍩熷悕绉�")
private String residencecountyname;
- /** 浜插睘鍏崇郴,澶氶�� ;鍙烽殧寮� 鏍规嵁瀛楀吀sys_KinshipConfirm */
+ /**
+ * 浜插睘鍏崇郴,澶氶�� ;鍙烽殧寮� 鏍规嵁瀛楀吀sys_KinshipConfirm
+ */
@ApiModelProperty("浜插睘鍏崇郴,澶氶�� ;鍙烽殧寮� 鏍规嵁瀛楀吀sys_KinshipConfirm")
@Excel(name = "浜插睘鍏崇郴,澶氶�� ;鍙烽殧寮� 鏍规嵁瀛楀吀sys_KinshipConfirm")
private String kinship;
- /** 瀛愬コ鏁伴噺 */
+ /**
+ * 瀛愬コ鏁伴噺
+ */
@ApiModelProperty("瀛愬コ鏁伴噺")
private Long kinshipChildrennum;
- /** 涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation */
+ /**
+ * 涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation
+ */
@ApiModelProperty("涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation")
private String signfamilyrelations;
- /** 浜插睘鍏崇郴纭绛惧瓧 */
+ /**
+ * 浜插睘鍏崇郴纭绛惧瓧
+ */
@ApiModelProperty("浜插睘鍏崇郴纭绛惧瓧")
private String kinshipconfirmationsign;
- /** 鎹愮尞鍐冲畾 */
+ /**
+ * 鎹愮尞鍐冲畾
+ */
@ApiModelProperty("鎹愮尞鍐冲畾")
@Excel(name = "鎹愮尞鍐冲畾")
private String organdecision;
- /** 鍏朵粬 */
+ /**
+ * 鍏朵粬
+ */
@ApiModelProperty("鍏朵粬")
private String organdecisionOther;
- /** 浜插睘纭绛惧瓧 */
+ /**
+ * 浜插睘纭绛惧瓧
+ */
@ApiModelProperty("浜插睘纭绛惧瓧")
private String relativeconfirmationsign;
- /** 涓庢崘璧犺�呭叧绯� */
+ /**
+ * 涓庢崘璧犺�呭叧绯�
+ */
@ApiModelProperty("涓庢崘璧犺�呭叧绯�")
private String familyrelations;
- /** 鑾峰彇缁勭粐缂栧彿 */
+ /**
+ * 鑾峰彇缁勭粐缂栧彿
+ */
@ApiModelProperty("鑾峰彇缁勭粐缂栧彿")
private String acquisitiontissueno;
- /** 鑾峰彇缁勭粐鍚嶇О */
+ /**
+ * 鑾峰彇缁勭粐鍚嶇О
+ */
@ApiModelProperty("鑾峰彇缁勭粐鍚嶇О")
private String acquisitiontissuename;
- /** 璐熻矗浜虹紪鍙� */
+ /**
+ * 璐熻矗浜虹紪鍙�
+ */
@ApiModelProperty("璐熻矗浜虹紪鍙�")
private String responsibleuserid;
- /** 璐熻矗浜哄鍚� */
+ /**
+ * 璐熻矗浜哄鍚�
+ */
@ApiModelProperty("璐熻矗浜哄鍚�")
@Excel(name = "璐熻矗浜哄鍚�")
private String responsibleusername;
- /** 鍗忚皟鍛樼瀛�1 */
+ /**
+ * 鍗忚皟鍛樼瀛�1
+ */
@ApiModelProperty("鍗忚皟鍛樼瀛�1")
@Excel(name = "鍗忚皟鍛樼瀛�1")
private String coordinateduserido;
- /** 鑱旂粶浜轰竴濮撳悕 */
+ /**
+ * 鑱旂粶浜轰竴濮撳悕
+ */
@ApiModelProperty("鑱旂粶浜轰竴濮撳悕")
private String coordinatedusernameo;
- /** 鍗忚皟鍛樼瀛�2 */
+ /**
+ * 鍗忚皟鍛樼瀛�2
+ */
@ApiModelProperty("鍗忚皟鍛樼瀛�2")
@Excel(name = "鍗忚皟鍛樼瀛�2")
private String coordinateduseridt;
- /** 鑱旂粶浜轰簩濮撳悕 */
+ /**
+ * 鑱旂粶浜轰簩濮撳悕
+ */
@ApiModelProperty("鑱旂粶浜轰簩濮撳悕")
private String coordinatedusernamet;
- /** 涓撹亴浜哄憳缂栧彿 */
+ /**
+ * 涓撹亴浜哄憳缂栧彿
+ */
@ApiModelProperty("涓撹亴浜哄憳缂栧彿")
private String operatorno;
- /** 涓撹亴浜哄憳濮撳悕 */
+ /**
+ * 涓撹亴浜哄憳濮撳悕
+ */
@ApiModelProperty("涓撹亴浜哄憳濮撳悕")
private String operatorname;
- /** 绛剧讲鏃ユ湡 */
+ /**
+ * 绛剧讲鏃ユ湡
+ */
@ApiModelProperty("绛剧讲鏃ユ湡")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "绛剧讲鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date signdate;
- /** 姘戞棌 */
+ /**
+ * 姘戞棌
+ */
@ApiModelProperty("姘戞棌")
private String nation;
-
- /** 瀛﹀巻 */
+ /**
+ * 瀛﹀巻
+ */
@ApiModelProperty("瀛﹀巻")
private String education;
@@ -200,5 +277,17 @@
*/
@ApiModelProperty("鑱屼笟")
private String occupation;
+
+ /**
+ * 闄勪欢
+ */
+ @ApiModelProperty("闄勪欢")
+ private String assessannex;
+
+ /**
+ * 瀹跺睘鎰忚澶囨敞
+ */
+ @ApiModelProperty("瀹跺睘鎰忚澶囨敞")
+ private String relativeRemark;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DeathBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DeathBaseInfoDTO.java
new file mode 100644
index 0000000..6e72cc3
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DeathBaseInfoDTO.java
@@ -0,0 +1,188 @@
+package com.ruoyi.project.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鎮ｈ�呮浜′俊鎭璞� service_deathinfo
+ *
+ * @author ls
+ * @date 2026-01-20
+ */
+@Data
+@ApiModel("鎮ｈ�呮浜′俊鎭搷搴斿璞�")
+public class DeathBaseInfoDTO extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * baseInfo鐨処D
+ */
+ @ApiModelProperty("baseInfo鐨処D")
+ private Long infoid;
+
+
+ /**
+ * 璁板綍鐘舵��
+ */
+ @ApiModelProperty("璁板綍鐘舵��")
+ @Excel(name = "璁板綍鐘舵��")
+ private String recordstate;
+
+
+ /**
+ * 妗堜緥缂栧彿
+ */
+ @ApiModelProperty("妗堜緥缂栧彿")
+ @Excel(name = "妗堜緥缂栧彿")
+ private String caseNo;
+
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ @Excel(name = "鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ private String treatmenthospitalname;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�")
+ private String treatmenthospitalno;
+
+ /**
+ * 鎬у埆
+ */
+ @ApiModelProperty("鎬у埆")
+ private String sex;
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕")
+ private String name;
+
+ /**
+ * 浣忛櫌鍙�
+ */
+ @ApiModelProperty("浣忛櫌鍙�")
+ @Excel(name = "浣忛櫌鍙�")
+ private String inpatientno;
+
+ /**
+ * 骞撮緞
+ */
+// @TableField(exist = false)
+ @ApiModelProperty("骞撮緞")
+ private Long age;
+
+
+ /**
+ * 琛�鍨�
+ */
+ @ApiModelProperty("琛�鍨� ")
+ private String bloodtype;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ private String idcardno;
+
+ /**
+ * 鐤剧梾璇婃柇鍚嶇О
+ */
+ @ApiModelProperty("鐤剧梾璇婃柇鍚嶇О")
+ @Excel(name = "鐤剧梾璇婃柇鍚嶇О")
+ private String diagnosisname;
+
+
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
+ @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
+ @Excel(name = "鎹愮尞鑰呯紪鍙�")
+ private String donorno;
+
+ /**
+ * 鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�
+ */
+ @ApiModelProperty("鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�")
+ @Excel(name = "鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�")
+ private String gainhospitalno;
+
+ /**
+ * 鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�
+ */
+ @ApiModelProperty("鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�")
+ @Excel(name = "鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�")
+ private String gainhospitalname;
+
+ /**
+ * 姝讳骸鏃堕棿
+ */
+ @ApiModelProperty("姝讳骸鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "姝讳骸鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date deathtime;
+
+ /**
+ * 姝讳骸鍘熷洜
+ */
+ @ApiModelProperty("姝讳骸鍘熷洜")
+ @Excel(name = "姝讳骸鍘熷洜")
+ private String deathreason;
+
+ /**
+ * 姝讳骸鍒ゅ畾鍖荤敓涓�
+ */
+ @ApiModelProperty("姝讳骸鍒ゅ畾鍖荤敓涓�")
+ @Excel(name = "姝讳骸鍒ゅ畾鍖荤敓涓�")
+ private String deathjudgedocto;
+
+ /**
+ * 姝讳骸鍒ゅ畾鍖荤敓浜�
+ */
+ @ApiModelProperty("姝讳骸鍒ゅ畾鍖荤敓浜�")
+ @Excel(name = "姝讳骸鍒ゅ畾鍖荤敓浜�")
+ private String deathjudgedoctt;
+
+
+ /**
+ * 鏄惁榛樺搥缂呮��浠紡 0锛氬惁锛�1锛氭槸
+ */
+ @ApiModelProperty("鏄惁榛樺搥缂呮��浠紡 0锛氬惁锛�1锛氭槸")
+ @Excel(name = "鏄惁榛樺搥缂呮��浠紡 0锛氬惁锛�1锛氭槸")
+ private Integer isspendremember;
+
+ /**
+ * 鏄惁鎭㈠閬椾綋浠 0锛氬惁锛�1锛氭槸
+ */
+ @ApiModelProperty("鏄惁鎭㈠閬椾綋浠 0锛氬惁锛�1锛氭槸")
+ @Excel(name = "鏄惁鎭㈠閬椾綋浠 0锛氬惁锛�1锛氭槸")
+ private Integer isrestoreremains;
+
+
+ /**
+ * 璐熻矗浜虹紪鍙�
+ */
+ @ApiModelProperty("璐熻矗浜虹紪鍙�")
+ @Excel(name = "璐熻矗浜虹紪鍙�")
+ private String responsibleuserid;
+
+ /**
+ * 璐熻矗浜哄鍚�
+ */
+ @ApiModelProperty("璐熻矗浜哄鍚�")
+ @Excel(name = "璐熻矗浜哄鍚�")
+ private String responsibleusername;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonatebaseinfoProgressDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonatebaseinfoProgressDTO.java
new file mode 100644
index 0000000..e0a748a
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonatebaseinfoProgressDTO.java
@@ -0,0 +1,196 @@
+package com.ruoyi.project.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鎹愮尞鍩虹瀵硅薄 service_donatebaseinfo
+ *
+ * @author ruoyi
+ * @date 2021-11-15
+ */
+@Data
+@ApiModel("鎹愮尞杩涘害鍩虹淇℃伅")
+public class DonatebaseinfoProgressDTO extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 娌荤枟鍖婚櫌
+ */
+ @ApiModelProperty("娌荤枟鍖婚櫌")
+ private String treatmenthospitalno;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋�")
+ @Excel(name = "鎵�鍦ㄥ尰鐤楁満鏋�")
+ private String treatmenthospitalname;
+
+
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
+ @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
+ private String donorno;
+
+ /**
+ * 妗堜緥缂栧彿
+ */
+ @ApiModelProperty("妗堜緥缂栧彿")
+ @Excel(name = "妗堜緥缂栧彿")
+ private String caseNo;
+
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕")
+ private String name;
+
+ /**
+ * 鎬у埆
+ */
+ @ApiModelProperty("鎬у埆")
+ private String sex;
+
+ /**
+ * 璁板綍鐘舵��
+ */
+ @ApiModelProperty("璁板綍鐘舵��")
+ @Excel(name = "璁板綍鐘舵��")
+ private String recordstate;
+
+ /**
+ * 骞撮緞
+ */
+ @ApiModelProperty("骞撮緞")
+ private Long age;
+
+ /**
+ * 骞撮緞鍗曚綅
+ */
+ @ApiModelProperty("骞撮緞鍗曚綅")
+ private String ageunit;
+
+ /**
+ * 琛�鍨�
+ */
+ @ApiModelProperty("琛�鍨� ")
+ private String bloodtype;
+
+ /**
+ * 鎶ュ憡鏃堕棿
+ */
+ @ApiModelProperty("鎶ュ憡鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鎶ュ憡鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date reporttime;
+
+ /**
+ * 鐤剧梾璇婃柇鍚嶇О
+ */
+ @ApiModelProperty("鐤剧梾璇婃柇鍚嶇О")
+ private String diagnosisname;
+
+ /**
+ * 鍗忚皟鍛樼紪鍙�
+ */
+ @ApiModelProperty("鍗忚皟鍛樼紪鍙�")
+ @Excel(name = "鍗忚皟鍛樼紪鍙�", readConverterExp = "鍗忚皟鍛樼紪鍙�")
+ private String coordinatorNo;
+
+ /**
+ * 鍗忚皟鍛樺鍚�
+ */
+ @ApiModelProperty("鍗忚皟鍛樺鍚�")
+ @Excel(name = "鍗忚皟鍛樺鍚�", readConverterExp = "鍗忚皟鍛樺鍚�")
+ private String coordinatorName;
+
+
+ /**
+ * 绗竴娆¤瘎浼版椂闂�
+ */
+ @ApiModelProperty("绗竴娆¤瘎浼版椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "绗竴娆¤瘎浼版椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date assessFirstTime;
+
+ /**
+ * 绗簩娆¤瘎浼版椂闂�
+ */
+ @ApiModelProperty("绗簩娆¤瘎浼版椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "绗簩娆¤瘎浼版椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date assessSecondTime;
+
+ /**
+ * 绗竴娆¤瘎浼扮粨璁�
+ */
+ @ApiModelProperty("绗竴娆¤瘎浼扮粨璁�")
+ private String firstAssessState;
+
+ /**
+ * 绗簩娆¤瘎浼扮粨璁�
+ */
+ @ApiModelProperty("绗簩娆¤瘎浼扮粨璁�")
+ private String secondAssessState;
+
+ /**
+ * 浜插睘纭鏃堕棿
+ */
+ @ApiModelProperty("浜插睘纭鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "浜插睘纭鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date signDate;
+
+ /**
+ * 浼︾悊瀹℃煡涓撳缁撹
+ */
+ @ApiModelProperty("浼︾悊瀹℃煡涓撳缁撹")
+ private String expertConclusion;
+
+ /**
+ * 浼︾悊瀹℃煡涓撳缁撹鏃堕棿
+ */
+ @ApiModelProperty("浼︾悊瀹℃煡涓撳缁撹鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "浼︾悊瀹℃煡涓撳缁撹鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date expertTime;
+
+ /**
+ * 鍣ㄥ畼鍒嗛厤鏁伴噺
+ */
+ @ApiModelProperty("鍣ㄥ畼鍒嗛厤鏁伴噺")
+ @Excel(name = "鍣ㄥ畼鍒嗛厤鏁伴噺", width = 30)
+ private Long organCount;
+
+ /**
+ * 鑾峰彇瑙佽瘉鏃堕棿
+ */
+ @ApiModelProperty("鑾峰彇瑙佽瘉鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鑾峰彇瑙佽瘉鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date operationBegTime;
+
+ /**
+ * 瀹屾垚鐧昏鏃堕棿
+ */
+ @ApiModelProperty("瀹屾垚鐧昏鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "瀹屾垚鐧昏鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date completeTime;
+
+ @ApiModelProperty("缁堟妗堜緥锛�0寮�鍚紝1缁堟 榛樿鍊硷細0")
+ @Excel(name = "缁堟妗堜緥")
+ private Integer terminationCase;
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonateorganBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonateorganBaseInfoDTO.java
new file mode 100644
index 0000000..41705cd
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonateorganBaseInfoDTO.java
@@ -0,0 +1,156 @@
+package com.ruoyi.project.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.project.domain.ServiceDonateorgan;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鍣ㄥ畼鍒嗛厤瀵硅薄 DonateorganBaseInfoVO
+ * 鍣ㄥ畼鍒嗛厤鍩烘湰淇℃伅璇锋眰瀵硅薄
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ApiModel("鍣ㄥ畼鍒嗛厤鍩烘湰淇℃伅璇锋眰瀵硅薄")
+public class DonateorganBaseInfoDTO extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+ /**
+ * baseInfo鐨処D
+ */
+ @ApiModelProperty("baseInfo鐨処D")
+ private Long infoid;
+
+ /**
+ * baseInfo鐨処D
+ */
+ @ApiModelProperty("baseInfo鐨処D")
+ private Long id;
+
+
+ /**
+ * 璁板綍鐘舵��
+ */
+ @ApiModelProperty("璁板綍鐘舵��")
+ @Excel(name = "璁板綍鐘舵��")
+ private String recordstate;
+
+
+ /**
+ * 妗堜緥缂栧彿
+ */
+ @ApiModelProperty("妗堜緥缂栧彿")
+ @Excel(name = "妗堜緥缂栧彿")
+ private String caseNo;
+
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
+ @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
+ @Excel(name = "鎹愮尞鑰呯紪鍙�")
+ private String donorno;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ @Excel(name = "鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ private String treatmenthospitalname;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�")
+ private String treatmenthospitalno;
+
+ /**
+ * 鎬у埆
+ */
+ @ApiModelProperty("鎬у埆")
+ private String sex;
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕")
+ private String name;
+
+ /**
+ * 骞撮緞
+ */
+// @TableField(exist = false)
+ @ApiModelProperty("骞撮緞")
+ private Long age;
+
+
+ /**
+ * 琛�鍨�
+ */
+ @ApiModelProperty("琛�鍨� ")
+ private String bloodtype;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ private String idcardno;
+
+ /**
+ * 鐤剧梾璇婃柇鍚嶇О
+ */
+ @ApiModelProperty("鐤剧梾璇婃柇鍚嶇О")
+ @Excel(name = "鐤剧梾璇婃柇鍚嶇О")
+ private String diagnosisname;
+
+ /**
+ * 鍒嗛厤鐘舵�侊細0:鏈垎閰嶏紱1锛氬凡鍒嗛厤锛�2浣滃簾
+ */
+ @ApiModelProperty("鍒嗛厤鐘舵�侊細0:鏈垎閰嶏紱1锛氬凡鍒嗛厤锛�2浣滃簾")
+ @Excel(name = "鍒嗛厤鐘舵�侊細0:鏈垎閰嶏紱1锛氬凡鍒嗛厤锛�2浣滃簾")
+ private Long allocationStatus;
+
+ /**
+ * 鍒嗛厤鏃堕棿
+ */
+ @ApiModelProperty("鍒嗛厤鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍒嗛厤鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date allocationTime;
+
+ /**
+ * 鐧昏浜虹紪鍙�
+ */
+ @ApiModelProperty("鐧昏浜虹紪鍙�")
+ @Excel(name = "鐧昏浜虹紪鍙�")
+ private String registrationCode;
+
+ /**
+ * 鐧昏浜哄鍚�
+ */
+ @ApiModelProperty("鐧昏浜哄鍚�")
+ @Excel(name = "鐧昏浜哄鍚�")
+ private String registrationName;
+
+ /**
+ * 鐧昏鏃堕棿
+ */
+ @ApiModelProperty("鐧昏鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鐧昏鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date registrationTime;
+
+ /**
+ * 鎹愮尞鍣ㄥ畼绠＄悊鍒楄〃
+ */
+ @ApiModelProperty("鎹愮尞澶氫釜鍣ㄥ畼璇︽儏绠＄悊鍒楄〃")
+ private List<ServiceDonateorgan> serviceDonateorganList;
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationCompletionBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationCompletionBaseInfoDTO.java
new file mode 100644
index 0000000..374427c
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationCompletionBaseInfoDTO.java
@@ -0,0 +1,122 @@
+package com.ruoyi.project.domain.dto;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("鍣ㄥ畼鎹愮尞瀹屾垚鍩烘湰淇℃伅鍝嶅簲瀵硅薄锛堝櫒瀹樺埄鐢ㄥ搷搴斿璞★級")
+public class DonationCompletionBaseInfoDTO {
+ /**
+ * baseInfo鐨処D
+ */
+ @ApiModelProperty("baseInfo鐨処D")
+ private Long infoid;
+
+ /**
+ * 璁板綍鐘舵��
+ */
+ @ApiModelProperty("璁板綍鐘舵��")
+ @Excel(name = "璁板綍鐘舵��")
+ private String recordstate;
+
+ /**
+ * 妗堜緥缂栧彿
+ */
+ @ApiModelProperty("妗堜緥缂栧彿")
+ @Excel(name = "妗堜緥缂栧彿")
+ private String caseNo;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ @Excel(name = "鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ private String treatmenthospitalname;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�")
+ private String treatmenthospitalno;
+
+ /**
+ * 鎬у埆
+ */
+ @ApiModelProperty("鎬у埆")
+ private String sex;
+
+ /**
+ * 浣忛櫌鍙�
+ */
+ @ApiModelProperty("浣忛櫌鍙�")
+ private String inpatientno;
+
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
+ @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
+ @Excel(name = "鎹愮尞鑰呯紪鍙�")
+ private String donorno;
+
+
+ /**
+ * 鎹愮尞鑰呭鍚�
+ */
+ @ApiModelProperty("鎹愮尞鑰呭鍚�")
+ @Excel(name = "鎹愮尞鑰呭鍚�")
+ private String name;
+ /**
+ * 骞撮緞
+ */
+// @TableField(exist = false)
+ @ApiModelProperty("骞撮緞")
+ private Long age;
+
+
+ /**
+ * 琛�鍨�
+ */
+ @ApiModelProperty("琛�鍨� ")
+ private String bloodtype;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ private String idcardno;
+
+ /**
+ * 鐤剧梾璇婃柇鍚嶇О
+ */
+ @ApiModelProperty("鐤剧梾璇婃柇鍚嶇О")
+ @Excel(name = "鐤剧梾璇婃柇鍚嶇О")
+ private String diagnosisname;
+
+ /**
+ * 瀹屾垚鏃堕棿
+ */
+ @ApiModelProperty("瀹屾垚鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "瀹屾垚鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date completetime;
+
+ /**
+ * 璐熻矗浜虹紪鍙�
+ */
+ @ApiModelProperty("璐熻矗浜虹紪鍙�")
+ private String responsibleuserid;
+
+ /**
+ * 璐熻矗浜哄鍚�
+ */
+ @ApiModelProperty("璐熻矗浜哄鍚�")
+ @Excel(name = "璐熻矗浜哄鍚�")
+ private String responsibleusername;
+
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationwitnessBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationwitnessBaseInfoDTO.java
new file mode 100644
index 0000000..be21003
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationwitnessBaseInfoDTO.java
@@ -0,0 +1,368 @@
+package com.ruoyi.project.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.project.domain.ServiceDonationwitnessorgan;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鎹愮尞瑙佽瘉鍩烘湰淇℃伅璇锋眰瀵硅薄
+ *
+ * @author ruoyi
+ * @date 2026-01-20
+ */
+@Data
+@ApiModel("鎹愮尞瑙佽瘉鍩烘湰淇℃伅鍝嶅簲瀵硅薄")
+public class DonationwitnessBaseInfoDTO extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+ /**
+ * $column.columnComment
+ */
+ @ApiModelProperty("鎹愮尞瑙佽瘉鐨刬d")
+ private Long id;
+
+ /**
+ *
+ */
+ @ApiModelProperty("baseInfo鐨刬d")
+ private Long infoid;
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕")
+ private String name;
+
+ /**
+ * 璁板綍鐘舵��
+ */
+ @ApiModelProperty("璁板綍鐘舵��")
+ @Excel(name = "璁板綍鐘舵��")
+ private String recordstate;
+
+
+ /**
+ * 妗堜緥缂栧彿
+ */
+ @ApiModelProperty("妗堜緥缂栧彿")
+ @Excel(name = "妗堜緥缂栧彿")
+ private String caseNo;
+
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
+ @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
+ @Excel(name = "鎹愮尞鑰呯紪鍙�")
+ private String donorno;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ @Excel(name = "鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ private String treatmenthospitalname;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�")
+ private String treatmenthospitalno;
+
+ /**
+ * 鎬у埆
+ */
+ @ApiModelProperty("鎬у埆")
+ private String sex;
+
+ /**
+ * 骞撮緞
+ */
+// @TableField(exist = false)
+ @ApiModelProperty("骞撮緞")
+ private Long age;
+
+
+ /**
+ * 琛�鍨�
+ */
+ @ApiModelProperty("琛�鍨� ")
+ private String bloodtype;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ private String idcardno;
+
+ /**
+ * 鐤剧梾璇婃柇鍚嶇О
+ */
+ @ApiModelProperty("鐤剧梾璇婃柇鍚嶇О")
+ @Excel(name = "鐤剧梾璇婃柇鍚嶇О")
+ private String diagnosisname;
+
+ /**
+ * 鍗忚皟鍛樺鍚�
+ */
+ @ApiModelProperty("鍗忚皟鍛樺鍚�")
+ @Excel(name = "鍗忚皟鍛樺鍚�", readConverterExp = "鍗忚皟鍛樺鍚�")
+ private String coordinatorName;
+
+ /**
+ * 鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿
+ */
+ @ApiModelProperty("鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿")
+ private String gainhospitalno;
+
+ /**
+ * 鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О
+ */
+ @ApiModelProperty("鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О")
+ @Excel(name = "鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О")
+ private String gainhospitalname;
+
+ /**
+ * 姝讳骸鏃堕棿锛堝仠鐢級
+ */
+ @ApiModelProperty("姝讳骸鏃堕棿锛堝仠鐢級")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "姝讳骸鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date deathtime;
+
+ /**
+ * 姝讳骸鍘熷洜锛堝仠鐢級
+ */
+ @ApiModelProperty("姝讳骸鍘熷洜锛堝仠鐢級")
+ @Excel(name = "姝讳骸鍘熷洜锛堝仠鐢級")
+ private String deathreason;
+
+ /**
+ * 姝讳骸鍒ゅ畾鍖荤敓涓�锛堝仠鐢級
+ */
+ @ApiModelProperty("姝讳骸鍒ゅ畾鍖荤敓涓�锛堝仠鐢級")
+ @Excel(name = "姝讳骸鍒ゅ畾鍖荤敓涓�锛堝仠鐢級")
+ private String deathjudgedocto;
+
+ /**
+ * 姝讳骸鍒ゅ畾鍖荤敓浜�
+ */
+ @ApiModelProperty("姝讳骸鍒ゅ畾鍖荤敓浜岋紙鍋滅敤锛�")
+ @Excel(name = "姝讳骸鍒ゅ畾鍖荤敓浜岋紙鍋滅敤锛�")
+ private String deathjudgedoctt;
+
+ /**
+ * 姝讳骸璇佹槑闄勪欢璺緞锛堝仠鐢級
+ */
+ @ApiModelProperty("姝讳骸璇佹槑闄勪欢璺緞锛堝仠鐢級")
+ private String deathjudgeannex;
+
+ /**
+ * 鎵嬫湳寮�濮嬫椂闂�
+ */
+ @ApiModelProperty("鎵嬫湳寮�濮嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "鎵嬫湳寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date operationbegtime;
+
+ /**
+ * 鎵嬫湳缁撴潫鏃堕棿
+ */
+ @ApiModelProperty("鎵嬫湳缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "鎵嬫湳缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date operationendtime;
+
+ /**
+ * 鎵嬫湳鍖荤敓
+ */
+ @ApiModelProperty("鎵嬫湳鍖荤敓")
+ @Excel(name = "鎵嬫湳鍖荤敓")
+ private String operationdoctor;
+
+ /**
+ * 鏄惁榛樺搥缂呮��浠紡锛堝仠鐢級
+ */
+ @ApiModelProperty("鏄惁榛樺搥缂呮��浠紡锛堝仠鐢級")
+ @Excel(name = "鏄惁榛樺搥缂呮��浠紡锛堝仠鐢級")
+ private Integer isspendremember;
+
+ /**
+ * 鏄惁鎭㈠閬椾綋浠
+ */
+ @ApiModelProperty("鏄惁鎭㈠閬椾綋浠锛堝仠鐢級")
+ @Excel(name = "鏄惁鎭㈠閬椾綋浠锛堝仠鐢級")
+ private Integer isrestoreremains;
+
+ /**
+ * 缂呮��浠紡闄勪欢璺緞锛堝仠鐢級
+ */
+ @ApiModelProperty("缂呮��浠紡闄勪欢璺緞锛堝仠鐢級")
+ private String rememberannex;
+
+ /**
+ * 璐熻矗浜虹紪鍙�
+ */
+ @ApiModelProperty("璐熻矗浜虹紪鍙�")
+ private String responsibleuserid;
+
+ /**
+ * 璐熻矗浜哄鍚�
+ */
+ @ApiModelProperty("璐熻矗浜哄鍚�")
+ @Excel(name = "璐熻矗浜哄鍚�")
+ private String responsibleusername;
+
+ /**
+ * 鑱旂粶浜轰竴缂栧彿
+ */
+ @ApiModelProperty("鑱旂粶浜轰竴缂栧彿")
+ private String coordinateduserido;
+
+ /**
+ * 鑱旂粶浜轰竴濮撳悕
+ */
+ @ApiModelProperty("鑱旂粶浜轰竴濮撳悕")
+ private String coordinatedusernameo;
+
+ /**
+ * 鑱旂粶浜轰簩缂栧彿
+ */
+ @ApiModelProperty("鑱旂粶浜轰簩缂栧彿")
+ private String coordinateduseridt;
+
+ /**
+ * 鑱旂粶浜轰簩濮撳悕
+ */
+ @ApiModelProperty("鑱旂粶浜轰簩濮撳悕")
+ private String coordinatedusernamet;
+
+ /**
+ * 鑵逛富鍔ㄨ剦鎻掔鏃堕棿
+ */
+ @ApiModelProperty("鑵逛富鍔ㄨ剦鎻掔鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "鑵逛富鍔ㄨ剦鎻掔鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date abdominalaortacannulatime;
+
+ /**
+ * 鑵逛富鍔ㄨ剦鐏屾敞鏃堕棿
+ */
+ @ApiModelProperty("鑵逛富鍔ㄨ剦鐏屾敞鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "鑵逛富鍔ㄨ剦鐏屾敞鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date abdominalaortaperfusiontime;
+
+ /**
+ * 闂ㄩ潤鑴夋彃绠℃椂闂�
+ */
+ @ApiModelProperty("闂ㄩ潤鑴夋彃绠℃椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "闂ㄩ潤鑴夋彃绠℃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date portalveincannulatime;
+
+ /**
+ * 闂ㄩ潤鑴夌亴娉ㄦ椂闂�
+ */
+ @ApiModelProperty("闂ㄩ潤鑴夌亴娉ㄦ椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "闂ㄩ潤鑴夌亴娉ㄦ椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date portalveinperfusiontime;
+
+ /**
+ * 鑲哄姩鑴夋彃绠℃椂闂�
+ */
+ @ApiModelProperty("鑲哄姩鑴夋彃绠℃椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "鑲哄姩鑴夋彃绠℃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date pulmonaryarterycannulatime;
+
+ /**
+ * 鑲哄姩鑴夌亴娉ㄦ椂闂�
+ */
+ @ApiModelProperty("鑲哄姩鑴夌亴娉ㄦ椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "鑲哄姩鑴夌亴娉ㄦ椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date pulmonaryarteryperfusiontime;
+
+ /**
+ * 涓诲姩鑴夋彃绠℃椂闂�
+ */
+ @ApiModelProperty("涓诲姩鑴夋彃绠℃椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "涓诲姩鑴夋彃绠℃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date aortacannulatime;
+
+ /**
+ * 涓诲姩鑴夌亴娉ㄦ椂闂�
+ */
+ @ApiModelProperty("涓诲姩鑴夌亴娉ㄦ椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "涓诲姩鑴夌亴娉ㄦ椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date aortaperfusiontime;
+
+ /**
+ * 鎹愮尞鍣ㄥ畼
+ */
+ @ApiModelProperty("鎹愮尞鍣ㄥ畼")
+ @Excel(name = "鎹愮尞鍣ㄥ畼")
+ private String organdonation;
+
+ /**
+ * 鎹愮尞鍣ㄥ畼 鍏朵粬
+ */
+ @ApiModelProperty("鎹愮尞鍣ㄥ畼 鍏朵粬")
+ @Excel(name = "鎹愮尞鍣ㄥ畼 鍏朵粬")
+ private String organdonationOther;
+
+
+ /**
+ * 鎹愮尞绫诲埆
+ */
+ @ApiModelProperty("鎹愮尞绫诲埆")
+ @Excel(name = "鎹愮尞绫诲埆")
+ private String donationcategory;
+
+ /**
+ * 鍗忚皟鍛樿繘鎵嬫湳瀹ゆ椂闂�
+ */
+ @ApiModelProperty("鍗忚皟鍛樿繘鎵嬫湳瀹ゆ椂闂�")
+ @Excel(name = "鍗忚皟鍛樿繘鎵嬫湳瀹ゆ椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date coordinatorInOperating;
+
+ /**
+ * 鍗忚皟鍛樺嚭鎵嬫湳瀹ゆ椂闂�
+ */
+ @ApiModelProperty("鍗忚皟鍛樺嚭鎵嬫湳瀹ゆ椂闂�")
+ @Excel(name = "鍗忚皟鍛樺嚭鎵嬫湳瀹ゆ椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date coordinatorOutOperating;
+
+ /**
+ * 鍗忚皟鍛樼瀛�
+ */
+ @ApiModelProperty("鍗忚皟鍛樼瀛�")
+ @Excel(name = "鍗忚皟鍛樼瀛�")
+ private String coordinatorSign;
+
+ /**
+ * 鍗忚皟鍛樼瀛楁椂闂�
+ */
+ @ApiModelProperty("鍗忚皟鍛樼瀛楁椂闂�")
+ @Excel(name = "鍗忚皟鍛樼瀛楁椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date coordinatorSignTime;
+
+ @ApiModelProperty("鍣ㄥ畼鍒楄〃闆嗗悎")
+ List<ServiceDonationwitnessorgan> serviceDonationwitnessorgans;
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MedicalevaluationBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MedicalevaluationBaseInfoDTO.java
new file mode 100644
index 0000000..20d1baa
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MedicalevaluationBaseInfoDTO.java
@@ -0,0 +1,154 @@
+package com.ruoyi.project.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.project.domain.ServiceMedicalevaluationorgan;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鍖诲璇勪及瀵硅薄 service_medicalevaluation
+ *
+ * @author ruoyi
+ * @date 2021-11-19
+ */
+@Data
+@ApiModel("鍖诲璇勪及鍩虹淇℃伅")
+public class MedicalevaluationBaseInfoDTO {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * $column.columnComment
+ */
+ @ApiModelProperty("鍖诲璇勪及鐨刬d")
+ private Long id;
+
+ /**
+ *
+ */
+ @ApiModelProperty("baseInfo鐨刬d")
+ private Long infoid;
+
+
+ /**
+ * 璁板綍鐘舵��
+ */
+ @ApiModelProperty("璁板綍鐘舵��")
+ @Excel(name = "璁板綍鐘舵��")
+ private String recordstate;
+
+
+ /**
+ * 妗堜緥缂栧彿
+ */
+ @ApiModelProperty("妗堜緥缂栧彿")
+ @Excel(name = "妗堜緥缂栧彿")
+ private String caseNo;
+
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
+ @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
+ @Excel(name = "鎹愮尞鑰呯紪鍙�")
+ private String donorno;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ @Excel(name = "鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ private String treatmenthospitalname;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�")
+ private String treatmenthospitalno;
+
+ /**
+ * 鎬у埆
+ */
+ @ApiModelProperty("鎬у埆")
+ private String sex;
+
+ /**
+ * 骞撮緞
+ */
+// @TableField(exist = false)
+ @ApiModelProperty("骞撮緞")
+ private Long age;
+
+
+ /**
+ * 琛�鍨�
+ */
+ @ApiModelProperty("琛�鍨� ")
+ private String bloodtype;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ private String idcardno;
+
+ /**
+ * 鐤剧梾璇婃柇鍚嶇О
+ */
+ @ApiModelProperty("鐤剧梾璇婃柇鍚嶇О")
+ @Excel(name = "鐤剧梾璇婃柇鍚嶇О")
+ private String diagnosisname;
+
+ /**
+ * 鍗忚皟鍛樺鍚�
+ */
+ @ApiModelProperty("鍗忚皟鍛樺鍚�")
+ @Excel(name = "鍗忚皟鍛樺鍚�", readConverterExp = "鍗忚皟鍛樺鍚�")
+ private String coordinatorName;
+
+
+ /**
+ * 棣栨璇勪及鏃堕棿
+ */
+ @ApiModelProperty("棣栨璇勪及鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "棣栨璇勪及鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date assessFirstTime;
+
+
+ /**
+ * 璇勪及鐘舵�侊細 棣栨锛�1.璇勪及閫氳繃 2璇勪及涓嶉�氳繃
+ */
+ @ApiModelProperty("璇勪及鐘舵�侊細 棣栨锛�1.璇勪及閫氳繃 2璇勪及涓嶉�氳繃 ")
+ private String firstAssessState;
+
+ /**
+ * 璇勪及鐘舵�侊細 棣栨锛�1.璇勪及閫氳繃 2璇勪及涓嶉�氳繃
+ */
+ @ApiModelProperty("璇勪及鐘舵�侊細 鍐嶆锛�1.璇勪及閫氳繃 2璇勪及涓嶉�氳繃")
+ private String secondAssessState;
+ /**
+ * 浜屾璇勪及鏃堕棿
+ */
+ @ApiModelProperty("浜屾璇勪及鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "浜屾璇勪及鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date assessSecondTime;
+
+ /**
+ * 璇勪及闄勪欢
+ */
+ @ApiModelProperty("璇勪及闄勪欢")
+ private String assessannex;
+
+ /**
+ * 鍣ㄥ畼璇勪及璇︽儏
+ */
+ @ApiModelProperty("鍣ㄥ畼璇勪及璇︽儏")
+ private ServiceMedicalevaluationorgan serviceMedicalevaluationorgan;
+
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java
new file mode 100644
index 0000000..2f1e5bd
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java
@@ -0,0 +1,176 @@
+package com.ruoyi.project.domain.dto;
+
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鍣ㄥ畼鎹愮尞瑙佽瘉鍩虹淇℃伅锛堟浜″垽瀹氾級鍝嶅簲淇℃伅
+ */
+@ApiModel("鍣ㄥ畼鎹愮尞纭鍩虹淇℃伅鍝嶅簲淇℃伅")
+@Data
+public class RelativeConfirmationBaseInfoDTO {
+
+ /**
+ * baseInfo鐨処D
+ */
+ @ApiModelProperty("baseInfo鐨処D")
+ private Long infoid;
+
+
+ /**
+ * 璁板綍鐘舵��
+ */
+ @ApiModelProperty("璁板綍鐘舵��")
+ @Excel(name = "璁板綍鐘舵��")
+ private String recordstate;
+
+
+ /**
+ * 妗堜緥缂栧彿
+ */
+ @ApiModelProperty("妗堜緥缂栧彿")
+ @Excel(name = "妗堜緥缂栧彿")
+ private String caseNo;
+
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
+ @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
+ @Excel(name = "鎹愮尞鑰呯紪鍙�")
+ private String donorno;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ @Excel(name = "鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ private String treatmenthospitalname;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�")
+ private String treatmenthospitalno;
+
+ /**
+ * 鎬у埆
+ */
+ @ApiModelProperty("鎬у埆")
+ private String sex;
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕")
+ private String name;
+
+ /**
+ * 骞撮緞
+ */
+// @TableField(exist = false)
+ @ApiModelProperty("骞撮緞")
+ private Long age;
+
+
+ /**
+ * 琛�鍨�
+ */
+ @ApiModelProperty("琛�鍨� ")
+ private String bloodtype;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ private String idcardno;
+
+ /**
+ * 鐤剧梾璇婃柇鍚嶇О
+ */
+ @ApiModelProperty("鐤剧梾璇婃柇鍚嶇О")
+ @Excel(name = "鐤剧梾璇婃柇鍚嶇О")
+ private String diagnosisname;
+
+ /**
+ * 鍗忚皟鍛樺鍚�
+ */
+ @ApiModelProperty("鍗忚皟鍛樺鍚�")
+ @Excel(name = "鍗忚皟鍛樺鍚�", readConverterExp = "鍗忚皟鍛樺鍚�")
+ private String CoordinatedUserIDO;
+
+ /**
+ * 浜插睘纭绛惧瓧
+ */
+ @ApiModelProperty("浜插睘纭绛惧瓧")
+ @Excel(name = "浜插睘纭绛惧瓧", readConverterExp = "浜插睘纭绛惧瓧")
+ private String relativeconfirmationsign;
+
+ /**
+ * 绛惧瓧鏃ユ湡
+ */
+ @ApiModelProperty("绛惧瓧鏃ユ湡")
+ @Excel(name = "绛惧瓧鏃ユ湡", readConverterExp = "绛惧瓧鏃ユ湡")
+ private Date signdate;
+
+ /**
+ * 璐熻矗浜哄鍚�
+ */
+ @ApiModelProperty("璐熻矗浜哄鍚�")
+ @Excel(name = "璐熻矗浜哄鍚�", readConverterExp = "璐熻矗浜哄鍚�")
+ private String responsibleusername;
+
+ /**
+ * 璐熻矗浜虹紪鍙�
+ */
+ @ApiModelProperty("璐熻矗浜虹紪鍙�")
+ private String responsibleuserid;
+
+ /**
+ * 鍗忚皟鍛樺鍚�2
+ */
+ @ApiModelProperty("鍗忚皟鍛樺鍚�2")
+ @Excel(name = "鍗忚皟鍛樺鍚�2", readConverterExp = "鍗忚皟鍛樺鍚�2")
+ private String coordinatedusernamet;
+
+ /**
+ * 鍗忚皟鍛樼紪鍙�2
+ */
+ @ApiModelProperty("鍗忚皟鍛樼紪鍙�2")
+ @Excel(name = "鍗忚皟鍛樼紪鍙�2", readConverterExp = "鍗忚皟鍛樼紪鍙�2")
+ private String coordinateduseridt;
+
+ /**
+ * 鍗忚皟鍛樺鍚�1
+ */
+ @ApiModelProperty("鍗忚皟鍛樺鍚�1")
+ @Excel(name = "鍗忚皟鍛樺鍚�1", readConverterExp = "鍗忚皟鍛樺鍚�1")
+ private String coordinatedusernameo;
+
+ /**
+ * 鍗忚皟鍛樼紪鍙�1
+ */
+ @ApiModelProperty("鍗忚皟鍛樼紪鍙�1")
+ @Excel(name = "鍗忚皟鍛樼紪鍙�1", readConverterExp = "鍗忚皟鍛樼紪鍙�1")
+ private String coordinateduserido;
+
+ /**
+ * 璇勪及闄勪欢
+ */
+ @ApiModelProperty("璇勪及闄勪欢")
+ private String assessannex;
+
+ /**
+ * 瀹跺睘鎰忚澶囨敞
+ */
+ @ApiModelProperty("瀹跺睘鎰忚澶囨敞")
+ private String relativeRemark;
+
+
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/ReviewInitiateBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/ReviewInitiateBaseInfoDTO.java
new file mode 100644
index 0000000..7a93494
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/ReviewInitiateBaseInfoDTO.java
@@ -0,0 +1,153 @@
+package com.ruoyi.project.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 浼︾悊瀹℃煡鍙戣捣璇锋眰瀵硅薄
+ *
+ * @author ruoyi
+ * @date 2025-12-20
+ */
+@Data
+@ApiModel("浼︾悊瀹℃煡鍙戣捣鍝嶅簲瀵硅薄")
+public class ReviewInitiateBaseInfoDTO extends BaseEntity {
+ /**
+ * baseInfo鐨処D
+ */
+ @ApiModelProperty("baseInfo鐨処D")
+ private Long infoid;
+
+ /**
+ * baseInfo鐨処D
+ */
+ @ApiModelProperty("浼︾悊瀹℃煡鐨処D")
+ private Long id;
+
+
+ /**
+ * 璁板綍鐘舵��
+ */
+ @ApiModelProperty("璁板綍鐘舵��")
+ @Excel(name = "璁板綍鐘舵��")
+ private String recordstate;
+
+
+ /**
+ * 妗堜緥缂栧彿
+ */
+ @ApiModelProperty("妗堜緥缂栧彿")
+ @Excel(name = "妗堜緥缂栧彿")
+ private String caseNo;
+
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
+ @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
+ @Excel(name = "鎹愮尞鑰呯紪鍙�")
+ private String donorno;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ @Excel(name = "鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ private String treatmenthospitalname;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�")
+ private String treatmenthospitalno;
+
+ /**
+ * 鎬у埆
+ */
+ @ApiModelProperty("鎬у埆")
+ private String sex;
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕")
+ private String name;
+
+ /**
+ * 浣忛櫌鍙�
+ */
+ @ApiModelProperty("浣忛櫌鍙�")
+ @Excel(name = "浣忛櫌鍙�")
+ private String inpatientno;
+
+ /**
+ * 骞撮緞
+ */
+// @TableField(exist = false)
+ @ApiModelProperty("骞撮緞")
+ private Long age;
+
+
+ /**
+ * 琛�鍨�
+ */
+ @ApiModelProperty("琛�鍨� ")
+ private String bloodtype;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ private String idcardno;
+
+ /**
+ * 鐤剧梾璇婃柇鍚嶇О
+ */
+ @ApiModelProperty("鐤剧梾璇婃柇鍚嶇О")
+ @Excel(name = "鐤剧梾璇婃柇鍚嶇О")
+ private String diagnosisname;
+
+ /**
+ * 涓撳鎰忚
+ */
+ @ApiModelProperty("涓撳鎰忚")
+ @Excel(name = "涓撳鎰忚")
+ private String expertOpinion;
+
+ /**
+ * 涓撳濮撳悕
+ */
+ @ApiModelProperty("涓撳濮撳悕")
+ @Excel(name = "涓撳濮撳悕")
+ private String expertName;
+
+ /**
+ * 涓撳缁撹 瑙佸瓧鍏� sys_0_1
+ */
+ @ApiModelProperty("涓撳缁撹 瑙佸瓧鍏� sys_0_1 ")
+ @Excel(name = "涓撳缁撹 瑙佸瓧鍏� sys_0_1 ")
+ private String expertConclusion;
+
+ /**
+ * 缁撹鏃堕棿
+ */
+ @ApiModelProperty("缁撹鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "缁撹鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date expertTime;
+
+ /**
+ * 0锛氭柊寤�;1锛氬鏌ヤ腑;2锛氱粨鏉�
+ */
+ @ApiModelProperty("鐘舵�侊細0锛氭柊寤�;1锛氬鏌ヤ腑;2锛氱粨鏉�")
+ @Excel(name = "鐘舵�侊細0锛氭柊寤�;1锛氬鏌ヤ腑;2锛氱粨鏉�")
+ private String status;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/ServiceDonatebaseinfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/ServiceDonatebaseinfoDTO.java
new file mode 100644
index 0000000..98cac7e
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/ServiceDonatebaseinfoDTO.java
@@ -0,0 +1,626 @@
+package com.ruoyi.project.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.project.domain.ServiceDonatemaintenance;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鎹愮尞鍩虹瀵硅薄 service_donatebaseinfo
+ *
+ * @author ruoyi
+ * @date 2021-11-15
+ */
+@Data
+@ApiModel("鎹愮尞鍩虹")
+public class ServiceDonatebaseinfoDTO extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * $column.columnComment
+ */
+ @ApiModelProperty("$column.columnComment")
+ //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 妗堜緥缂栧彿
+ */
+ @ApiModelProperty("妗堜緥缂栧彿")
+ @Excel(name = "妗堜緥缂栧彿")
+ private String caseNo;
+
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕")
+ private String name;
+
+ /**
+ * 鎬у埆
+ */
+ @ApiModelProperty("鎬у埆")
+ private String sex;
+
+ /**
+ * 璇佷欢绫诲瀷
+ */
+ @ApiModelProperty("璇佷欢绫诲瀷")
+ private Long idcardtype;
+
+ /**
+ * 妗堜緥涓婃姤ID
+ */
+ @ApiModelProperty("妗堜緥涓婃姤ID")
+ private Long reportId;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ private String idcardno;
+
+ /**
+ * 骞撮緞
+ */
+// @TableField(exist = false)
+ @ApiModelProperty("骞撮緞")
+ private Long age;
+
+ /**
+ * 骞撮緞鍗曚綅
+ */
+// @TableField(exist = false)
+ @ApiModelProperty("骞撮緞鍗曚綅")
+ private String ageunit;
+ /**
+ * 骞撮緞
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("骞撮緞")
+ private Long age2;
+
+ /**
+ * 骞�
+ * 榫勫崟浣�
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("骞撮緞鍗曚綅")
+ private String ageunit2;
+
+ /**
+ * 鍑虹敓鏃ユ湡
+ */
+ @ApiModelProperty("鍑虹敓鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date birthday;
+
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
+ @ApiModelProperty("鑱旂郴鐢佃瘽")
+ private String phone;
+
+ /**
+ * 鐜颁綇鍦板潃
+ */
+ @ApiModelProperty("鐜颁綇鍦板潃")
+ private String residenceaddress;
+
+ /**
+ * 鍥界睄
+ */
+ @ApiModelProperty("鍥界睄")
+ private String nationality;
+
+ /**
+ * 鐪�(鍖�/甯�)
+ */
+ @ApiModelProperty("鐪�(鍖�/甯�)")
+ @Excel(name = "鐪�(鍖�/甯�)")
+ private String residenceprovince;
+
+ /**
+ * 绫嶈疮
+ */
+ @ApiModelProperty("绫嶈疮")
+ @Excel(name = "绫嶈疮")
+ private String nativeplace;
+
+ /**
+ * 鐜颁綇鍦板潃鐪佸悕绉�
+ */
+ @ApiModelProperty("鐜颁綇鍦板潃鐪佸悕绉�")
+ private String residenceprovincename;
+
+ /**
+ * 姘戞棌
+ */
+ @ApiModelProperty("姘戞棌")
+ private String nation;
+
+ /**
+ * 鑱屼笟
+ */
+ @ApiModelProperty("鑱屼笟")
+ private String occupation;
+
+ /**
+ * 甯�(宸�)
+ */
+ @ApiModelProperty("甯�(宸�)")
+ private String residencecity;
+
+ /**
+ * 甯傚悕绉�
+ */
+ @ApiModelProperty("甯傚悕绉�")
+ private String residencecityname;
+
+ /**
+ * 瀛﹀巻
+ */
+ @ApiModelProperty("瀛﹀巻")
+ private String education;
+
+ /**
+ * 鍘匡紙甯�/鍖猴級
+ */
+ @ApiModelProperty("鍘匡紙甯�/鍖猴級")
+ private String residencetown;
+
+ /**
+ * 鎵�灞炶閬擄紙闀囷級鍚嶇О
+ */
+ @ApiModelProperty("鎵�灞炶閬擄紙闀囷級鍚嶇О")
+ private String residencetownname;
+
+ /**
+ * 绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�
+ */
+ @ApiModelProperty("绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
+ private String residencecommunity;
+
+ /**
+ * 绀惧尯锛堟潙锛夊悕绉�
+ */
+ @ApiModelProperty("绀惧尯锛堟潙锛夊悕绉�")
+ private String residencecommunityname;
+
+ /**
+ * 鎵�灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�
+ */
+ @ApiModelProperty("鎵�灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
+ private String residencecountycode;
+
+ /**
+ * 鎵�灞炲尯鍩熷悕绉�
+ */
+ @ApiModelProperty("鎵�灞炲尯鍩熷悕绉�")
+ private String residencecountyname;
+
+ /**
+ * 鎴风睄鍦板潃
+ */
+ @ApiModelProperty("鎴风睄鍦板潃")
+ private String registeraddress;
+
+ /**
+ * 鐪�(鍖�/甯�)
+ */
+ @ApiModelProperty("鐪�(鍖�/甯�)")
+ private String registerprovince;
+
+ /**
+ * 鎴风睄鍦板潃鐪佸悕绉�
+ */
+ @ApiModelProperty("鎴风睄鍦板潃鐪佸悕绉�")
+ private String registerprovincename;
+
+ /**
+ * 甯�(宸�)
+ */
+ @ApiModelProperty("甯�(宸�)")
+ private String registercity;
+
+ /**
+ * 甯傚悕绉�
+ */
+ @ApiModelProperty("甯傚悕绉�")
+ private String registercityname;
+
+ /**
+ * 鍘匡紙甯�/鍖猴級
+ */
+ @ApiModelProperty("鍘匡紙甯�/鍖猴級")
+ private String registertown;
+
+ /**
+ * 鎵�灞炶閬擄紙闀囷級鍚嶇О
+ */
+ @ApiModelProperty("鎵�灞炶閬擄紙闀囷級鍚嶇О")
+ private String registertownname;
+
+ /**
+ * 绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�
+ */
+ @ApiModelProperty("绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
+ private String registercommunity;
+
+ /**
+ * 绀惧尯锛堟潙锛夊悕绉�
+ */
+ @ApiModelProperty("绀惧尯锛堟潙锛夊悕绉�")
+ private String registercommunityname;
+
+ /**
+ * 鎵�灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�
+ */
+ @ApiModelProperty("鎵�灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
+ private String registercountycode;
+
+ /**
+ * 鎵�灞炲尯鍩熷悕绉�
+ */
+ @ApiModelProperty("鎵�灞炲尯鍩熷悕绉�")
+ private String registercountyname;
+
+ /**
+ * 璁板綍鐘舵��
+ */
+ @ApiModelProperty("璁板綍鐘舵��")
+ @Excel(name = "璁板綍鐘舵��")
+ private String recordstate;
+
+ /**
+ * 娌荤枟鍖婚櫌
+ */
+ @ApiModelProperty("娌荤枟鍖婚櫌")
+ private String treatmenthospitalno;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋�")
+ @Excel(name = "鎵�鍦ㄥ尰鐤楁満鏋�")
+ private String treatmenthospitalname;
+
+ /**
+ * 绉戝
+ */
+ @ApiModelProperty("绉戝")
+ private String treatmentdeptname;
+
+ /**
+ * 鐤剧梾璇婃柇
+ */
+ @ApiModelProperty("鐤剧梾璇婃柇")
+ private String diagnosisno;
+
+ /**
+ * 鐤剧梾璇婃柇鍚嶇О
+ */
+ @ApiModelProperty("鐤剧梾璇婃柇鍚嶇О")
+ private String diagnosisname;
+
+ /**
+ * 琛�鍨�
+ */
+ @ApiModelProperty("琛�鍨� ")
+ private String bloodtype;
+
+ /**
+ * 浣忛櫌鍙�
+ */
+ @ApiModelProperty("浣忛櫌鍙�")
+ private String inpatientno;
+
+ /**
+ * Rh闃存��
+ */
+ @ApiModelProperty("Rh闃存��")
+ private String rhyin;
+
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
+ @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
+ private String donorno;
+
+ /**
+ * 鎹愮尞绫诲埆
+ */
+ @ApiModelProperty("鎹愮尞绫诲埆")
+ private String donationcategory;
+
+ /**
+ * 鐥呮儏姒傚喌
+ */
+ @ApiModelProperty("鐥呮儏姒傚喌")
+ private String illnessoverview;
+
+ /**
+ * 鐤剧梾绫诲瀷
+ */
+ @ApiModelProperty("鐤剧梾绫诲瀷")
+ private String diseasetype;
+
+ /**
+ * 浼犳煋鐥呮儏鍐�
+ */
+ @ApiModelProperty("浼犳煋鐥呮儏鍐�")
+ private String infectious;
+
+ /**
+ * 鏈汉鎰忔効
+ */
+ @ApiModelProperty("鏈汉鎰忔効 ")
+ private String selfwill;
+
+ /**
+ * 鍏朵粬鎯呭喌
+ */
+ @ApiModelProperty("鍏朵粬鎯呭喌")
+ private String othercases;
+
+ /**
+ * 浜插睘鎰忔効
+ */
+ @ApiModelProperty("浜插睘鎰忔効")
+ private Long kinshipwill;
+
+ /**
+ * 鍏朵粬
+ */
+ @ApiModelProperty("鍏朵粬")
+ private String diseasetypeOther;
+
+ /**
+ * 浜插睘鍏崇郴鐘跺喌
+ */
+ @ApiModelProperty("浜插睘鍏崇郴鐘跺喌")
+ private String kinship;
+
+ /**
+ * 淇℃伅鏉ユ簮
+ */
+ @ApiModelProperty("淇℃伅鏉ユ簮")
+ private String infosources;
+
+ /**
+ * 绾㈠崄瀛椾細鏈烘瀯缂栧彿 閫夎嚜鏈烘瀯琛�
+ */
+ @ApiModelProperty("绾㈠崄瀛椾細鏈烘瀯缂栧彿 閫夎嚜鏈烘瀯琛�")
+ private String redorganno;
+
+ /**
+ * 绾㈠崄瀛椾細鏈烘瀯鍚嶇О
+ */
+ @ApiModelProperty("绾㈠崄瀛椾細鏈烘瀯鍚嶇О")
+ private String redorganname;
+
+ /**
+ * 绾㈠崄瀛椾細鑱旂郴浜�
+ */
+ @ApiModelProperty("绾㈠崄瀛椾細鑱旂郴浜�")
+ private String contactperson;
+
+ /**
+ * 鍏朵粬
+ */
+ @ApiModelProperty("鍏朵粬")
+ private String infectiousOther;
+
+ /**
+ * 绾㈠崄瀛椾細鑱旂郴鐢佃瘽
+ */
+ @ApiModelProperty("绾㈠崄瀛椾細鑱旂郴鐢佃瘽")
+ private String contactnumber;
+
+ /**
+ * 鎶ュ憡鑰呯紪鍙�
+ */
+ @ApiModelProperty("鎶ュ憡鑰呯紪鍙�")
+ private String reporterno;
+
+ /**
+ * 鎶ュ憡鑰呭鍚�
+ */
+ @ApiModelProperty("鎶ュ憡鑰呭鍚�")
+ @Excel(name = "鎶ュ憡鑰呭鍚�")
+ private String reportername;
+
+ /**
+ * 鐥呬汉鐘跺喌
+ */
+ @ApiModelProperty("鐥呬汉鐘跺喌")
+ private String patientstate;
+
+ /**
+ * 鎶ュ憡鑰呰仈绯荤數璇�
+ */
+ @ApiModelProperty("鎶ュ憡鑰呰仈绯荤數璇�")
+ private String reporterphone;
+
+ /**
+ * 淇℃伅鏉ユ簮鍏朵粬
+ */
+ @ApiModelProperty("淇℃伅鏉ユ簮鍏朵粬")
+ private String infosourcesOther;
+
+ /**
+ * 鎶ュ憡鏃堕棿
+ */
+ @ApiModelProperty("鎶ュ憡鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鎶ュ憡鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date reporttime;
+
+ /**
+ * 鍏朵粬
+ */
+ @ApiModelProperty("鍏朵粬")
+ private String kinshipOther;
+
+ /**
+ * 涓昏浜插睘
+ */
+ @ApiModelProperty("涓昏浜插睘")
+ private String majorrelatives;
+
+ /**
+ * 涓庢崘璧犺�呭叧绯�
+ */
+ @ApiModelProperty("涓庢崘璧犺�呭叧绯�")
+ private String familyrelations;
+
+ /**
+ * 鑾峰彇缁勭粐缂栧彿
+ */
+ @ApiModelProperty("鑾峰彇缁勭粐缂栧彿")
+ private String acquisitiontissueno;
+
+ /**
+ * 鑾峰彇缁勭粐鍚嶇О
+ */
+ @ApiModelProperty("鑾峰彇缁勭粐鍚嶇О")
+ private String acquisitiontissuename;
+
+ /**
+ * 淇℃伅鍛樺鍚�
+ */
+ @ApiModelProperty("淇℃伅鍛樺鍚�")
+ private String infoName;
+
+ /**
+ * 淇℃伅鍛樺鍚�
+ */
+ @ApiModelProperty("淇℃伅鍛樼紪鍙�")
+ private String infoNo;
+
+ /**
+ * 淇℃伅鍛樿仈绯绘柟寮�
+ */
+ @ApiModelProperty("淇℃伅鍛樿仈绯绘柟寮�")
+ private String infophone;
+
+ /**
+ * 鑱旂郴鏃堕棿
+ */
+ @ApiModelProperty("鑱旂郴鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date contacttime;
+
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date starttime;
+
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date endtime;
+
+ @TableField(exist = false)
+ private String city;
+
+
+ private Long deptid;
+
+ @ApiModelProperty("閮ㄩ棬鍚嶇О")
+ @Excel(name = "閮ㄩ棬鍚嶇О")
+ private String deptname;
+
+ @ApiModelProperty("缁勯暱缂栫爜")
+ @Excel(name = "缁勯暱缂栫爜")
+ private String leaderno;
+
+ @ApiModelProperty("缁勯暱鍚嶇О")
+ @Excel(name = "缁勯暱鍚嶇О")
+ private String leadername;
+
+ @ApiModelProperty("涓氬姟鍦板尯")
+ @Excel(name = "涓氬姟鍦板尯")
+ private String businessarea;
+
+
+ @ApiModelProperty("闄勪欢鍦板潃")
+ @Excel(name = "闄勪欢鍦板潃")
+ private String annexfiles;
+
+
+ @ApiModelProperty("宸ヤ綔娴�")
+ @Excel(name = "宸ヤ綔娴�")
+ private Integer workflow;
+
+
+ @ApiModelProperty("缁堟妗堜緥锛�0寮�鍚紝1缁堟 榛樿鍊硷細0")
+ @Excel(name = "缁堟妗堜緥")
+ private Integer terminationCase;
+
+ @ApiModelProperty("妗堜緥鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date donatetime;
+
+ @ApiModelProperty("妗堜緥搴忓彿")
+ private String donateno;
+
+ @ApiModelProperty("褰撳墠鍖荤枟鏈烘瀯")
+ private String currentMedicalInstitution;
+
+ @ApiModelProperty("棣栨鍖荤枟鏈烘瀯")
+ private String firstMedicalInstitution;
+
+ @ApiModelProperty("褰撳墠鍖荤枟鏈烘瀯绉戝")
+ private String currentDept;
+
+ @ApiModelProperty("棣栨鍖荤枟鏈烘瀯绉戝")
+ private String firstDept;
+
+ /**
+ * GSC璇勫垎
+ */
+ @ApiModelProperty("GSC璇勫垎")
+ @Excel(name = "GSC璇勫垎", readConverterExp = "GSC璇勫垎")
+ private String gcsScore;
+
+ /**
+ * 鍗忚皟鍛樼紪鍙�
+ */
+ @ApiModelProperty("鍗忚皟鍛樼紪鍙�")
+ @Excel(name = "鍗忚皟鍛樼紪鍙�", readConverterExp = "鍗忚皟鍛樼紪鍙�")
+ private String coordinatorNo;
+
+ /**
+ * 鍗忚皟鍛樺鍚�
+ */
+ @ApiModelProperty("鍗忚皟鍛樺鍚�")
+ @Excel(name = "鍗忚皟鍛樺鍚�", readConverterExp = "鍗忚皟鍛樺鍚�")
+ private String coordinatorName;
+
+
+ // 涓嬮潰鏄� 鈥滀緵浣撶淮鎶よ褰曞璞♀�濋噷鐨勫瓧娈�
+
+ @ApiModelProperty("渚涗綋缁存姢璁板綍")
+ @Excel(name = "渚涗綋缁存姢璁板綍")
+ @TableField(exist = false)
+ private List<ServiceDonatemaintenance> serviceDonatemaintenanceList;
+
+
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/WitnessBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/WitnessBaseInfoDTO.java
new file mode 100644
index 0000000..26184dd
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/WitnessBaseInfoDTO.java
@@ -0,0 +1,159 @@
+package com.ruoyi.project.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鍣ㄥ畼鎹愮尞瑙佽瘉鍩虹淇℃伅锛堟浜″垽瀹氾級鍝嶅簲淇℃伅
+ */
+@ApiModel("鍣ㄥ畼鎹愮尞瑙佽瘉鍩虹淇℃伅锛堟浜″垽瀹氾級鍝嶅簲淇℃伅")
+@Data
+public class WitnessBaseInfoDTO extends BaseEntity {
+ /**
+ *
+ */
+ @ApiModelProperty("鎹愮尞瑙佽瘉(姝讳骸鍒ゅ畾)鐨処D")
+ private Long id;
+
+ @ApiModelProperty("baseInfo鐨処D")
+ private Long infoid;
+
+ /**
+ * 璁板綍鐘舵��
+ */
+ @ApiModelProperty("璁板綍鐘舵��")
+ @Excel(name = "璁板綍鐘舵��")
+ private String recordstate;
+
+
+ /**
+ * 妗堜緥缂栧彿
+ */
+ @ApiModelProperty("妗堜緥缂栧彿")
+ @Excel(name = "妗堜緥缂栧彿")
+ private String caseNo;
+
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
+ @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
+ @Excel(name = "鎹愮尞鑰呯紪鍙�")
+ private String donorno;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ @Excel(name = "鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ private String treatmenthospitalname;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�")
+ private String treatmenthospitalno;
+
+ /**
+ * 鎬у埆
+ */
+ @ApiModelProperty("鎬у埆")
+ private String sex;
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕")
+ private String name;
+
+ /**
+ * 骞撮緞
+ */
+// @TableField(exist = false)
+ @ApiModelProperty("骞撮緞")
+ private Long age;
+
+
+ /**
+ * 琛�鍨�
+ */
+ @ApiModelProperty("琛�鍨� ")
+ private String bloodtype;
+
+
+ /**
+ * 姝讳骸璇佹槑闄勪欢璺緞,澶氬紶鐢�;鍙烽殧寮�
+ */
+ @ApiModelProperty("姝讳骸璇佹槑闄勪欢璺緞,澶氬紶鐢�;鍙烽殧寮� ")
+ private String deathJudgeAnnex;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ private String idcardno;
+
+ /**
+ * 鐤剧梾璇婃柇鍚嶇О
+ */
+ @ApiModelProperty("鐤剧梾璇婃柇鍚嶇О")
+ @Excel(name = "鐤剧梾璇婃柇鍚嶇О")
+ private String diagnosisname;
+
+ /**
+ * 姝讳骸鏃堕棿
+ */
+ @ApiModelProperty("姝讳骸鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "姝讳骸鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date deathtime;
+
+ /**
+ * 姝讳骸鍘熷洜
+ */
+ @ApiModelProperty("姝讳骸鍘熷洜")
+ @Excel(name = "姝讳骸鍘熷洜")
+ private String deathreason;
+
+ /**
+ * 姝讳骸鍒ゅ畾鍖荤敓涓�
+ */
+ @ApiModelProperty("姝讳骸鍒ゅ畾鍖荤敓涓�")
+ @Excel(name = "姝讳骸鍒ゅ畾鍖荤敓涓�")
+ private String deathjudgedocto;
+
+ /**
+ * 姝讳骸鍒ゅ畾鍖荤敓浜�
+ */
+ @ApiModelProperty("姝讳骸鍒ゅ畾鍖荤敓浜�")
+ @Excel(name = "姝讳骸鍒ゅ畾鍖荤敓浜�")
+ private String deathjudgedoctt;
+
+ /**
+ * 姝讳骸璇佹槑闄勪欢璺緞
+ */
+ @ApiModelProperty("姝讳骸璇佹槑闄勪欢璺緞")
+ private String deathjudgeannex;
+
+ /**
+ * 鍗忚皟鍛樼瀛�
+ */
+ @ApiModelProperty("鍗忚皟鍛樼瀛�")
+ @Excel(name = "鍗忚皟鍛樼瀛�")
+ private String coordinatorSign;
+
+ /**
+ * 鍗忚皟鍛樼瀛楁椂闂�
+ */
+ @ApiModelProperty("鍗忚皟鍛樼瀛楁椂闂�")
+ @Excel(name = "鍗忚皟鍛樼瀛楁椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date coordinatorSignTime;
+
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DeathBaseInfoVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DeathBaseInfoVO.java
new file mode 100644
index 0000000..b05e8e0
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DeathBaseInfoVO.java
@@ -0,0 +1,190 @@
+package com.ruoyi.project.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鎮ｈ�呮浜′俊鎭璞� service_deathinfo
+ *
+ * @author ls
+ * @date 2026-01-20
+ */
+@Data
+@ApiModel("鎮ｈ�呮浜′俊鎭姹傚璞�")
+public class DeathBaseInfoVO extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * baseInfo鐨処D
+ */
+ @ApiModelProperty("baseInfo鐨処D")
+ private Long infoid;
+
+
+ /**
+ * 璁板綍鐘舵��
+ */
+ @ApiModelProperty("璁板綍鐘舵��")
+ @Excel(name = "璁板綍鐘舵��")
+ private String recordstate;
+
+
+ /**
+ * 妗堜緥缂栧彿
+ */
+ @ApiModelProperty("妗堜緥缂栧彿")
+ @Excel(name = "妗堜緥缂栧彿")
+ private String caseNo;
+
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ @Excel(name = "鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ private String treatmenthospitalname;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�")
+ private String treatmenthospitalno;
+
+ /**
+ * 鎬у埆
+ */
+ @ApiModelProperty("鎬у埆")
+ private String sex;
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕")
+ private String name;
+
+ /**
+ * 浣忛櫌鍙�
+ */
+ @ApiModelProperty("浣忛櫌鍙�")
+ @Excel(name = "浣忛櫌鍙�")
+ private String inpatientno;
+
+ /**
+ * 骞撮緞
+ */
+// @TableField(exist = false)
+ @ApiModelProperty("骞撮緞")
+ private Long age;
+
+
+ /**
+ * 琛�鍨�
+ */
+ @ApiModelProperty("琛�鍨� ")
+ private String bloodtype;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ private String idcardno;
+
+ /**
+ * 鐤剧梾璇婃柇鍚嶇О
+ */
+ @ApiModelProperty("鐤剧梾璇婃柇鍚嶇О")
+ @Excel(name = "鐤剧梾璇婃柇鍚嶇О")
+ private String diagnosisname;
+
+
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
+ @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
+ @Excel(name = "鎹愮尞鑰呯紪鍙�")
+ private String donorno;
+
+ /**
+ * 鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�
+ */
+ @ApiModelProperty("鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�")
+ @Excel(name = "鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�")
+ private String gainhospitalno;
+
+ /**
+ * 鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�
+ */
+ @ApiModelProperty("鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�")
+ @Excel(name = "鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�")
+ private String gainhospitalname;
+
+ /**
+ * 姝讳骸鏃堕棿
+ */
+ @ApiModelProperty("姝讳骸鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "姝讳骸鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date deathtime;
+
+ /**
+ * 姝讳骸鍘熷洜
+ */
+ @ApiModelProperty("姝讳骸鍘熷洜")
+ @Excel(name = "姝讳骸鍘熷洜")
+ private String deathreason;
+
+ /**
+ * 姝讳骸鍒ゅ畾鍖荤敓涓�
+ */
+ @ApiModelProperty("姝讳骸鍒ゅ畾鍖荤敓涓�")
+ @Excel(name = "姝讳骸鍒ゅ畾鍖荤敓涓�")
+ private String deathjudgedocto;
+
+ /**
+ * 姝讳骸鍒ゅ畾鍖荤敓浜�
+ */
+ @ApiModelProperty("姝讳骸鍒ゅ畾鍖荤敓浜�")
+ @Excel(name = "姝讳骸鍒ゅ畾鍖荤敓浜�")
+ private String deathjudgedoctt;
+
+
+ /**
+ * 鏄惁榛樺搥缂呮��浠紡 0锛氬惁锛�1锛氭槸
+ */
+ @ApiModelProperty("鏄惁榛樺搥缂呮��浠紡 0锛氬惁锛�1锛氭槸")
+ @Excel(name = "鏄惁榛樺搥缂呮��浠紡 0锛氬惁锛�1锛氭槸")
+ private Integer isspendremember;
+
+ /**
+ * 鏄惁鎭㈠閬椾綋浠 0锛氬惁锛�1锛氭槸
+ */
+ @ApiModelProperty("鏄惁鎭㈠閬椾綋浠 0锛氬惁锛�1锛氭槸")
+ @Excel(name = "鏄惁鎭㈠閬椾綋浠 0锛氬惁锛�1锛氭槸")
+ private Integer isrestoreremains;
+
+
+ /**
+ * 璐熻矗浜虹紪鍙�
+ */
+ @ApiModelProperty("璐熻矗浜虹紪鍙�")
+ @Excel(name = "璐熻矗浜虹紪鍙�")
+ private String responsibleuserid;
+
+ /**
+ * 璐熻矗浜哄鍚�
+ */
+ @ApiModelProperty("璐熻矗浜哄鍚�")
+ @Excel(name = "璐熻矗浜哄鍚�")
+ private String responsibleusername;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonatebaseinfoProgressVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonatebaseinfoProgressVO.java
new file mode 100644
index 0000000..843064f
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonatebaseinfoProgressVO.java
@@ -0,0 +1,71 @@
+package com.ruoyi.project.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 鎹愮尞鍩虹瀵硅薄 service_donatebaseinfo
+ *
+ * @author ruoyi
+ * @date 2021-11-15
+ */
+@Data
+@ApiModel("鎹愮尞鍩虹")
+public class DonatebaseinfoProgressVO extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * $column.columnComment
+ */
+ @ApiModelProperty("$column.columnComment")
+ //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 妗堜緥缂栧彿
+ */
+ @ApiModelProperty("妗堜緥缂栧彿")
+ @Excel(name = "妗堜緥缂栧彿")
+ private String caseNo;
+
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕")
+ private String name;
+
+ /**
+ * 妗堜緥涓婃姤ID
+ */
+ @ApiModelProperty("妗堜緥涓婃姤ID")
+ private Long reportId;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ private String idcardno;
+
+
+ /**
+ * 璁板綍鐘舵��
+ */
+ @ApiModelProperty("璁板綍鐘舵��")
+ @Excel(name = "璁板綍鐘舵��")
+ private String recordstate;
+
+
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateorganBaseInfoVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateorganBaseInfoVO.java
new file mode 100644
index 0000000..be7b787
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateorganBaseInfoVO.java
@@ -0,0 +1,153 @@
+package com.ruoyi.project.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 鍣ㄥ畼鍒嗛厤瀵硅薄 DonateorganBaseInfoVO
+ * 鍣ㄥ畼鍒嗛厤鍩烘湰淇℃伅璇锋眰瀵硅薄
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ApiModel("鍣ㄥ畼鍒嗛厤鍩烘湰淇℃伅璇锋眰瀵硅薄")
+public class DonateorganBaseInfoVO extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+ /**
+ * baseInfo鐨処D
+ */
+ @ApiModelProperty("baseInfo鐨処D")
+ private Long infoid;
+
+
+ /**
+ * 璁板綍鐘舵��
+ */
+ @ApiModelProperty("璁板綍鐘舵��")
+ @Excel(name = "璁板綍鐘舵��")
+ private String recordstate;
+
+
+ /**
+ * 妗堜緥缂栧彿
+ */
+ @ApiModelProperty("妗堜緥缂栧彿")
+ @Excel(name = "妗堜緥缂栧彿")
+ private String caseNo;
+
+ /**
+ * 浣忛櫌鍙�
+ */
+ @ApiModelProperty("浣忛櫌鍙�")
+ private String inpatientno;
+
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
+ @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
+ @Excel(name = "鎹愮尞鑰呯紪鍙�")
+ private String donorno;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ @Excel(name = "鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ private String treatmenthospitalname;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�")
+ private String treatmenthospitalno;
+
+ /**
+ * 鎬у埆
+ */
+ @ApiModelProperty("鎬у埆")
+ private String sex;
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕")
+ private String name;
+
+ /**
+ * 骞撮緞
+ */
+// @TableField(exist = false)
+ @ApiModelProperty("骞撮緞")
+ private Long age;
+
+
+ /**
+ * 琛�鍨�
+ */
+ @ApiModelProperty("琛�鍨� ")
+ private String bloodtype;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ private String idcardno;
+
+ /**
+ * 鐤剧梾璇婃柇鍚嶇О
+ */
+ @ApiModelProperty("鐤剧梾璇婃柇鍚嶇О")
+ @Excel(name = "鐤剧梾璇婃柇鍚嶇О")
+ private String diagnosisname;
+
+ /**
+ * 鍒嗛厤鐘舵�侊細0:鏈垎閰嶏紱1锛氬凡鍒嗛厤锛�2浣滃簾
+ */
+ @ApiModelProperty("鍒嗛厤鐘舵�侊細0:鏈垎閰嶏紱1锛氬凡鍒嗛厤锛�2浣滃簾")
+ @Excel(name = "鍒嗛厤鐘舵�侊細0:鏈垎閰嶏紱1锛氬凡鍒嗛厤锛�2浣滃簾")
+ private Long allocationStatus;
+
+ /**
+ * 鍒嗛厤鏃堕棿
+ */
+ @ApiModelProperty("鍒嗛厤鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍒嗛厤鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date allocationTime;
+
+ /**
+ * 鐧昏浜虹紪鍙�
+ */
+ @ApiModelProperty("鐧昏浜虹紪鍙�")
+ @Excel(name = "鐧昏浜虹紪鍙�")
+ private String registrationCode;
+
+ /**
+ * 鐧昏浜哄鍚�
+ */
+ @ApiModelProperty("鐧昏浜哄鍚�")
+ @Excel(name = "鐧昏浜哄鍚�")
+ private String registrationName;
+
+ /**
+ * 鐧昏鏃堕棿
+ */
+ @ApiModelProperty("鐧昏鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鐧昏鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date registrationTime;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationCompletionBaseInfoVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationCompletionBaseInfoVO.java
new file mode 100644
index 0000000..20eca9b
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationCompletionBaseInfoVO.java
@@ -0,0 +1,122 @@
+package com.ruoyi.project.domain.vo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("鍣ㄥ畼鎹愮尞瀹屾垚鍩烘湰淇℃伅璇锋眰瀵硅薄锛堝櫒瀹樺埄鐢ㄨ姹傚璞★級")
+public class DonationCompletionBaseInfoVO {
+ /**
+ * baseInfo鐨処D
+ */
+ @ApiModelProperty("baseInfo鐨処D")
+ private Long infoid;
+
+ /**
+ * 璁板綍鐘舵��
+ */
+ @ApiModelProperty("璁板綍鐘舵��")
+ @Excel(name = "璁板綍鐘舵��")
+ private String recordstate;
+
+ /**
+ * 妗堜緥缂栧彿
+ */
+ @ApiModelProperty("妗堜緥缂栧彿")
+ @Excel(name = "妗堜緥缂栧彿")
+ private String caseNo;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ @Excel(name = "鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ private String treatmenthospitalname;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�")
+ private String treatmenthospitalno;
+
+ /**
+ * 鎬у埆
+ */
+ @ApiModelProperty("鎬у埆")
+ private String sex;
+
+ /**
+ * 浣忛櫌鍙�
+ */
+ @ApiModelProperty("浣忛櫌鍙�")
+ private String inpatientno;
+
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
+ @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
+ @Excel(name = "鎹愮尞鑰呯紪鍙�")
+ private String donorno;
+
+ /**
+ * 鎹愮尞鑰呭鍚�
+ */
+ @ApiModelProperty("鎹愮尞鑰呭鍚�")
+ @Excel(name = "鎹愮尞鑰呭鍚�")
+ private String name;
+
+ /**
+ * 骞撮緞
+ */
+// @TableField(exist = false)
+ @ApiModelProperty("骞撮緞")
+ private Long age;
+
+
+ /**
+ * 琛�鍨�
+ */
+ @ApiModelProperty("琛�鍨� ")
+ private String bloodtype;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ private String idcardno;
+
+ /**
+ * 鐤剧梾璇婃柇鍚嶇О
+ */
+ @ApiModelProperty("鐤剧梾璇婃柇鍚嶇О")
+ @Excel(name = "鐤剧梾璇婃柇鍚嶇О")
+ private String diagnosisname;
+
+ /**
+ * 瀹屾垚鏃堕棿
+ */
+ @ApiModelProperty("瀹屾垚鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "瀹屾垚鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date completetime;
+
+ /**
+ * 璐熻矗浜虹紪鍙�
+ */
+ @ApiModelProperty("璐熻矗浜虹紪鍙�")
+ private String responsibleuserid;
+
+ /**
+ * 璐熻矗浜哄鍚�
+ */
+ @ApiModelProperty("璐熻矗浜哄鍚�")
+ @Excel(name = "璐熻矗浜哄鍚�")
+ private String responsibleusername;
+
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationwitnessBaseInfoVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationwitnessBaseInfoVO.java
new file mode 100644
index 0000000..e9307f3
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationwitnessBaseInfoVO.java
@@ -0,0 +1,253 @@
+package com.ruoyi.project.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鎹愮尞瑙佽瘉鍩烘湰淇℃伅璇锋眰瀵硅薄
+ *
+ * @author ruoyi
+ * @date 2026-01-20
+ */
+@Data
+@ApiModel("鎹愮尞瑙佽瘉鍩烘湰淇℃伅璇锋眰瀵硅薄")
+public class DonationwitnessBaseInfoVO extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * $column.columnComment
+ */
+ @ApiModelProperty("$column.columnComment")
+ //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+
+ /**
+ * 浣忛櫌鍙�
+ */
+ @ApiModelProperty("浣忛櫌鍙�")
+ private String inpatientno;
+
+
+ /**
+ *
+ */
+ @ApiModelProperty("")
+ private Long infoid;
+
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
+ @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
+ @Excel(name = "鎹愮尞鑰呯紪鍙�")
+ private String donorno;
+
+ /**
+ * 鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿
+ */
+ @ApiModelProperty("鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿")
+ private String gainhospitalno;
+
+ /**
+ * 鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О
+ */
+ @ApiModelProperty("鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О")
+ @Excel(name = "鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О")
+ private String gainhospitalname;
+
+
+ /**
+ * 鎵嬫湳寮�濮嬫椂闂�
+ */
+ @ApiModelProperty("鎵嬫湳寮�濮嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "鎵嬫湳寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date operationbegtime;
+
+ /**
+ * 鎵嬫湳缁撴潫鏃堕棿
+ */
+ @ApiModelProperty("鎵嬫湳缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "鎵嬫湳缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date operationendtime;
+
+ /**
+ * 鎵嬫湳鍖荤敓
+ */
+ @ApiModelProperty("鎵嬫湳鍖荤敓")
+ @Excel(name = "鎵嬫湳鍖荤敓")
+ private String operationdoctor;
+
+ /**
+ * 璐熻矗浜虹紪鍙�
+ */
+ @ApiModelProperty("璐熻矗浜虹紪鍙�")
+ private String responsibleuserid;
+
+ /**
+ * 璐熻矗浜哄鍚�
+ */
+ @ApiModelProperty("璐熻矗浜哄鍚�")
+ @Excel(name = "璐熻矗浜哄鍚�")
+ private String responsibleusername;
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕")
+ private String name;
+
+ /**
+ * 鑱旂粶浜轰竴缂栧彿
+ */
+ @ApiModelProperty("鑱旂粶浜轰竴缂栧彿")
+ private String coordinateduserido;
+
+ /**
+ * 鑱旂粶浜轰竴濮撳悕
+ */
+ @ApiModelProperty("鑱旂粶浜轰竴濮撳悕")
+ private String coordinatedusernameo;
+
+ /**
+ * 鑱旂粶浜轰簩缂栧彿
+ */
+ @ApiModelProperty("鑱旂粶浜轰簩缂栧彿")
+ private String coordinateduseridt;
+
+ /**
+ * 鑱旂粶浜轰簩濮撳悕
+ */
+ @ApiModelProperty("鑱旂粶浜轰簩濮撳悕")
+ private String coordinatedusernamet;
+
+ /**
+ * 鑵逛富鍔ㄨ剦鎻掔鏃堕棿
+ */
+ @ApiModelProperty("鑵逛富鍔ㄨ剦鎻掔鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "鑵逛富鍔ㄨ剦鎻掔鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date abdominalaortacannulatime;
+
+ /**
+ * 鑵逛富鍔ㄨ剦鐏屾敞鏃堕棿
+ */
+ @ApiModelProperty("鑵逛富鍔ㄨ剦鐏屾敞鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "鑵逛富鍔ㄨ剦鐏屾敞鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date abdominalaortaperfusiontime;
+
+ /**
+ * 闂ㄩ潤鑴夋彃绠℃椂闂�
+ */
+ @ApiModelProperty("闂ㄩ潤鑴夋彃绠℃椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "闂ㄩ潤鑴夋彃绠℃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date portalveincannulatime;
+
+ /**
+ * 闂ㄩ潤鑴夌亴娉ㄦ椂闂�
+ */
+ @ApiModelProperty("闂ㄩ潤鑴夌亴娉ㄦ椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "闂ㄩ潤鑴夌亴娉ㄦ椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date portalveinperfusiontime;
+
+ /**
+ * 鑲哄姩鑴夋彃绠℃椂闂�
+ */
+ @ApiModelProperty("鑲哄姩鑴夋彃绠℃椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "鑲哄姩鑴夋彃绠℃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date pulmonaryarterycannulatime;
+
+ /**
+ * 鑲哄姩鑴夌亴娉ㄦ椂闂�
+ */
+ @ApiModelProperty("鑲哄姩鑴夌亴娉ㄦ椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "鑲哄姩鑴夌亴娉ㄦ椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date pulmonaryarteryperfusiontime;
+
+ /**
+ * 涓诲姩鑴夋彃绠℃椂闂�
+ */
+ @ApiModelProperty("涓诲姩鑴夋彃绠℃椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "涓诲姩鑴夋彃绠℃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date aortacannulatime;
+
+ /**
+ * 涓诲姩鑴夌亴娉ㄦ椂闂�
+ */
+ @ApiModelProperty("涓诲姩鑴夌亴娉ㄦ椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "涓诲姩鑴夌亴娉ㄦ椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date aortaperfusiontime;
+
+ /**
+ * 鎹愮尞鍣ㄥ畼
+ */
+ @ApiModelProperty("鎹愮尞鍣ㄥ畼")
+ @Excel(name = "鎹愮尞鍣ㄥ畼")
+ private String organdonation;
+
+ /**
+ * 鎹愮尞鍣ㄥ畼 鍏朵粬
+ */
+ @ApiModelProperty("鎹愮尞鍣ㄥ畼 鍏朵粬")
+ @Excel(name = "鎹愮尞鍣ㄥ畼 鍏朵粬")
+ private String organdonationOther;
+
+
+ /**
+ * 鎹愮尞绫诲埆
+ */
+ @ApiModelProperty("鎹愮尞绫诲埆")
+ @Excel(name = "鎹愮尞绫诲埆")
+ private String donationcategory;
+
+ /**
+ * 鍗忚皟鍛樿繘鎵嬫湳瀹ゆ椂闂�
+ */
+ @ApiModelProperty("鍗忚皟鍛樿繘鎵嬫湳瀹ゆ椂闂�")
+ @Excel(name = "鍗忚皟鍛樿繘鎵嬫湳瀹ゆ椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date coordinatorInOperating;
+
+ /**
+ * 鍗忚皟鍛樺嚭鎵嬫湳瀹ゆ椂闂�
+ */
+ @ApiModelProperty("鍗忚皟鍛樺嚭鎵嬫湳瀹ゆ椂闂�")
+ @Excel(name = "鍗忚皟鍛樺嚭鎵嬫湳瀹ゆ椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date coordinatorOutOperating;
+
+ /**
+ * 鍗忚皟鍛樼瀛�
+ */
+ @ApiModelProperty("鍗忚皟鍛樼瀛�")
+ @Excel(name = "鍗忚皟鍛樼瀛�")
+ private String coordinatorSign;
+
+ /**
+ * 鍗忚皟鍛樼瀛楁椂闂�
+ */
+ @ApiModelProperty("鍗忚皟鍛樼瀛楁椂闂�")
+ @Excel(name = "鍗忚皟鍛樼瀛楁椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date coordinatorSignTime;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java
index 9347022..532e61a 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java
@@ -345,6 +345,12 @@
*/
@ApiModelProperty("鍏朵粬鎯呭喌")
private String othercases;
+
+ /**
+ * 妗堜欢缂栧彿
+ */
+ @ApiModelProperty("妗堜欢缂栧彿 ")
+ private String caseNo;
/**
* 浜插睘鎰忔効
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/RelativeConfirmationBaseInfoVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/RelativeConfirmationBaseInfoVO.java
new file mode 100644
index 0000000..4d52344
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/RelativeConfirmationBaseInfoVO.java
@@ -0,0 +1,164 @@
+package com.ruoyi.project.domain.vo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 鍣ㄥ畼鎹愮尞瑙佽瘉鍩虹淇℃伅锛堟浜″垽瀹氾級鍝嶅簲淇℃伅
+ */
+@ApiModel("鍣ㄥ畼鎹愮尞纭鍩虹淇℃伅璇锋眰淇℃伅")
+@Data
+public class RelativeConfirmationBaseInfoVO extends BaseEntity {
+
+ /**
+ * baseInfo鐨処D
+ */
+ @ApiModelProperty("baseInfo鐨処D")
+ private Long infoid;
+
+
+ /**
+ * 璁板綍鐘舵��
+ */
+ @ApiModelProperty("璁板綍鐘舵��")
+ @Excel(name = "璁板綍鐘舵��")
+ private String recordstate;
+
+
+ /**
+ * 妗堜緥缂栧彿
+ */
+ @ApiModelProperty("妗堜緥缂栧彿")
+ @Excel(name = "妗堜緥缂栧彿")
+ private String caseNo;
+
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
+ @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
+ @Excel(name = "鎹愮尞鑰呯紪鍙�")
+ private String donorno;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ @Excel(name = "鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ private String treatmenthospitalname;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�")
+ private String treatmenthospitalno;
+
+ /**
+ * 鎬у埆
+ */
+ @ApiModelProperty("鎬у埆")
+ private String sex;
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕")
+ private String name;
+
+ /**
+ * 骞撮緞
+ */
+// @TableField(exist = false)
+ @ApiModelProperty("骞撮緞")
+ private Long age;
+
+
+ /**
+ * 琛�鍨�
+ */
+ @ApiModelProperty("琛�鍨� ")
+ private String bloodtype;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ private String idcardno;
+
+ /**
+ * 鐤剧梾璇婃柇鍚嶇О
+ */
+ @ApiModelProperty("鐤剧梾璇婃柇鍚嶇О")
+ @Excel(name = "鐤剧梾璇婃柇鍚嶇О")
+ private String diagnosisname;
+
+ /**
+ * 浜插睘纭绛惧瓧
+ */
+ @ApiModelProperty("浜插睘纭绛惧瓧")
+ @Excel(name = "浜插睘纭绛惧瓧", readConverterExp = "浜插睘纭绛惧瓧")
+ private String relativeconfirmationsign;
+
+ /**
+ * 绛惧瓧鏃ユ湡
+ */
+ @ApiModelProperty("寮�濮嬬瀛楁棩鏈�")
+ @Excel(name = "寮�濮嬬瀛楁棩鏈�", readConverterExp = "寮�濮嬬瀛楁棩鏈�")
+ private Date startSigndate; /**
+ * 绛惧瓧鏃ユ湡
+ */
+ @ApiModelProperty("缁撴潫绛惧瓧鏃ユ湡")
+ @Excel(name = "缁撴潫绛惧瓧鏃ユ湡", readConverterExp = "缁撴潫绛惧瓧鏃ユ湡")
+ private Date endSigndate;
+
+
+ /**
+ * 璐熻矗浜哄鍚�
+ */
+ @ApiModelProperty("璐熻矗浜哄鍚�")
+ @Excel(name = "璐熻矗浜哄鍚�", readConverterExp = "璐熻矗浜哄鍚�")
+ private String responsibleusername;
+
+ /**
+ * 璐熻矗浜虹紪鍙�
+ */
+ @ApiModelProperty("璐熻矗浜虹紪鍙�")
+ private String responsibleuserid;
+
+ /**
+ * 鍗忚皟鍛樺鍚�2
+ */
+ @ApiModelProperty("鍗忚皟鍛樺鍚�2")
+ @Excel(name = "鍗忚皟鍛樺鍚�2", readConverterExp = "鍗忚皟鍛樺鍚�2")
+ private String coordinatedusernamet;
+
+ /**
+ * 鍗忚皟鍛樼紪鍙�2
+ */
+ @ApiModelProperty("鍗忚皟鍛樼紪鍙�2")
+ @Excel(name = "鍗忚皟鍛樼紪鍙�2", readConverterExp = "鍗忚皟鍛樼紪鍙�2")
+ private String coordinateduseridt;
+
+ /**
+ * 鍗忚皟鍛樺鍚�1
+ */
+ @ApiModelProperty("鍗忚皟鍛樺鍚�1")
+ @Excel(name = "鍗忚皟鍛樺鍚�1", readConverterExp = "鍗忚皟鍛樺鍚�1")
+ private String coordinatedusernameo;
+
+ /**
+ * 鍗忚皟鍛樼紪鍙�1
+ */
+ @ApiModelProperty("鍗忚皟鍛樼紪鍙�1")
+ @Excel(name = "鍗忚皟鍛樼紪鍙�1", readConverterExp = "鍗忚皟鍛樼紪鍙�1")
+ private String coordinateduserido;
+
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ReviewInitiateBaseInfoVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ReviewInitiateBaseInfoVO.java
new file mode 100644
index 0000000..c2c4ca2
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ReviewInitiateBaseInfoVO.java
@@ -0,0 +1,149 @@
+package com.ruoyi.project.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 浼︾悊瀹℃煡鍙戣捣璇锋眰瀵硅薄
+ *
+ * @author ruoyi
+ * @date 2025-12-20
+ */
+@Data
+@ApiModel("浼︾悊瀹℃煡鍙戣捣璇锋眰瀵硅薄")
+public class ReviewInitiateBaseInfoVO extends BaseEntity {
+ /**
+ * baseInfo鐨処D
+ */
+ @ApiModelProperty("baseInfo鐨処D")
+ private Long infoid;
+
+
+ /**
+ * 璁板綍鐘舵��
+ */
+ @ApiModelProperty("璁板綍鐘舵��")
+ @Excel(name = "璁板綍鐘舵��")
+ private String recordstate;
+
+
+ /**
+ * 妗堜緥缂栧彿
+ */
+ @ApiModelProperty("妗堜緥缂栧彿")
+ @Excel(name = "妗堜緥缂栧彿")
+ private String caseNo;
+
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
+ @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
+ @Excel(name = "鎹愮尞鑰呯紪鍙�")
+ private String donorno;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ @Excel(name = "鎵�鍦ㄥ尰鐤楁満鏋勫悕绉�")
+ private String treatmenthospitalname;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋勭紪鐮�")
+ private String treatmenthospitalno;
+
+ /**
+ * 鎬у埆
+ */
+ @ApiModelProperty("鎬у埆")
+ private String sex;
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕")
+ private String name;
+
+ /**
+ * 浣忛櫌鍙�
+ */
+ @ApiModelProperty("浣忛櫌鍙�")
+ @Excel(name = "浣忛櫌鍙�")
+ private String inpatientno;
+
+ /**
+ * 骞撮緞
+ */
+// @TableField(exist = false)
+ @ApiModelProperty("骞撮緞")
+ private Long age;
+
+
+ /**
+ * 琛�鍨�
+ */
+ @ApiModelProperty("琛�鍨� ")
+ private String bloodtype;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ private String idcardno;
+
+ /**
+ * 鐤剧梾璇婃柇鍚嶇О
+ */
+ @ApiModelProperty("鐤剧梾璇婃柇鍚嶇О")
+ @Excel(name = "鐤剧梾璇婃柇鍚嶇О")
+ private String diagnosisname;
+
+ /**
+ * 涓撳鎰忚
+ */
+ @ApiModelProperty("涓撳鎰忚")
+ @Excel(name = "涓撳鎰忚")
+ private String expertOpinion;
+
+ /**
+ * 涓撳濮撳悕
+ */
+ @ApiModelProperty("涓撳濮撳悕")
+ @Excel(name = "涓撳濮撳悕")
+ private String expertName;
+
+ /**
+ * 涓撳缁撹 瑙佸瓧鍏� sys_0_1
+ */
+ @ApiModelProperty("涓撳缁撹 瑙佸瓧鍏� sys_0_1 ")
+ @Excel(name = "涓撳缁撹 瑙佸瓧鍏� sys_0_1 ")
+ private String expertConclusion;
+
+ /**
+ * 缁撹鏃堕棿
+ */
+ @ApiModelProperty("缁撹鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "缁撹鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date expertTime;
+
+ /**
+ * 0锛氭柊寤�;1锛氬鏌ヤ腑;2锛氱粨鏉�
+ */
+ @ApiModelProperty("鐘舵�侊細0锛氭柊寤�;1锛氬鏌ヤ腑;2锛氱粨鏉�")
+ @Excel(name = "鐘舵�侊細0锛氭柊寤�;1锛氬鏌ヤ腑;2锛氱粨鏉�")
+ private String status;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonatemaintenanceVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonatemaintenanceVO.java
new file mode 100644
index 0000000..1fca681
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonatemaintenanceVO.java
@@ -0,0 +1,74 @@
+package com.ruoyi.project.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 渚涗綋缁存姢璁板綍瀵硅薄 service_donatemaintenance
+ *
+ * @author ruoyi
+ * @date 2025-12-27
+ */
+@Data
+@ApiModel("渚涗綋缁存姢璁板綍")
+public class ServiceDonatemaintenanceVO extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
+ */
+ @ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
+ @Excel(name = "鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
+ private Long infoid;
+
+ /**
+ * 妗堜緥缂栧彿
+ */
+ @ApiModelProperty("妗堜緥缂栧彿")
+ @Excel(name = "妗堜緥缂栧彿")
+ private String caseNo;
+
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = "濮撳悕")
+ private String name;
+
+ /**
+ * 鎵�鍦ㄥ尰鐤楁満鏋�
+ */
+ @ApiModelProperty("鎵�鍦ㄥ尰鐤楁満鏋�")
+ @Excel(name = "鎵�鍦ㄥ尰鐤楁満鏋�")
+ private String treatmenthospitalname;
+
+
+ @ApiModelProperty("閮ㄩ棬鍚嶇О(鍖荤枟缁�)")
+ @Excel(name = "閮ㄩ棬鍚嶇О(鍖荤枟缁�)")
+ private String deptname;
+
+ /**
+ * 鎶ュ憡鏃堕棿
+ */
+ @ApiModelProperty("鎶ュ憡鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鎶ュ憡鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date reporttime;
+
+ /**
+ * 璁板綍鐘舵��
+ */
+ @ApiModelProperty("璁板綍鐘舵��")
+ @Excel(name = "璁板綍鐘舵��")
+ private String recordstate;
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceMedicalevaluationVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceMedicalevaluationVO.java
new file mode 100644
index 0000000..2d7aac5
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceMedicalevaluationVO.java
@@ -0,0 +1,105 @@
+package com.ruoyi.project.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鍖诲璇勪及瀵硅薄 service_medicalevaluation
+ *
+ * @author LS
+ * @date 2021-11-19
+ */
+@Data
+@ApiModel("鍖诲璇勪及")
+public class ServiceMedicalevaluationVO extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
+ */
+ @ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
+ @Excel(name = "鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
+ private Long infoid;
+
+ /**
+ * 妗堜緥缂栧彿
+ */
+ @ApiModelProperty("妗堜緥缂栧彿")
+ @Excel(name = "妗堜緥缂栧彿")
+ private String caseNo;
+
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
+ @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
+ @Excel(name = "鎹愮尞鑰呯紪鍙�")
+ private String donorno;
+
+ /**
+ * 鐤剧梾璇婃柇鍚嶇О
+ */
+ @ApiModelProperty("鐤剧梾璇婃柇鍚嶇О")
+ @Excel(name = "鐤剧梾璇婃柇鍚嶇О")
+ private String diagnosisname;
+
+ /**
+ * 璇勪及闄勪欢
+ */
+ @ApiModelProperty("璇勪及闄勪欢")
+ private String assessannex;
+
+ /**
+ * 璇勪及鐘舵�侊細 棣栨锛�1.璇勪及閫氳繃 2璇勪及涓嶉�氳繃 鏈�缁堬細3.璇勪及閫氳繃 4璇勪及涓嶉�氳繃
+ */
+ @ApiModelProperty("璇勪及鐘舵�侊細 棣栨锛�1.璇勪及閫氳繃 2璇勪及涓嶉�氳繃 鏈�缁堬細3.璇勪及閫氳繃 4璇勪及涓嶉�氳繃")
+ private String assessState;
+
+ /**
+ * 棣栨璇勪及鏃堕棿
+ */
+ @ApiModelProperty("棣栨璇勪及鏃堕棿(榛樿璇勪及鏃堕棿)")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "棣栨璇勪及鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date assessFirstTime;
+
+ /**
+ * 浜屾璇勪及鏃堕棿
+ */
+ @ApiModelProperty("浜屾璇勪及鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "浜屾璇勪及鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date assessSecondTime;
+
+ /**
+ * 鍗忚皟鍛樼紪鍙�
+ */
+ @ApiModelProperty("鍗忚皟鍛樼紪鍙�")
+ @Excel(name = "鍗忚皟鍛樼紪鍙�", readConverterExp = "鍗忚皟鍛樼紪鍙�")
+ private String coordinatorNo;
+
+ /**
+ * 鍗忚皟鍛樺鍚�
+ */
+ @ApiModelProperty("鍗忚皟鍛樺鍚�")
+ @Excel(name = "鍗忚皟鍛樺鍚�", readConverterExp = "鍗忚皟鍛樺鍚�")
+ private String coordinatorName;
+
+ /**
+ * 鎶ュ憡鏃堕棿
+ */
+ @ApiModelProperty("鎶ュ憡鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鎶ュ憡鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date reporttime;
+
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDeathinfoMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDeathinfoMapper.java
new file mode 100644
index 0000000..140d628
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDeathinfoMapper.java
@@ -0,0 +1,29 @@
+package com.ruoyi.project.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.project.domain.ServiceDeathinfo;
+import com.ruoyi.project.domain.dto.DeathBaseInfoDTO;
+import com.ruoyi.project.domain.vo.DeathBaseInfoVO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 鎮ｈ�呮浜′俊鎭疢apper鎺ュ彛
+ *
+ * @author ls
+ * @date 2026-01-20
+ */
+@Mapper
+public interface ServiceDeathinfoMapper extends BaseMapper<ServiceDeathinfo> {
+ /**
+ * 鏌ヨ鎮ｈ�呮浜′俊鎭垪琛�
+ *
+ * @param serviceDeathinfo 鎮ｈ�呮浜′俊鎭�
+ * @return 鎮ｈ�呮浜′俊鎭泦鍚�
+ */
+ public List<ServiceDeathinfo> selectServiceDeathinfoList(ServiceDeathinfo serviceDeathinfo);
+
+ public List<DeathBaseInfoDTO> dathInfoBaseInfoList(DeathBaseInfoVO deathBaseInfoVO);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonatebaseinfoMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonatebaseinfoMapper.java
index ee85224..5fc7237 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonatebaseinfoMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonatebaseinfoMapper.java
@@ -7,6 +7,8 @@
import java.util.List;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
+import com.ruoyi.project.domain.dto.DonatebaseinfoProgressDTO;
+import com.ruoyi.project.domain.vo.DonatebaseinfoProgressVO;
import com.ruoyi.project.domain.vo.TimeVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -53,6 +55,8 @@
String gethqzz(Long infoid);
+ List<DonatebaseinfoProgressDTO> donateBaseInfoProgressList(DonatebaseinfoProgressVO donatebaseinfoProgressVO);
+
ServiceDonatebaseinfo getById(Long infoid);
int countByRecordState(@Param("recordState") String recordState, @Param("starttime") Date starttime, @Param("endtime") Date endtime);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonateorganBaseMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonateorganBaseMapper.java
new file mode 100644
index 0000000..db42c79
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonateorganBaseMapper.java
@@ -0,0 +1,30 @@
+package com.ruoyi.project.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+import com.ruoyi.project.domain.dto.DonateorganBaseInfoDTO;
+import com.ruoyi.project.domain.vo.DonateorganBaseInfoVO;
+import org.apache.ibatis.annotations.Mapper;
+import com.ruoyi.project.domain.ServiceDonateorganBase;
+
+/**
+ * 鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹Mapper鎺ュ彛
+ *
+ * @author ls
+ * @date 2026-01-17
+ */
+@Mapper
+public interface ServiceDonateorganBaseMapper extends BaseMapper<ServiceDonateorganBase> {
+ /**
+ * 鏌ヨ鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹鍒楄〃
+ *
+ * @param serviceDonateorganBase 鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹
+ * @return 鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹闆嗗悎
+ */
+ public List<ServiceDonateorganBase> selectServiceDonateorganBaseList(ServiceDonateorganBase serviceDonateorganBase);
+
+ public List<DonateorganBaseInfoDTO> getDonateorganBaseInfoList(DonateorganBaseInfoVO donateorganBaseInfoVO);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonationwitnessMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonationwitnessMapper.java
index 88e8927..7a35f6c 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonationwitnessMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonationwitnessMapper.java
@@ -3,11 +3,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import java.sql.Time;
-import java.util.Collection;
import java.util.List;
-import com.ruoyi.project.domain.ServiceDonateorgan;
+import com.ruoyi.project.domain.dto.DonationwitnessBaseInfoDTO;
+import com.ruoyi.project.domain.vo.DonationwitnessBaseInfoVO;
import com.ruoyi.project.domain.ServiceDonationwitness;
import com.ruoyi.project.domain.vo.DonationWitnessVO;
import com.ruoyi.project.domain.vo.TimeVO;
@@ -15,7 +14,7 @@
/**
* 鎹愮尞瑙佽瘉Mapper鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2021-11-17
*/
@@ -28,7 +27,9 @@
* @param serviceDonationwitness 鎹愮尞瑙佽瘉
* @return 鎹愮尞瑙佽瘉闆嗗悎
*/
- public List<ServiceDonationwitness> selectServiceDonationwitnessList(ServiceDonationwitness serviceDonationwitness);
+ List<ServiceDonationwitness> selectServiceDonationwitnessList(ServiceDonationwitness serviceDonationwitness);
+
+ List<DonationwitnessBaseInfoDTO> getDonationwitnessBaseInfo(DonationwitnessBaseInfoVO donationwitnessBaseInfoVO);
List<ServiceDonationwitness> getWitnessList();
@@ -46,8 +47,8 @@
ServiceDonationwitness selectByInfoId(Long infoid);
- List<ServiceDonationwitness> getAllDonatePeople();
+ List<ServiceDonationwitness> getAllDonatePeople();
int countThisYearByTime(TimeVO timeVO);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceEthicalreviewinitiateMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceEthicalreviewinitiateMapper.java
index 9b49345..11133c0 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceEthicalreviewinitiateMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceEthicalreviewinitiateMapper.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.project.domain.ServiceEthicalreviewinitiate;
+import com.ruoyi.project.domain.dto.ReviewInitiateBaseInfoDTO;
+import com.ruoyi.project.domain.vo.ReviewInitiateBaseInfoVO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -22,4 +24,6 @@
* @return 浼︾悊瀹℃煡鍙戣捣闆嗗悎
*/
public List<ServiceEthicalreviewinitiate> selectServiceEthicalreviewinitiateList(ServiceEthicalreviewinitiate serviceEthicalreviewinitiate);
+
+ public List<ReviewInitiateBaseInfoDTO> reviewinitiateBaseInfoList(ReviewInitiateBaseInfoVO reviewInitiateBaseInfoVO);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceMedicalevaluationMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceMedicalevaluationMapper.java
index 184f24a..3b93c97 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceMedicalevaluationMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceMedicalevaluationMapper.java
@@ -2,21 +2,25 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
import java.util.List;
+
+import com.ruoyi.project.domain.dto.MedicalevaluationBaseInfoDTO;
import com.ruoyi.project.domain.ServiceMedicalevaluation;
+import com.ruoyi.project.domain.vo.MedicalEvaluationWithBaseInfoVO;
+import com.ruoyi.project.domain.vo.ServiceMedicalevaluationVO;
import com.ruoyi.project.domain.vo.MedicalEvaluationVO;
import com.ruoyi.project.domain.vo.TimeVO;
import org.apache.ibatis.annotations.Mapper;
/**
* 鍖诲璇勪及Mapper鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2021-11-19
*/
@Mapper
-public interface ServiceMedicalevaluationMapper extends BaseMapper<ServiceMedicalevaluation>
-{
+public interface ServiceMedicalevaluationMapper extends BaseMapper<ServiceMedicalevaluation> {
/**
* 鏌ヨ鍖诲璇勪及鍒楄〃
*
@@ -28,4 +32,6 @@
List<MedicalEvaluationVO> selectVOList(MedicalEvaluationVO medicalEvaluationVO);
Integer countNumber(TimeVO timeVO);
+
+ List<MedicalevaluationBaseInfoDTO> selectEvaluateBaseInfoList(MedicalEvaluationWithBaseInfoVO medicalEvaluationWithBaseInfoVO);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceRelativesconfirmationMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceRelativesconfirmationMapper.java
index 636627b..0672e60 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceRelativesconfirmationMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceRelativesconfirmationMapper.java
@@ -6,6 +6,8 @@
import java.util.List;
import com.ruoyi.project.domain.ServiceRelativesconfirmation;
+import com.ruoyi.project.domain.dto.RelativeConfirmationBaseInfoDTO;
+import com.ruoyi.project.domain.vo.RelativeConfirmationBaseInfoVO;
import com.ruoyi.project.domain.vo.RelativeConfirmationVO;
import com.ruoyi.project.domain.vo.TimeVO;
import org.apache.ibatis.annotations.Mapper;
@@ -30,5 +32,7 @@
List<RelativeConfirmationVO> selectVOList(RelativeConfirmationVO relativeConfirmationVO);
+ List<RelativeConfirmationBaseInfoDTO> confirmationBaseInfoList(RelativeConfirmationBaseInfoVO relativeConfirmationBaseInfoVO);
+
Integer countNumber(TimeVO timeVO);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDeathinfoService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDeathinfoService.java
new file mode 100644
index 0000000..0251dca
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDeathinfoService.java
@@ -0,0 +1,37 @@
+package com.ruoyi.project.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.project.domain.ServiceDeathinfo;
+import com.ruoyi.project.domain.dto.DeathBaseInfoDTO;
+import com.ruoyi.project.domain.vo.DeathBaseInfoVO;
+
+import java.util.List;
+
+/**
+ * 鎮ｈ�呮浜′俊鎭疭ervice鎺ュ彛
+ *
+ * @author ls
+ * @date 2026-01-20
+ */
+public interface IServiceDeathinfoService extends IService<ServiceDeathinfo>
+{
+
+ /**
+ * 鏌ヨ鎮ｈ�呮浜′俊鎭垪琛�
+ *
+ * @param serviceDeathinfo 鎮ｈ�呮浜′俊鎭�
+ * @return 鎮ｈ�呮浜′俊鎭泦鍚�
+ */
+ public Page<ServiceDeathinfo> queryList(ServiceDeathinfo serviceDeathinfo);
+
+ /**
+ * 鏌ヨ鎮ｈ�呮浜′俊鎭垪琛�
+ *
+ * @param serviceDeathinfo 鎮ｈ�呮浜′俊鎭�
+ * @return 鎮ｈ�呮浜′俊鎭泦鍚�
+ */
+ public List<ServiceDeathinfo> exportQueryList(ServiceDeathinfo serviceDeathinfo);
+
+ public List<DeathBaseInfoDTO> dathInfoBaseInfoList(DeathBaseInfoVO deathBaseInfoVO);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoService.java
index 993ac52..9a5836b 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoService.java
@@ -3,29 +3,39 @@
import java.util.List;
import java.util.Map;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
+import com.ruoyi.project.domain.dto.DonatebaseinfoProgressDTO;
+import com.ruoyi.project.domain.vo.DonatebaseinfoProgressVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.domain.vo.countByRecordStateVO;
import org.apache.xmlbeans.impl.xb.xsdschema.Public;
/**
* 鎹愮尞鍩虹Service鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2021-11-13
*/
-public interface IServiceDonatebaseinfoService extends IService<ServiceDonatebaseinfo>
-{
+public interface IServiceDonatebaseinfoService extends IService<ServiceDonatebaseinfo> {
/**
* 鏌ヨ鎹愮尞鍩虹鍒楄〃
- *
+ *
* @param serviceDonatebaseinfo 鎹愮尞鍩虹
* @return 鎹愮尞鍩虹闆嗗悎
*/
public List<ServiceDonatebaseinfo> queryList(ServiceDonatebaseinfo serviceDonatebaseinfo);
+
+ /**
+ * 鏌ヨ鎹愮尞鍩虹鍒楄〃(鍒嗛〉)
+ *
+ * @param serviceDonatebaseinfo 鎹愮尞鍩虹
+ * @return 鎹愮尞鍩虹闆嗗悎(鍒嗛〉)
+ */
+ public Page<ServiceDonatebaseinfo> queryListPage(ServiceDonatebaseinfo serviceDonatebaseinfo);
public String getDonateNumber(ServiceDonatebaseinfo serviceDonatebaseinfo);
@@ -39,6 +49,8 @@
List<ServiceDonatebaseinfo> listForSearch(ServiceDonatebaseinfo serviceDonatebaseinfo);
+ List<DonatebaseinfoProgressDTO> donateBaseInfoProgressList(DonatebaseinfoProgressVO donatebaseinfoProgressVO);
+
String gethqzz(Long infoid);
countByRecordStateVO countByRecordState(TimeVO timeVO);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatemaintenanceService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatemaintenanceService.java
index bc7bdac..21e3e8d 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatemaintenanceService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatemaintenanceService.java
@@ -1,9 +1,9 @@
package com.ruoyi.project.service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceDonatemaintenance;
-
-import java.util.List;
+import com.ruoyi.project.domain.vo.ServiceDonatemaintenanceVO;
/**
* 渚涗綋缁存姢璁板綍Service鎺ュ彛
@@ -20,5 +20,13 @@
* @param serviceDonatemaintenance 渚涗綋缁存姢璁板綍
* @return 渚涗綋缁存姢璁板綍闆嗗悎
*/
- public List<ServiceDonatemaintenance> queryList(ServiceDonatemaintenance serviceDonatemaintenance);
+ public Page<ServiceDonatemaintenance> queryList(ServiceDonatemaintenance serviceDonatemaintenance);
+
+ /**
+ * 鑾峰彇渚涗綋缁存姢璁板綍鍩烘湰淇℃伅鍒楄〃
+ *
+ * @param serviceDonatemaintenanceVO
+ * @return
+ */
+ public Page maintenanceBaseInfoList(ServiceDonatemaintenanceVO serviceDonatemaintenanceVO);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganBaseService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganBaseService.java
new file mode 100644
index 0000000..66096c4
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganBaseService.java
@@ -0,0 +1,42 @@
+package com.ruoyi.project.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.project.domain.ServiceDonateorganBase;
+import com.ruoyi.project.domain.dto.DonateorganBaseInfoDTO;
+import com.ruoyi.project.domain.vo.DonateorganBaseInfoVO;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * 鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹Service鎺ュ彛
+ *
+ * @author ls
+ * @date 2026-01-17
+ */
+public interface IServiceDonateorganBaseService extends IService<ServiceDonateorganBase> {
+
+ /**
+ * 鏌ヨ鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹鍒楄〃
+ *
+ * @param serviceDonateorganBase 鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹
+ * @return 鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹闆嗗悎
+ */
+ public Page<ServiceDonateorganBase> queryList(ServiceDonateorganBase serviceDonateorganBase);
+
+ /**
+ * 鏌ヨ鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹鍒楄〃
+ * @param donateorganBaseInfoVO
+ * @return
+ */
+ public List<DonateorganBaseInfoDTO> getDonateorganBaseInfoList(@RequestBody DonateorganBaseInfoVO donateorganBaseInfoVO);
+
+ /**
+ * 鏌ヨ鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹鍒楄〃
+ *
+ * @param serviceDonateorganBase 鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹
+ * @return 鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹闆嗗悎
+ */
+ public List<ServiceDonateorganBase> exportQueryList(ServiceDonateorganBase serviceDonateorganBase);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonationwitnessService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonationwitnessService.java
index 30c0043..99ccfb0 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonationwitnessService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonationwitnessService.java
@@ -1,8 +1,11 @@
package com.ruoyi.project.service;
import java.util.List;
+
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.project.domain.vo.DonationwitnessBaseInfoVO;
import com.ruoyi.project.domain.ServiceDonationwitness;
+import com.ruoyi.project.domain.dto.DonationwitnessBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonationWitnessVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.domain.vo.WitnessStatsVO;
@@ -13,8 +16,7 @@
* @author ruoyi
* @date 2021-11-17
*/
-public interface IServiceDonationwitnessService extends IService<ServiceDonationwitness>
-{
+public interface IServiceDonationwitnessService extends IService<ServiceDonationwitness> {
/**
* 鏌ヨ鎹愮尞瑙佽瘉鍒楄〃
@@ -26,6 +28,13 @@
public List<ServiceDonationwitness> selectServiceDonationwitnessList(ServiceDonationwitness serviceDonationwitness);
+ /**
+ * 鑾峰彇鎹愮尞瑙佽瘉鍩烘湰淇℃伅
+ * @param donationwitnessBaseInfoVO
+ * @return
+ */
+ public List<DonationwitnessBaseInfoDTO> getDonationwitnessBaseInfo(DonationwitnessBaseInfoVO donationwitnessBaseInfoVO);
+
List<DonationWitnessVO> selectVOList(DonationWitnessVO donationWitnessVO);
ServiceDonationwitness getByInfoId(Long infoid);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceEthicalreviewinitiateService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceEthicalreviewinitiateService.java
index ea8234a..093b9cb 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceEthicalreviewinitiateService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceEthicalreviewinitiateService.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceEthicalreviewinitiate;
+import com.ruoyi.project.domain.dto.ReviewInitiateBaseInfoDTO;
+import com.ruoyi.project.domain.vo.ReviewInitiateBaseInfoVO;
import java.util.List;
@@ -11,8 +13,7 @@
* @author ruoyi
* @date 2025-12-20
*/
-public interface IServiceEthicalreviewinitiateService extends IService<ServiceEthicalreviewinitiate>
-{
+public interface IServiceEthicalreviewinitiateService extends IService<ServiceEthicalreviewinitiate> {
/**
* 鏌ヨ浼︾悊瀹℃煡鍙戣捣鍒楄〃
@@ -21,4 +22,6 @@
* @return 浼︾悊瀹℃煡鍙戣捣闆嗗悎
*/
public List<ServiceEthicalreviewinitiate> queryList(ServiceEthicalreviewinitiate serviceEthicalreviewinitiate);
+
+ public List<ReviewInitiateBaseInfoDTO> reviewinitiateBaseInfoList(ReviewInitiateBaseInfoVO reviewInitiateBaseInfoVO);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceMedicalevaluationService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceMedicalevaluationService.java
index 6e1f622..73b0120 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceMedicalevaluationService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceMedicalevaluationService.java
@@ -1,13 +1,16 @@
package com.ruoyi.project.service;
-import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceMedicalevaluation;
+import com.ruoyi.project.domain.dto.MedicalevaluationBaseInfoDTO;
import com.ruoyi.project.domain.vo.MedicalEvaluationVO;
+import com.ruoyi.project.domain.vo.MedicalEvaluationWithBaseInfoVO;
+
+import java.util.List;
/**
* 鍖诲璇勪及Service鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2021-11-19
*/
@@ -16,7 +19,7 @@
/**
* 鏌ヨ鍖诲璇勪及鍒楄〃
- *
+ *
* @param serviceMedicalevaluation 鍖诲璇勪及
* @return 鍖诲璇勪及闆嗗悎
*/
@@ -24,5 +27,5 @@
List<MedicalEvaluationVO> selectVOList(MedicalEvaluationVO medicalEvaluationVO);
- List<ServiceMedicalevaluation> selectServiceMedicalevaluationList(ServiceMedicalevaluation serviceMedicalevaluation);
+ List<MedicalevaluationBaseInfoDTO> evaluateBaseInfolist(MedicalEvaluationWithBaseInfoVO medicalEvaluationWithBaseInfoVO);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceRelativesconfirmationService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceRelativesconfirmationService.java
index 4308060..2524688 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceRelativesconfirmationService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceRelativesconfirmationService.java
@@ -3,11 +3,13 @@
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceRelativesconfirmation;
+import com.ruoyi.project.domain.dto.RelativeConfirmationBaseInfoDTO;
+import com.ruoyi.project.domain.vo.RelativeConfirmationBaseInfoVO;
import com.ruoyi.project.domain.vo.RelativeConfirmationVO;
/**
* 鎹愮尞浜插睘纭Service鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2021-11-15
*/
@@ -16,7 +18,7 @@
/**
* 鏌ヨ鎹愮尞浜插睘纭鍒楄〃
- *
+ *
* @param serviceRelativesconfirmation 鎹愮尞浜插睘纭
* @return 鎹愮尞浜插睘纭闆嗗悎
*/
@@ -26,4 +28,6 @@
List<RelativeConfirmationVO> selectVOList(RelativeConfirmationVO relativeConfirmationVO);
+
+ List<RelativeConfirmationBaseInfoDTO> confirmationBaseInfoList(RelativeConfirmationBaseInfoVO relativeConfirmationBaseInfoVO);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/DingTalkServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/DingTalkServiceImpl.java
index 99fb158..9974eb6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/DingTalkServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/DingTalkServiceImpl.java
@@ -3,19 +3,14 @@
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.dingtalk.api.DefaultDingTalkClient;
-import com.dingtalk.api.DingTalkClient;
-import com.dingtalk.api.request.*;
-import com.dingtalk.api.response.*;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
-import com.ruoyi.project.domain.vo.DingDetpInfoVo;
import com.ruoyi.project.domain.vo.DingTalkReqVo;
-import com.ruoyi.project.domain.vo.DingUserInfoVo;
import com.ruoyi.project.service.DingTalkService;
+import com.ruoyi.project.utils.DingTalkProxyClient;
import com.ruoyi.system.mapper.SysUserMapper;
import com.taobao.api.ApiException;
import lombok.extern.log4j.Log4j;
@@ -27,6 +22,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -54,6 +50,9 @@
@Autowired
private SysUserMapper sysUserMapper;
+ @Autowired
+ private DingTalkProxyClient dingTalkProxyClient;
+
@Override
public Boolean sendNotification(DingTalkReqVo dingTalkReqVo) {
String body = null;
@@ -63,37 +62,32 @@
String accessToken = null;
try {
- accessToken = getAccessToken();
+ accessToken = dingTalkProxyClient.getAccessToken();
} catch (ApiException e) {
e.printStackTrace();
}
if (StringUtils.isNotEmpty(dingTalkReqVo.getNumber())) {
- DingTalkClient clientT = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/user/getbymobile");
- OapiV2UserGetbymobileRequest req = new OapiV2UserGetbymobileRequest();
- req.setMobile(dingTalkReqVo.getNumber());
- OapiV2UserGetbymobileResponse rsp = null;
+ // 浣跨敤浠ｇ悊瀹㈡埛绔皟鐢ㄨ幏鍙栫敤鎴稩D鎺ュ彛
+ Map<String, String> params = new HashMap<>();
+ params.put("access_token", accessToken);
+ params.put("mobile", dingTalkReqVo.getNumber());
try {
- rsp = clientT.execute(req, accessToken);
- body = rsp.getBody();
+ body = dingTalkProxyClient.executeGet("/topapi/v2/user/getbymobile", params);
String jsonObject = JSONObject.parseObject(body).getJSONObject("result").get("userid").toString();
userIdlist.add(jsonObject);
-
} catch (ApiException e) {
e.printStackTrace();
}
} else {
- DingTalkClient client3 = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/user/listid");
-
- OapiUserListidRequest request2 = new OapiUserListidRequest();
- request2.setDeptId(dingTalkReqVo.getDeptId()); // 璁剧疆瑕佽幏鍙栫殑閮ㄩ棬 ID锛岃繖閲屼互鏍归儴闂ㄤ负渚�675909059L
- // 璁剧疆閮ㄩ棬 ID锛屽鏋滆幏鍙栨墍鏈夊憳宸ユ墜鏈哄彿锛屽彲浠ヨ缃负鏍归儴闂ㄧ殑 ID
- OapiUserListidResponse response2 = null;
+ // 浣跨敤浠ｇ悊瀹㈡埛绔皟鐢ㄨ幏鍙栭儴闂ㄧ敤鎴稩D鍒楄〃鎺ュ彛
+ Map<String, String> params = new HashMap<>();
+ params.put("access_token", accessToken);
+ params.put("dept_id", String.valueOf(dingTalkReqVo.getDeptId()));
try {
- response2 = client3.execute(request2, accessToken);
+ body = dingTalkProxyClient.executeGet("/topapi/user/listid", params);
} catch (ApiException e) {
e.printStackTrace();
}
- body = response2.getBody();
// 瑙ｆ瀽涓篔SONObject
JSONObject jsonObject = JSONObject.parseObject(body);
if (jsonObject != null) {
@@ -108,60 +102,62 @@
//userid鏁扮粍
for (String urid : userIdlist) {
- DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/message/corpconversation/asyncsend_v2");
- OapiMessageCorpconversationAsyncsendV2Request request = new OapiMessageCorpconversationAsyncsendV2Request();
- request.setUseridList(urid);
- request.setAgentId(agentId);
- request.setToAllUser(false);
+ // 鏋勫缓鍙戦�佹秷鎭殑瀹屾暣JSON瀵硅薄锛岀鍚堥拤閽堿PI鏍煎紡
+ Map<String, Object> messageData = new HashMap<>();
+ messageData.put("userid_list", urid);
+ messageData.put("agent_id", agentId);
+ messageData.put("to_all_user", false);
//鍙戦�佸唴瀹瑰鐞�
List<ConcurrentHashMap<String, Object>> contents = dingTalkReqVo.getContents();
- ArrayList<OapiMessageCorpconversationAsyncsendV2Request.Form> objects = new ArrayList<>();
+ List<Map<String, Object>> objects = new ArrayList<>();
for (int i = 0; i < contents.size(); i++) {
ConcurrentHashMap<String, Object> map = contents.get(i);
for (Map.Entry<String, Object> entry : map.entrySet()) {
- OapiMessageCorpconversationAsyncsendV2Request.Form formSeverityDesc = new OapiMessageCorpconversationAsyncsendV2Request.Form();
- formSeverityDesc.setKey(entry.getKey());
+ Map<String, Object> formItem = new HashMap<>();
+ formItem.put("key", entry.getKey());
if (entry.getKey().contains("瀹℃壒鏃堕棿")) {
Date date = (Date) entry.getValue();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
String format = simpleDateFormat.format(date);
- formSeverityDesc.setValue(format);
+ formItem.put("value", format);
} else {
if (entry.getValue() != null) {
- formSeverityDesc.setValue(entry.getValue().toString());
+ formItem.put("value", entry.getValue().toString());
+ } else {
+ formItem.put("value", "");
}
}
- objects.add(formSeverityDesc);
+ objects.add(formItem);
}
}
- OapiMessageCorpconversationAsyncsendV2Request.Msg msg = new OapiMessageCorpconversationAsyncsendV2Request.Msg();
- msg.setOa(new OapiMessageCorpconversationAsyncsendV2Request.OA());
- msg.getOa().setMessageUrl(dingTalkReqVo.getUrl());
- msg.getOa().setPcMessageUrl(dingTalkReqVo.getUrl());
- msg.getOa().setHead(new OapiMessageCorpconversationAsyncsendV2Request.Head());
- // msg.getOa().getHead().setText("浣犲湪璇村暐鍛㈢粧椤舵浛鑻涘ず闃挎柉钂傝姮闃挎柉钂傝姮");
- msg.getOa().getHead().setBgcolor("00409eff");
- msg.getOa().setBody(new OapiMessageCorpconversationAsyncsendV2Request.Body());
- msg.getOa().getBody().setTitle(dingTalkReqVo.getTitle());
- // msg.getOa().getBody().setContent("寰呭鐞�:" + "123" + "鏉�");
+ Map<String, Object> msg = new HashMap<>();
+ Map<String, Object> oa = new HashMap<>();
+ oa.put("message_url", dingTalkReqVo.getUrl());
+ oa.put("pc_message_url", dingTalkReqVo.getUrl());
+ Map<String, Object> head = new HashMap<>();
+ head.put("bgcolor", "00409eff");
+ oa.put("head", head);
+ Map<String, Object> bodyContent = new HashMap<>();
+ bodyContent.put("title", dingTalkReqVo.getTitle());
+ bodyContent.put("form", objects);
+ oa.put("body", bodyContent);
+ msg.put("oa", oa);
+ msg.put("msgtype", "oa");
+ messageData.put("msg", msg);
- msg.getOa().getBody().setForm(objects);
- msg.setMsgtype("oa");
- request.setMsg(msg);
- // log.info("鑾峰彇鍙戦�侀�氱煡娑堟伅浣撳拰鑾峰彇鍙戦�侀�氱煡浜哄畬鎴�");
- OapiMessageCorpconversationAsyncsendV2Response response = null;
+ // 灏哸ccess_token浣滀负URL鍙傛暟浼犻��
+ String messageJson = JSONObject.toJSONString(messageData);
try {
- response = client.execute(request, accessToken);
+ // 浣跨敤浠ｇ悊瀹㈡埛绔彂閫丳OST璇锋眰
+ body = dingTalkProxyClient.executePost("/topapi/message/corpconversation/asyncsend_v2?access_token=" + accessToken, messageJson);
+ JSONObject response = JSONObject.parseObject(body);
+ result = response.getInteger("errcode") == 0;
} catch (ApiException e) {
- e.getErrMsg();
+ log.error("鍙戦�侀拤閽夋秷鎭け璐�: " + e.getErrMsg());
}
- // log.info("娑堟伅浠诲姟ID"+response.getTaskId());
- System.out.println(response.getTaskId());
-
- result = response.isSuccess();
}
return result;
}
@@ -174,9 +170,8 @@
*/
public Map<String, Object> noLogin(String authCode) {
try {
- String urlString = "https://oapi.dingtalk.com/topapi/v2/user/getuserinfo";
- String params = "access_token=" + getAccessToken() + "&code=" + authCode;
- String result = HttpUtils.sendPost(urlString, params);
+ String params = "access_token=" + dingTalkProxyClient.getAccessToken() + "&code=" + authCode;
+ String result = HttpUtils.sendPost("https://oapi.dingtalk.com/topapi/v2/user/getuserinfo", params);
ObjectMapper objectMapper = new ObjectMapper();
Map<String, Object> map = objectMapper.readValue(result, Map.class);
return map;
@@ -193,13 +188,13 @@
//鏍规嵁浼犺繃鏉ョ殑閮ㄩ棬ID锛屽幓鑾峰彇璇ラ儴闂ㄤ笅鐨勭敤鎴蜂俊鎭�
if (begin != 1) DingUserInfoList(deptID);
//鑾峰彇瀛愰儴闂ㄧ殑dept_id
- DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/department/listsub");
- OapiV2DepartmentListsubRequest req = new OapiV2DepartmentListsubRequest();
- req.setDeptId(deptID);
- req.setLanguage("zh_CN");
- OapiV2DepartmentListsubResponse rsp = client.execute(req, getAccessToken());
+ Map<String, String> params = new HashMap<>();
+ params.put("access_token", dingTalkProxyClient.getAccessToken());
+ params.put("dept_id", deptID.toString());
+ params.put("language", "zh_CN");
+ String rspBody = dingTalkProxyClient.executeGet("/topapi/v2/department/listsub", params);
ObjectMapper objectMapper = new ObjectMapper();
- Map<String, Object> map = objectMapper.readValue(rsp.getBody(), Map.class);
+ Map<String, Object> map = objectMapper.readValue(rspBody, Map.class);
if (ObjectUtils.isNotEmpty(map)) {
List<Map<String, Object>> dingDetpInfoList = (List<Map<String, Object>>) map.get("result");
if (Integer.valueOf(map.get("errcode").toString()) == 0) {
@@ -216,18 +211,17 @@
}
public void DingUserInfoList(Long deptId) {
- DingTalkClient client = null;
try {
- client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/user/list?access_token=" + getAccessToken());
- OapiV2UserListRequest req = new OapiV2UserListRequest();
- req.setDeptId(deptId);
- req.setCursor(0L);
- req.setSize(100L);
- req.setLanguage("zh_CN");
- OapiV2UserListResponse rsp = client.execute(req, "");
+ Map<String, String> params = new HashMap<>();
+ params.put("access_token", dingTalkProxyClient.getAccessToken());
+ params.put("dept_id", deptId.toString());
+ params.put("cursor", "0");
+ params.put("size", "100");
+ params.put("language", "zh_CN");
+ String rspBody = dingTalkProxyClient.executeGet("/topapi/v2/user/list", params);
//鑾峰彇resp閲岀殑鐢ㄦ埛淇℃伅闆嗗悎
ObjectMapper objectMapper = new ObjectMapper();
- Map<String, Object> map = objectMapper.readValue(rsp.getBody(), Map.class);
+ Map<String, Object> map = objectMapper.readValue(rspBody, Map.class);
Map<String, Object> mapResult = (Map<String, Object>) map.get("result");
List<Map<String, Object>> userInfoMapList = (List<Map<String, Object>>) mapResult.get("list");
if (!CollectionUtils.isEmpty(userInfoMapList)) {
@@ -251,16 +245,7 @@
* 鑾峰彇 access_token
*/
private String getAccessToken() throws ApiException {
- DefaultDingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/gettoken");
- OapiGettokenRequest request = new OapiGettokenRequest();
- //Appkey
- request.setAppkey(dingAppid);
- //Appsecret
- request.setAppsecret(dingAppSecret);
- /*璇锋眰鏂瑰紡*/
- request.setHttpMethod("GET");
- OapiGettokenResponse response = client.execute(request);
- return response.getAccessToken();
+ return dingTalkProxyClient.getAccessToken();
}
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDeathinfoServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDeathinfoServiceImpl.java
new file mode 100644
index 0000000..8057715
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDeathinfoServiceImpl.java
@@ -0,0 +1,152 @@
+package com.ruoyi.project.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.project.domain.ServiceDeathinfo;
+import com.ruoyi.project.domain.dto.DeathBaseInfoDTO;
+import com.ruoyi.project.domain.vo.DeathBaseInfoVO;
+import com.ruoyi.project.mapper.ServiceDeathinfoMapper;
+import com.ruoyi.project.service.IServiceDeathinfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鎮ｈ�呮浜′俊鎭疭ervice涓氬姟灞傚鐞�
+ *
+ * @author ls
+ * @date 2026-01-20
+ */
+@Service
+public class ServiceDeathinfoServiceImpl extends ServiceImpl<ServiceDeathinfoMapper, ServiceDeathinfo> implements IServiceDeathinfoService {
+
+ @Autowired
+ private ServiceDeathinfoMapper serviceDeathinfoMapper;
+
+ /**
+ * 鏌ヨ鎮ｈ�呮浜′俊鎭垪琛�
+ *
+ * @param serviceDeathinfo 鎮ｈ�呮浜′俊鎭�
+ * @return 鎮ｈ�呮浜′俊鎭�
+ */
+ @Override
+ public Page<ServiceDeathinfo> queryList(ServiceDeathinfo serviceDeathinfo) {
+ LambdaQueryWrapper<ServiceDeathinfo> wrappers = Wrappers.lambdaQuery();
+ if (serviceDeathinfo.getInfoid() != null) {
+ wrappers.eq(ServiceDeathinfo::getInfoid, serviceDeathinfo.getInfoid());
+ }
+ if (StringUtils.isNotBlank(serviceDeathinfo.getDonorno())) {
+ wrappers.eq(ServiceDeathinfo::getDonorno, serviceDeathinfo.getDonorno());
+ }
+ if (StringUtils.isNotBlank(serviceDeathinfo.getGainhospitalno())) {
+ wrappers.eq(ServiceDeathinfo::getGainhospitalno, serviceDeathinfo.getGainhospitalno());
+ }
+ if (StringUtils.isNotBlank(serviceDeathinfo.getGainhospitalname())) {
+ wrappers.like(ServiceDeathinfo::getGainhospitalname, serviceDeathinfo.getGainhospitalname());
+ }
+ if (serviceDeathinfo.getDeathtime() != null) {
+ wrappers.eq(ServiceDeathinfo::getDeathtime, serviceDeathinfo.getDeathtime());
+ }
+ if (StringUtils.isNotBlank(serviceDeathinfo.getDeathreason())) {
+ wrappers.eq(ServiceDeathinfo::getDeathreason, serviceDeathinfo.getDeathreason());
+ }
+ if (StringUtils.isNotBlank(serviceDeathinfo.getDeathjudgedocto())) {
+ wrappers.eq(ServiceDeathinfo::getDeathjudgedocto, serviceDeathinfo.getDeathjudgedocto());
+ }
+ if (StringUtils.isNotBlank(serviceDeathinfo.getDeathjudgedoctt())) {
+ wrappers.eq(ServiceDeathinfo::getDeathjudgedoctt, serviceDeathinfo.getDeathjudgedoctt());
+ }
+ if (StringUtils.isNotBlank(serviceDeathinfo.getDeathjudgeannex())) {
+ wrappers.eq(ServiceDeathinfo::getDeathjudgeannex, serviceDeathinfo.getDeathjudgeannex());
+ }
+ if (serviceDeathinfo.getIsspendremember() != null) {
+ wrappers.eq(ServiceDeathinfo::getIsspendremember, serviceDeathinfo.getIsspendremember());
+ }
+ if (serviceDeathinfo.getIsrestoreremains() != null) {
+ wrappers.eq(ServiceDeathinfo::getIsrestoreremains, serviceDeathinfo.getIsrestoreremains());
+ }
+ if (StringUtils.isNotBlank(serviceDeathinfo.getRememberannex())) {
+ wrappers.eq(ServiceDeathinfo::getRememberannex, serviceDeathinfo.getRememberannex());
+ }
+ if (StringUtils.isNotBlank(serviceDeathinfo.getResponsibleuserid())) {
+ wrappers.eq(ServiceDeathinfo::getResponsibleuserid, serviceDeathinfo.getResponsibleuserid());
+ }
+ if (StringUtils.isNotBlank(serviceDeathinfo.getResponsibleusername())) {
+ wrappers.like(ServiceDeathinfo::getResponsibleusername, serviceDeathinfo.getResponsibleusername());
+ }
+
+ int currentPage = (serviceDeathinfo.getPageNum() == null || serviceDeathinfo.getPageNum() < 1) ? 1 : serviceDeathinfo.getPageNum();
+ int size = (serviceDeathinfo.getPageSize() == null || serviceDeathinfo.getPageSize() < 1) ? 10 : serviceDeathinfo.getPageSize();
+ Page<ServiceDeathinfo> page = new Page<>(currentPage, size);
+ List<ServiceDeathinfo> serviceDeathinfoList = serviceDeathinfoMapper.selectPage(page, wrappers).getRecords();
+
+ return page.setRecords(serviceDeathinfoList);
+ }
+
+
+ /**
+ * 鏌ヨ鎮ｈ�呮浜′俊鎭垪琛�
+ *
+ * @param serviceDeathinfo 鎮ｈ�呮浜′俊鎭�
+ * @return 鎮ｈ�呮浜′俊鎭�
+ */
+ @Override
+ public List<ServiceDeathinfo> exportQueryList(ServiceDeathinfo serviceDeathinfo) {
+ LambdaQueryWrapper<ServiceDeathinfo> wrappers = Wrappers.lambdaQuery();
+ if (serviceDeathinfo.getInfoid() != null) {
+ wrappers.eq(ServiceDeathinfo::getInfoid, serviceDeathinfo.getInfoid());
+ }
+ if (StringUtils.isNotBlank(serviceDeathinfo.getDonorno())) {
+ wrappers.eq(ServiceDeathinfo::getDonorno, serviceDeathinfo.getDonorno());
+ }
+ if (StringUtils.isNotBlank(serviceDeathinfo.getGainhospitalno())) {
+ wrappers.eq(ServiceDeathinfo::getGainhospitalno, serviceDeathinfo.getGainhospitalno());
+ }
+ if (StringUtils.isNotBlank(serviceDeathinfo.getGainhospitalname())) {
+ wrappers.like(ServiceDeathinfo::getGainhospitalname, serviceDeathinfo.getGainhospitalname());
+ }
+ if (serviceDeathinfo.getDeathtime() != null) {
+ wrappers.eq(ServiceDeathinfo::getDeathtime, serviceDeathinfo.getDeathtime());
+ }
+ if (StringUtils.isNotBlank(serviceDeathinfo.getDeathreason())) {
+ wrappers.eq(ServiceDeathinfo::getDeathreason, serviceDeathinfo.getDeathreason());
+ }
+ if (StringUtils.isNotBlank(serviceDeathinfo.getDeathjudgedocto())) {
+ wrappers.eq(ServiceDeathinfo::getDeathjudgedocto, serviceDeathinfo.getDeathjudgedocto());
+ }
+ if (StringUtils.isNotBlank(serviceDeathinfo.getDeathjudgedoctt())) {
+ wrappers.eq(ServiceDeathinfo::getDeathjudgedoctt, serviceDeathinfo.getDeathjudgedoctt());
+ }
+ if (StringUtils.isNotBlank(serviceDeathinfo.getDeathjudgeannex())) {
+ wrappers.eq(ServiceDeathinfo::getDeathjudgeannex, serviceDeathinfo.getDeathjudgeannex());
+ }
+ if (serviceDeathinfo.getIsspendremember() != null) {
+ wrappers.eq(ServiceDeathinfo::getIsspendremember, serviceDeathinfo.getIsspendremember());
+ }
+ if (serviceDeathinfo.getIsrestoreremains() != null) {
+ wrappers.eq(ServiceDeathinfo::getIsrestoreremains, serviceDeathinfo.getIsrestoreremains());
+ }
+ if (StringUtils.isNotBlank(serviceDeathinfo.getRememberannex())) {
+ wrappers.eq(ServiceDeathinfo::getRememberannex, serviceDeathinfo.getRememberannex());
+ }
+ if (StringUtils.isNotBlank(serviceDeathinfo.getResponsibleuserid())) {
+ wrappers.eq(ServiceDeathinfo::getResponsibleuserid, serviceDeathinfo.getResponsibleuserid());
+ }
+ if (StringUtils.isNotBlank(serviceDeathinfo.getResponsibleusername())) {
+ wrappers.like(ServiceDeathinfo::getResponsibleusername, serviceDeathinfo.getResponsibleusername());
+ }
+ return this.list(wrappers);
+ }
+
+ @Override
+ public List<DeathBaseInfoDTO> dathInfoBaseInfoList(DeathBaseInfoVO deathBaseInfoVO) {
+ List<DeathBaseInfoDTO> deathBaseInfoDTOS = serviceDeathinfoMapper.dathInfoBaseInfoList(deathBaseInfoVO);
+ return deathBaseInfoDTOS;
+ }
+
+
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
index a839871..213182b 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
@@ -9,12 +9,15 @@
import java.util.concurrent.ConcurrentHashMap;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.*;
+import com.ruoyi.project.domain.dto.DonatebaseinfoProgressDTO;
+import com.ruoyi.project.domain.vo.DonatebaseinfoProgressVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.domain.vo.countByRecordStateVO;
import com.ruoyi.project.mapper.*;
@@ -92,50 +95,22 @@
@Override
public List<ServiceDonatebaseinfo> queryList(ServiceDonatebaseinfo serviceDonatebaseinfo) {
LambdaQueryWrapper<ServiceDonatebaseinfo> wrappers = Wrappers.lambdaQuery();
- if (StringUtils.isNotBlank(serviceDonatebaseinfo.getName())) {
- wrappers.like(ServiceDonatebaseinfo::getName, serviceDonatebaseinfo.getName());
- }
- if (StringUtils.isNotBlank(serviceDonatebaseinfo.getIdcardno())) {
- wrappers.like(ServiceDonatebaseinfo::getIdcardno, serviceDonatebaseinfo.getIdcardno());
- }
- if (StringUtils.isNotBlank(serviceDonatebaseinfo.getResidenceprovince())) {
- wrappers.eq(ServiceDonatebaseinfo::getResidenceprovince, serviceDonatebaseinfo.getResidenceprovince());
- }
- if (serviceDonatebaseinfo.getRecordstate() != null) {
- wrappers.eq(ServiceDonatebaseinfo::getRecordstate, serviceDonatebaseinfo.getRecordstate());
- }
- if (StringUtils.isNotBlank(serviceDonatebaseinfo.getTreatmenthospitalname())) {
- wrappers.like(ServiceDonatebaseinfo::getTreatmenthospitalname, serviceDonatebaseinfo.getTreatmenthospitalname());
- }
- if (StringUtils.isNotBlank(serviceDonatebaseinfo.getDonorno())) {
- wrappers.eq(ServiceDonatebaseinfo::getDonorno, serviceDonatebaseinfo.getDonorno());
- }
- if (StringUtils.isNotBlank(serviceDonatebaseinfo.getReportername())) {
- wrappers.like(ServiceDonatebaseinfo::getReportername, serviceDonatebaseinfo.getReportername());
- }
- if (StringUtils.isNotBlank(serviceDonatebaseinfo.getCaseNo())) {
- wrappers.eq(ServiceDonatebaseinfo::getCaseNo, serviceDonatebaseinfo.getCaseNo());
- }
- if (StringUtils.isNotBlank(serviceDonatebaseinfo.getInfoName())) {
- wrappers.like(ServiceDonatebaseinfo::getInfoName, serviceDonatebaseinfo.getInfoName());
- }
- if (StringUtils.isNotBlank(serviceDonatebaseinfo.getInfoNo())) {
- wrappers.eq(ServiceDonatebaseinfo::getInfoNo, serviceDonatebaseinfo.getInfoNo());
- }
- if (StringUtils.isNotBlank(serviceDonatebaseinfo.getCoordinatorName())) {
- wrappers.like(ServiceDonatebaseinfo::getCoordinatorName, serviceDonatebaseinfo.getCoordinatorName());
- }
- if (StringUtils.isNotBlank(serviceDonatebaseinfo.getCoordinatorNo())) {
- wrappers.eq(ServiceDonatebaseinfo::getCoordinatorNo, serviceDonatebaseinfo.getCoordinatorNo());
- }
- if (StringUtils.isNotBlank(serviceDonatebaseinfo.getGcsScore())) {
- wrappers.eq(ServiceDonatebaseinfo::getGcsScore, serviceDonatebaseinfo.getGcsScore());
- }
- Map<String, Object> params = serviceDonatebaseinfo.getParams();
- if (params.get("beginReporttime") != null && params.get("endReporttime") != null) {
- wrappers.between(ServiceDonatebaseinfo::getReporttime, params.get("beginReporttime"), params.get("endReporttime"));
- }
+ setWrappers( wrappers,serviceDonatebaseinfo);
return this.list(wrappers);
+ }
+
+ @Override
+ public Page<ServiceDonatebaseinfo> queryListPage(ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ LambdaQueryWrapper<ServiceDonatebaseinfo> wrappers = Wrappers.lambdaQuery();
+ setWrappers( wrappers,serviceDonatebaseinfo);
+
+ // 鍒涘缓鍒嗛〉瀵硅薄锛岃缃〉鐮佸拰姣忛〉澶у皬
+ int currentPage = (serviceDonatebaseinfo.getPageNum() == null || serviceDonatebaseinfo.getPageNum() < 1) ? 1 : serviceDonatebaseinfo.getPageNum();
+ int size = (serviceDonatebaseinfo.getPageSize() == null || serviceDonatebaseinfo.getPageSize() < 1) ? 10 : serviceDonatebaseinfo.getPageSize();
+ Page<ServiceDonatebaseinfo> page = new Page<>(currentPage, size);
+
+ List<ServiceDonatebaseinfo> serviceDonatemaintenanceList = serviceDonatebaseinfoMapper.selectPage(page, wrappers).getRecords();
+ return page.setRecords(serviceDonatemaintenanceList);
}
@Override
@@ -192,15 +167,6 @@
String number = "";
-// if (completeDonation < 10) {
-// number = "000" + completeDonation;
-// } else if (completeDonation >= 10 && completeDonation < 100) {
-// number = "00" + completeDonation;
-// } else if (completeDonation >= 100 && completeDonation < 1000) {
-// number = "0" + completeDonation;
-// } else {
-// number = "" + completeDonation;
-// }
Calendar calendar = Calendar.getInstance();
int year = calendar.get(Calendar.YEAR);
BaseOnlyvalue baseOnlyvalue = new BaseOnlyvalue();
@@ -255,14 +221,6 @@
}
List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoMapper.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
for (ServiceDonatebaseinfo serviceDonatebaseinfo1 : serviceDonatebaseinfos) {
- //杩欓噷涓嶈兘鍐嶉�氳繃褰撳墠鏃堕棿绠楀勾榫勪簡锛屾偅鑰呭彲鑳藉凡缁忔浜′簡
-// if (serviceDonatebaseinfo1.getBirthday() != null) {
-// Map<String, String> map = CalculateDateUtils.calculateAge(serviceDonatebaseinfo1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
-// serviceDonatebaseinfo1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
-// serviceDonatebaseinfo1.setAgeunit(map.get("ageUnit"));
-// serviceDonatebaseinfo1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
-// serviceDonatebaseinfo1.setAgeunit2(map.get("ageUnit2"));
-// }
//鍏堢粰涓勾榫勯粯璁ゅ�硷紙鍥犱负age鏄暟瀛楃被鍨嬶紝涓嶈兘鏀炬í鏉狅紝鎵�浠ュ氨鎵�妯墰鏀惧埌鍗曚綅涓婏級
serviceDonatebaseinfo1.setAgeunit("-");
serviceDonatebaseinfo1.setAge(null);
@@ -307,6 +265,17 @@
}
return serviceDonatebaseinfoMapper.listForSearch(serviceDonatebaseinfo);
+ }
+
+ /**
+ * 鎹愮尞杩涘害鍩烘湰淇℃伅
+ * @param donatebaseinfoProgressVO
+ * @return
+ */
+ @Override
+ public List<DonatebaseinfoProgressDTO> donateBaseInfoProgressList(DonatebaseinfoProgressVO donatebaseinfoProgressVO) {
+ List<DonatebaseinfoProgressDTO> donatebaseinfoProgressDTOS = serviceDonatebaseinfoMapper.donateBaseInfoProgressList(donatebaseinfoProgressVO);
+ return donatebaseinfoProgressDTOS;
}
@Override
@@ -568,4 +537,52 @@
//灏嗘暟鎹皝闂紝骞惰繑鍥�
return map;
}
+
+
+ private void setWrappers(LambdaQueryWrapper<ServiceDonatebaseinfo> wrappers, ServiceDonatebaseinfo serviceDonatebaseinfo){
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getName())) {
+ wrappers.like(ServiceDonatebaseinfo::getName, serviceDonatebaseinfo.getName());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getIdcardno())) {
+ wrappers.like(ServiceDonatebaseinfo::getIdcardno, serviceDonatebaseinfo.getIdcardno());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getResidenceprovince())) {
+ wrappers.eq(ServiceDonatebaseinfo::getResidenceprovince, serviceDonatebaseinfo.getResidenceprovince());
+ }
+ if (serviceDonatebaseinfo.getRecordstate() != null) {
+ wrappers.eq(ServiceDonatebaseinfo::getRecordstate, serviceDonatebaseinfo.getRecordstate());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getTreatmenthospitalname())) {
+ wrappers.like(ServiceDonatebaseinfo::getTreatmenthospitalname, serviceDonatebaseinfo.getTreatmenthospitalname());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getDonorno())) {
+ wrappers.eq(ServiceDonatebaseinfo::getDonorno, serviceDonatebaseinfo.getDonorno());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getReportername())) {
+ wrappers.like(ServiceDonatebaseinfo::getReportername, serviceDonatebaseinfo.getReportername());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getCaseNo())) {
+ wrappers.eq(ServiceDonatebaseinfo::getCaseNo, serviceDonatebaseinfo.getCaseNo());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getInfoName())) {
+ wrappers.like(ServiceDonatebaseinfo::getInfoName, serviceDonatebaseinfo.getInfoName());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getInfoNo())) {
+ wrappers.eq(ServiceDonatebaseinfo::getInfoNo, serviceDonatebaseinfo.getInfoNo());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getCoordinatorName())) {
+ wrappers.like(ServiceDonatebaseinfo::getCoordinatorName, serviceDonatebaseinfo.getCoordinatorName());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getCoordinatorNo())) {
+ wrappers.eq(ServiceDonatebaseinfo::getCoordinatorNo, serviceDonatebaseinfo.getCoordinatorNo());
+ }
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getGcsScore())) {
+ wrappers.eq(ServiceDonatebaseinfo::getGcsScore, serviceDonatebaseinfo.getGcsScore());
+ }
+ Map<String, Object> params = serviceDonatebaseinfo.getParams();
+ if (params.get("beginReporttime") != null && params.get("endReporttime") != null) {
+ wrappers.between(ServiceDonatebaseinfo::getReporttime, params.get("beginReporttime"), params.get("endReporttime"));
+ }
+ }
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatemaintenanceServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatemaintenanceServiceImpl.java
index 23cde40..1e79a5e 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatemaintenanceServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatemaintenanceServiceImpl.java
@@ -2,11 +2,18 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
+import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.ServiceDonatemaintenance;
+import com.ruoyi.project.domain.dto.ServiceDonatebaseinfoDTO;
+import com.ruoyi.project.domain.vo.ServiceDonatemaintenanceVO;
import com.ruoyi.project.mapper.ServiceDonatemaintenanceMapper;
+import com.ruoyi.project.service.IServiceDonatebaseinfoService;
import com.ruoyi.project.service.IServiceDonatemaintenanceService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -18,9 +25,12 @@
* @date 2025-12-27
*/
@Service
-public class ServiceDonatemaintenanceServiceImpl extends ServiceImpl<ServiceDonatemaintenanceMapper, ServiceDonatemaintenance> implements IServiceDonatemaintenanceService
-{
+public class ServiceDonatemaintenanceServiceImpl extends ServiceImpl<ServiceDonatemaintenanceMapper, ServiceDonatemaintenance> implements IServiceDonatemaintenanceService {
+ @Autowired
+ private ServiceDonatemaintenanceMapper serviceDonatemaintenanceMapper;
+ @Autowired
+ private IServiceDonatebaseinfoService serviceDonatebaseinfoService;
/**
* 鏌ヨ渚涗綋缁存姢璁板綍鍒楄〃
@@ -29,30 +39,61 @@
* @return 渚涗綋缁存姢璁板綍
*/
@Override
- public List<ServiceDonatemaintenance> queryList(ServiceDonatemaintenance serviceDonatemaintenance) {
+ public Page<ServiceDonatemaintenance> queryList(ServiceDonatemaintenance serviceDonatemaintenance) {
LambdaQueryWrapper<ServiceDonatemaintenance> wrappers = Wrappers.lambdaQuery();
- if (serviceDonatemaintenance.getInfoid() != null){
- wrappers.eq(ServiceDonatemaintenance::getInfoid ,serviceDonatemaintenance.getInfoid());
+ if (serviceDonatemaintenance.getInfoid() != null) {
+ wrappers.eq(ServiceDonatemaintenance::getInfoid, serviceDonatemaintenance.getInfoid());
}
- if (StringUtils.isNotBlank(serviceDonatemaintenance.getCaseNo())){
- wrappers.eq(ServiceDonatemaintenance::getCaseNo ,serviceDonatemaintenance.getCaseNo());
+ if (StringUtils.isNotBlank(serviceDonatemaintenance.getCaseNo())) {
+ wrappers.eq(ServiceDonatemaintenance::getCaseNo, serviceDonatemaintenance.getCaseNo());
}
- if (StringUtils.isNotBlank(serviceDonatemaintenance.getDonorno())){
- wrappers.eq(ServiceDonatemaintenance::getDonorno ,serviceDonatemaintenance.getDonorno());
+ if (StringUtils.isNotBlank(serviceDonatemaintenance.getDonorno())) {
+ wrappers.eq(ServiceDonatemaintenance::getDonorno, serviceDonatemaintenance.getDonorno());
}
- if (StringUtils.isNotBlank(serviceDonatemaintenance.getItemNo())){
- wrappers.eq(ServiceDonatemaintenance::getItemNo ,serviceDonatemaintenance.getItemNo());
+ if (StringUtils.isNotBlank(serviceDonatemaintenance.getItemNo())) {
+ wrappers.eq(ServiceDonatemaintenance::getItemNo, serviceDonatemaintenance.getItemNo());
}
- if (StringUtils.isNotBlank(serviceDonatemaintenance.getItemName())){
- wrappers.like(ServiceDonatemaintenance::getItemName ,serviceDonatemaintenance.getItemName());
+ if (StringUtils.isNotBlank(serviceDonatemaintenance.getItemName())) {
+ wrappers.like(ServiceDonatemaintenance::getItemName, serviceDonatemaintenance.getItemName());
}
- if (serviceDonatemaintenance.getItemTime() != null){
- wrappers.eq(ServiceDonatemaintenance::getItemTime ,serviceDonatemaintenance.getItemTime());
+ if (serviceDonatemaintenance.getItemTime() != null) {
+ wrappers.eq(ServiceDonatemaintenance::getItemTime, serviceDonatemaintenance.getItemTime());
}
- if (StringUtils.isNotBlank(serviceDonatemaintenance.getItemDesc())){
- wrappers.eq(ServiceDonatemaintenance::getItemDesc ,serviceDonatemaintenance.getItemDesc());
+ if (StringUtils.isNotBlank(serviceDonatemaintenance.getItemDesc())) {
+ wrappers.eq(ServiceDonatemaintenance::getItemDesc, serviceDonatemaintenance.getItemDesc());
}
- return this.list(wrappers);
+
+ // 鍒涘缓鍒嗛〉瀵硅薄锛岃缃〉鐮佸拰姣忛〉澶у皬
+ int currentPage = (serviceDonatemaintenance.getPageNum() == null || serviceDonatemaintenance.getPageNum() < 1) ? 1 : serviceDonatemaintenance.getPageNum();
+ int size = (serviceDonatemaintenance.getPageSize() == null || serviceDonatemaintenance.getPageSize() < 1) ? 10 : serviceDonatemaintenance.getPageSize();
+ Page<ServiceDonatemaintenance> page = new Page<>(currentPage, size);
+
+ List<ServiceDonatemaintenance> serviceDonatemaintenanceList = serviceDonatemaintenanceMapper.selectPage(page, wrappers).getRecords();
+ return page.setRecords(serviceDonatemaintenanceList);
+ }
+
+ @Override
+ public Page maintenanceBaseInfoList(ServiceDonatemaintenanceVO serviceDonatemaintenanceVO) {
+ ServiceDonatebaseinfo serviceDonatebaseinfo = new ServiceDonatebaseinfo();
+ serviceDonatebaseinfo.setPageNum(serviceDonatemaintenanceVO.getPageNum());
+ serviceDonatebaseinfo.setPageSize(serviceDonatemaintenanceVO.getPageSize());
+ serviceDonatebaseinfo.setName(serviceDonatemaintenanceVO.getName());
+ serviceDonatebaseinfo.setTreatmenthospitalname(serviceDonatemaintenanceVO.getTreatmenthospitalname());
+ serviceDonatebaseinfo.setDeptname(serviceDonatemaintenanceVO.getDeptname());
+ serviceDonatebaseinfo.setRecordstate(serviceDonatemaintenanceVO.getRecordstate());
+ Page serviceDonatebaseinfoPage = serviceDonatebaseinfoService.queryListPage(serviceDonatebaseinfo);
+
+ List<ServiceDonatebaseinfo> records = serviceDonatebaseinfoPage.getRecords();
+ List<ServiceDonatebaseinfoDTO> serviceDonatebaseinfoDTOS = DtoConversionUtils.sourceToTarget(records, ServiceDonatebaseinfoDTO.class);
+ for (ServiceDonatebaseinfoDTO serviceDonatebaseinfoDTO : serviceDonatebaseinfoDTOS) {
+ ServiceDonatemaintenance serviceDonatemaintenance = new ServiceDonatemaintenance();
+ serviceDonatemaintenance.setInfoid(serviceDonatebaseinfoDTO.getId());
+ List<ServiceDonatemaintenance> serviceDonatemaintenanceList = serviceDonatemaintenanceMapper.selectServiceDonatemaintenanceList(serviceDonatemaintenance);
+ serviceDonatebaseinfoDTO.setServiceDonatemaintenanceList(serviceDonatemaintenanceList);
+ }
+
+ serviceDonatebaseinfoPage.setRecords(serviceDonatebaseinfoDTOS);
+ return serviceDonatebaseinfoPage;
}
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java
new file mode 100644
index 0000000..4c43028
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java
@@ -0,0 +1,130 @@
+package com.ruoyi.project.service.impl;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.project.domain.ServiceDonateorgan;
+import com.ruoyi.project.domain.dto.DonateorganBaseInfoDTO;
+import com.ruoyi.project.domain.vo.DonateorganBaseInfoVO;
+import com.ruoyi.project.mapper.ServiceDonateorganMapper;
+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.ServiceDonateorganBaseMapper;
+import com.ruoyi.project.domain.ServiceDonateorganBase;
+import com.ruoyi.project.service.IServiceDonateorganBaseService;
+
+/**
+ * 鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹Service涓氬姟灞傚鐞�
+ *
+ * @author ls
+ * @date 2026-01-17
+ */
+@Service
+public class ServiceDonateorganBaseServiceImpl extends ServiceImpl<ServiceDonateorganBaseMapper, ServiceDonateorganBase> implements IServiceDonateorganBaseService {
+
+ @Autowired
+ private ServiceDonateorganBaseMapper serviceDonateorganBaseMapper;
+
+ @Autowired
+ private ServiceDonateorganMapper serviceDonateorganMapper;
+
+ /**
+ * 鏌ヨ鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹鍒楄〃
+ *
+ * @param serviceDonateorganBase 鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹
+ * @return 鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹
+ */
+ @Override
+ public Page<ServiceDonateorganBase> queryList(ServiceDonateorganBase serviceDonateorganBase) {
+ LambdaQueryWrapper<ServiceDonateorganBase> wrappers = Wrappers.lambdaQuery();
+ if (serviceDonateorganBase.getInfoid() != null) {
+ wrappers.eq(ServiceDonateorganBase::getInfoid, serviceDonateorganBase.getInfoid());
+ }
+ if (serviceDonateorganBase.getAllocationStatus() != null) {
+ wrappers.eq(ServiceDonateorganBase::getAllocationStatus, serviceDonateorganBase.getAllocationStatus());
+ }
+ if (serviceDonateorganBase.getAllocationTime() != null) {
+ wrappers.eq(ServiceDonateorganBase::getAllocationTime, serviceDonateorganBase.getAllocationTime());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganBase.getRegistrationCode())) {
+ wrappers.eq(ServiceDonateorganBase::getRegistrationCode, serviceDonateorganBase.getRegistrationCode());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganBase.getRegistrationName())) {
+ wrappers.like(ServiceDonateorganBase::getRegistrationName, serviceDonateorganBase.getRegistrationName());
+ }
+ if (serviceDonateorganBase.getRegistrationTime() != null) {
+ wrappers.eq(ServiceDonateorganBase::getRegistrationTime, serviceDonateorganBase.getRegistrationTime());
+ }
+ if (serviceDonateorganBase.getEstimatedtime() != null) {
+ wrappers.eq(ServiceDonateorganBase::getEstimatedtime, serviceDonateorganBase.getEstimatedtime());
+ }
+
+ int currentPage = (serviceDonateorganBase.getPageNum() == null || serviceDonateorganBase.getPageNum() < 1) ? 1 : serviceDonateorganBase.getPageNum();
+ int size = (serviceDonateorganBase.getPageSize() == null || serviceDonateorganBase.getPageSize() < 1) ? 10 : serviceDonateorganBase.getPageSize();
+ Page<ServiceDonateorganBase> page = new Page<>(currentPage, size);
+ List<ServiceDonateorganBase> serviceDonateorganBaseList = serviceDonateorganBaseMapper.selectPage(page, wrappers).getRecords();
+
+ return page.setRecords(serviceDonateorganBaseList);
+ }
+
+ @Override
+ public List<DonateorganBaseInfoDTO> getDonateorganBaseInfoList(DonateorganBaseInfoVO donateorganBaseInfoVO) {
+ List<DonateorganBaseInfoDTO> donateorganBaseInfoList = serviceDonateorganBaseMapper.getDonateorganBaseInfoList(donateorganBaseInfoVO);
+ if (!donateorganBaseInfoList.isEmpty() && donateorganBaseInfoVO.getPageNum() != null) {
+ for (DonateorganBaseInfoDTO donateorganBaseInfoDTO : donateorganBaseInfoList) {
+ ServiceDonateorgan serviceDonateorgan = new ServiceDonateorgan();
+ serviceDonateorgan.setInfoid(donateorganBaseInfoDTO.getInfoid());
+ serviceDonateorgan.setBaseId(donateorganBaseInfoDTO.getId());
+
+ //鑾峰彇鎹愮尞澶氫釜鍣ㄥ畼璇︽儏绠＄悊鍒楄〃
+ List<ServiceDonateorgan> serviceDonateorgans = serviceDonateorganMapper.selectServiceDonateorganList(serviceDonateorgan);
+ donateorganBaseInfoDTO.setServiceDonateorganList(serviceDonateorgans);
+ }
+ }
+ return donateorganBaseInfoList;
+ }
+
+
+ /**
+ * 鏌ヨ鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹鍒楄〃
+ *
+ * @param serviceDonateorganBase 鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹
+ * @return 鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹
+ */
+ @Override
+ public List<ServiceDonateorganBase> exportQueryList(ServiceDonateorganBase serviceDonateorganBase) {
+ LambdaQueryWrapper<ServiceDonateorganBase> wrappers = Wrappers.lambdaQuery();
+ if (serviceDonateorganBase.getInfoid() != null) {
+ wrappers.eq(ServiceDonateorganBase::getInfoid, serviceDonateorganBase.getInfoid());
+ }
+ if (serviceDonateorganBase.getAllocationStatus() != null) {
+ wrappers.eq(ServiceDonateorganBase::getAllocationStatus, serviceDonateorganBase.getAllocationStatus());
+ }
+ if (serviceDonateorganBase.getAllocationTime() != null) {
+ wrappers.eq(ServiceDonateorganBase::getAllocationTime, serviceDonateorganBase.getAllocationTime());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganBase.getRegistrationCode())) {
+ wrappers.eq(ServiceDonateorganBase::getRegistrationCode, serviceDonateorganBase.getRegistrationCode());
+ }
+ if (StringUtils.isNotBlank(serviceDonateorganBase.getRegistrationName())) {
+ wrappers.like(ServiceDonateorganBase::getRegistrationName, serviceDonateorganBase.getRegistrationName());
+ }
+ if (serviceDonateorganBase.getRegistrationTime() != null) {
+ wrappers.eq(ServiceDonateorganBase::getRegistrationTime, serviceDonateorganBase.getRegistrationTime());
+ }
+ if (serviceDonateorganBase.getEstimatedtime() != null) {
+ wrappers.eq(ServiceDonateorganBase::getEstimatedtime, serviceDonateorganBase.getEstimatedtime());
+ }
+ return this.list(wrappers);
+ }
+
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java
index 525832a..38419ab 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java
@@ -82,6 +82,9 @@
@Override
public List<ServiceDonateorgan> queryList(ServiceDonateorgan serviceDonateorgan) {
LambdaQueryWrapper<ServiceDonateorgan> wrappers = Wrappers.lambdaQuery();
+ if (StringUtils.isNotNull(serviceDonateorgan.getBaseId())) {
+ wrappers.eq(ServiceDonateorgan::getBaseId, serviceDonateorgan.getBaseId());
+ }
if (StringUtils.isNotNull(serviceDonateorgan.getInfoid())) {
wrappers.eq(ServiceDonateorgan::getInfoid, serviceDonateorgan.getInfoid());
}
@@ -446,7 +449,7 @@
@Override
public List<DonateOrganVO> selectVOList(DonateOrganVO donateOrganVO) {
List<DonateOrganVO> donateOrganVOS = serviceDonateorganMapper.selectVOList(donateOrganVO);
- for (DonateOrganVO donateOrganVO1:donateOrganVOS) {
+ for (DonateOrganVO donateOrganVO1 : donateOrganVOS) {
if (donateOrganVO1.getBirthday() != null) {
Map<String, String> map = CalculateDateUtils.calculateAge(donateOrganVO1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
donateOrganVO1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java
index 7259405..bb3bde1 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java
@@ -1,6 +1,5 @@
package com.ruoyi.project.service.impl;
-import java.time.LocalDate;
import java.time.ZoneId;
import java.util.Date;
import java.util.List;
@@ -8,16 +7,17 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
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.project.common.CalculateDateUtils;
+import com.ruoyi.project.domain.ServiceDonationwitnessorgan;
+import com.ruoyi.project.domain.vo.DonationwitnessBaseInfoVO;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
-import com.ruoyi.project.domain.ServiceDonateorgan;
+import com.ruoyi.project.domain.dto.DonationwitnessBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonationWitnessVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.domain.vo.WitnessStatsVO;
import com.ruoyi.project.mapper.ServiceDonatebaseinfoMapper;
-import com.ruoyi.project.mapper.ServiceDonateorganMapper;
+import com.ruoyi.project.mapper.ServiceDonationwitnessorganMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -25,7 +25,6 @@
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;
@@ -47,6 +46,9 @@
@Autowired
ServiceDonationwitnessMapper serviceDonationwitnessMapper;
+
+ @Autowired
+ ServiceDonationwitnessorganMapper serviceDonationwitnessorganMapper;
@Autowired
ServiceDonatebaseinfoMapper serviceDonatebaseinfoMapper;
@@ -81,6 +83,22 @@
}
@Override
+ public List<DonationwitnessBaseInfoDTO> getDonationwitnessBaseInfo(DonationwitnessBaseInfoVO donationwitnessBaseInfoVO) {
+ List<DonationwitnessBaseInfoDTO> donationwitnessBaseInfos = serviceDonationwitnessMapper.getDonationwitnessBaseInfo(donationwitnessBaseInfoVO);
+
+ //鑾峰彇鎵�鏈夊櫒瀹樹俊鎭�
+ if (!CollectionUtils.isEmpty(donationwitnessBaseInfos)&&donationwitnessBaseInfoVO.getPageNum()!=null) {
+ for (DonationwitnessBaseInfoDTO donationwitnessBaseInfoDTO:donationwitnessBaseInfos) {
+ ServiceDonationwitnessorgan serviceDonationwitnessorgan=new ServiceDonationwitnessorgan();
+ serviceDonationwitnessorgan.setInfoid(donationwitnessBaseInfoDTO.getInfoid());
+ List<ServiceDonationwitnessorgan> serviceDonationwitnessorgans = serviceDonationwitnessorganMapper.selectServiceDonationwitnessorganList(serviceDonationwitnessorgan);
+ donationwitnessBaseInfoDTO.setServiceDonationwitnessorgans(serviceDonationwitnessorgans);
+ }
+ }
+ return donationwitnessBaseInfos;
+ }
+
+ @Override
public List<DonationWitnessVO> selectVOList(DonationWitnessVO donationWitnessVO) {
SysUser user = SecurityUtils.getLoginUser().getUser();
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewinitiateServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewinitiateServiceImpl.java
index aa1561b..49c6244 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewinitiateServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewinitiateServiceImpl.java
@@ -6,8 +6,11 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfoReport;
import com.ruoyi.project.domain.ServiceEthicalreviewinitiate;
+import com.ruoyi.project.domain.dto.ReviewInitiateBaseInfoDTO;
+import com.ruoyi.project.domain.vo.ReviewInitiateBaseInfoVO;
import com.ruoyi.project.mapper.ServiceEthicalreviewinitiateMapper;
import com.ruoyi.project.service.IServiceEthicalreviewinitiateService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -21,6 +24,8 @@
@Service
public class ServiceEthicalreviewinitiateServiceImpl extends ServiceImpl<ServiceEthicalreviewinitiateMapper, ServiceEthicalreviewinitiate> implements IServiceEthicalreviewinitiateService {
+ @Autowired
+ private ServiceEthicalreviewinitiateMapper serviceEthicalreviewinitiateMapper;
/**
* 鏌ヨ浼︾悊瀹℃煡鍙戣捣鍒楄〃
@@ -84,4 +89,10 @@
return this.list(wrappers);
}
+ @Override
+ public List<ReviewInitiateBaseInfoDTO> reviewinitiateBaseInfoList(ReviewInitiateBaseInfoVO reviewInitiateBaseInfoVO) {
+ List<ReviewInitiateBaseInfoDTO> reviewInitiateBaseInfoDTOS = serviceEthicalreviewinitiateMapper.reviewinitiateBaseInfoList(reviewInitiateBaseInfoVO);
+ return reviewInitiateBaseInfoDTOS;
+ }
+
}
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 03ea8a4..886e747 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,27 @@
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.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.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 +35,12 @@
@Autowired
ServiceMedicalevaluationMapper serviceMedicalevaluationMapper;
+
+ @Autowired
+ ServiceMedicalevaluationorganMapper serviceMedicalevaluationorganMapper;
+
+ @Autowired
+ ServiceDonatebaseinfoMapper serviceDonatebaseinfoMapper;
/**
@@ -51,8 +58,10 @@
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.getFirstAssessState())) {
+ wrappers.eq(ServiceMedicalevaluation::getFirstAssessState, serviceMedicalevaluation.getFirstAssessState());
+ } if (StringUtils.isNotNull(serviceMedicalevaluation.getSecondAssessState())) {
+ wrappers.eq(ServiceMedicalevaluation::getSecondAssessState, serviceMedicalevaluation.getSecondAssessState());
}
if (StringUtils.isNotBlank(serviceMedicalevaluation.getDonorno())) {
wrappers.eq(ServiceMedicalevaluation::getDonorno, serviceMedicalevaluation.getDonorno());
@@ -84,9 +93,20 @@
}
@Override
- public List<ServiceMedicalevaluation> selectServiceMedicalevaluationList(ServiceMedicalevaluation serviceMedicalevaluation) {
+ public List<MedicalevaluationBaseInfoDTO> evaluateBaseInfolist(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.setServiceMedicalevaluationorgan(serviceMedicalevaluationorgans.get(0));
+ }
+ }
+ return medicalevaluationBaseInfoDTOS;
}
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceRelativesconfirmationServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceRelativesconfirmationServiceImpl.java
index 4beca60..e219653 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceRelativesconfirmationServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceRelativesconfirmationServiceImpl.java
@@ -13,7 +13,9 @@
import com.ruoyi.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.ServiceDonationwitness;
+import com.ruoyi.project.domain.dto.RelativeConfirmationBaseInfoDTO;
import com.ruoyi.project.domain.vo.MedicalEvaluationVO;
+import com.ruoyi.project.domain.vo.RelativeConfirmationBaseInfoVO;
import com.ruoyi.project.domain.vo.RelativeConfirmationVO;
import com.ruoyi.project.mapper.ServiceDonatebaseinfoMapper;
import com.ruoyi.project.mapper.ServiceDonationwitnessMapper;
@@ -249,4 +251,13 @@
return relativeConfirmationVOS;
}
+ @Override
+ public List<RelativeConfirmationBaseInfoDTO> confirmationBaseInfoList(RelativeConfirmationBaseInfoVO relativeConfirmationBaseInfoVO) {
+ List<RelativeConfirmationBaseInfoDTO> relativeConfirmationBaseInfoDTOS = serviceRelativesconfirmationMapper.confirmationBaseInfoList(relativeConfirmationBaseInfoVO);
+ if (!CollectionUtils.isEmpty(relativeConfirmationBaseInfoDTOS)) {
+ return relativeConfirmationBaseInfoDTOS;
+ }
+ return null;
+ }
+
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
new file mode 100644
index 0000000..f4658cf
--- /dev/null
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.mapper.ServiceDeathinfoMapper">
+
+ <resultMap type="com.ruoyi.project.domain.ServiceDeathinfo" id="ServiceDeathinfoResult">
+ <result property="id" column="ID"/>
+ <result property="infoid" column="InfoID"/>
+ <result property="donorno" column="DonorNo"/>
+ <result property="gainhospitalno" column="GainHospitalNo"/>
+ <result property="gainhospitalname" column="GainHospitalName"/>
+ <result property="deathtime" column="DeathTime"/>
+ <result property="deathreason" column="DeathReason"/>
+ <result property="deathjudgedocto" column="DeathJudgeDoctO"/>
+ <result property="deathjudgedoctt" column="DeathJudgeDoctT"/>
+ <result property="deathjudgeannex" column="DeathJudgeAnnex"/>
+ <result property="isspendremember" column="IsSpendRemember"/>
+ <result property="isrestoreremains" column="IsRestoreRemains"/>
+ <result property="rememberannex" column="RememberAnnex"/>
+ <result property="responsibleuserid" column="ResponsibleUserID"/>
+ <result property="responsibleusername" column="ResponsibleUserName"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ </resultMap>
+
+ <sql id="selectServiceDeathinfoVo">
+ select ID,
+ InfoID,
+ DonorNo,
+ GainHospitalNo,
+ GainHospitalName,
+ DeathTime,
+ DeathReason,
+ DeathJudgeDoctO,
+ DeathJudgeDoctT,
+ DeathJudgeAnnex,
+ IsSpendRemember,
+ IsRestoreRemains,
+ RememberAnnex,
+ ResponsibleUserID,
+ ResponsibleUserName,
+ del_flag,
+ create_by,
+ create_time,
+ update_by,
+ update_time
+ from service_deathinfo
+ </sql>
+
+ <select id="selectServiceDeathinfoList" parameterType="com.ruoyi.project.domain.ServiceDeathinfo"
+ resultMap="ServiceDeathinfoResult">
+ <include refid="selectServiceDeathinfoVo"/>
+ <where>
+ <if test="infoid != null ">and InfoID = #{infoid}</if>
+ <if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if>
+ <if test="gainhospitalno != null and gainhospitalno != ''">and GainHospitalNo = #{gainhospitalno}</if>
+ <if test="gainhospitalname != null and gainhospitalname != ''">and GainHospitalName like concat('%',
+ #{gainhospitalname}, '%')
+ </if>
+ <if test="deathtime != null ">and DeathTime = #{deathtime}</if>
+ <if test="deathreason != null and deathreason != ''">and DeathReason = #{deathreason}</if>
+ <if test="deathjudgedocto != null and deathjudgedocto != ''">and DeathJudgeDoctO = #{deathjudgedocto}</if>
+ <if test="deathjudgedoctt != null and deathjudgedoctt != ''">and DeathJudgeDoctT = #{deathjudgedoctt}</if>
+ <if test="deathjudgeannex != null and deathjudgeannex != ''">and DeathJudgeAnnex = #{deathjudgeannex}</if>
+ <if test="isspendremember != null ">and IsSpendRemember = #{isspendremember}</if>
+ <if test="isrestoreremains != null ">and IsRestoreRemains = #{isrestoreremains}</if>
+ <if test="rememberannex != null and rememberannex != ''">and RememberAnnex = #{rememberannex}</if>
+ <if test="responsibleuserid != null and responsibleuserid != ''">and ResponsibleUserID =
+ #{responsibleuserid}
+ </if>
+ <if test="responsibleusername != null and responsibleusername != ''">and ResponsibleUserName like
+ concat('%', #{responsibleusername}, '%')
+ </if>
+ </where>
+ </select>
+
+ <select id="dathInfoBaseInfoList" parameterType="com.ruoyi.project.domain.vo.DeathBaseInfoVO"
+ resultType="com.ruoyi.project.domain.dto.DeathBaseInfoDTO">
+ SELECT
+ sd.treatmenthospitalname AS treatmenthospitalname,
+ sd.treatmenthospitalno AS treatmenthospitalno,
+ sd.DonorNo AS donorno,
+ sd.case_no AS caseNo,
+ sd.Name AS NAME,
+ sd.RecordState AS recordstate,
+ sd.Sex AS sex,
+ sd.Age AS age,
+ sd.BloodType AS bloodtype,
+ sd.idcardno AS idcardno,
+ sd.diagnosisname AS diagnosisname,
+ sdi.infoID AS infoid,
+ sdi.ID AS id,
+ sdi.GainHospitalNo as gainhospitalno,
+ sdi.GainHospitalName as gainhospitalname,
+ sdi.DeathTime as deathtime,
+ sdi.DeathReason as deathreason,
+ sdi.DeathJudgeDoctO as deathjudgedocto,
+ sdi.DeathJudgeDoctT as deathjudgedoctt,
+ sdi.DeathJudgeAnnex as deathjudgeannex,
+ sdi.IsSpendRemember as isspendremember,
+ sdi.IsRestoreRemains as isrestoreremains,
+ sdi.RememberAnnex as rememberannex,
+ sdi.ResponsibleUserID as responsibleuserid,
+ sdi.ResponsibleUserName as responsibleusername
+ FROM
+ service_donatebaseinfo sd
+ LEFT JOIN service_deathinfo sdi ON sd.ID = sdi.InfoID
+ AND sd.del_flag = 0
+ AND sdi.del_flag = 0
+ <where>
+ <if test="infoid != null ">and se.InfoID = #{infoid}</if>
+ <if test="caseNo != null and caseNo != ''">and sd.case_no = #{caseNo}</if>
+ <if test="name != null and name != ''">and sd.Name = #{name}</if>
+ <if test="donorno != null and donorno != ''">and sd.DonorNo = #{donorno}</if>
+ <if test="treatmenthospitalno != null and treatmenthospitalno != ''">and sd.treatmenthospitalno =
+ #{treatmenthospitalno}
+ </if>
+ <if test="treatmenthospitalname != null and treatmenthospitalname != ''">and sd.treatmenthospitalname like
+ concat('%',#{treatmenthospitalname}, '%')
+ </if>
+ <if test="name != null and name != ''">and sd.NAME like concat('%',#{name}, '%')</if>
+ <if test="deathtime != null">and sdi.DeathTime = #{deathtime}</if>
+ <if test="deathjudgedocto != null">and sdi.DeathJudgeDoctO = #{deathjudgedocto}</if>
+ <if test="deathjudgedoctt != null">and sdi.DeathJudgeDoctT = #{deathjudgedoctt}</if>
+ <if test="responsibleuserid != null">and sdi.ResponsibleUserID = #{responsibleuserid}</if>
+ <if test="responsibleusername != null and responsibleusername != ''">and sd.ResponsibleUserName like
+ concat('%',#{responsibleusername}, '%')
+ </if>
+
+ </where>
+ <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
+ </select>
+
+</mapper>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
index ad612dc..e3cdc4d 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -410,4 +410,52 @@
AND d.OrganGetTime <= #{endtime}
</select>
+ <select id="donateBaseInfoProgressList" resultType="com.ruoyi.project.domain.dto.DonatebaseinfoProgressDTO">
+ SELECT sd.treatmenthospitalname AS treatmenthospitalname,
+ sd.treatmenthospitalno AS treatmenthospitalno,
+ sd.DonorNo AS donorno,
+ sd.case_no AS caseNo,
+ sd.NAME AS NAME,
+ sd.RecordState AS recordstate,
+ sd.Sex AS sex,
+ sd.Age AS age,
+ sd.BloodType AS bloodtype,
+ sd.idcardno AS idcardno,
+ sd.ReportTime AS reportTime,
+ sd.coordinator_no AS coordinatorNo,
+ sd.coordinator_name AS coordinatorName,
+ sd.termination_case AS terminationCase,
+ sd.diagnosisname AS diagnosisname,
+ sm.assess_first_time AS assessFirstTime,-- 绗竴娆¤瘎浼版椂闂�
+ sm.assess_second_time AS assessSecondTime,-- 绗簩娆¤瘎浼版椂闂�
+ sm.first_assess_state AS firstAssessState,-- 绗竴娆¤瘎浼扮粨璁�
+ sm.second_assess_state AS secondAssessState,-- 绗簩娆¤瘎浼扮粨璁�
+ sr.SignDate AS signDate,-- 浜插睘纭鏃堕棿
+ se.expert_conclusion AS expertConclusion,-- 浼︾悊瀹℃煡涓撳缁撹
+ se.expert_time AS expertTime,-- 浼︾悊瀹℃煡涓撳缁撹鏃堕棿
+ (SELECT COUNT(*) FROM service_donateorgan sdo WHERE sdo.InfoID = sd.ID) AS organCount,-- 鍣ㄥ畼鍒嗛厤鏁伴噺
+ sdw.OperationBegTime AS operationBegTime,-- 鑾峰彇瑙佽瘉鏃堕棿
+ sdt.CompleteTime AS completeTime -- 瀹屾垚鐧昏鏃堕棿
+
+ FROM service_donatebaseinfo sd
+ LEFT JOIN service_medicalevaluation sm ON sd.ID = sm.InfoID
+ AND sm.del_flag = 0 -- 鎹愮尞璇勪及
+ LEFT JOIN service_relativesconfirmation sr ON sd.ID = sr.InfoID
+ AND sr.del_flag = 0-- 鎹愮尞纭
+ LEFT JOIN service_ethicalreviewinitiate se ON sd.ID = se.InfoID
+ AND se.del_flag = 0-- 浼︾悊瀹℃煡
+ LEFT JOIN service_donationwitness sdw ON sd.ID = sdw.InfoID
+ AND sdw.del_flag = 0-- 鑾峰彇瑙佽瘉
+ LEFT JOIN service_donatecompletioninfo sdt ON sd.ID = sdt.InfoID
+ AND sdt.del_flag = 0 -- 瀹屾垚鐧昏
+
+ <where>sd.del_flag = 0
+ <if test="name != null ">AND sd.Name >= #{name}</if>
+ <if test="idcardno != null and idcardno != ''">and IDCardNo = #{idcardno}</if>
+ <if test="recordstate != null and recordstate != ''">and RecordState = #{recordstate}</if>
+ </where>
+
+ ORDER BY sd.ReportTime DESC
+ <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
+ </select>
</mapper>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
index d5c2d00..0a54e4a 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
@@ -41,6 +41,7 @@
resultMap="ServiceDonatemaintenanceResult">
<include refid="selectServiceDonatemaintenanceVo"/>
<where>
+ del_flag=0
<if test="infoid != null ">and InfoID = #{infoid}</if>
<if test="caseNo != null and caseNo != ''">and case_no = #{caseNo}</if>
<if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml
new file mode 100644
index 0000000..ac37a5e
--- /dev/null
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.mapper.ServiceDonateorganBaseMapper">
+
+ <resultMap type="com.ruoyi.project.domain.ServiceDonateorganBase" id="ServiceDonateorganBaseResult">
+ <result property="id" column="ID"/>
+ <result property="infoid" column="InfoID"/>
+ <result property="allocationStatus" column="allocation_status"/>
+ <result property="allocationTime" column="allocation_time"/>
+ <result property="registrationCode" column="registration_code"/>
+ <result property="registrationName" column="registration_name"/>
+ <result property="registrationTime" column="registration_time"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="estimatedtime" column="EstimatedTime"/>
+ </resultMap>
+
+ <sql id="selectServiceDonateorganBaseVo">
+ select ID,
+ InfoID,
+ allocation_status,
+ allocation_time,
+ registration_code,
+ registration_name,
+ registration_time,
+ del_flag,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ EstimatedTime
+ from service_donateorgan_base
+ </sql>
+
+ <select id="selectServiceDonateorganBaseList" parameterType="com.ruoyi.project.domain.ServiceDonateorganBase"
+ resultMap="ServiceDonateorganBaseResult">
+ <include refid="selectServiceDonateorganBaseVo"/>
+ <where>
+ <if test="infoid != null ">and InfoID = #{infoid}</if>
+ <if test="allocationStatus != null ">and allocation_status = #{allocationStatus}</if>
+ <if test="allocationTime != null ">and allocation_time = #{allocationTime}</if>
+ <if test="registrationCode != null and registrationCode != ''">and registration_code =
+ #{registrationCode}
+ </if>
+ <if test="registrationName != null and registrationName != ''">and registration_name like concat('%',
+ #{registrationName}, '%')
+ </if>
+ <if test="registrationTime != null ">and registration_time = #{registrationTime}</if>
+ <if test="estimatedtime != null ">and EstimatedTime = #{estimatedtime}</if>
+ </where>
+ </select>
+
+
+ <select id="getDonateorganBaseInfoList" resultType="com.ruoyi.project.domain.dto.DonateorganBaseInfoDTO">
+ SELECT
+ sd.treatmenthospitalname AS treatmenthospitalname,
+ sd.treatmenthospitalno AS treatmenthospitalno,
+ sd.DonorNo AS donorno,
+ sd.case_no AS caseNo,
+ sd.Name AS NAME,
+ sd.Sex AS sex,
+ sd.Age AS age,
+ sd.BloodType AS bloodtype,
+ sd.idcardno AS idcardno,
+ sd.diagnosisname AS diagnosisname,
+ sdb.infoID AS infoid,
+ sdb.ID AS id,
+ sdb.registration_name AS registrationName,
+ sdb.registration_time AS registrationTime,
+ sdb.registration_code AS registrationCode
+ FROM
+ service_donatebaseinfo sd
+ LEFT JOIN service_donateorgan_base sdb ON sd.ID = sdb.InfoID and sd.del_flag = 0
+ and sdb.del_flag = 0
+ <where>
+
+ <if test="donorno != null and donorno != ''">and sd.DonorNo = #{donorno}</if>
+ <if test="treatmenthospitalname != null and treatmenthospitalname != ''">and sd.treatmenthospitalname like
+ concat('%', #{treatmenthospitalname}, '%')
+ </if>
+ <if test="idcardno != null and idcardno != ''">and sd.IDCardNo. = #{idcardno}</if>
+ <if test="treatmenthospitalno != null and treatmenthospitalno != ''">and sd.TreatmentHospitalNo =
+ #{treatmenthospitalno}
+ </if>
+ <if test="recordstate != null and recordstate != ''">and sd.RecordState = #{recordstate}
+ </if>
+ <if test="name != null and name != ''">and sd.Name = #{name}
+ </if>
+ <if test="inpatientno != null and inpatientno != ''">and sd.InpatientNo = #{inpatientno}
+ </if>
+ <if test="registrationName != null and registrationName != ''">and sdb.registration_name =
+ #{registrationName}
+ </if>
+ <if test="registrationTime != null and registrationTime != ''">
+ and sdb.registration_time = #{registrationTime}
+ </if>
+ <if test="registrationCode != null and registrationCode != ''">
+ and sdb.registration_code = #{registrationCode}
+ </if>
+ </where>
+ <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
+ </select>
+
+</mapper>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
index e7c7910..c5bf61e 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
@@ -6,6 +6,7 @@
<resultMap type="com.ruoyi.project.domain.ServiceDonateorgan" id="ServiceDonateorganResult">
<result property="id" column="ID"/>
+ <result property="baseId" column="base_id"/>
<result property="infoid" column="InfoID"/>
<result property="donorno" column="DonorNo"/>
<result property="organno" column="OrganNo"/>
@@ -29,7 +30,7 @@
<result property="ispathogenpositive" column="IsPathogenPositive"/>
<result property="ispnf" column="IsPNF"/>
<result property="isdgf" column="IsDGF"/>
- <result property="del_flag" column="del_flag"/>
+ <result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
@@ -74,6 +75,7 @@
<sql id="selectServiceDonateorganVo">
select ID,
+ base_id,
InfoID,
DonorNo,
OrganNo,
@@ -148,7 +150,9 @@
resultMap="ServiceDonateorganResult">
<include refid="selectServiceDonateorganVo"/>
<where>
+ del_flag=0
<if test="infoid != null ">and InfoID = #{infoid}</if>
+ <if test="baseId != null ">and base_id = #{baseId}</if>
<if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if>
<if test="organno != null and organno != ''">and OrganNo = #{organno}</if>
<if test="organname != null and organname != ''">and OrganName like concat('%', #{organname}, '%')</if>
@@ -535,7 +539,8 @@
and OrganGetTime <= #{endtime}
</select>
<select id="getDistinctOrgansCount" resultType="com.ruoyi.project.domain.vo.DistinctOrgansCount">
- select count(*) as gainsum,ifnull(sum( CASE WHEN transplantstate = 3 THEN 1 ELSE 0 END ),0) as abandonCount from service_donatecomporgan d
+ select count(*) as gainsum,ifnull(sum( CASE WHEN transplantstate = 3 THEN 1 ELSE 0 END ),0) as abandonCount from
+ service_donatecomporgan d
inner join service_donatebaseinfo b on b.id = d.InfoID
inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
where d.OrganNo = #{organno}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index 73e8fb3..b0bd5b7 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -35,7 +35,7 @@
<result property="pulmonaryarteryperfusiontime" column="PulmonaryArteryPerfusionTime"/>
<result property="aortacannulatime" column="AortaCannulaTime"/>
<result property="aortaperfusiontime" column="AortaPerfusionTime"/>
- <result property="del_flag" column="del_flag"/>
+ <result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
@@ -106,6 +106,65 @@
<if test="operationdoctor != null and operationdoctor != ''">and OperationDoctor = #{operationdoctor}</if>
<if test="infoid != null">and InfoID = #{infoid}</if>
</where>
+ </select>
+
+ <select id="getDonationwitnessBaseInfo" parameterType="com.ruoyi.project.domain.vo.DonationwitnessBaseInfoVO" resultType="com.ruoyi.project.domain.dto.DonationwitnessBaseInfoDTO">
+ select
+ sd.treatmenthospitalname AS treatmenthospitalname,
+ sd.treatmenthospitalno AS treatmenthospitalno,
+ sd.DonorNo AS donorno,
+ sd.case_no AS caseNo,
+ sd.NAME AS name,
+ sd.RecordState AS recordstate,
+ sd.Sex AS sex,
+ sd.Age AS age,
+ sd.BloodType AS bloodtype,
+ sd.idcardno AS idcardno,
+ sd.diagnosisname AS diagnosisname,
+ st.coordinator_in_operating as coordinatorInOperating,
+ st.InfoID as infoid,
+ st.coordinator_out_operating as coordinatorOutOperating,
+ st.coordinator_sign as coordinatorSign,
+ st.coordinator_sign_time as coordinatorSignTime,
+ st.DonorNo as donorno,
+ st.GainHospitalNo as gainhospitalno,
+ st.GainHospitalName as gainhospitalname,
+ st.OperationBegTime as operationbegtime,
+ st.OperationEndTime as operationendtime,
+ st.OperationDoctor as operationdoctor,
+ st.ResponsibleUserID as responsibleuserid,
+ st.ResponsibleUserName as responsibleusername,
+ st.CoordinatedUserIDO as coordinateduserido,
+ st.CoordinatedUserNameO as coordinatedusernameo,
+ st.CoordinatedUserIDT as coordinateduseridt,
+ st.CoordinatedUserNameT as coordinatedusernamet,
+ st.AbdominalAortaCannulaTime as abdominalaortacannulatime,
+ st.AbdominalAortaPerfusionTime as abdominalaortaperfusiontime,
+ st.PortalVeinCannulaTime as portalveincannulatime,
+ st.PortalVeinPerfusionTime as portalveinperfusiontime,
+ st.PulmonaryArteryCannulaTime as pulmonaryarterycannulatime,
+ st.PulmonaryArteryPerfusionTime as pulmonaryarteryperfusiontime,
+ st.AortaCannulaTime as aortacannulatime,
+ st.AortaPerfusionTime as aortaperfusiontime,
+ st.OrganDonation as organdonation,
+ st.OrganDonation_Other as organdonationOther,
+ st.DonationCategory as donationcategory
+ FROM
+ service_donatebaseinfo sd
+ LEFT JOIN service_donationwitness st ON sd.ID = st.InfoID
+ AND sd.del_flag = 0
+ AND st.del_flag = 0
+ <where>
+ <if test="name != null and name != ''">and sd.Name like concat('%', #{name}, '%')</if>
+ <if test="inpatientno != null and inpatientno != ''">and sd.inpatientno = #{inpatientno}</if>
+ <if test="donorno != null and donorno != ''">and st.DonorNo = #{donorno}</if>
+ <if test="gainhospitalname != null and gainhospitalname != ''">and st.GainHospitalName like concat('%',
+ #{gainhospitalname}, '%')
+ </if>
+ <if test="operationdoctor != null and operationdoctor != ''">and st.OperationDoctor = #{operationdoctor}</if>
+ <if test="infoid != null">and st.InfoID = #{infoid}</if>
+ </where>
+ <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
<select id="selectVOList" resultType="com.ruoyi.project.domain.vo.DonationWitnessVO">
@@ -207,6 +266,7 @@
order by `service_donationwitness`.`create_time` desc
</select>
+
<select id="getDBDDonaterNumberThisYear" resultType="java.lang.Integer">
select count(*) from service_donationwitness w
inner join service_donatebaseinfo b on w.InfoID = b.id
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
index e4be9fc..004417b 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
@@ -78,5 +78,41 @@
</where>
</select>
+ <select id="reviewinitiateBaseInfoList" parameterType="com.ruoyi.project.domain.vo.ReviewInitiateBaseInfoVO"
+ resultType="com.ruoyi.project.domain.dto.ReviewInitiateBaseInfoDTO">
+ SELECT
+ sd.treatmenthospitalname as treatmenthospitalname,
+ sd.treatmenthospitalno as treatmenthospitalno,
+ sd.DonorNo as donorno,
+ sd.case_no as caseNo,
+ sd.Name as name,
+ sd.RecordState as recordstate,
+ sd.Sex as sex,
+ sd.Age as age,
+ sd.BloodType as bloodtype,
+ sd.idcardno as idcardno,
+ sd.diagnosisname as diagnosisname,
+ se.infoID as infoid,
+ se.ID as id,
+ se.expert_conclusion as expertConclusion,
+ se.expert_name as expertName,
+ se.expert_opinion as expertOpinion,
+ se.expert_time as expertTime,
+ se.status as status
+ FROM
+ service_donatebaseinfo sd
+ LEFT JOIN service_ethicalreviewinitiate se ON sd.ID = se.InfoID and sd.del_flag = 0
+ AND se.del_flag = 0
+ <where>
+ <if test="infoid != null ">and se.InfoID = #{infoid}</if>
+ <if test="caseNo != null and caseNo != ''">and sd.case_no = #{caseNo}</if>
+ <if test="expertConclusion != null ">and se.expert_conclusion = #{expertConclusion}</if>
+ <if test="expertName != null ">and se.expert_name = #{expertName}</if>
+ <if test="expertOpinion != null ">and se.expert_opinion = #{expertOpinion}</if>
+ <if test="expertTime != null ">and se.expert_time = #{expertTime}</if>
+ <if test="status != null ">and se.status = #{status}</if>
+ </where>
+ <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
+ </select>
</mapper>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
index c2f6397..142adab 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
@@ -27,11 +27,32 @@
<result property="assessState" column="assess_state"/>
<result property="assessFirstTime" column="assess_first_time"/>
<result property="assessSecondTime" column="assess_second_time"/>
- <result property="del_flag" column="del_flag"/>
+ <result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
+ </resultMap>
+
+ <resultMap type="com.ruoyi.project.domain.dto.MedicalevaluationBaseInfoDTO"
+ id="MedicalEvaluationWithBaseInfoVOResult">
+ <id property="id" column="ID"/>
+ <result property="infoid" column="infoID"/>
+ <result property="recordstate" column="recordstate"/>
+ <result property="caseNo" column="case_no"/>
+ <result property="donorno" column="DonorNo"/>
+ <result property="treatmenthospitalname" column="TreatmentHospitalName"/>
+ <result property="treatmenthospitalno" column="TreatmentHospitalNo"/>
+ <result property="sex" column="Sex"/>
+ <result property="age" column="Age"/>
+ <result property="bloodtype" column="BloodType"/>
+ <result property="idcardno" column="idcardno"/>
+ <result property="diagnosisname" column="diagnosisname"/>
+ <result property="coordinatorName" column="coordinator_name"/>
+ <result property="assessFirstTime" column="assess_first_time"/>
+ <result property="assessSecondTime" column="assess_second_time"/>
+ <result property="assessState" column="assess_state"/>
+ <result property="assessannex" column="AssessAnnex"/>
</resultMap>
<sql id="selectServiceMedicalevaluationVo">
@@ -172,4 +193,49 @@
and CoreTeamAssessTime <= #{endtime}
</select>
+ <select id="selectEvaluateBaseInfoList" resultMap="MedicalEvaluationWithBaseInfoVOResult">
+ SELECT
+ sb.TreatmentHospitalName,
+ sb.TreatmentHospitalNo,
+ sb.DonorNo,
+ sb.case_no,
+ sb.Name,
+ sb.Sex,
+ sb.Age,
+ sb.BloodType,
+ sb.idcardno,
+ sb.diagnosisname,
+ sb.recordstate,
+ sb.coordinator_name,
+ sm.assess_first_time,
+ sm.infoID,
+ sm.ID,
+ sm.assessannex,
+ sm.assess_second_time,
+ sm.assess_state
+ FROM service_donatebaseinfo sb
+ LEFT JOIN service_medicalevaluation sm ON sb.ID = sm.InfoID and sm.del_flag = 0
+ and sb.del_flag = 0
+ <where>
+
+ <if test="infoid != null">AND sm.InfoID = #{infoid}</if>
+ <if test="caseNo != null and caseNo != ''">AND sm.case_no = #{caseNo}</if>
+ <if test="donorno != null and donorno != ''">AND sm.DonorNo = #{donorno}</if>
+ <if test="diagnosisname != null and diagnosisname != ''">AND sm.DiagnosisName = #{diagnosisname}</if>
+ <if test="assessState != null and assessState != ''">AND sm.assess_state = #{assessState}</if>
+ <if test="name != null and name != ''">AND sb.Name LIKE CONCAT('%', #{name}, '%')</if>
+ <if test="sex != null and sex != ''">AND sb.Sex = #{sex}</if>
+ <if test="idcardno != null and idcardno != ''">AND sb.IDCardNo = #{idcardno}</if>
+ <if test="recordstate != null and recordstate != ''">AND sb.RecordState = #{recordstate}</if>
+ <if test="treatmenthospitalno != null and treatmenthospitalno != ''">AND sb.TreatmentHospitalNo =
+ #{treatmenthospitalno}
+ </if>
+ <if test="treatmenthospitalname != null and treatmenthospitalname != ''">AND sb.TreatmentHospitalName =
+ #{treatmenthospitalname}
+ </if>
+ </where>
+ <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
+
+ </select>
+
</mapper>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationorganMapper.xml
index abae226..fbbcff5 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationorganMapper.xml
@@ -33,6 +33,8 @@
<sql id="selectServiceMedicalevaluationorganVo">
select ID,
InfoID,
+ first_assess_state,
+ second_assess_state,
DonorNo,
OrganNo,
OrganName,
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
index bf55b0e..f8620d8 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -1,77 +1,133 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceRelativesconfirmationMapper">
<resultMap type="com.ruoyi.project.domain.ServiceRelativesconfirmation" id="ServiceRelativesconfirmationResult">
- <result property="id" column="ID" />
- <result property="infoid" column="InfoID" />
- <result property="donorno" column="DonorNo" />
- <result property="name" column="Name" />
- <result property="idcardtype" column="IDCardType" />
- <result property="idcardno" column="IDCardNo" />
- <result property="phone" column="Phone" />
- <result property="residenceaddress" column="ResidenceAddress" />
- <result property="residenceprovince" column="ResidenceProvince" />
- <result property="residenceprovincename" column="ResidenceProvinceName" />
- <result property="residencecity" column="ResidenceCity" />
- <result property="residencecityname" column="ResidenceCityName" />
- <result property="residencetown" column="ResidenceTown" />
- <result property="residencetownname" column="ResidenceTownName" />
- <result property="residencecommunity" column="ResidenceCommunity" />
- <result property="residencecommunityname" column="ResidenceCommunityName" />
- <result property="residencecountycode" column="ResidenceCountyCode" />
- <result property="residencecountyname" column="ResidenceCountyName" />
- <result property="kinship" column="Kinship" />
- <result property="kinshipChildrennum" column="Kinship_ChildrenNum" />
- <result property="signfamilyrelations" column="SignFamilyRelations" />
- <result property="kinshipconfirmationsign" column="KinshipConfirmationSign" />
- <result property="organdecision" column="OrganDecision" />
- <result property="organdecisionOther" column="OrganDecision_Other" />
- <result property="relativeconfirmationsign" column="RelativeConfirmationSign" />
- <result property="familyrelations" column="FamilyRelations" />
- <result property="acquisitiontissueno" column="AcquisitionTissueNo" />
- <result property="acquisitiontissuename" column="AcquisitionTissueName" />
- <result property="responsibleuserid" column="ResponsibleUserID" />
- <result property="responsibleusername" column="ResponsibleUserName" />
- <result property="coordinateduserido" column="CoordinatedUserIDO" />
- <result property="coordinatedusernameo" column="CoordinatedUserNameO" />
- <result property="coordinateduseridt" column="CoordinatedUserIDT" />
- <result property="coordinatedusernamet" column="CoordinatedUserNameT" />
- <result property="signdate" column="SignDate" />
- <result property="delFlag" column="del_flag" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="operatorno" column="operatorno" />
- <result property="operatorname" column="operatorname" />
- <result property="nation" column="nation" />
- <result property="education" column="education" />
- <result property="occupation" column="occupation" />
+ <result property="id" column="ID"/>
+ <result property="infoid" column="InfoID"/>
+ <result property="donorno" column="DonorNo"/>
+ <result property="name" column="Name"/>
+ <result property="idcardtype" column="IDCardType"/>
+ <result property="idcardno" column="IDCardNo"/>
+ <result property="phone" column="Phone"/>
+ <result property="residenceaddress" column="ResidenceAddress"/>
+ <result property="residenceprovince" column="ResidenceProvince"/>
+ <result property="residenceprovincename" column="ResidenceProvinceName"/>
+ <result property="residencecity" column="ResidenceCity"/>
+ <result property="residencecityname" column="ResidenceCityName"/>
+ <result property="residencetown" column="ResidenceTown"/>
+ <result property="residencetownname" column="ResidenceTownName"/>
+ <result property="residencecommunity" column="ResidenceCommunity"/>
+ <result property="residencecommunityname" column="ResidenceCommunityName"/>
+ <result property="residencecountycode" column="ResidenceCountyCode"/>
+ <result property="residencecountyname" column="ResidenceCountyName"/>
+ <result property="kinship" column="Kinship"/>
+ <result property="kinshipChildrennum" column="Kinship_ChildrenNum"/>
+ <result property="signfamilyrelations" column="SignFamilyRelations"/>
+ <result property="kinshipconfirmationsign" column="KinshipConfirmationSign"/>
+ <result property="organdecision" column="OrganDecision"/>
+ <result property="organdecisionOther" column="OrganDecision_Other"/>
+ <result property="relativeconfirmationsign" column="RelativeConfirmationSign"/>
+ <result property="familyrelations" column="FamilyRelations"/>
+ <result property="acquisitiontissueno" column="AcquisitionTissueNo"/>
+ <result property="acquisitiontissuename" column="AcquisitionTissueName"/>
+ <result property="responsibleuserid" column="ResponsibleUserID"/>
+ <result property="responsibleusername" column="ResponsibleUserName"/>
+ <result property="coordinateduserido" column="CoordinatedUserIDO"/>
+ <result property="coordinatedusernameo" column="CoordinatedUserNameO"/>
+ <result property="coordinateduseridt" column="CoordinatedUserIDT"/>
+ <result property="coordinatedusernamet" column="CoordinatedUserNameT"/>
+ <result property="signdate" column="SignDate"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="operatorno" column="operatorno"/>
+ <result property="operatorname" column="operatorname"/>
+ <result property="nation" column="nation"/>
+ <result property="education" column="education"/>
+ <result property="occupation" column="occupation"/>
+ <result property="assessannex" column="assessannex"/>
+ <result property="relativeRemark" column="relative_remark"/>
</resultMap>
<sql id="selectServiceRelativesconfirmationVo">
- select ID, InfoID,nation,education,occupation, DonorNo, Name, IDCardType, IDCardNo, Phone, ResidenceAddress, ResidenceProvince, ResidenceProvinceName, ResidenceCity, ResidenceCityName, ResidenceTown, ResidenceTownName, ResidenceCommunity, ResidenceCommunityName, ResidenceCountyCode, ResidenceCountyName, Kinship, Kinship_ChildrenNum, SignFamilyRelations, KinshipConfirmationSign, OrganDecision, OrganDecision_Other, RelativeConfirmationSign, FamilyRelations, AcquisitionTissueNo, AcquisitionTissueName, ResponsibleUserID, ResponsibleUserName, CoordinatedUserIDO, CoordinatedUserNameO, CoordinatedUserIDT, CoordinatedUserNameT, SignDate, del_flag, create_by, create_time, update_by, update_time,operatorname,operatorno from service_relativesconfirmation
+ select ID,
+ InfoID,
+ assessannex,
+ relative_remark,
+ nation,
+ education,
+ occupation,
+ DonorNo,
+ Name,
+ IDCardType,
+ IDCardNo,
+ Phone,
+ ResidenceAddress,
+ ResidenceProvince,
+ ResidenceProvinceName,
+ ResidenceCity,
+ ResidenceCityName,
+ ResidenceTown,
+ ResidenceTownName,
+ ResidenceCommunity,
+ ResidenceCommunityName,
+ ResidenceCountyCode,
+ ResidenceCountyName,
+ Kinship,
+ Kinship_ChildrenNum,
+ SignFamilyRelations,
+ KinshipConfirmationSign,
+ OrganDecision,
+ OrganDecision_Other,
+ RelativeConfirmationSign,
+ FamilyRelations,
+ AcquisitionTissueNo,
+ AcquisitionTissueName,
+ ResponsibleUserID,
+ ResponsibleUserName,
+ CoordinatedUserIDO,
+ CoordinatedUserNameO,
+ CoordinatedUserIDT,
+ CoordinatedUserNameT,
+ SignDate,
+ del_flag,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ operatorname,
+ operatorno
+ from service_relativesconfirmation
</sql>
- <select id="selectServiceRelativesconfirmationList" parameterType="com.ruoyi.project.domain.ServiceRelativesconfirmation" resultMap="ServiceRelativesconfirmationResult">
+ <select id="selectServiceRelativesconfirmationList"
+ parameterType="com.ruoyi.project.domain.ServiceRelativesconfirmation"
+ resultMap="ServiceRelativesconfirmationResult">
<include refid="selectServiceRelativesconfirmationVo"/>
<where>
- <if test="donorno != null and donorno != ''"> and DonorNo = #{donorno}</if>
- <if test="name != null and name != ''"> and Name like concat('%', #{name}, '%')</if>
- <if test="idcardno != null and idcardno != ''"> and IDCardNo = #{idcardno}</if>
- <if test="acquisitiontissueno != null and acquisitiontissueno != ''"> and AcquisitionTissueNo = #{acquisitiontissueno}</if>
- <if test="params.beginSigndate != null and params.beginSigndate != '' and params.endSigndate != null and params.endSigndate != ''"> and SignDate between #{params.beginSigndate} and #{params.endSigndate}</if>
+ <if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if>
+ <if test="name != null and name != ''">and Name like concat('%', #{name}, '%')</if>
+ <if test="idcardno != null and idcardno != ''">and IDCardNo = #{idcardno}</if>
+ <if test="acquisitiontissueno != null and acquisitiontissueno != ''">and AcquisitionTissueNo =
+ #{acquisitiontissueno}
+ </if>
+ <if test="params.beginSigndate != null and params.beginSigndate != '' and params.endSigndate != null and params.endSigndate != ''">
+ and SignDate between #{params.beginSigndate} and #{params.endSigndate}
+ </if>
</where>
</select>
<select id="getCoordinateUserByInfoId" resultType="java.lang.String">
- select CoordinatedUserIDO from service_relativesconfirmation
+ select CoordinatedUserIDO
+ from service_relativesconfirmation
where InfoID = #{infoid}
</select>
<select id="selectVOList" resultType="com.ruoyi.project.domain.vo.RelativeConfirmationVO">
- SELECT
+ SELECT
`service_donatebaseinfo`.`ID` AS `ID`,
`service_donatebaseinfo`.`Name` AS `Name`,
`service_donatebaseinfo`.`Sex` AS `Sex`,
@@ -155,41 +211,111 @@
`service_relativesconfirmation`.`nation` AS `nation`,
`service_relativesconfirmation`.`education` AS `education`,
`service_relativesconfirmation`.`occupation` AS `occupation`
- FROM
+ FROM
- `service_donatebaseinfo`
- LEFT JOIN `service_relativesconfirmation` ON
- `service_donatebaseinfo`.`ID` = `service_relativesconfirmation`.`InfoID`
+ `service_donatebaseinfo`
+ LEFT JOIN `service_relativesconfirmation` ON
+ `service_donatebaseinfo`.`ID` = `service_relativesconfirmation`.`InfoID`
LEFT JOIN `base_organization` ON
`base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
<where>
service_donatebaseinfo.del_flag=0
and service_relativesconfirmation.del_flag=0
- <if test="donorno != null and donorno != ''"> and `service_donatebaseinfo`.`DonorNo` = #{donorno}</if>
- <if test="name != null and name != ''"> and `service_donatebaseinfo`.`Name` like concat('%', #{name}, '%')</if>
- <if test="idcardno != null and idcardno != ''"> and `service_donatebaseinfo`.`IDCardNo` = #{idcardno}</if>
- <if test="treatmenthospitalno != null and treatmenthospitalno != ''"> and `service_donatebaseinfo`.`TreatmentHospitalNo` = #{treatmenthospitalno}</if>
- <if test="recordstate != null and recordstate != ''"> and `service_donatebaseinfo`.`RecordState` = #{recordstate}</if>
- <if test="basecreateby != null and basecreateby != ''"> and `service_donatebaseinfo`.`create_by` = #{basecreateby}</if>
- <if test="infoid != null and infoid != ''"> and `service_relativesconfirmation`.`InfoID` = #{infoid}</if>
- <if test="starttime != null "> and `service_relativesconfirmation`.SignDate >= #{starttime} </if>
- <if test="endtime != null "> and `service_relativesconfirmation`.SignDate <= #{endtime}</if>
- <if test="reporterno != null and reporterno != ''"> and `service_donatebaseinfo`.ReporterNo = #{reporterno}</if>
- <if test="city != null and city != ''"> and `base_organization`.`City` = #{city}</if>
- <if test="residenceprovince != null and residenceprovince != ''"> and `service_relativesconfirmation`.`ResidenceProvince` = #{residenceprovince}</if>
- <if test="residencecity != null and residencecity != ''"> and `service_relativesconfirmation`.`ResidenceCity` = #{residencecity}</if>
- <if test="residencetown != null and residencetown != ''"> and `service_relativesconfirmation`.`ResidenceTown` = #{residencetown}</if>
- <if test="workflow != null "> and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
+ <if test="donorno != null and donorno != ''">and `service_donatebaseinfo`.`DonorNo` = #{donorno}</if>
+ <if test="name != null and name != ''">and `service_donatebaseinfo`.`Name` like concat('%', #{name}, '%')
+ </if>
+ <if test="idcardno != null and idcardno != ''">and `service_donatebaseinfo`.`IDCardNo` = #{idcardno}</if>
+ <if test="treatmenthospitalno != null and treatmenthospitalno != ''">and
+ `service_donatebaseinfo`.`TreatmentHospitalNo` = #{treatmenthospitalno}
+ </if>
+ <if test="recordstate != null and recordstate != ''">and `service_donatebaseinfo`.`RecordState` =
+ #{recordstate}
+ </if>
+ <if test="basecreateby != null and basecreateby != ''">and `service_donatebaseinfo`.`create_by` =
+ #{basecreateby}
+ </if>
+ <if test="infoid != null and infoid != ''">and `service_relativesconfirmation`.`InfoID` = #{infoid}</if>
+ <if test="starttime != null ">and `service_relativesconfirmation`.SignDate >= #{starttime}</if>
+ <if test="endtime != null ">and `service_relativesconfirmation`.SignDate <= #{endtime}</if>
+ <if test="reporterno != null and reporterno != ''">and `service_donatebaseinfo`.ReporterNo =
+ #{reporterno}
+ </if>
+ <if test="city != null and city != ''">and `base_organization`.`City` = #{city}</if>
+ <if test="residenceprovince != null and residenceprovince != ''">and
+ `service_relativesconfirmation`.`ResidenceProvince` = #{residenceprovince}
+ </if>
+ <if test="residencecity != null and residencecity != ''">and `service_relativesconfirmation`.`ResidenceCity`
+ = #{residencecity}
+ </if>
+ <if test="residencetown != null and residencetown != ''">and `service_relativesconfirmation`.`ResidenceTown`
+ = #{residencetown}
+ </if>
+ <if test="workflow != null ">and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
- </where>
+ </where>
order by `service_relativesconfirmation`.`create_time` desc
</select>
<select id="countNumber" resultType="java.lang.Integer">
- select count(*) from service_relativesconfirmation
- where SignDate >= #{starttime} and SignDate <= #{endtime}
+ select count(*)
+ from service_relativesconfirmation
+ where SignDate >= #{starttime}
+ and SignDate <= #{endtime}
+ </select>
+
+ <select id="confirmationBaseInfoList" resultType="com.ruoyi.project.domain.dto.RelativeConfirmationBaseInfoDTO">
+ SELECT sd.TreatmentHospitalName as treatmenthospitalname,
+ sd.TreatmentHospitalNo as treatmenthospitalno,
+ sd.DonorNo as donorno,
+ sd.case_no as caseNo,
+ sd.Name as name,
+ sd.RecordState as recordstate,
+ sd.Sex as sex,
+ sd.Age as age,
+ sd.BloodType as bloodtype,
+ sd.idcardno as idcardno,
+ sd.diagnosisname as diagnosisname,
+ sr.infoID as infoid,
+ sr.ID as id,
+ sr.RelativeConfirmationSign as relativeConfirmationSign,
+ sr.SignDate as signdate,
+ sr.ResponsibleUserName as responsibleusername,
+ sr.ResponsibleUserID as responsibleuserid,
+ sr.CoordinatedUserIDO as coordinateduserido,
+ sr.CoordinatedUserNameO as coordinatedusernameo,
+ sr.CoordinatedUserNameT as coordinateduseridt,
+ sr.ResponsibleUserID as responsibleuserid
+ FROM service_donatebaseinfo sd
+ LEFT JOIN service_relativesconfirmation sr ON sd.ID = sr.InfoID and sd.del_flag = 0
+ AND sr.del_flag = 0
+ <where>
+ <if test="infoid != null and infoid != ''">AND sr.InfoID = #{infoid}</if>
+ <if test="recordstate != null and recordstate != ''">AND sd.RecordState = #{recordstate}</if>
+ <if test="caseNo != null and caseNo != ''">AND sd.case_no = #{caseNo}</if>
+ <if test="treatmenthospitalname != null and treatmenthospitalname != ''">AND sd.TreatmentHospitalName =
+ #{treatmenthospitalname}
+ </if>
+ <if test="name != null and name != ''">AND sd.Name = #{name}</if>
+ <if test="responsibleusername != null and responsibleusername != ''">AND sd.ResponsibleUserName =
+ #{responsibleusername}
+ </if>
+ <if test="responsibleusername != null and responsibleusername != ''">AND sd.SignDate =
+ #{responsibleusername}
+ </if>
+ <if test="relativeconfirmationsign != null and relativeconfirmationsign != ''">AND
+ sd.RelativeConfirmationSign =
+ #{relativeconfirmationsign}
+ </if>
+ <if test="startSigndate != null and startSigndate != ''"><!-- 纭寮�濮嬫椂闂存绱� -->
+ and sr.SignDate >= #{startSigndate}
+ </if>
+ <if test="endSigndate != null and endSigndate != ''"><!-- 纭缁撴潫鏃堕棿妫�绱� -->
+ and sr.SignDate <= #{endSigndate}
+ </if>
+ </where>
+ <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
</mapper>
--
Gitblit v1.9.3