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 |   78 +++++++++++++++++++++++----------------
 1 files changed, 46 insertions(+), 32 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..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;
@@ -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);
@@ -75,26 +76,37 @@
         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));
+    @PostMapping("/saveOrUpdatePatInfo")
+    public AjaxResult saveOrUpdatePatInfo(@RequestBody PatArchiveVO patArchiveVO) {
+        return toAjax(patArchiveService.saveOrUpdatePatInfo(patArchiveVO));
     }
 
     /**
@@ -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,20 @@
     }
 
     /**
-     * 鑾峰彇鐢ㄦ埛璇婄枟淇℃伅锛堝尰鐤楁。妗堬級
-     *
-     * @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