From 7d5f9cae5e237c25649ac4b481ace6355447a06c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 02 八月 2024 17:51:31 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java | 62 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 13 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
index 8b37ba3..0a36625 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.github.pagehelper.ISelect;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -38,18 +39,18 @@
public class PatArchiveController extends BaseController {
@Autowired
private IPatArchiveService patArchiveService;
-//
-// /**
-// * 鏌ヨ鎮ｈ�呮。妗堝垪琛�
-// */
-// @ApiOperation("鏌ヨ鎮ｈ�呮。妗堝垪琛�")
-// @PreAuthorize("@ss.hasPermi('smartor:patarchive:list')")
-// @PostMapping("/list")
-// public TableDataInfo list(@RequestBody PatArchive patArchive) {
-// startPage();
-// List<PatArchive> list = patArchiveService.selectPatArchiveList(patArchive);
-// return getDataTable(list);
-//}
+
+ /**
+ * 鏌ヨ鎮ｈ�呮。妗堝垪琛�
+ */
+ @ApiOperation("鏌ヨ鎮ｈ�呮。妗堝垪琛�")
+ @PreAuthorize("@ss.hasPermi('smartor:patarchive:list')")
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody PatArchive patArchive) {
+ startPage();
+ List<PatArchive> list = patArchiveService.selectPatArchiveList(patArchive);
+ return getDataTable(list);
+ }
/**
* 瀵煎嚭鎮ｈ�呮。妗堝垪琛�
@@ -85,6 +86,17 @@
// public AjaxResult add(@RequestBody PatArchive patArchive) {
// return toAjax(patArchiveService.insertPatArchive(patArchive));
// }
+
+ /**
+ * 鏂板鎮ｈ�呮。妗�
+ */
+ @ApiOperation("淇敼鎮ｈ�呮。妗�")
+ @PreAuthorize("@ss.hasPermi('smartor:patarchive:update')")
+ @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.UPDATE)
+ @PostMapping("/update")
+ public AjaxResult update(@RequestBody PatArchive patArchive) {
+ return toAjax(patArchiveService.update(patArchive));
+ }
/**
* 鏂板鎴栦慨鏀规偅鑰呮。淇℃伅
@@ -160,7 +172,14 @@
@PostMapping("/patInfoByContion")
public TableDataInfo patInfoByCondition(@RequestBody PatArchiveReq patArchive) {
PageUtils.startPageByPost(patArchive.getPageNum(), patArchive.getPageSize());
- return getDataTable(patArchiveService.patInfoByContion(patArchive));
+ List<PatArchive> patArchives = patArchiveService.patInfoByContion(patArchive);
+ long count = PageUtils.count(new ISelect() {
+ @Override
+ public void doSelect() {
+ patArchiveService.patInfoByContion(patArchive);
+ }
+ });
+ return getDataTable2(count, patArchives);
}
@@ -181,4 +200,21 @@
util.exportExcel(response, patArchives, "鎮ｈ�呮。妗堟暟鎹�");
}
+ /**
+ * 鑾峰彇鎮ｈ�呬俊鎭�
+ */
+ @ApiOperation("鑾峰彇鎮ｈ�呬俊鎭�")
+ @PostMapping("/getPatientInfo")
+ public TableDataInfo getPatientInfo(@RequestBody PatArchiveReq patArchiveReq) {
+ PageUtils.startPageByPost(patArchiveReq.getPageNum(), patArchiveReq.getPageSize());
+ List<PatTaskRelevance> patientInfo = patArchiveService.getPatientInfo(patArchiveReq);
+ long count = PageUtils.count(new ISelect() {
+ @Override
+ public void doSelect() {
+ patArchiveService.getPatientInfo(patArchiveReq);
+ }
+ });
+ return getDataTable2(count, patientInfo);
+ }
+
}
--
Gitblit v1.9.3