From 1fba8f84b6326b2f1d613ec02890386ad512f184 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期六, 09 五月 2026 09:45:34 +0800
Subject: [PATCH] 青附院opo捐献亲属确认增加状态 青附院opo患者死亡信息增加状态 青附院opo供体维护记录增加状态
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 e621012..69c64cd 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
@@ -22,6 +22,7 @@
import com.ruoyi.project.domain.dto.ReviewInitiateBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonatebaseinfoProgressVO;
import com.ruoyi.project.domain.vo.TimeVO;
+import com.ruoyi.project.domain.vo.WorkFlowVO;
import com.ruoyi.project.service.IServiceDonatebaseinfoService;
import com.ruoyi.project.service.IServiceDonationwitnessService;
import com.ruoyi.project.service.IServiceExternalpersonService;
@@ -51,7 +52,7 @@
* @date 2021-11-10
*/
@Slf4j
-@Api(description = "娼滃湪鎹愮尞淇℃伅绠＄悊")
+@Api(description = "娼滃湪鎹愮尞淇℃伅绠＄悊",tags={"娼滃湪鎹愮尞淇℃伅绠＄悊"})
@RestController
@RequestMapping("/project/donatebaseinfo")
public class ServiceDonatebaseinfoController extends BaseController {
@@ -79,12 +80,21 @@
* 鏌ヨ鎹愮尞鍩虹鍒楄〃
*/
@ApiOperation("娼滃湪鎹愮尞淇℃伅鍒楄〃")
- @GetMapping("/list")
- public TableDataInfo list(ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ @PostMapping("/list")
+ public Map<String, Object> list(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
log.info("娼滃湪鎹愮尞淇℃伅鍒楄〃锛歿}", serviceDonatebaseinfo);
- startPage();
+ Integer offset = PageUtils.getOffset(serviceDonatebaseinfo.getPageNum(), serviceDonatebaseinfo.getPageSize());
+ serviceDonatebaseinfo.setPageNum(offset);
List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
- return getDataTable(list);
+
+ //鑾峰彇鎬绘暟
+ serviceDonatebaseinfo.setPageNum(null);
+ serviceDonatebaseinfo.setPageSize(null);
+ Integer totalCount = 0;
+ List<ServiceDonatebaseinfo> total = serviceDonatebaseinfoService.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
+
+ if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
+ return getDataTable(list, totalCount);
}
@ApiOperation("灏忕▼搴忕娼滃湪鎹愮尞淇℃伅鍒楄〃")
@@ -112,11 +122,12 @@
//鑾峰彇鎹愮尞杩涚▼杩涘害
Map<Integer, Long> terminationCase = total.stream().filter(Objects::nonNull).map(DonatebaseinfoProgressDTO::getTerminationCase).filter(Objects::nonNull).collect(Collectors.groupingBy(type -> type, Collectors.counting()));
-
+ List<Map<String,Object>> totals= serviceDonatebaseinfoService.totalConfirmationBaseInfo(donatebaseinfoProgressVO);
//鏁版嵁灏佽
Map<String, Object> map = new HashMap<>();
map.put("terminationCase", terminationCase);
map.put("donatebaseinfoProgressDTOS", donatebaseinfoProgressDTOS);
+ map.put("total", totals);
if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
return getDataTable(map, totalCount);
@@ -992,9 +1003,9 @@
*/
@ApiOperation("鑾峰彇鎹愮尞宸ヤ綔娴�")
@GetMapping(value = "/getWorkFlow/{id}")
- public AjaxResult getWorkFlow(@PathVariable("id") Long id) {
+ public WorkFlowVO getWorkFlow(@PathVariable("id") Long id) {
log.info("鑾峰彇鎹愮尞宸ヤ綔娴侊細{}", id);
- return AjaxResult.success(serviceDonatebaseinfoService.getWorkFlow(id));
+ return serviceDonatebaseinfoService.getWorkFlow(id);
}
}
--
Gitblit v1.9.3