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 |   65 +++++++++++++++++++++++---------
 1 files changed, 47 insertions(+), 18 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 0f9e8ce..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
@@ -39,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)
+    @Log(title = "鎮ｈ�呮。妗�" , businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, PatArchive patArchive) {
         List<PatArchive> list = patArchiveService.selectPatArchiveList(patArchive);
@@ -71,7 +71,7 @@
     @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));
     }
@@ -88,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)
+    @Log(title = "鎮ｈ�呮。妗�" , businessType = BusinessType.UPDATE)
     @PostMapping("/saveOrUpdatePatInfo")
     public AjaxResult saveOrUpdatePatInfo(@RequestBody PatArchiveVO patArchiveVO) {
         return toAjax(patArchiveService.saveOrUpdatePatInfo(patArchiveVO));
@@ -103,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));
     }
@@ -118,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);
         //鑾峰彇褰撳墠鐧婚檰浜�
@@ -189,4 +200,22 @@
         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