From 0bb9f6c3e894e56ff58d335110fbe4cfa87b64b2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 28 一月 2026 14:17:19 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationorganServiceImpl.java | 14 -
ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceMedicalevaluation.java | 27 --
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonatebaseinfoProgressVO.java | 6
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java | 33 ++-
ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml | 14 -
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonatebaseinfoProgressDTO.java | 38 ++--
ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml | 11
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java | 10
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceMedicalevaluationorgan.java | 37 +---
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatecompletioninfoService.java | 10 +
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 35 ---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java | 18 ++
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DeathBaseInfoDTO.java | 6
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java | 7
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationCompletionBaseInfoVO.java | 3
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MedicalevaluationBaseInfoDTO.java | 32 +--
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonationwitnessMapper.java | 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDeathinfoController.java | 2
ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml | 2
ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationorganMapper.xml | 17 -
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDeathinfo.java | 6
ruoyi-project/src/main/java/com/ruoyi/project/domain/VUserOrg.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationCompletionBaseInfoDTO.java | 75 ++++++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java | 9
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonatecompletioninfoMapper.java | 6
ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml | 41 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java | 9
30 files changed, 281 insertions(+), 203 deletions(-)
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
index d277f37..beae740 100644
--- 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
@@ -1,6 +1,5 @@
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;
@@ -10,7 +9,6 @@
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;
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 c438790..9750a90 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
@@ -78,12 +78,10 @@
* 鏌ヨ鎹愮尞鍩虹鍒楄〃
*/
@ApiOperation("娼滃湪鎹愮尞淇℃伅鍒楄〃")
- //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonatebaseinfo serviceDonatebaseinfo) {
log.info("娼滃湪鎹愮尞淇℃伅鍒楄〃锛歿}", serviceDonatebaseinfo);
startPage();
- //List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
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 5d5af86..2d52701 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
@@ -9,10 +9,13 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.OrganEnum;
import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.ServiceDonateorgan;
+import com.ruoyi.project.domain.dto.DonationCompletionBaseInfoDTO;
+import com.ruoyi.project.domain.dto.DonationwitnessBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonationCompletionBaseInfoVO;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
import com.ruoyi.project.service.IServiceDonatecompletioninfoService;
@@ -60,17 +63,25 @@
configuration.setDefaultEncoding("utf-8");
}
-// /**
-// * 鏌ヨ鎹愮尞瀹屾垚鍒楄〃
-// */
-// @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);
-// }
+ /**
+ * 鏌ヨ鎹愮尞瀹屾垚鍒楄〃鍩烘湰淇℃伅
+ */
+ @ApiOperation("鏌ヨ鎹愮尞瀹屾垚鍒楄〃鍩烘湰淇℃伅锛堝櫒瀹樺埄鐢級")
+ //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:list')")
+ @PostMapping("/getDonationCompletionBaseInfo")
+ public Map<String, Object> getDonationCompletionBaseInfo(@RequestBody DonationCompletionBaseInfoVO donationCompletionBaseInfoVO) {
+ log.info("鏌ヨ鎹愮尞瀹屾垚鍒楄〃鍩烘湰淇℃伅锛歿}", donationCompletionBaseInfoVO);
+ Integer offset = PageUtils.getOffset(donationCompletionBaseInfoVO.getPageNum(), donationCompletionBaseInfoVO.getPageSize());
+ donationCompletionBaseInfoVO.setPageNum(offset);
+ List<DonationCompletionBaseInfoDTO> donationCompletionBaseInfoDTOList = serviceDonatecompletioninfoService.getDonationCompletionBaseInfo(donationCompletionBaseInfoVO);
+
+ donationCompletionBaseInfoVO.setPageNum(null);
+ donationCompletionBaseInfoVO.setPageSize(null);
+ Integer totalCount = 0;
+ List<DonationCompletionBaseInfoDTO> total = serviceDonatecompletioninfoService.getDonationCompletionBaseInfo(donationCompletionBaseInfoVO);
+ if (!org.springframework.util.CollectionUtils.isEmpty(total)) totalCount = total.size();
+ return getDataTable(donationCompletionBaseInfoDTOList,totalCount);
+ }
/**
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
index 97f022a..8104a84 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDeathinfo.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDeathinfo.java
@@ -69,9 +69,9 @@
@Excel(name = "姝讳骸鍒ゅ畾鍖荤敓浜�")
private String deathjudgedoctt;
- /** 姝讳骸璇佹槑闄勪欢璺緞,澶氬紶鐢�;鍙烽殧寮� */
- @ApiModelProperty("姝讳骸璇佹槑闄勪欢璺緞,澶氬紶鐢�;鍙烽殧寮�")
- @Excel(name = "姝讳骸璇佹槑闄勪欢璺緞,澶氬紶鐢�;鍙烽殧寮�")
+ /** 姝讳骸璇佹槑闄勪欢 */
+ @ApiModelProperty("姝讳骸璇佹槑闄勪欢")
+ @Excel(name = "姝讳骸璇佹槑闄勪欢")
private String deathjudgeannex;
/** 鏄惁榛樺搥缂呮��浠紡 0锛氬惁锛�1锛氭槸 */
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 dd13680..2b31817 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
@@ -1,5 +1,6 @@
package com.ruoyi.project.domain;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -103,7 +104,6 @@
* 鍑虹敓鏃ユ湡
*/
@ApiModelProperty("鍑虹敓鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date birthday;
/**
@@ -557,7 +557,7 @@
private String businessarea;
- @ApiModelProperty("闄勪欢鍦板潃")
+ @ApiModelProperty("闄勪欢鍦板潃锛堜緵鑰呰瘎浼板悇椤硅褰曪級")
@Excel(name = "闄勪欢鍦板潃")
private String annexfiles;
@@ -571,9 +571,10 @@
@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")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date donatetime;
@ApiModelProperty("妗堜緥搴忓彿")
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 e0726b9..df1494d 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
@@ -158,33 +158,20 @@
private String assessannex;
/**
- * 璇勪及鐘舵�侊細 棣栨锛�1.璇勪及閫氳繃 2璇勪及涓嶉�氳繃 鏈�缁堬細3.璇勪及閫氳繃 4璇勪及涓嶉�氳繃
+ * 璇勪及鐘舵�侊細 1.璇勪及閫氳繃 2璇勪及涓嶉�氳繃
*/
- @ApiModelProperty("璇勪及鐘舵�侊細 棣栨锛�1.璇勪及閫氳繃 2璇勪及涓嶉�氳繃 鏈�缁堬細3.璇勪及閫氳繃 4璇勪及涓嶉�氳繃")
- private String firstAssessState;
-
- /**
- * 璇勪及鐘舵�侊細 棣栨锛�1.璇勪及閫氳繃 2璇勪及涓嶉�氳繃 鏈�缁堬細3.璇勪及閫氳繃 4璇勪及涓嶉�氳繃
- */
- @ApiModelProperty("璇勪及鐘舵�侊細 棣栨锛�1.璇勪及閫氳繃 2璇勪及涓嶉�氳繃 鏈�缁堬細3.璇勪及閫氳繃 4璇勪及涓嶉�氳繃")
- private String secondAssessState;
+ @ApiModelProperty("璇勪及鐘舵�侊細 1.璇勪及閫氳繃 2璇勪及涓嶉�氳繃 ")
+ private String assessState;
/**
- * 棣栨璇勪及鏃堕棿
+ * 璇勪及鏃堕棿
*/
- @ApiModelProperty("棣栨璇勪及鏃堕棿")
+ @ApiModelProperty("璇勪及鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "棣栨璇勪及鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date assessFirstTime;
+ @Excel(name = "璇勪及鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date assessTime;
- /**
- * 浜屾璇勪及鏃堕棿
- */
- @ApiModelProperty("浜屾璇勪及鏃堕棿")
- @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/ServiceMedicalevaluationorgan.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceMedicalevaluationorgan.java
index ba8b8a9..899f84b 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceMedicalevaluationorgan.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceMedicalevaluationorgan.java
@@ -65,34 +65,6 @@
@Excel(name = "鍣ㄥ畼缂栧彿 ")
private String organnumber;
- /**
- * 鍣ㄥ畼璇勪及鐘舵�� 锛�1锛氬彲鐢紝2锛氫笉鍙敤
- */
- @ApiModelProperty("鍣ㄥ畼璇勪及鐘舵�� 锛�1锛氬彲鐢紝2锛氫笉鍙敤")
- @Excel(name = "鍣ㄥ畼璇勪及鐘舵�� 锛�1锛氬彲鐢紝2锛氫笉鍙敤")
- private String organState;
-
- /**
- * 涓嶅彲鐢ㄥ師鍥�
- */
- @ApiModelProperty("涓嶅彲鐢ㄥ師鍥�")
- @Excel(name = "涓嶅彲鐢ㄥ師鍥�")
- private String notgetreason;
-
- /**
- * 鍣ㄥ畼璇勪及鏃堕棿
- */
- @ApiModelProperty("鍣ㄥ畼璇勪及鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鍣ㄥ畼璇勪及鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date organAssessTime;
-
- /**
- * 璇勪及鍖荤敓濮撳悕
- */
- @ApiModelProperty("璇勪及鍖荤敓濮撳悕")
- @Excel(name = "璇勪及鍖荤敓濮撳悕")
- private String organAssessDoct;
/**
* 鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�
@@ -150,5 +122,14 @@
@Excel(name = "鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1")
private String isdgf;
+
+ /**
+ * 澶氭璇勪及鎰忚
+ */
+ @ApiModelProperty("澶氭璇勪及鎰忚")
+ @Excel(name = "澶氭璇勪及鎰忚")
+ private String assesscontent;
+
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/VUserOrg.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/VUserOrg.java
index 5f8907e..735d0b6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/VUserOrg.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/VUserOrg.java
@@ -16,7 +16,7 @@
*/
@Data
@ApiModel("VIEW")
-public class VUserOrg extends BaseEntity
+public class VUserOrg
{
private static final long serialVersionUID = 1L;
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
index 6e72cc3..c8edb48 100644
--- 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
@@ -26,6 +26,12 @@
@ApiModelProperty("baseInfo鐨処D")
private Long infoid;
+ /**
+ * DeathBaseInfo鐨処D
+ */
+ @ApiModelProperty("DeathBaseInfo鐨処D")
+ private Long id;
+
/**
* 璁板綍鐘舵��
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 e0a748a..b64587b 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
@@ -21,6 +21,11 @@
@ApiModel("鎹愮尞杩涘害鍩虹淇℃伅")
public class DonatebaseinfoProgressDTO extends BaseEntity {
private static final long serialVersionUID = 1L;
+ /**
+ * Donatebaseinfo鐨処D
+ */
+ @ApiModelProperty("Donatebaseinfo鐨処D")
+ private Long id;
/**
* 娌荤枟鍖婚櫌
@@ -77,6 +82,12 @@
private Long age;
/**
+ * 宸ヤ綔娴�
+ */
+ @ApiModelProperty("宸ヤ綔娴�")
+ private Long workflow;
+
+ /**
* 骞撮緞鍗曚綅
*/
@ApiModelProperty("骞撮緞鍗曚綅")
@@ -118,32 +129,21 @@
/**
- * 绗竴娆¤瘎浼版椂闂�
+ * 璇勪及鐘舵�侊細1.璇勪及閫氳繃 2璇勪及涓嶉�氳繃
*/
- @ApiModelProperty("绗竴娆¤瘎浼版椂闂�")
+ @ApiModelProperty("璇勪及鐘舵�侊細1.璇勪及閫氳繃 2璇勪及涓嶉�氳繃 ")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "绗竴娆¤瘎浼版椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date assessFirstTime;
+ @Excel(name = "璇勪及鐘舵�侊細1.璇勪及閫氳繃 2璇勪及涓嶉�氳繃 ", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private String assessState;
/**
- * 绗簩娆¤瘎浼版椂闂�
+ * 璇勪及鏃堕棿
*/
- @ApiModelProperty("绗簩娆¤瘎浼版椂闂�")
+ @ApiModelProperty("璇勪及鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "绗簩娆¤瘎浼版椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date assessSecondTime;
+ @Excel(name = "璇勪及鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date assessTime;
- /**
- * 绗竴娆¤瘎浼扮粨璁�
- */
- @ApiModelProperty("绗竴娆¤瘎浼扮粨璁�")
- private String firstAssessState;
-
- /**
- * 绗簩娆¤瘎浼扮粨璁�
- */
- @ApiModelProperty("绗簩娆¤瘎浼扮粨璁�")
- private String secondAssessState;
/**
* 浜插睘纭鏃堕棿
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 374427c..7450779 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
@@ -3,11 +3,13 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.project.domain.ServiceDonatecomporgan;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
+import java.util.List;
@Data
@ApiModel("鍣ㄥ畼鎹愮尞瀹屾垚鍩烘湰淇℃伅鍝嶅簲瀵硅薄锛堝櫒瀹樺埄鐢ㄥ搷搴斿璞★級")
@@ -17,6 +19,12 @@
*/
@ApiModelProperty("baseInfo鐨処D")
private Long infoid;
+
+ /**
+ * DonationCompletion鐨処D
+ */
+ @ApiModelProperty("DonationCompletion鐨処D")
+ private Long id;
/**
* 璁板綍鐘舵��
@@ -64,6 +72,27 @@
@Excel(name = "鎹愮尞鑰呯紪鍙�")
private String donorno;
+ /**
+ * 鏄惁閬椾綋鎹愮尞
+ */
+ @ApiModelProperty("鏄惁閬椾綋鎹愮尞")
+ @Excel(name = "鏄惁閬椾綋鎹愮尞")
+ private String isbodydonation;
+
+
+ /**
+ * 鎺ユ敹鍗曚綅鍚嶇О
+ */
+ @ApiModelProperty("鎺ユ敹鍗曚綅鍚嶇О")
+ @Excel(name = "鎺ユ敹鍗曚綅鍚嶇О")
+ private String receivingunitname;
+
+ /**
+ * 鎺ユ敹鍗曚綅
+ */
+ @ApiModelProperty("鎺ユ敹鍗曚綅")
+ @Excel(name = "鎺ユ敹鍗曚綅")
+ private String receivingunit;
/**
* 鎹愮尞鑰呭鍚�
@@ -119,4 +148,50 @@
@Excel(name = "璐熻矗浜哄鍚�")
private String responsibleusername;
+ /**
+ * 鍗忚皟鍛樹竴缂栧彿
+ */
+ @ApiModelProperty("鍗忚皟鍛樹竴缂栧彿")
+ private String coordinateduserido;
+
+ /**
+ * 鍗忚皟鍛樹竴濮撳悕
+ */
+ @ApiModelProperty("鍗忚皟鍛樹竴濮撳悕")
+ @Excel(name = "鍗忚皟鍛樹竴濮撳悕")
+ private String coordinatedusernameo;
+
+ /**
+ * 鍗忚皟鍛樹簩缂栧彿
+ */
+ @ApiModelProperty("鍗忚皟鍛樹簩缂栧彿")
+ private String coordinateduseridt;
+
+ /**
+ * 鍗忚皟鍛樹簩濮撳悕
+ */
+ @ApiModelProperty("鍗忚皟鍛樹簩濮撳悕")
+ @Excel(name = "鍗忚皟鍛樹簩濮撳悕")
+ private String coordinatedusernamet;
+
+
+ /**
+ * 闄勪欢
+ */
+ @ApiModelProperty("闄勪欢")
+ private String assessannex;
+
+ /**
+ * 鎹愮尞鍣ㄥ畼
+ */
+ @ApiModelProperty("鎹愮尞鍣ㄥ畼")
+ @Excel(name = "鎹愮尞鍣ㄥ畼")
+ private String donateorgan;
+
+ /**
+ * 鎹愮尞鍣ㄥ畼绉绘璇︽儏
+ */
+ @ApiModelProperty("鎹愮尞鍣ㄥ畼绉绘璇︽儏")
+ private List<ServiceDonatecomporgan> serviceDonatecomporganList;
+
}
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 20d1baa..cca1eed 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
@@ -8,6 +8,7 @@
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* 鍖诲璇勪及瀵硅薄 service_medicalevaluation
@@ -16,7 +17,7 @@
* @date 2021-11-19
*/
@Data
-@ApiModel("鍖诲璇勪及鍩虹淇℃伅")
+@ApiModel("鍖诲璇勪及鍩虹淇℃伅鍝嶅簲瀵硅薄")
public class MedicalevaluationBaseInfoDTO {
private static final long serialVersionUID = 1L;
@@ -110,32 +111,19 @@
/**
- * 棣栨璇勪及鏃堕棿
+ * 璇勪及鏃堕棿
*/
- @ApiModelProperty("棣栨璇勪及鏃堕棿")
+ @ApiModelProperty("璇勪及鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "棣栨璇勪及鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date assessFirstTime;
+ @Excel(name = "璇勪及鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date assessTime;
/**
- * 璇勪及鐘舵�侊細 棣栨锛�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("璇勪及鐘舵�侊細1.寰呰瘎浼般��2.璇勪及涓��3.宸插畬鎴� ")
+ private String assessState;
/**
* 璇勪及闄勪欢
@@ -147,7 +135,7 @@
* 鍣ㄥ畼璇勪及璇︽儏
*/
@ApiModelProperty("鍣ㄥ畼璇勪及璇︽儏")
- private ServiceMedicalevaluationorgan serviceMedicalevaluationorgan;
+ private List<ServiceMedicalevaluationorgan> serviceMedicalevaluationorgans;
}
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
index 2f1e5bd..134fe1e 100644
--- 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
@@ -24,6 +24,13 @@
/**
+ * 鍣ㄥ畼鎹愮尞纭鐨処D
+ */
+ @ApiModelProperty("鍣ㄥ畼鎹愮尞纭鐨処D")
+ private Long id;
+
+
+ /**
* 璁板綍鐘舵��
*/
@ApiModelProperty("璁板綍鐘舵��")
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 843064f..f1794f0 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
@@ -39,6 +39,12 @@
@Excel(name = "妗堜緥缂栧彿")
private String caseNo;
+ /**
+ * 宸ヤ綔娴�
+ */
+ @ApiModelProperty("宸ヤ綔娴�")
+ private Long workflow;
+
/**
* 濮撳悕
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
index 20eca9b..da91a0c 100644
--- 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
@@ -3,6 +3,7 @@
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;
@@ -11,7 +12,7 @@
@Data
@ApiModel("鍣ㄥ畼鎹愮尞瀹屾垚鍩烘湰淇℃伅璇锋眰瀵硅薄锛堝櫒瀹樺埄鐢ㄨ姹傚璞★級")
-public class DonationCompletionBaseInfoVO {
+public class DonationCompletionBaseInfoVO extends BaseEntity {
/**
* baseInfo鐨処D
*/
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonatecompletioninfoMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonatecompletioninfoMapper.java
index a7827a2..19c13fd 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonatecompletioninfoMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonatecompletioninfoMapper.java
@@ -6,6 +6,8 @@
import java.util.Date;
import java.util.List;
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
+import com.ruoyi.project.domain.dto.DonationCompletionBaseInfoDTO;
+import com.ruoyi.project.domain.vo.DonationCompletionBaseInfoVO;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
import com.ruoyi.project.domain.vo.TimeVO;
import org.apache.ibatis.annotations.Mapper;
@@ -13,7 +15,7 @@
/**
* 鎹愮尞瀹屾垚Mapper鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2021-11-19
*/
@@ -40,4 +42,6 @@
List<ServiceDonatecompletioninfo> getCompletionDonatePeopleByTime(TimeVO timeVO);
public void delDuplicateDonateCompletioninfo(@Param("infoid") long infoid,@Param("createby") String createby);
+
+ List<DonationCompletionBaseInfoDTO> getDonationCompletionBaseInfo(DonationCompletionBaseInfoVO donationCompletionBaseInfoVO);
}
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 7a35f6c..a42179e 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
@@ -19,17 +19,16 @@
* @date 2021-11-17
*/
@Mapper
-public interface ServiceDonationwitnessMapper extends BaseMapper<ServiceDonationwitness>
-{
+public interface ServiceDonationwitnessMapper extends BaseMapper<ServiceDonationwitness> {
/**
* 鏌ヨ鎹愮尞瑙佽瘉鍒楄〃
*
* @param serviceDonationwitness 鎹愮尞瑙佽瘉
* @return 鎹愮尞瑙佽瘉闆嗗悎
*/
- List<ServiceDonationwitness> selectServiceDonationwitnessList(ServiceDonationwitness serviceDonationwitness);
+ List<ServiceDonationwitness> selectServiceDonationwitnessList(ServiceDonationwitness serviceDonationwitness);
- List<DonationwitnessBaseInfoDTO> getDonationwitnessBaseInfo(DonationwitnessBaseInfoVO donationwitnessBaseInfoVO);
+ List<DonationwitnessBaseInfoDTO> getDonationwitnessBaseInfo(DonationwitnessBaseInfoVO donationwitnessBaseInfoVO);
List<ServiceDonationwitness> getWitnessList();
@@ -46,7 +45,6 @@
Integer countNumber(TimeVO timeVO);
ServiceDonationwitness selectByInfoId(Long infoid);
-
List<ServiceDonationwitness> getAllDonatePeople();
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatecompletioninfoService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatecompletioninfoService.java
index 0a93d0b..7332df6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatecompletioninfoService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatecompletioninfoService.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
+import com.ruoyi.project.domain.dto.DonationCompletionBaseInfoDTO;
+import com.ruoyi.project.domain.vo.DonationCompletionBaseInfoVO;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
import java.util.List;
@@ -22,6 +24,14 @@
*/
public List<ServiceDonatecompletioninfo> queryList(ServiceDonatecompletioninfo serviceDonatecompletioninfo);
+ /**
+ * 鏌ヨ鎹愮尞瀹屾垚鍒楄〃鍩烘湰淇℃伅
+ *
+ * @param donationCompletionBaseInfoVO 鎹愮尞瀹屾垚
+ * @return 鎹愮尞瀹屾垚闆嗗悎
+ */
+ public List<DonationCompletionBaseInfoDTO> getDonationCompletionBaseInfo(DonationCompletionBaseInfoVO donationCompletionBaseInfoVO);
+
public List<ServiceDonatecompletioninfo> queryListDetail(ServiceDonatecompletioninfo serviceDonatecompletioninfo);
List<DonationCompletionVO> selectVOList(DonationCompletionVO donationCompletionVO);
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 fb10d55..116bd0d 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
@@ -22,10 +22,7 @@
import java.time.LocalDate;
import java.time.ZoneId;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 鎹愮尞涓婃姤鍩虹Service涓氬姟灞傚鐞�
@@ -124,16 +121,20 @@
//灏唕eport鏁版嵁澶嶅埗鍒皊erviceDonatebaseinfo涓�
ServiceDonatebaseinfo serviceDonatebaseinfo1 = DtoConversionUtils.sourceToTarget(serviceDonatebaseinfoReport, ServiceDonatebaseinfo.class);
serviceDonatebaseinfo1.setId(null);
+ serviceDonatebaseinfo1.setReporterno(serviceDonatebaseinfoReport.getCoordinatorNo());
+ serviceDonatebaseinfo1.setReportername(serviceDonatebaseinfoReport.getCoordinatorName());
//鍏堥�氳繃caseNo鏌ヨ鏄惁瀛樺湪
ServiceDonatebaseinfo serviceDonatebaseinfo = new ServiceDonatebaseinfo();
serviceDonatebaseinfo.setCaseNo(serviceDonatebaseinfoReport.getCaseNo());
List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
if (CollectionUtils.isNotEmpty(serviceDonatebaseinfos) && serviceDonatebaseinfos.size() > 0) {
serviceDonatebaseinfo1.setId(serviceDonatebaseinfos.get(0).getId());
+ serviceDonatebaseinfo1.setUpdateTime(new Date());
serviceDonatebaseinfoService.updateById(serviceDonatebaseinfo1);
return true;
}
//鍒涘缓
+ serviceDonatebaseinfo1.setDonatetime(new Date());
return serviceDonatebaseinfoService.save(serviceDonatebaseinfo1);
}
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 213182b..d333d7b 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
@@ -95,14 +95,14 @@
@Override
public List<ServiceDonatebaseinfo> queryList(ServiceDonatebaseinfo serviceDonatebaseinfo) {
LambdaQueryWrapper<ServiceDonatebaseinfo> wrappers = Wrappers.lambdaQuery();
- setWrappers( wrappers,serviceDonatebaseinfo);
+ setWrappers(wrappers, serviceDonatebaseinfo);
return this.list(wrappers);
}
@Override
public Page<ServiceDonatebaseinfo> queryListPage(ServiceDonatebaseinfo serviceDonatebaseinfo) {
LambdaQueryWrapper<ServiceDonatebaseinfo> wrappers = Wrappers.lambdaQuery();
- setWrappers( wrappers,serviceDonatebaseinfo);
+ setWrappers(wrappers, serviceDonatebaseinfo);
// 鍒涘缓鍒嗛〉瀵硅薄锛岃缃〉鐮佸拰姣忛〉澶у皬
int currentPage = (serviceDonatebaseinfo.getPageNum() == null || serviceDonatebaseinfo.getPageNum() < 1) ? 1 : serviceDonatebaseinfo.getPageNum();
@@ -110,7 +110,7 @@
Page<ServiceDonatebaseinfo> page = new Page<>(currentPage, size);
List<ServiceDonatebaseinfo> serviceDonatemaintenanceList = serviceDonatebaseinfoMapper.selectPage(page, wrappers).getRecords();
- return page.setRecords(serviceDonatemaintenanceList);
+ return page.setRecords(serviceDonatemaintenanceList);
}
@Override
@@ -220,32 +220,6 @@
serviceDonatebaseinfo.setDeptid(user.getDeptId());
}
List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoMapper.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
- for (ServiceDonatebaseinfo serviceDonatebaseinfo1 : serviceDonatebaseinfos) {
- //鍏堢粰涓勾榫勯粯璁ゅ�硷紙鍥犱负age鏄暟瀛楃被鍨嬶紝涓嶈兘鏀炬í鏉狅紝鎵�浠ュ氨鎵�妯墰鏀惧埌鍗曚綅涓婏級
- serviceDonatebaseinfo1.setAgeunit("-");
- serviceDonatebaseinfo1.setAge(null);
- serviceDonatebaseinfo1.setAge2(null);
-
- //鑾峰彇姝讳骸鏃堕棿锛屽鏋滆幏鍙栬璇侀噷鏈夋浜℃椂闂达紝鍒欒繘琛岃绠椾粬鐨勫勾榫�
- ServiceDonationwitness sdw = new ServiceDonationwitness();
- sdw.setInfoid(serviceDonatebaseinfo1.getId());
- List<ServiceDonationwitness> serviceDonationwitnessList = serviceDonationwitnessMapper.selectServiceDonationwitnessList(sdw);
- if (!CollectionUtils.isEmpty(serviceDonationwitnessList) && serviceDonatebaseinfo1.getBirthday() != null) {
- Date deathtime = serviceDonationwitnessList.get(0).getDeathtime();
- if (ObjectUtils.isNotEmpty(deathtime)) {
- Map<String, String> map = CalculateDateUtils.calculateAge(serviceDonatebaseinfo1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), deathtime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
- if (Objects.isNull(map)) {
- log.error("ServiceDonationwitness鍑虹敓鏃ユ湡锛歿},ServiceDonationwitness姝讳骸鏃ユ湡锛歿}", serviceDonatebaseinfo1.getBirthday(), deathtime);
- continue;
- }
- 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"));
- }
- }
-
- }
return serviceDonatebaseinfos;
}
@@ -269,6 +243,7 @@
/**
* 鎹愮尞杩涘害鍩烘湰淇℃伅
+ *
* @param donatebaseinfoProgressVO
* @return
*/
@@ -539,7 +514,7 @@
}
- private void setWrappers(LambdaQueryWrapper<ServiceDonatebaseinfo> wrappers, ServiceDonatebaseinfo serviceDonatebaseinfo){
+ private void setWrappers(LambdaQueryWrapper<ServiceDonatebaseinfo> wrappers, ServiceDonatebaseinfo serviceDonatebaseinfo) {
if (StringUtils.isNotBlank(serviceDonatebaseinfo.getName())) {
wrappers.like(ServiceDonatebaseinfo::getName, serviceDonatebaseinfo.getName());
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java
index 453f215..83ad703 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java
@@ -13,6 +13,8 @@
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.ServiceDonatecomporgan;
import com.ruoyi.project.domain.ServiceDonationwitness;
+import com.ruoyi.project.domain.dto.DonationCompletionBaseInfoDTO;
+import com.ruoyi.project.domain.vo.DonationCompletionBaseInfoVO;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
import com.ruoyi.project.mapper.ServiceDonatecompletioninfoMapper;
import com.ruoyi.project.mapper.ServiceDonationwitnessMapper;
@@ -75,6 +77,22 @@
return this.list(wrappers);
}
+ @Override
+ public List<DonationCompletionBaseInfoDTO> getDonationCompletionBaseInfo(DonationCompletionBaseInfoVO donationCompletionBaseInfoVO) {
+ List<DonationCompletionBaseInfoDTO> donationCompletionBaseInfoDTOList = serviceDonatecompletioninfoMapper.getDonationCompletionBaseInfo(donationCompletionBaseInfoVO);
+
+ if(CollectionUtils.isNotEmpty(donationCompletionBaseInfoDTOList) && donationCompletionBaseInfoVO.getPageNum() == null) {
+ for (DonationCompletionBaseInfoDTO donationCompletionBaseInfoDTO : donationCompletionBaseInfoDTOList) {
+ ServiceDonatecomporgan serviceDonatecomporgan = new ServiceDonatecomporgan();
+ serviceDonatecomporgan.setInfoid(donationCompletionBaseInfoDTO.getInfoid());
+ List<ServiceDonatecomporgan> serviceDonatecomporgans = serviceDonatecomporganService.queryList(serviceDonatecomporgan);
+ donationCompletionBaseInfoDTO.setServiceDonatecomporganList(serviceDonatecomporgans);
+ }
+ }
+
+ return donationCompletionBaseInfoDTOList;
+ }
+
/**
* 鏆傛椂鍏堜笉鐢ㄤ簡
*
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java
index 886e747..ad934c0 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java
@@ -58,10 +58,10 @@
if (StringUtils.isNotNull(serviceMedicalevaluation.getInfoid())) {
wrappers.eq(ServiceMedicalevaluation::getInfoid, serviceMedicalevaluation.getInfoid());
}
- if (StringUtils.isNotNull(serviceMedicalevaluation.getFirstAssessState())) {
- wrappers.eq(ServiceMedicalevaluation::getFirstAssessState, serviceMedicalevaluation.getFirstAssessState());
- } if (StringUtils.isNotNull(serviceMedicalevaluation.getSecondAssessState())) {
- wrappers.eq(ServiceMedicalevaluation::getSecondAssessState, serviceMedicalevaluation.getSecondAssessState());
+ if (StringUtils.isNotNull(serviceMedicalevaluation.getAssessState())) {
+ wrappers.eq(ServiceMedicalevaluation::getAssessState, serviceMedicalevaluation.getAssessState());
+ } if (StringUtils.isNotNull(serviceMedicalevaluation.getAssessTime())) {
+ wrappers.eq(ServiceMedicalevaluation::getAssessTime, serviceMedicalevaluation.getAssessTime());
}
if (StringUtils.isNotBlank(serviceMedicalevaluation.getDonorno())) {
wrappers.eq(ServiceMedicalevaluation::getDonorno, serviceMedicalevaluation.getDonorno());
@@ -103,7 +103,7 @@
serviceMedicalevaluationorgan.setInfoid(medicalevaluationBaseInfoDTO.getInfoid());
List<ServiceMedicalevaluationorgan> serviceMedicalevaluationorgans = serviceMedicalevaluationorganMapper.selectServiceMedicalevaluationorganList(serviceMedicalevaluationorgan);
if (CollectionUtils.isNotEmpty(serviceMedicalevaluationorgans))
- medicalevaluationBaseInfoDTO.setServiceMedicalevaluationorgan(serviceMedicalevaluationorgans.get(0));
+ medicalevaluationBaseInfoDTO.setServiceMedicalevaluationorgans(serviceMedicalevaluationorgans);
}
}
return medicalevaluationBaseInfoDTOS;
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationorganServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationorganServiceImpl.java
index 49ca424..3ee3905 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationorganServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationorganServiceImpl.java
@@ -46,18 +46,6 @@
if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getOrgannumber())){
wrappers.eq(ServiceMedicalevaluationorgan::getOrgannumber ,serviceMedicalevaluationorgan.getOrgannumber());
}
- if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getOrganState())){
- wrappers.eq(ServiceMedicalevaluationorgan::getOrganState ,serviceMedicalevaluationorgan.getOrganState());
- }
- if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getNotgetreason())){
- wrappers.eq(ServiceMedicalevaluationorgan::getNotgetreason ,serviceMedicalevaluationorgan.getNotgetreason());
- }
- if (serviceMedicalevaluationorgan.getOrganAssessTime() != null){
- wrappers.eq(ServiceMedicalevaluationorgan::getOrganAssessTime ,serviceMedicalevaluationorgan.getOrganAssessTime());
- }
- if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getOrganAssessDoct())){
- wrappers.eq(ServiceMedicalevaluationorgan::getOrganAssessDoct ,serviceMedicalevaluationorgan.getOrganAssessDoct());
- }
if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getGainhospitalno())){
wrappers.eq(ServiceMedicalevaluationorgan::getGainhospitalno ,serviceMedicalevaluationorgan.getGainhospitalno());
}
@@ -81,6 +69,8 @@
}
if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getIsdgf())){
wrappers.eq(ServiceMedicalevaluationorgan::getIsdgf ,serviceMedicalevaluationorgan.getIsdgf());
+ } if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getAssesscontent())){
+ wrappers.eq(ServiceMedicalevaluationorgan::getAssesscontent ,serviceMedicalevaluationorgan.getAssesscontent());
}
return this.list(wrappers);
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
index e3cdc4d..bd323c2 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -414,9 +414,11 @@
SELECT sd.treatmenthospitalname AS treatmenthospitalname,
sd.treatmenthospitalno AS treatmenthospitalno,
sd.DonorNo AS donorno,
+ sd.id AS id,
sd.case_no AS caseNo,
sd.NAME AS NAME,
sd.RecordState AS recordstate,
+ sd.workflow AS workflow,
sd.Sex AS sex,
sd.Age AS age,
sd.BloodType AS bloodtype,
@@ -426,10 +428,8 @@
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,-- 绗簩娆¤瘎浼扮粨璁�
+ sm.assess_state AS assessState,-- 璇勪及鐘舵��
+ sm.assess_time AS assessTime,-- 璇勪及鏃堕棿
sr.SignDate AS signDate,-- 浜插睘纭鏃堕棿
se.expert_conclusion AS expertConclusion,-- 浼︾悊瀹℃煡涓撳缁撹
se.expert_time AS expertTime,-- 浼︾悊瀹℃煡涓撳缁撹鏃堕棿
@@ -452,7 +452,8 @@
<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>
+ <if test="recordstate != null and recordstate != ''">and sd.RecordState = #{recordstate}</if>
+ <if test="workflow != null">and sd.workflow = #{workflow}</if>
</where>
ORDER BY sd.ReportTime DESC
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
index 89798f2..bac4318 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
@@ -177,6 +177,47 @@
where CompleteTime >= #{starttime} AND CompleteTime <= #{endtime} AND del_flag=0
</select>
+ <select id="getDonationCompletionBaseInfo" resultType="com.ruoyi.project.domain.dto.DonationCompletionBaseInfoDTO">
+ 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.id AS infoid,
+ sdc.ID AS id,
+ sdc.DonorNo AS donorno,
+ sdc.IsBodyDonation AS isbodydonation,
+ sdc.ReceivingUnitName AS receivingunitname,
+ sdc.ReceivingUnit AS receivingunit,
+ sdc.CompleteTime AS completetime,
+ sdc.ResponsibleUserID AS responsibleuserid,
+ sdc.ResponsibleUserName AS responsibleusername,
+ sdc.CoordinatedUserIDO AS coordinateduserido,
+ sdc.CoordinatedUserNameO AS coordinatedusernameo,
+ sdc.CoordinatedUserIDT AS coordinateduseridt,
+ sdc.CoordinatedUserNameT AS coordinatedusernamet,
+ sdc.AssessAnnex AS assessannex,
+ sdc.DonateOrgan AS donateorgan
+ FROM
+ service_donatebaseinfo sd
+ LEFT JOIN service_donatecompletioninfo sdc ON sd.ID = sdc.InfoID
+ AND sd.del_flag = 0
+ AND sdc.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 sdc.DonorNo = #{donorno}</if>
+ <if test="infoid != null">and sdc.InfoID = #{infoid}</if>
+ </where>
+ <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
+ </select>
+
<update id="delDuplicateDonateCompletioninfo">
update service_donatecompletioninfo
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml
index ac37a5e..f3c072d 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml
@@ -68,7 +68,7 @@
sd.BloodType AS bloodtype,
sd.idcardno AS idcardno,
sd.diagnosisname AS diagnosisname,
- sdb.infoID AS infoid,
+ sd.id AS infoid,
sdb.ID AS id,
sdb.registration_name AS registrationName,
sdb.registration_time AS registrationTime,
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index b0bd5b7..ff6a3a0 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -122,7 +122,7 @@
sd.idcardno AS idcardno,
sd.diagnosisname AS diagnosisname,
st.coordinator_in_operating as coordinatorInOperating,
- st.InfoID as infoid,
+ sd.id AS infoid,
st.coordinator_out_operating as coordinatorOutOperating,
st.coordinator_sign as coordinatorSign,
st.coordinator_sign_time as coordinatorSignTime,
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
index 004417b..5647acb 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
@@ -92,7 +92,7 @@
sd.BloodType as bloodtype,
sd.idcardno as idcardno,
sd.diagnosisname as diagnosisname,
- se.infoID as infoid,
+ sd.id AS infoid,
se.ID as id,
se.expert_conclusion as expertConclusion,
se.expert_name as expertName,
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
index 142adab..e1e1bd3 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
@@ -49,8 +49,7 @@
<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="assessTime" column="assess_time"/>
<result property="assessState" column="assess_state"/>
<result property="assessannex" column="AssessAnnex"/>
</resultMap>
@@ -59,10 +58,9 @@
select ID,
InfoID,
case_no,
- assess_second_time,
- assess_first_time,
DonorNo,
assess_state,
+ assess_time,
IllnessOverview,
DiagnosisName,
HospitalAssessContent,
@@ -147,8 +145,6 @@
`service_medicalevaluation`.`create_by` AS `createby`,
`service_medicalevaluation`.`update_by` AS `updateby`,
`service_medicalevaluation`.`assess_state` AS `assess_state`,
- `service_medicalevaluation`.`assess_second_time` AS `assess_second_time`,
- `service_medicalevaluation`.`assess_first_time` AS `assess_first_time`,
`service_medicalevaluation`.`update_time` AS `updatetime`
FROM
`service_donatebaseinfo`
@@ -207,22 +203,20 @@
sb.diagnosisname,
sb.recordstate,
sb.coordinator_name,
- sm.assess_first_time,
- sm.infoID,
+ sb.id as 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="assessTime != null ">AND sm.assess_time = #{assessTime}</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>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationorganMapper.xml
index fbbcff5..be39482 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationorganMapper.xml
@@ -11,10 +11,6 @@
<result property="organno" column="OrganNo"/>
<result property="organname" column="OrganName"/>
<result property="organnumber" column="OrganNumber"/>
- <result property="organState" column="Organ_state"/>
- <result property="notgetreason" column="notgetreason"/>
- <result property="organAssessTime" column="Organ_assess_time"/>
- <result property="organAssessDoct" column="Organ_assess_doct"/>
<result property="gainhospitalno" column="GainHospitalNo"/>
<result property="gainhospitalname" column="GainHospitalName"/>
<result property="isbiopsybefore" column="IsBiopsyBefore"/>
@@ -28,21 +24,17 @@
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
+ <result property="assesscontent" column="assesscontent"/>
</resultMap>
<sql id="selectServiceMedicalevaluationorganVo">
select ID,
InfoID,
- first_assess_state,
- second_assess_state,
DonorNo,
+ assesscontent,
OrganNo,
OrganName,
OrganNumber,
- Organ_state,
- notgetreason,
- Organ_assess_time,
- Organ_assess_doct,
GainHospitalNo,
GainHospitalName,
IsBiopsyBefore,
@@ -69,11 +61,6 @@
<if test="organno != null and organno != ''">and OrganNo = #{organno}</if>
<if test="organname != null and organname != ''">and OrganName like concat('%', #{organname}, '%')</if>
<if test="organnumber != null and organnumber != ''">and OrganNumber = #{organnumber}</if>
- <if test="organState != null and organState != ''">and Organ_state = #{organState}</if>
- <if test="notgetreason != null and notgetreason != ''">and notgetreason = #{notgetreason}</if>
- <if test="organAssessTime != null ">and Organ_assess_time = #{organAssessTime}</if>
- <if test="organAssessDoct != null and organAssessDoct != ''">and Organ_assess_doct = #{organAssessDoct}
- </if>
<if test="gainhospitalno != null and gainhospitalno != ''">and GainHospitalNo = #{gainhospitalno}</if>
<if test="gainhospitalname != null and gainhospitalname != ''">and GainHospitalName like concat('%',
#{gainhospitalname}, '%')
--
Gitblit v1.9.3