From d88fffd5d757a23f302011ced88dea92e1ce31e9 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 30 一月 2026 13:48:20 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/MaintenanceBaseInfoVO.java | 166 ++++++++++++
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceMedicalevaluationService.java | 2
ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml | 4
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonatebaseinfoProgressVO.java | 59 ++++
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml | 4
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportFileServiceImpl.java | 3
ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml | 6
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatemaintenanceServiceImpl.java | 27 -
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonatebaseinfoProgressDTO.java | 36 ++
ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml | 23 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/ReviewInitiateBaseInfoDTO.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java | 35 +-
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateflowchart.java | 14
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonatemaintenanceMapper.java | 6
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java | 2
ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml | 31 ++
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MaintenanceBaseInfoDTO.java | 159 ++++++++++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MedicalevaluationBaseInfoDTO.java | 5
ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml | 5
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationCompletionBaseInfoDTO.java | 5
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatemaintenanceService.java | 9
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java | 28 ++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java | 7
/dev/null | 74 -----
ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml | 3
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonateorganBaseInfoDTO.java | 4
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoReportFileService.java | 2
ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java | 13 -
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java | 8
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java | 2
33 files changed, 598 insertions(+), 159 deletions(-)
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 9750a90..4e88a49 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
@@ -190,19 +190,6 @@
log.info("鏂板娼滃湪鎹愮尞淇℃伅锛歿}", serviceDonatebaseinfo);
SysUser user = SecurityUtils.getLoginUser().getUser();
-// String bh = "";
-// bh = serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo);
-// if (bh == "") {
-// return AjaxResult.error("鏂板鏃剁敓鎴愮殑缂栧彿涓虹┖,鍒涘缓澶辫触!");
-// } else {
-// ServiceDonatebaseinfo serviceDonatebaseinfo1 = new ServiceDonatebaseinfo();
-// serviceDonatebaseinfo1.setDonorno(bh);
-// List<ServiceDonatebaseinfo> listrecord = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo1);
-// if (listrecord.size() > 0) {
-// return AjaxResult.error("鏂板鏃剁敓鎴愮殑缂栧彿" + bh + "宸插瓨鍦�,鏃犳硶淇濆瓨!");
-// }
-//
-// }
String idcardno = serviceDonatebaseinfo.getIdcardno();
ServiceDonatebaseinfo serviceDonatebaseinfo2 = new ServiceDonatebaseinfo();
serviceDonatebaseinfo2.setIdcardno(idcardno);
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 7796d1d..5257a8b 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
@@ -132,7 +132,7 @@
boolean save = serviceDonatebaseinfoReportService.save(serviceDonatebaseinfoReport);
//灏嗙敓鎴愮殑鏂囦欢鍦板潃瀛樺偍鍒版暟鎹簱涓�
if (save)
- serviceDonatebaseinfoReportFileService.addList(serviceDonatebaseinfoReport.getAnnexfilesList(), serviceDonatebaseinfoReport.getCaseNo(), getNickName());
+ serviceDonatebaseinfoReportFileService.addList(serviceDonatebaseinfoReport.getAnnexfilesList(), serviceDonatebaseinfoReport.getCaseNo(), getNickName(), serviceDonatebaseinfoReport.getId());
return toAjax(save);
}
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 7c31ca2..bb57781 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
@@ -9,11 +9,14 @@
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.domain.dto.MaintenanceBaseInfoDTO;
+import com.ruoyi.project.domain.dto.MedicalevaluationBaseInfoDTO;
+import com.ruoyi.project.domain.vo.MaintenanceBaseInfoVO;
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.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -32,28 +35,24 @@
@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("鑾峰彇渚涗綋缁存姢璁板綍鍩烘湰淇℃伅鍒楄〃")
// @PreAuthorize("@ss.hasPermi('system:donatemaintenance: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());
+ public Map<String, Object> maintenanceBaseInfoList(@RequestBody MaintenanceBaseInfoVO maintenanceBaseInfoVO) {
+ Integer offset = PageUtils.getOffset(maintenanceBaseInfoVO.getPageNum(), maintenanceBaseInfoVO.getPageSize());
+ maintenanceBaseInfoVO.setPageNum(offset);
+ List<MaintenanceBaseInfoDTO> maintenanceBaseInfoDTOS = serviceDonatemaintenanceService.maintenanceBaseInfoList(maintenanceBaseInfoVO);
+
+ //鑾峰彇鎬绘暟
+ maintenanceBaseInfoVO.setPageNum(null);
+ maintenanceBaseInfoVO.setPageSize(null);
+ Integer totalCount = 0;
+ List<MaintenanceBaseInfoDTO> total = serviceDonatemaintenanceService.maintenanceBaseInfoList(maintenanceBaseInfoVO);
+ if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
+ return getDataTable(maintenanceBaseInfoDTOS, 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 e441a2f..d637272 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
@@ -57,17 +57,17 @@
*/
@ApiOperation("鑾峰彇鍖荤枟璇勪及鎮ｈ�呭熀鏈俊鎭垪琛�")
//// @PreAuthorize("@ss.hasPermi('project:medicalevaluation:list')")
- @PostMapping("/evaluateBaseInfolist")
- public Map<String, Object> evaluateBaseInfolist(@RequestBody MedicalEvaluationWithBaseInfoVO medicalEvaluationWithBaseInfoVO) {
+ @PostMapping("/medevaluateBaseInfolist")
+ public Map<String, Object> medevaluateBaseInfolist(@RequestBody MedicalEvaluationWithBaseInfoVO medicalEvaluationWithBaseInfoVO) {
Integer offset = PageUtils.getOffset(medicalEvaluationWithBaseInfoVO.getPageNum(), medicalEvaluationWithBaseInfoVO.getPageSize());
medicalEvaluationWithBaseInfoVO.setPageNum(offset);
- List<MedicalevaluationBaseInfoDTO> medicalEvaluationWithBaseInfoVOS = serviceMedicalevaluationService.evaluateBaseInfolist(medicalEvaluationWithBaseInfoVO);
+ List<MedicalevaluationBaseInfoDTO> medicalEvaluationWithBaseInfoVOS = serviceMedicalevaluationService.medevaluateBaseInfolist(medicalEvaluationWithBaseInfoVO);
//鑾峰彇鎬绘暟
medicalEvaluationWithBaseInfoVO.setPageNum(null);
medicalEvaluationWithBaseInfoVO.setPageSize(null);
Integer totalCount = 0;
- List<MedicalevaluationBaseInfoDTO> total = serviceMedicalevaluationService.evaluateBaseInfolist(medicalEvaluationWithBaseInfoVO);
+ List<MedicalevaluationBaseInfoDTO> total = serviceMedicalevaluationService.medevaluateBaseInfolist(medicalEvaluationWithBaseInfoVO);
if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
return getDataTable(medicalEvaluationWithBaseInfoVOS, totalCount);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
index 2b31817..ad330de 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
@@ -571,7 +571,33 @@
@Excel(name = "缁堟妗堜緥")
private Integer terminationCase;
- /** 妗堜緥鏃堕棿 */
+
+ @ApiModelProperty("缁堟鍘熷洜锛�1濂借浆 2姝讳骸 3涓嶇鍚堟崘鐚爣鍑� 4瀹跺睘鏀惧純鎹愮尞 5鍏跺畠")
+ @Excel(name = "缁堟鍘熷洜锛�1濂借浆 2姝讳骸 3涓嶇鍚堟崘鐚爣鍑� 4瀹跺睘鏀惧純鎹愮尞 5鍏跺畠")
+ private Integer terminationType;
+
+
+ @ApiModelProperty("缁堟绫诲瀷锛�0寮�鍚紝1缁堟 榛樿鍊硷細0")
+ @Excel(name = "缁堟绫诲瀷")
+ private String terminationResult;
+
+ @ApiModelProperty("鎵╁睍鍐呭")
+ @Excel(name = "鎵╁睍鍐呭")
+ private String extracontent;
+
+
+ @ApiModelProperty("褰撳墠鍖婚櫌")
+ @Excel(name = "褰撳墠鍖婚櫌")
+ private String currentHospital;
+
+
+ @ApiModelProperty("涓婃姤鍖婚櫌")
+ @Excel(name = "涓婃姤鍖婚櫌")
+ private String reportHospital;
+
+ /**
+ * 妗堜緥鏃堕棿
+ */
@ApiModelProperty("妗堜緥鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
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 ffe1940..e5cf36f 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
@@ -403,5 +403,12 @@
@Excel(name = "鍗忚皟鍛樺鍚�", readConverterExp = "鍗忚皟鍛樺鍚�")
private String coordinatorName;
+ /**
+ * 涓婃姤鐨勫尰闄紙鎮ｈ�呴渶瑕佽浆杩愬埌鐨勯偅瀹跺尰闄級
+ */
+ @ApiModelProperty("涓婃姤鐨勫尰闄�")
+ @Excel(name = "涓婃姤鐨勫尰闄�", readConverterExp = "涓婃姤鐨勫尰闄�")
+ private String toHospital;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateflowchart.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateflowchart.java
index 5484cda..47a366f 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateflowchart.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateflowchart.java
@@ -4,11 +4,12 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 鎹愮尞娴佺▼瀵硅薄 service_donateflowchart
- *
+ *
* @author ruoyi
* @date 2021-11-15
*/
@@ -27,20 +28,25 @@
/** 鎹愮尞鑰呯紪鍙� */
@Excel(name = "鎹愮尞鑰呯紪鍙�")
+ @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
private String donorno;
/** 娴佺▼鍚嶇О */
@Excel(name = "娴佺▼鍚嶇О")
+ @ApiModelProperty("娴佺▼鍚嶇О")
private String flowname;
- /** 娴佺▼闄勪欢 */
+ /** 娴佺▼闄勪欢 锛堜綔搴燂級*/
+ @ApiModelProperty("娴佺▼闄勪欢 锛堜綔搴燂級")
private String flowannex;
- /** 娴佺▼鍐呭 */
+ /** 娴佺▼鍐呭 锛堜綔搴燂級*/
+ @ApiModelProperty("娴佺▼鍐呭 锛堜綔搴燂級")
private String flowcontent;
/** 娴佺▼缁撹 */
- @Excel(name = "娴佺▼缁撹")
+ @ApiModelProperty("娴佺▼缁撹锛堜綔搴燂級")
+ @Excel(name = "娴佺▼缁撹锛堜綔搴燂級")
private Long flowconclusion;
}
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
index b64587b..4633e8c 100644
--- 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
@@ -33,6 +33,17 @@
@ApiModelProperty("娌荤枟鍖婚櫌")
private String treatmenthospitalno;
+
+ /**
+ * 浣忛櫌鍙�
+ */
+ @ApiModelProperty("浣忛櫌鍙�")
+ private String inpatientNo;
+
+ @ApiModelProperty("鎵╁睍鍐呭")
+ @Excel(name = "鎵╁睍鍐呭")
+ private String extracontent;
+
/**
* 鎵�鍦ㄥ尰鐤楁満鏋�
*/
@@ -84,7 +95,7 @@
/**
* 宸ヤ綔娴�
*/
- @ApiModelProperty("宸ヤ綔娴�")
+ @ApiModelProperty("宸ヤ綔娴�:1.渚涜�呯淮鎶� 2.鎹愮尞鎰忔効 3.鍖诲璇勪及 4.姝讳骸鍒ゅ畾 5.浼︾悊瀹℃煡 6.鍣ㄥ畼鍒嗛厤 7.鍣ㄥ畼鍒╃敤 99.鎹愮尞瀹屾垚")
private Long workflow;
/**
@@ -92,6 +103,18 @@
*/
@ApiModelProperty("骞撮緞鍗曚綅")
private String ageunit;
+
+ /**
+ * 浼犳煋鐥呮儏鍐�
+ */
+ @ApiModelProperty("浼犳煋鐥呮儏鍐�")
+ private String infectious;
+
+ /**
+ * 浼犳煋鐥呭叾瀹冩儏鍐�
+ */
+ @ApiModelProperty("浼犳煋鐥呭叾瀹冩儏鍐�")
+ private String infectiousOther;
/**
* 琛�鍨�
@@ -193,4 +216,15 @@
@ApiModelProperty("缁堟妗堜緥锛�0寮�鍚紝1缁堟 榛樿鍊硷細0")
@Excel(name = "缁堟妗堜緥")
private Integer terminationCase;
+
+
+ @ApiModelProperty("缁堟妗堜緥鍘熷洜")
+ @Excel(name = "缁堟妗堜緥")
+ private Integer terminationResult;
+
+
+ @ApiModelProperty("缁堟鍘熷洜锛�1濂借浆 2姝讳骸 3涓嶇鍚堟崘鐚爣鍑� 4瀹跺睘鏀惧純鎹愮尞 5鍏跺畠")
+ @Excel(name = "缁堟鍘熷洜锛�1濂借浆 2姝讳骸 3涓嶇鍚堟崘鐚爣鍑� 4瀹跺睘鏀惧純鎹愮尞 5鍏跺畠")
+ private Integer terminationType;
+
}
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
index 41705cd..2d5db9a 100644
--- 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
@@ -34,6 +34,10 @@
@ApiModelProperty("baseInfo鐨処D")
private Long id;
+ /** 鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory */
+ @ApiModelProperty("鎹愮尞绫诲埆")
+ @Excel(name = "鎹愮尞绫诲埆")
+ private String donationcategory;
/**
* 璁板綍鐘舵��
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
index 7450779..9e587cb 100644
--- 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
@@ -33,6 +33,11 @@
@Excel(name = "璁板綍鐘舵��")
private String recordstate;
+ /** 鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory */
+ @ApiModelProperty("鎹愮尞绫诲埆")
+ @Excel(name = "鎹愮尞绫诲埆")
+ private String donationcategory;
+
/**
* 妗堜緥缂栧彿
*/
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MaintenanceBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MaintenanceBaseInfoDTO.java
new file mode 100644
index 0000000..a813069
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MaintenanceBaseInfoDTO.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;
+
+/**
+ * 渚涗綋缁存姢璁板綍瀵硅薄 service_donatemaintenance
+ *
+ * @author ruoyi
+ * @date 2025-12-27
+ */
+@Data
+@ApiModel("渚涗綋缁存姢璁板綍")
+public class MaintenanceBaseInfoDTO extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 璁板綍鐘舵��
+ */
+ @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("寮�濮嬪勾榫�")
+ private Long startAge;
+
+ /**
+ * 缁撴潫骞撮緞
+ */
+ @ApiModelProperty("缁撴潫骞撮緞")
+ private Long endAge;
+
+ /**
+ * 琛�鍨�
+ */
+ @ApiModelProperty("琛�鍨� ")
+ private String bloodtype;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ private String idcardno;
+
+ /**
+ * 鐤剧梾璇婃柇鍚嶇О
+ */
+ @ApiModelProperty("鐤剧梾璇婃柇鍚嶇О")
+ @Excel(name = "鐤剧梾璇婃柇鍚嶇О")
+ private String diagnosisname;
+
+ /**
+ * 鍗忚皟鍛樺鍚�
+ */
+ @ApiModelProperty("鍗忚皟鍛樺鍚�")
+ @Excel(name = "鍗忚皟鍛樺鍚�", readConverterExp = "鍗忚皟鍛樺鍚�")
+ private String coordinatorName;
+
+ /**
+ * 浣忛櫌鍙�
+ */
+ @ApiModelProperty("浣忛櫌鍙�")
+ private String inpatientno;
+
+ /**
+ * 缁存姢璁板綍涓婚敭
+ */
+ @ApiModelProperty("$column.columnComment")
+ private Long id;
+
+ /**
+ * 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
+ */
+ @ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
+ @Excel(name = "鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
+ private Long infoid;
+
+
+ /**
+ * 缁存姢椤圭洰缂栧彿
+ */
+ @ApiModelProperty("缁存姢椤圭洰缂栧彿")
+ @Excel(name = "缁存姢椤圭洰缂栧彿")
+ private String itemNo;
+
+ /**
+ * 缁存姢椤圭洰鍚嶇О
+ */
+ @ApiModelProperty("缁存姢椤圭洰鍚嶇О")
+ @Excel(name = "缁存姢椤圭洰鍚嶇О")
+ private String itemName;
+
+ /**
+ * 缁存寔椤圭洰鏃堕棿
+ */
+ @ApiModelProperty("缁存寔椤圭洰鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "缁存寔椤圭洰鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date itemTime;
+
+ /**
+ * 椤圭洰缁存姢璇︽儏锛宩son缁撴瀯
+ */
+ @ApiModelProperty("椤圭洰缁存姢璇︽儏锛宩son缁撴瀯")
+ @Excel(name = "椤圭洰缁存姢璇︽儏锛宩son缁撴瀯")
+ private String itemDesc;
+
+}
+
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
index cca1eed..bb00dfa 100644
--- 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
@@ -27,6 +27,11 @@
@ApiModelProperty("鍖诲璇勪及鐨刬d")
private Long id;
+ /** 鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory */
+ @ApiModelProperty("鎹愮尞绫诲埆")
+ @Excel(name = "鎹愮尞绫诲埆")
+ private String donationcategory;
+
/**
*
*/
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
index 7a93494..e7b71a1 100644
--- 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
@@ -24,6 +24,11 @@
@ApiModelProperty("baseInfo鐨処D")
private Long infoid;
+ /** 鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory */
+ @ApiModelProperty("鎹愮尞绫诲埆")
+ @Excel(name = "鎹愮尞绫诲埆")
+ private String donationcategory;
+
/**
* baseInfo鐨処D
*/
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
index f1794f0..00f1bb4 100644
--- 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
@@ -33,6 +33,12 @@
private Long id;
/**
+ * 浣忛櫌鍙�
+ */
+ @ApiModelProperty("浣忛櫌鍙�")
+ private String inpatientNo;
+
+ /**
* 妗堜緥缂栧彿
*/
@ApiModelProperty("妗堜緥缂栧彿")
@@ -40,11 +46,58 @@
private String caseNo;
/**
- * 宸ヤ綔娴�
+ * 缁堟妗堜緥锛�0寮�鍚� 1缁堟 榛樿 0
*/
- @ApiModelProperty("宸ヤ綔娴�")
+ @ApiModelProperty("缁堟妗堜緥锛�0寮�鍚� 1缁堟 榛樿 0")
+ @Excel(name = "缁堟妗堜緥锛�0寮�鍚� 1缁堟 榛樿 0")
+ private Integer terminationCase;
+
+ /**
+ * 鐤剧梾璇婃柇鍚嶇О
+ */
+ @ApiModelProperty("鐤剧梾璇婃柇鍚嶇О")
+ @Excel(name = "鐤剧梾璇婃柇鍚嶇О")
+ private String diagnosisName;
+
+ @ApiModelProperty("缁堟鍘熷洜锛�1濂借浆 2姝讳骸 3涓嶇鍚堟崘鐚爣鍑� 4瀹跺睘鏀惧純鎹愮尞 5鍏跺畠")
+ @Excel(name = "缁堟鍘熷洜锛�1濂借浆 2姝讳骸 3涓嶇鍚堟崘鐚爣鍑� 4瀹跺睘鏀惧純鎹愮尞 5鍏跺畠")
+ private Integer terminationType;
+
+ /**
+ * 宸ヤ綔娴�:1.渚涜�呯淮鎶� 2 鎹愮尞鎰忔効 3 鍖诲璇勪及 4 姝讳骸鍒ゅ畾 5 浼︾悊瀹℃煡 6 鍣ㄥ畼鍒嗛厤 7 鍣ㄥ畼鍒╃敤 99 鎹愮尞瀹屾垚
+ */
+ @ApiModelProperty("宸ヤ綔娴�:1.渚涜�呯淮鎶� 2 鎹愮尞鎰忔効 3 鍖诲璇勪及 4 姝讳骸鍒ゅ畾 5 浼︾悊瀹℃煡 6 鍣ㄥ畼鍒嗛厤 7 鍣ㄥ畼鍒╃敤 99 鎹愮尞瀹屾垚")
private Long workflow;
+ /**
+ * 涓婃姤鍖婚櫌
+ */
+ @ApiModelProperty("涓婃姤鍖婚櫌")
+ private String treatmentHospitalName;
+
+ /**
+ * 浼犳煋鐥呮儏鍐�
+ */
+ @ApiModelProperty("浼犳煋鐥呮儏鍐�")
+ private String infectious;
+
+ /**
+ * 浼犳煋鐥呭叾瀹冩儏鍐�
+ */
+ @ApiModelProperty("浼犳煋鐥呭叾瀹冩儏鍐�")
+ private String infectiousOther;
+
+ /**
+ * 寮�濮嬪勾榫�
+ */
+ @ApiModelProperty("寮�濮嬪勾榫�")
+ private Long startAge;
+
+ /**
+ * 缁撴潫骞撮緞
+ */
+ @ApiModelProperty("缁撴潫骞撮緞")
+ private Long endAge;
/**
* 濮撳悕
@@ -65,13 +118,11 @@
@ApiModelProperty("璇佷欢鍙风爜")
private String idcardno;
-
/**
* 璁板綍鐘舵��
*/
@ApiModelProperty("璁板綍鐘舵��")
@Excel(name = "璁板綍鐘舵��")
private String recordstate;
-
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/MaintenanceBaseInfoVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/MaintenanceBaseInfoVO.java
new file mode 100644
index 0000000..3a799fc
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/MaintenanceBaseInfoVO.java
@@ -0,0 +1,166 @@
+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 MaintenanceBaseInfoVO extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 璁板綍鐘舵��
+ */
+ @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("寮�濮嬪勾榫�")
+ private Long startAge;
+
+ /**
+ * 缁撴潫骞撮緞
+ */
+ @ApiModelProperty("缁撴潫骞撮緞")
+ private Long endAge;
+
+ /**
+ * 琛�鍨�
+ */
+ @ApiModelProperty("琛�鍨� ")
+ private String bloodtype;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ private String idcardno;
+
+ /**
+ * 鐤剧梾璇婃柇鍚嶇О
+ */
+ @ApiModelProperty("鐤剧梾璇婃柇鍚嶇О")
+ @Excel(name = "鐤剧梾璇婃柇鍚嶇О")
+ private String diagnosisname;
+
+ /**
+ * 鍗忚皟鍛樺鍚�
+ */
+ @ApiModelProperty("鍗忚皟鍛樺鍚�")
+ @Excel(name = "鍗忚皟鍛樺鍚�", readConverterExp = "鍗忚皟鍛樺鍚�")
+ private String coordinatorName;
+
+ /**
+ * 浣忛櫌鍙�
+ */
+ @ApiModelProperty("浣忛櫌鍙�")
+ private String inpatientno;
+
+ /**
+ * 缁存姢璁板綍涓婚敭
+ */
+ @ApiModelProperty("$column.columnComment")
+ private Long id;
+
+ /**
+ * 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
+ */
+ @ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
+ @Excel(name = "鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
+ private Long infoid;
+
+
+ /**
+ * 缁存姢椤圭洰缂栧彿
+ */
+ @ApiModelProperty("缁存姢椤圭洰缂栧彿")
+ @Excel(name = "缁存姢椤圭洰缂栧彿")
+ private String itemNo;
+
+ /**
+ * 缁存姢椤圭洰鍚嶇О
+ */
+ @ApiModelProperty("缁存姢椤圭洰鍚嶇О")
+ @Excel(name = "缁存姢椤圭洰鍚嶇О")
+ private String itemName;
+
+ /**
+ * 缁存寔椤圭洰鏃堕棿
+ */
+ @ApiModelProperty("缁存寔椤圭洰鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "缁存寔椤圭洰鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date itemTime;
+
+ /**
+ * 椤圭洰缁存姢璇︽儏锛宩son缁撴瀯
+ */
+ @ApiModelProperty("椤圭洰缁存姢璇︽儏锛宩son缁撴瀯")
+ @Excel(name = "椤圭洰缁存姢璇︽儏锛宩son缁撴瀯")
+ private String itemDesc;
+
+
+ @ApiModelProperty("閮ㄩ棬鍚嶇О")
+ @Excel(name = "閮ㄩ棬鍚嶇О")
+ private String deptname;
+
+}
+
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
deleted file mode 100644
index 1fca681..0000000
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonatemaintenanceVO.java
+++ /dev/null
@@ -1,74 +0,0 @@
-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/mapper/ServiceDonatemaintenanceMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonatemaintenanceMapper.java
index 6c90d23..33ee601 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonatemaintenanceMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonatemaintenanceMapper.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.project.domain.ServiceDonatemaintenance;
+import com.ruoyi.project.domain.dto.MaintenanceBaseInfoDTO;
+import com.ruoyi.project.domain.vo.MaintenanceBaseInfoVO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -18,8 +20,8 @@
/**
* 鏌ヨ渚涗綋缁存姢璁板綍鍒楄〃
*
- * @param serviceDonatemaintenance 渚涗綋缁存姢璁板綍
+ * @param maintenanceBaseInfoVO 渚涗綋缁存姢璁板綍
* @return 渚涗綋缁存姢璁板綍闆嗗悎
*/
- public List<ServiceDonatemaintenance> selectServiceDonatemaintenanceList(ServiceDonatemaintenance serviceDonatemaintenance);
+ public List<MaintenanceBaseInfoDTO> selectServiceDonatemaintenanceList(MaintenanceBaseInfoVO maintenanceBaseInfoVO);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoReportFileService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoReportFileService.java
index 2f2e38d..c1ebd5a 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoReportFileService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoReportFileService.java
@@ -23,7 +23,7 @@
public List<ServiceDonatebaseinfoReportFile> queryList(ServiceDonatebaseinfoReportFile serviceDonatebaseinfoReportFile);
//鎵归噺涓婁紶
- public Boolean addList(List<ServiceDonatebaseinfoReportFile> serviceDonatebaseinfoReportFiles,String caseNo,String updateName);
+ public Boolean addList(List<ServiceDonatebaseinfoReportFile> serviceDonatebaseinfoReportFiles,String caseNo,String updateName,Long reportId);
public Boolean updateList(List<ServiceDonatebaseinfoReportFile> serviceDonatebaseinfoReportFiles, Long reportId,String caseNo,String updateName);
}
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 21e3e8d..aacb00a 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
@@ -3,7 +3,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceDonatemaintenance;
-import com.ruoyi.project.domain.vo.ServiceDonatemaintenanceVO;
+import com.ruoyi.project.domain.dto.MaintenanceBaseInfoDTO;
+import com.ruoyi.project.domain.vo.MaintenanceBaseInfoVO;
+
+import java.util.List;
/**
* 渚涗綋缁存姢璁板綍Service鎺ュ彛
@@ -25,8 +28,8 @@
/**
* 鑾峰彇渚涗綋缁存姢璁板綍鍩烘湰淇℃伅鍒楄〃
*
- * @param serviceDonatemaintenanceVO
+ * @param maintenanceBaseInfoVO
* @return
*/
- public Page maintenanceBaseInfoList(ServiceDonatemaintenanceVO serviceDonatemaintenanceVO);
+ public List<MaintenanceBaseInfoDTO> maintenanceBaseInfoList(MaintenanceBaseInfoVO maintenanceBaseInfoVO);
}
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 73b0120..6f4bd7e 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
@@ -27,5 +27,5 @@
List<MedicalEvaluationVO> selectVOList(MedicalEvaluationVO medicalEvaluationVO);
- List<MedicalevaluationBaseInfoDTO> evaluateBaseInfolist(MedicalEvaluationWithBaseInfoVO medicalEvaluationWithBaseInfoVO);
+ List<MedicalevaluationBaseInfoDTO> medevaluateBaseInfolist(MedicalEvaluationWithBaseInfoVO medicalEvaluationWithBaseInfoVO);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportFileServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportFileServiceImpl.java
index 16d8ac0..fed752b 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportFileServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportFileServiceImpl.java
@@ -59,13 +59,14 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public Boolean addList(List<ServiceDonatebaseinfoReportFile> serviceDonatebaseinfoReportFiles,String caseNo,String createName) {
+ public Boolean addList(List<ServiceDonatebaseinfoReportFile> serviceDonatebaseinfoReportFiles,String caseNo,String createName,Long reportId) {
boolean save = false;
if (CollectionUtils.isNotEmpty(serviceDonatebaseinfoReportFiles)) {
for (ServiceDonatebaseinfoReportFile serviceDonatebaseinfoReportFile : serviceDonatebaseinfoReportFiles) {
serviceDonatebaseinfoReportFile.setCreateTime(new Date());
serviceDonatebaseinfoReportFile.setCreateBy(createName);
serviceDonatebaseinfoReportFile.setCaseNo(caseNo);
+ serviceDonatebaseinfoReportFile.setDonatebaseinfoReportId(reportId);
serviceDonatebaseinfoReportFile.setCreateTime(new Date());
save = save(serviceDonatebaseinfoReportFile);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
index 116bd0d..d2eb5f4 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
@@ -123,6 +123,8 @@
serviceDonatebaseinfo1.setId(null);
serviceDonatebaseinfo1.setReporterno(serviceDonatebaseinfoReport.getCoordinatorNo());
serviceDonatebaseinfo1.setReportername(serviceDonatebaseinfoReport.getCoordinatorName());
+ serviceDonatebaseinfo1.setCurrentHospital(serviceDonatebaseinfoReport.getToHospital());
+ serviceDonatebaseinfo1.setReportername(serviceDonatebaseinfoReport.getCoordinatorName());
//鍏堥�氳繃caseNo鏌ヨ鏄惁瀛樺湪
ServiceDonatebaseinfo serviceDonatebaseinfo = new ServiceDonatebaseinfo();
serviceDonatebaseinfo.setCaseNo(serviceDonatebaseinfoReport.getCaseNo());
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 d333d7b..877ec1d 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
@@ -554,6 +554,12 @@
if (StringUtils.isNotBlank(serviceDonatebaseinfo.getGcsScore())) {
wrappers.eq(ServiceDonatebaseinfo::getGcsScore, serviceDonatebaseinfo.getGcsScore());
}
+ if (StringUtils.isNotBlank(serviceDonatebaseinfo.getExtracontent())) {
+ wrappers.eq(ServiceDonatebaseinfo::getExtracontent, serviceDonatebaseinfo.getExtracontent());
+ }
+ if (serviceDonatebaseinfo.getTerminationType()!=null) {
+ wrappers.eq(ServiceDonatebaseinfo::getTerminationType, serviceDonatebaseinfo.getTerminationType());
+ }
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 1e79a5e..78e0788 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
@@ -8,8 +8,9 @@
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.MaintenanceBaseInfoDTO;
import com.ruoyi.project.domain.dto.ServiceDonatebaseinfoDTO;
-import com.ruoyi.project.domain.vo.ServiceDonatemaintenanceVO;
+import com.ruoyi.project.domain.vo.MaintenanceBaseInfoVO;
import com.ruoyi.project.mapper.ServiceDonatemaintenanceMapper;
import com.ruoyi.project.service.IServiceDonatebaseinfoService;
import com.ruoyi.project.service.IServiceDonatemaintenanceService;
@@ -73,27 +74,9 @@
}
@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;
+ public List<MaintenanceBaseInfoDTO> maintenanceBaseInfoList(MaintenanceBaseInfoVO maintenanceBaseInfoVO) {
+ List<MaintenanceBaseInfoDTO> maintenanceBaseInfoDTOS = serviceDonatemaintenanceMapper.selectServiceDonatemaintenanceList(maintenanceBaseInfoVO);
+ return maintenanceBaseInfoDTOS;
}
}
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 ad934c0..04e952f 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
@@ -93,7 +93,7 @@
}
@Override
- public List<MedicalevaluationBaseInfoDTO> evaluateBaseInfolist(MedicalEvaluationWithBaseInfoVO medicalEvaluationWithBaseInfoVO) {
+ public List<MedicalevaluationBaseInfoDTO> medevaluateBaseInfolist(MedicalEvaluationWithBaseInfoVO medicalEvaluationWithBaseInfoVO) {
List<MedicalevaluationBaseInfoDTO> medicalevaluationBaseInfoDTOS = serviceMedicalevaluationMapper.selectEvaluateBaseInfoList(medicalEvaluationWithBaseInfoVO);
//鍒ゆ柇pgaeNun鏄负浜嗚鏌ヨtotal涓嶅啀鏌ヨserviceMedicalevaluationorgan
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
index f4658cf..c0d0462 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
@@ -111,7 +111,9 @@
LEFT JOIN service_deathinfo sdi ON sd.ID = sdi.InfoID
AND sd.del_flag = 0
AND sdi.del_flag = 0
+ AND sdi.ID IS NOT NULL
<where>
+ sd.termination_case = 0
<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>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
index bd323c2..a7355d1 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -91,6 +91,11 @@
<result property="gcsScore" column="gcs_score"/>
<result property="coordinatorNo" column="coordinator_no"/>
<result property="coordinatorName" column="coordinator_name"/>
+ <result property="terminationResult" column="termination_result"/>
+ <result property="reportHospital" column="report_hospital"/>
+ <result property="currentHospital" column="current_hospital"/>
+ <result property="terminationType" column="termination_type"/>
+ <result property="extracontent" column="extracontent"/>
</resultMap>
<sql id="selectServiceDonatebaseinfoVo">
@@ -415,10 +420,16 @@
sd.treatmenthospitalno AS treatmenthospitalno,
sd.DonorNo AS donorno,
sd.id AS id,
+ sd.InpatientNo AS inpatientNo,
sd.case_no AS caseNo,
sd.NAME AS NAME,
sd.RecordState AS recordstate,
+ sd.termination_case AS terminationCase,
+ sd.termination_type AS terminationType,
+ sd.termination_result AS terminationResult,
sd.workflow AS workflow,
+ sd.Infectious AS infectious,
+ sd.Infectious_other AS infectiousOther,
sd.Sex AS sex,
sd.Age AS age,
sd.BloodType AS bloodtype,
@@ -426,8 +437,8 @@
sd.ReportTime AS reportTime,
sd.coordinator_no AS coordinatorNo,
sd.coordinator_name AS coordinatorName,
- sd.termination_case AS terminationCase,
sd.diagnosisname AS diagnosisname,
+ sd.extracontent AS extracontent,
sm.assess_state AS assessState,-- 璇勪及鐘舵��
sm.assess_time AS assessTime,-- 璇勪及鏃堕棿
sr.SignDate AS signDate,-- 浜插睘纭鏃堕棿
@@ -450,13 +461,21 @@
AND sdt.del_flag = 0 -- 瀹屾垚鐧昏
<where>sd.del_flag = 0
- <if test="name != null ">AND sd.Name >= #{name}</if>
+ <if test="terminationCase != null ">AND sd.termination_case = #{terminationCase}</if>
+ <if test="treatmentHospitalName != null ">AND sd.TreatmentHospitalName = #{treatmentHospitalName}</if>
+ <if test="name != null ">AND sd.Name = #{name}</if>
+ <if test="inpatientNo != null ">AND sd.InpatientNo = #{inpatientNo}</if>
+ <if test="startAge != null">AND sd.age >= #{startAge}</if>
+ <if test="endAge !=null">AND sd.age <= #{endAge}
+ </if>
<if test="idcardno != null and idcardno != ''">and IDCardNo = #{idcardno}</if>
<if test="recordstate != null and recordstate != ''">and sd.RecordState = #{recordstate}</if>
<if test="workflow != null">and sd.workflow = #{workflow}</if>
+ <if test="diagnosisName != null">and sd.DiagnosisName like concat('%', #{diagnosisName}, '%')</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/ServiceDonatecompletioninfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
index bac4318..e691054 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
@@ -183,6 +183,7 @@
sd.treatmenthospitalno AS treatmenthospitalno,
sd.DonorNo AS donorno,
sd.case_no AS caseNo,
+ sd.DonationCategory as donationcategory,
sd.NAME AS name,
sd.RecordState AS recordstate,
sd.Sex AS sex,
@@ -209,7 +210,9 @@
LEFT JOIN service_donatecompletioninfo sdc ON sd.ID = sdc.InfoID
AND sd.del_flag = 0
AND sdc.del_flag = 0
+ and sdc.ID is not null
<where>
+ sd.termination_case = 0
<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 sdc.DonorNo = #{donorno}</if>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
index 0a54e4a..55c3a37 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
@@ -38,13 +38,38 @@
</sql>
<select id="selectServiceDonatemaintenanceList" parameterType="com.ruoyi.project.domain.ServiceDonatemaintenance"
- resultMap="ServiceDonatemaintenanceResult">
- <include refid="selectServiceDonatemaintenanceVo"/>
+ resultType="com.ruoyi.project.domain.dto.DonationCompletionBaseInfoDTO">
+ select
+ sd.treatmenthospitalname AS treatmenthospitalname,
+ sd.treatmenthospitalno AS treatmenthospitalno,
+ sd.DonorNo AS donorno,
+ sd.DonationCategory as donationcategory,
+ 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,
+ sdm.id AS infoid,
+ sdm.item_no as itemNo,
+ sdm.item_name as itemName,
+ sdm.item_time as itemTime,
+ sdm.item_desc as itemDesc
+ FROM
+ service_donatebaseinfo sd
+ LEFT JOIN service_donatemaintenance sdm ON sd.ID = sdm.InfoID
+ AND sd.del_flag = 0
+ AND sdm.del_flag = 0
+ and sdm.ID is not null
<where>
- del_flag=0
+ sd.termination_case = 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>
+ <if test="name != null and name != ''">and name = #{name}</if>
+ <if test="coordinatorName != null and coordinatorName != ''">and coordinator_name = #{coordinatorName}</if>
<if test="itemNo != null and itemNo != ''">and item_no = #{itemNo}</if>
<if test="itemName != null and itemName != ''">and item_name like concat('%', #{itemName}, '%')</if>
<if test="itemTime != null ">and item_time = #{itemTime}</if>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml
index f3c072d..4965a03 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml
@@ -61,6 +61,7 @@
sd.treatmenthospitalname AS treatmenthospitalname,
sd.treatmenthospitalno AS treatmenthospitalno,
sd.DonorNo AS donorno,
+ sd.DonationCategory as donationcategory,
sd.case_no AS caseNo,
sd.Name AS NAME,
sd.Sex AS sex,
@@ -77,8 +78,9 @@
service_donatebaseinfo sd
LEFT JOIN service_donateorgan_base sdb ON sd.ID = sdb.InfoID and sd.del_flag = 0
and sdb.del_flag = 0
+ and sdb.ID is not null
<where>
-
+ sd.termination_case = 0
<if test="donorno != null and donorno != ''">and sd.DonorNo = #{donorno}</if>
<if test="treatmenthospitalname != null and treatmenthospitalname != ''">and sd.treatmenthospitalname like
concat('%', #{treatmenthospitalname}, '%')
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index ff6a3a0..c69d04c 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -112,6 +112,7 @@
select
sd.treatmenthospitalname AS treatmenthospitalname,
sd.treatmenthospitalno AS treatmenthospitalno,
+ sd.DonationCategory as donationcategory,
sd.DonorNo AS donorno,
sd.case_no AS caseNo,
sd.NAME AS name,
@@ -152,9 +153,12 @@
FROM
service_donatebaseinfo sd
LEFT JOIN service_donationwitness st ON sd.ID = st.InfoID
+ and st.ID is not null
AND sd.del_flag = 0
AND st.del_flag = 0
<where>
+ sd.termination_case = 0
+
<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>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
index 5647acb..0964082 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
@@ -83,6 +83,7 @@
SELECT
sd.treatmenthospitalname as treatmenthospitalname,
sd.treatmenthospitalno as treatmenthospitalno,
+ sd.DonationCategory as donationcategory,
sd.DonorNo as donorno,
sd.case_no as caseNo,
sd.Name as name,
@@ -102,8 +103,10 @@
FROM
service_donatebaseinfo sd
LEFT JOIN service_ethicalreviewinitiate se ON sd.ID = se.InfoID and sd.del_flag = 0
- AND se.del_flag = 0
+ AND se.del_flag = 0 and se.ID is not null
<where>
+ sd.termination_case = 0
+
<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>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
index e1e1bd3..89cc4fc 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
@@ -52,6 +52,7 @@
<result property="assessTime" column="assess_time"/>
<result property="assessState" column="assess_state"/>
<result property="assessannex" column="AssessAnnex"/>
+ <result property="donationcategory" column="donationcategory"/>
</resultMap>
<sql id="selectServiceMedicalevaluationVo">
@@ -193,6 +194,7 @@
SELECT
sb.TreatmentHospitalName,
sb.TreatmentHospitalNo,
+ sb.DonationCategory as donationcategory,
sb.DonorNo,
sb.case_no,
sb.Name,
@@ -206,11 +208,13 @@
sb.id as infoID,
sm.ID,
sm.assessannex,
+ sm.assess_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
+ and sb.del_flag = 0 and sm.ID is not null
<where>
+ sb.termination_case = 0
<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>
--
Gitblit v1.9.3