From 89e166f18d6e33efde0dda97f1fb27f29e675660 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 05 八月 2024 17:57:45 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java | 91 ++++++++++++++++++++++++++-------------------
1 files changed, 53 insertions(+), 38 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 6f6c85b..8c38bce 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;
@@ -44,7 +45,7 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呮。妗堝垪琛�")
@PreAuthorize("@ss.hasPermi('smartor:patarchive:list')")
- @PostMapping("/list")
+ @PostMapping("/list")
public TableDataInfo list(@RequestBody PatArchive patArchive) {
startPage();
List<PatArchive> list = patArchiveService.selectPatArchiveList(patArchive);
@@ -56,7 +57,7 @@
*/
@ApiOperation("瀵煎嚭鎮ｈ�呮。妗堝垪琛�")
@PreAuthorize("@ss.hasPermi('smartor:patarchive:export')")
- @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.EXPORT)
+ @Log(title = "鎮ｈ�呮。妗�" , businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, PatArchive patArchive) {
List<PatArchive> list = patArchiveService.selectPatArchiveList(patArchive);
@@ -70,31 +71,42 @@
@ApiOperation("鑾峰彇鎮ｈ�呮。妗堣缁嗕俊鎭�")
@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));
}
+// /**
+// * 鏂板鎮ｈ�呮。妗�
+// */
+// @ApiOperation("鏂板鎮ｈ�呮。妗�")
+// @PreAuthorize("@ss.hasPermi('smartor:patarchive:add')")
+// @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.INSERT)
+// @PostMapping("/add")
+// public AjaxResult add(@RequestBody PatArchive patArchive) {
+// return toAjax(patArchiveService.insertPatArchive(patArchive));
+// }
+
/**
* 鏂板鎮ｈ�呮。妗�
*/
- @ApiOperation("鏂板鎮ｈ�呮。妗�")
- @PreAuthorize("@ss.hasPermi('smartor:patarchive:add')")
- @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.INSERT)
- @PostMapping("/add")
- 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));
}
/**
- * 淇敼鎮ｈ�呮。妗�
+ * 鏂板鎴栦慨鏀规偅鑰呮。淇℃伅
*/
- @ApiOperation("淇敼鎮ｈ�呮。妗�")
+ @ApiOperation("鏂板鎴栦慨鏀规偅鑰呮。淇℃伅")
@PreAuthorize("@ss.hasPermi('smartor:patarchive:edit')")
- @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
- public AjaxResult edit(@RequestBody PatArchive patArchive) {
- return toAjax(patArchiveService.updatePatArchive(patArchive));
+ @Log(title = "鎮ｈ�呮。妗�" , businessType = BusinessType.UPDATE)
+ @PostMapping("/saveOrUpdatePatInfo")
+ public AjaxResult saveOrUpdatePatInfo(@RequestBody PatArchiveVO patArchiveVO) {
+ return toAjax(patArchiveService.saveOrUpdatePatInfo(patArchiveVO));
}
/**
@@ -102,9 +114,9 @@
*/
@ApiOperation("鍒犻櫎鎮ｈ�呮。妗�")
@PreAuthorize("@ss.hasPermi('smartor:patarchive:remove')")
- @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.DELETE)
+ @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);
//鑾峰彇褰撳墠鐧婚檰浜�
@@ -159,20 +171,16 @@
@ApiOperation("鏌ヨ鎮ｈ�呭垪琛�")
@PostMapping("/patInfoByContion")
public TableDataInfo patInfoByCondition(@RequestBody PatArchiveReq patArchive) {
- PageUtils.startPageByPost(patArchive.getPageNum(),patArchive.getPageSize());
- return getDataTable(patArchiveService.patInfoByContion(patArchive));
+ PageUtils.startPageByPost(patArchive.getPageNum(), patArchive.getPageSize());
+ List<PatArchive> patArchives = patArchiveService.patInfoByContion(patArchive);
+ long count = PageUtils.count(new ISelect() {
+ @Override
+ public void doSelect() {
+ patArchiveService.patInfoByContion(patArchive);
+ }
+ });
+ return getDataTable2(count, patArchives);
}
-
-
-// /**
-// * 鎮ｈ�呮爣绛剧鐞�
-// */
-// @ApiOperation("鎮ｈ�呮爣绛剧鐞�")
-// @PostMapping("/patTagByContion")
-// public TableDataInfo patTagByContion(@RequestBody List<Long> tagids) {
-// startPage();
-// return getDataTable(patArchiveService.patTagByContion(tagids));
-// }
/**
@@ -193,14 +201,21 @@
}
/**
- * 鑾峰彇鐢ㄦ埛璇婄枟淇℃伅锛堝尰鐤楁。妗堬級
- *
- * @return
+ * 鑾峰彇鎮ｈ�呬俊鎭�
*/
- @ApiOperation("鑾峰彇鐢ㄦ埛璇婄枟淇℃伅锛堝尰鐤楁。妗�")
- @PostMapping("/getUserTreatmentInfo")
- public AjaxResult getUserTreatmentInfo(@RequestParam("pid") String pid,@RequestParam("type") String type) {
- return null;
+ @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