From 907641e56c2085aaa81f267946dc3e3e9fca73e7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 18 九月 2024 09:39:02 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java | 85 ++++++++++++++++++++++++++++++------------
1 files changed, 61 insertions(+), 24 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..2ac7b55 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,25 +39,25 @@
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);
+ }
/**
* 瀵煎嚭鎮ｈ�呮。妗堝垪琛�
*/
@ApiOperation("瀵煎嚭鎮ｈ�呮。妗堝垪琛�")
- @PreAuthorize("@ss.hasPermi('smartor:patarchive:export')")
- @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.EXPORT)
+ //@PreAuthorize("@ss.hasPermi('smartor:patarchive:export')")
+ @Log(title = "鎮ｈ�呮。妗�" , businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, PatArchive patArchive) {
List<PatArchive> list = patArchiveService.selectPatArchiveList(patArchive);
@@ -68,9 +69,9 @@
* 鑾峰彇鎮ｈ�呮。妗堣缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇鎮ｈ�呮。妗堣缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('smartor:patarchive:query')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patarchive:query')")
@GetMapping(value = "/getInfo/{patid}")
- @ApiImplicitParam(name = "patid", value = "鎮ｈ�卛d")
+ @ApiImplicitParam(name = "patid" , value = "鎮ｈ�卛d")
public AjaxResult getInfo(@PathVariable(name = "patid") Long patid) {
return success(patArchiveService.selectPatArchiveByPatid(patid));
}
@@ -79,7 +80,7 @@
// * 鏂板鎮ｈ�呮。妗�
// */
// @ApiOperation("鏂板鎮ｈ�呮。妗�")
-// @PreAuthorize("@ss.hasPermi('smartor:patarchive:add')")
+// //@PreAuthorize("@ss.hasPermi('smartor:patarchive:add')")
// @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.INSERT)
// @PostMapping("/add")
// public AjaxResult add(@RequestBody PatArchive patArchive) {
@@ -87,11 +88,22 @@
// }
/**
+ * 鏂板鎮ｈ�呮。妗�
+ */
+ @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));
+ }
+
+ /**
* 鏂板鎴栦慨鏀规偅鑰呮。淇℃伅
*/
@ApiOperation("鏂板鎴栦慨鏀规偅鑰呮。淇℃伅")
- @PreAuthorize("@ss.hasPermi('smartor:patarchive:edit')")
- @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.UPDATE)
+ //@PreAuthorize("@ss.hasPermi('smartor:patarchive:edit')")
+ @Log(title = "鎮ｈ�呮。妗�" , businessType = BusinessType.UPDATE)
@PostMapping("/saveOrUpdatePatInfo")
public AjaxResult saveOrUpdatePatInfo(@RequestBody PatArchiveVO patArchiveVO) {
return toAjax(patArchiveService.saveOrUpdatePatInfo(patArchiveVO));
@@ -101,10 +113,10 @@
* 鍒犻櫎鎮ｈ�呮。妗�
*/
@ApiOperation("鍒犻櫎鎮ｈ�呮。妗�")
- @PreAuthorize("@ss.hasPermi('smartor:patarchive:remove')")
- @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.DELETE)
+ //@PreAuthorize("@ss.hasPermi('smartor:patarchive:remove')")
+ @Log(title = "鎮ｈ�呮。妗�" , businessType = BusinessType.DELETE)
@GetMapping("/remove/{patids}")
- @ApiImplicitParam(name = "patids", value = "鎮ｈ�卛d闆嗗悎", dataType = "long", dataTypeClass = Long.class)
+ @ApiImplicitParam(name = "patids" , value = "鎮ｈ�卛d闆嗗悎" , dataType = "long" , dataTypeClass = Long.class)
public AjaxResult remove(@PathVariable Long[] patids) {
return toAjax(patArchiveService.deletePatArchiveByPatids(patids));
}
@@ -117,7 +129,7 @@
*/
@ApiOperation("瀵煎叆鎮ｈ�呮枃浠跺鐞�")
@PostMapping("/importFilehandle")
- @ApiImplicitParams({@ApiImplicitParam(name = "tags", value = "鏍囩"), @ApiImplicitParam(name = "multipartFile", value = "涓婁紶鏂囦欢")})
+ @ApiImplicitParams({@ApiImplicitParam(name = "tags" , value = "鏍囩"), @ApiImplicitParam(name = "multipartFile" , value = "涓婁紶鏂囦欢")})
public AjaxResult importFilehandle(@RequestParam("tags") String tags, @RequestParam("multipartFile") MultipartFile multipartFile) {
Executor executor = Executors.newFixedThreadPool(3);
//鑾峰彇褰撳墠鐧婚檰浜�
@@ -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,22 @@
util.exportExcel(response, patArchives, "鎮ｈ�呮。妗堟暟鎹�");
}
+ /**
+ * 鑾峰彇鎮ｈ�呬俊鎭�
+ */
+ @ApiOperation("鑾峰彇鎮ｈ�呬俊鎭�")
+ @PostMapping("/getPatientInfo")
+ public TableDataInfo getPatientInfo(@RequestBody PatArchiveReq patArchiveReq) {
+ PageUtils.startPageByPost(patArchiveReq.getPageNum(), patArchiveReq.getPageSize());
+ List<PatArchiveOthreInfo> 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