From 5389773b2d1ae86daec68b00f67c3682dc907e01 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 22 十一月 2024 14:35:48 +0800
Subject: [PATCH] 代码提交(长期任务电话完成)

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
index 7b15428..e407fd3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
@@ -4,12 +4,9 @@
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.smartor.domain.PatMedInhosp;
 import com.smartor.domain.PatMedInhospVO;
@@ -18,14 +15,11 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 鎮h�呬綇闄㈣褰旵ontroller
@@ -110,7 +104,7 @@
      */
     @ApiOperation("鑾峰彇鎮h�呬綇闄㈣褰曡缁嗕俊鎭�")
     //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:query')")
-    @GetMapping(value = "/{inhospid}")
+    @GetMapping(value = "/getInfo/{inhospid}")
     public AjaxResult getInfo(@PathVariable("inhospid") Long inhospid) {
         return success(patMedInhospService.selectPatMedInhospByInhospid(inhospid));
     }
@@ -159,4 +153,16 @@
         return getDataTable(patMedInhospService.getDeptRanking(patMedReq));
     }
 
+
+    /**
+     * 鍖绘姢涓庢偅鑰呭叧鑱斿叧绯�
+     *
+     * @return
+     */
+    @ApiOperation("鍖绘姢涓庢偅鑰呭叧鑱斿叧绯�")
+    @PostMapping("/getDocAndPat")
+    public TableDataInfo getDocAndPat(@RequestBody PatMedInhosp patMedInhosp) {
+        return getDataTable(patMedInhospService.getDocAndPat(patMedInhosp));
+    }
+
 }

--
Gitblit v1.9.3