From 8d913e5594f45ca2a4ce656ea9feb99ffe715913 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 29 十一月 2024 18:44:58 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java | 63 ++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 10 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 9f1a04d..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
@@ -1,18 +1,21 @@
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;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.PatMedInhosp;
+import com.smartor.domain.PatMedInhospVO;
import com.smartor.domain.PatMedReq;
import com.smartor.service.IPatMedInhospService;
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;
@@ -35,12 +38,40 @@
* 鏌ヨ鎮ｈ�呬綇闄㈣褰曞垪琛�
*/
@ApiOperation("鏌ヨ鎮ｈ�呬綇闄㈣褰曞垪琛�")
- @PreAuthorize("@ss.hasPermi('smartor:patinhosp:list')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:list')")
@PostMapping("/selectPatMedInhospList")
public TableDataInfo selectPatMedInhosplist(@RequestBody PatMedInhosp patMedInhosp) {
- startPage();
+ PageUtils.startPageByPost(patMedInhosp.getPageNum(), patMedInhosp.getPageSize());
List<PatMedInhosp> list = patMedInhospService.selectPatMedInhospList(patMedInhosp);
- return getDataTable(list);
+ long count = PageUtils.count(new ISelect() {
+ @Override
+ public void doSelect() {
+ patMedInhospService.selectPatMedInhospList(patMedInhosp);
+ }
+ });
+ return getDataTable2(count, list);
+ }
+
+ /**
+ * 鏌ヨ褰撳墠鐧婚檰浜鸿嚜宸憋紙鐥呭尯銆侀儴闂級鐨勬偅鑰呬綇闄㈣褰曞垪琛�
+ */
+ @ApiOperation("鏌ヨ褰撳墠鐧婚檰浜鸿嚜宸憋紙鐥呭尯銆侀儴闂級鐨勬偅鑰呬綇闄㈣褰曞垪琛�")
+ @PostMapping("/selectPatMedInhospListByCondition")
+ public TableDataInfo selectPatMedInhospListByCondition(@RequestBody PatMedInhospVO patMedInhospVO) {
+ PageUtils.startPageByPost(patMedInhospVO.getPageNum(), patMedInhospVO.getPageSize());
+ List<PatMedInhosp> list = null;
+ if (!CollectionUtils.isEmpty(patMedInhospVO.getLeavehospitaldistrictcodes())) {
+ list = patMedInhospService.selectPatMedInhospListByCondition(patMedInhospVO);
+ } else if (!CollectionUtils.isEmpty(patMedInhospVO.getLeaveldeptcodes())) {
+ list = patMedInhospService.selectPatMedInhospListByCondition(patMedInhospVO);
+ }
+ long count = PageUtils.count(new ISelect() {
+ @Override
+ public void doSelect() {
+ patMedInhospService.selectPatMedInhospListByCondition(patMedInhospVO);
+ }
+ });
+ return getDataTable2(count, list);
}
@PostMapping("/getDeptCodeByPatId")
@@ -59,7 +90,7 @@
* 瀵煎嚭鎮ｈ�呬綇闄㈣褰曞垪琛�
*/
@ApiOperation("瀵煎嚭鎮ｈ�呬綇闄㈣褰曞垪琛�")
- @PreAuthorize("@ss.hasPermi('smartor:patinhosp:export')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:export')")
@Log(title = "鎮ｈ�呬綇闄㈣褰�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, PatMedInhosp patMedInhosp) {
@@ -72,8 +103,8 @@
* 鑾峰彇鎮ｈ�呬綇闄㈣褰曡缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇鎮ｈ�呬綇闄㈣褰曡缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('smartor:patinhosp:query')")
- @GetMapping(value = "/{inhospid}")
+ //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:query')")
+ @GetMapping(value = "/getInfo/{inhospid}")
public AjaxResult getInfo(@PathVariable("inhospid") Long inhospid) {
return success(patMedInhospService.selectPatMedInhospByInhospid(inhospid));
}
@@ -82,7 +113,7 @@
* 鏂板鎮ｈ�呬綇闄㈣褰�
*/
@ApiOperation("鏂板鎮ｈ�呬綇闄㈣褰�")
- @PreAuthorize("@ss.hasPermi('smartor:patinhosp:add')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:add')")
@Log(title = "鎮ｈ�呬綇闄㈣褰�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody PatMedInhosp patMedInhosp) {
@@ -93,7 +124,7 @@
* 淇敼鎮ｈ�呬綇闄㈣褰�
*/
@ApiOperation("淇敼鎮ｈ�呬綇闄㈣褰�")
- @PreAuthorize("@ss.hasPermi('smartor:patinhosp:edit')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:edit')")
@Log(title = "鎮ｈ�呬綇闄㈣褰�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedInhosp patMedInhosp) {
@@ -104,7 +135,7 @@
* 鍒犻櫎鎮ｈ�呬綇闄㈣褰�
*/
@ApiOperation("鍒犻櫎鎮ｈ�呬綇闄㈣褰�")
- @PreAuthorize("@ss.hasPermi('smartor:patinhosp:remove')")
+ //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:remove')")
@Log(title = "鎮ｈ�呬綇闄㈣褰�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{inhospids}")
public AjaxResult remove(@PathVariable Long[] inhospids) {
@@ -122,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