From 20fc2f9fad59563799df18f635b3cfbfe06fc97b Mon Sep 17 00:00:00 2001
From: tangw <czlis@tangw>
Date: Thu, 18 Sep 2025 10:28:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B8=E5=8F=AF=E7=A0=81=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/work/LisWorkController.java       | 16 ++++++++--------
 .../czlis/liswork/service/LisWorkService.java    |  2 +-
 .../liswork/service/impl/LisWorkServiceImpl.java |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java
index 082b07e..2c95340 100644
--- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java
+++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java
@@ -67,14 +67,14 @@ public class LisWorkController extends BaseController {
      */
     @ApiOperation("获取样本列表")
     @GetMapping("/samplelist")
-    // public Result getSampleList(Date jyrq,String yq,Long days){
-    //     return lisWorkService.getSampleList(jyrq,yq,days);
-    // }
-    public TableDataInfo getsamplelist(Date jyrq, String yq, Long days) {
-        startPage();
-        List<LabPat> labPatList = lisWorkService.getSampleList(jyrq, yq, days);
-        return getDataTable(labPatList);
-    }
+     public Result getSampleList(Date jyrq,String yq,Long days){
+        return lisWorkService.getSampleList(jyrq,yq,days);
+     }
+ //   public TableDataInfo getsamplelist(Date jyrq, String yq, Long days) {
+ //       startPage();
+  //      List<LabPat> labPatList = lisWorkService.getSampleList(jyrq, yq, days);
+  //      return getDataTable(labPatList);
+  //  }
 
     /**
      * 获取普通样本信息
diff --git a/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java b/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java
index 938d097..5c804fc 100644
--- a/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java
+++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java
@@ -13,7 +13,7 @@ public interface LisWorkService {
     Result getInstrdList(Long userId);
     Result getGroupInstrdList(Long userId,String groupId);
     Result getInstrdConfig(String yq);
-    List<LabPat> getSampleList(Date jyrq, String yq, Long days);
+    Result getSampleList(Date jyrq, String yq, Long days);
     Result getLabPat(Date jyrq, String yq, String ybh);
     Result sampleMedInfo(Date jyrq, String yq, String ybh);
     Result checkUser(String yhdh, String mm);
diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java
index 36f7c68..c7a65a8 100644
--- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java
+++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java
@@ -64,13 +64,13 @@ public class LisWorkServiceImpl implements LisWorkService {
     }
 
     @Override
-    public List<LabPat> getSampleList(Date jyrq, String yq, Long days) {
+    public Result getSampleList(Date jyrq, String yq, Long days) {
         if(days>1) {
             List<LabPat> labPatListday = commonUtil.getSampleListday(yq, days);
-            return labPatListday;
+            return new Result("0", "获取样本数据成功！", labPatListday);
         }else {
             List<LabPat> labPatListday = commonUtil.getsamplelist(jyrq, yq);
-            return labPatListday;
+            return new Result("0", "获取样本数据成功！", labPatListday);
         }
     }
     @Override