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/PatArchiveController.java |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 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 0a36625..8609d79 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
@@ -44,7 +44,7 @@
      * 鏌ヨ鎮ｈ�呮。妗堝垪琛�
      */
     @ApiOperation("鏌ヨ鎮ｈ�呮。妗堝垪琛�")
-    @PreAuthorize("@ss.hasPermi('smartor:patarchive:list')")
+    //@PreAuthorize("@ss.hasPermi('smartor:patarchive:list')")
     @PostMapping("/list")
     public TableDataInfo list(@RequestBody PatArchive patArchive) {
         startPage();
@@ -56,7 +56,7 @@
      * 瀵煎嚭鎮ｈ�呮。妗堝垪琛�
      */
     @ApiOperation("瀵煎嚭鎮ｈ�呮。妗堝垪琛�")
-    @PreAuthorize("@ss.hasPermi('smartor:patarchive:export')")
+    //@PreAuthorize("@ss.hasPermi('smartor:patarchive:export')")
     @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, PatArchive patArchive) {
@@ -69,7 +69,7 @@
      * 鑾峰彇鎮ｈ�呮。妗堣缁嗕俊鎭�
      */
     @ApiOperation("鑾峰彇鎮ｈ�呮。妗堣缁嗕俊鎭�")
-    @PreAuthorize("@ss.hasPermi('smartor:patarchive:query')")
+    //@PreAuthorize("@ss.hasPermi('smartor:patarchive:query')")
     @GetMapping(value = "/getInfo/{patid}")
     @ApiImplicitParam(name = "patid", value = "鎮ｈ�卛d")
     public AjaxResult getInfo(@PathVariable(name = "patid") Long patid) {
@@ -80,7 +80,7 @@
 //     * 鏂板鎮ｈ�呮。妗�
 //     */
 //    @ApiOperation("鏂板鎮ｈ�呮。妗�")
-//    @PreAuthorize("@ss.hasPermi('smartor:patarchive:add')")
+//    //@PreAuthorize("@ss.hasPermi('smartor:patarchive:add')")
 //    @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.INSERT)
 //    @PostMapping("/add")
 //    public AjaxResult add(@RequestBody PatArchive patArchive) {
@@ -91,7 +91,7 @@
      * 鏂板鎮ｈ�呮。妗�
      */
     @ApiOperation("淇敼鎮ｈ�呮。妗�")
-    @PreAuthorize("@ss.hasPermi('smartor:patarchive:update')")
+    //@PreAuthorize("@ss.hasPermi('smartor:patarchive:update')")
     @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.UPDATE)
     @PostMapping("/update")
     public AjaxResult update(@RequestBody PatArchive patArchive) {
@@ -102,7 +102,7 @@
      * 鏂板鎴栦慨鏀规偅鑰呮。淇℃伅
      */
     @ApiOperation("鏂板鎴栦慨鏀规偅鑰呮。淇℃伅")
-    @PreAuthorize("@ss.hasPermi('smartor:patarchive:edit')")
+    //@PreAuthorize("@ss.hasPermi('smartor:patarchive:edit')")
     @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.UPDATE)
     @PostMapping("/saveOrUpdatePatInfo")
     public AjaxResult saveOrUpdatePatInfo(@RequestBody PatArchiveVO patArchiveVO) {
@@ -113,7 +113,7 @@
      * 鍒犻櫎鎮ｈ�呮。妗�
      */
     @ApiOperation("鍒犻櫎鎮ｈ�呮。妗�")
-    @PreAuthorize("@ss.hasPermi('smartor:patarchive:remove')")
+    //@PreAuthorize("@ss.hasPermi('smartor:patarchive:remove')")
     @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.DELETE)
     @GetMapping("/remove/{patids}")
     @ApiImplicitParam(name = "patids", value = "鎮ｈ�卛d闆嗗悎", dataType = "long", dataTypeClass = Long.class)
@@ -172,6 +172,12 @@
     @PostMapping("/patInfoByContion")
     public TableDataInfo patInfoByCondition(@RequestBody PatArchiveReq patArchive) {
         PageUtils.startPageByPost(patArchive.getPageNum(), patArchive.getPageSize());
+        if (CollectionUtils.isEmpty(patArchive.getLeavehospitaldistrictcodes()) || patArchive.getLeavehospitaldistrictcodes().size() == 0) {
+            patArchive.setLeavehospitaldistrictcodes(null);
+        }
+        if (CollectionUtils.isEmpty(patArchive.getLeaveldeptcodes()) || patArchive.getLeaveldeptcodes().size() == 0) {
+            patArchive.setLeaveldeptcodes(null);
+        }
         List<PatArchive> patArchives = patArchiveService.patInfoByContion(patArchive);
         long count = PageUtils.count(new ISelect() {
             @Override
@@ -207,7 +213,13 @@
     @PostMapping("/getPatientInfo")
     public TableDataInfo getPatientInfo(@RequestBody PatArchiveReq patArchiveReq) {
         PageUtils.startPageByPost(patArchiveReq.getPageNum(), patArchiveReq.getPageSize());
-        List<PatTaskRelevance> patientInfo = patArchiveService.getPatientInfo(patArchiveReq);
+        if (CollectionUtils.isEmpty(patArchiveReq.getLeavehospitaldistrictcodes()) || patArchiveReq.getLeavehospitaldistrictcodes().size() == 0) {
+            patArchiveReq.setLeavehospitaldistrictcodes(null);
+        }
+        if (CollectionUtils.isEmpty(patArchiveReq.getLeaveldeptcodes()) || patArchiveReq.getLeaveldeptcodes().size() == 0) {
+            patArchiveReq.setLeaveldeptcodes(null);
+        }
+        List<PatArchiveOthreInfo> patientInfo = patArchiveService.getPatientInfo(patArchiveReq);
         long count = PageUtils.count(new ISelect() {
             @Override
             public void doSelect() {
@@ -217,4 +229,5 @@
         return getDataTable2(count, patientInfo);
     }
 
+
 }

--
Gitblit v1.9.3