Quellcode durchsuchen

fix:添加分页

Ciallo vor 9 Monaten
Ursprung
Commit
e000eed66f

+ 10 - 3
ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_DgController.java

@@ -1,25 +1,32 @@
 package com.ruoyi.web.work.api;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.web.work.api.config.BaseController;
 import com.ruoyi.web.work.api.util.AppUtil;
+import com.ruoyi.web.work.domain.Dg;
 import com.ruoyi.web.work.service.IDgService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @Api(tags = "小程序就诊信息管理")
 @RestController
 @RequestMapping("/app/dg")
-public class Api_DgController {
+public class Api_DgController extends BaseController {
 
     @Autowired
     private IDgService dgService;
 
     @ApiOperation(value = "根据就诊卡号获取用户诊断信息(如主要诊断,次要诊断)")
     @GetMapping("/diagnosis/{card}")
-    public AjaxResult getDgByCard(@PathVariable("card") String card){
-        return dgService.getDgByCard(card);
+    public TableDataInfo getDgByCard(@PathVariable("card") String card){
+        startPage();
+        List<Dg> dgList=dgService.getDgByCard(card);
+        return getDataTable(dgList);
     }
 
 

+ 9 - 5
ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_ObxController.java

@@ -1,11 +1,13 @@
 package com.ruoyi.web.work.api;
 
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.web.work.api.config.BaseController;
+
 import com.ruoyi.web.work.domain.Obx;
 import com.ruoyi.web.work.service.IObxService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import net.bytebuddy.agent.builder.AgentBuilder;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -14,19 +16,21 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
+
 @Api(tags = "小程序检测项目管理")
 @RestController
 @RequestMapping("/app/obx")
-public class Api_ObxController {
+public class Api_ObxController extends BaseController {
 
     @Autowired
     private IObxService obxService;
 
     @ApiOperation(value = "根据就诊卡号获取检测项目列表")
     @GetMapping("/examine/{card}")
-    public AjaxResult getObxByCard(@PathVariable("card") String card) {
+    public TableDataInfo getObxByCard(@PathVariable("card") String card) {
+        startPage();
         List<Obx> obxList=obxService.getObxByCard(card);
-        return AjaxResult.success(obxList);
+        return getDataTable(obxList);
     }
 
 

+ 8 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_Pv1Controller.java

@@ -2,9 +2,9 @@ package com.ruoyi.web.work.api;
 
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.web.work.api.config.BaseController;
 import com.ruoyi.web.work.api.util.AppUtil;
-import com.ruoyi.web.work.domain.Pv1;
-import com.ruoyi.web.work.domain.dto.PatientCardDto;
 import com.ruoyi.web.work.domain.dto.Pv1MedicalRecord;
 import com.ruoyi.web.work.service.IPv1Service;
 import io.swagger.annotations.Api;
@@ -14,20 +14,22 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
+
 @Api(tags = "小程序住院信息管理")
 @RestController
 @RequestMapping("/app/pv1")
-public class Api_Pv1Controller {
+public class Api_Pv1Controller extends BaseController {
 
     @Autowired
     private IPv1Service ipv1Service;
 
     @ApiOperation(value = "根据时间获取用户就医记录")
     @GetMapping("/record")
-    public AjaxResult getMedicalRecord(@RequestParam("beginTime") String beginTime,
-                                       @RequestParam("endTime") String endTime){
+    public TableDataInfo getMedicalRecord(@RequestParam("beginTime") String beginTime,
+                                          @RequestParam("endTime") String endTime){
+        startPage();
         List<Pv1MedicalRecord> pv1List=ipv1Service.getMedicalRecord(beginTime,endTime, AppUtil.getUser().getPatientId());
-        return AjaxResult.success(pv1List);
+        return getDataTable(pv1List);
     }
 
 

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IDgService.java

@@ -15,5 +15,5 @@ public interface IDgService extends IService<Dg>{
 
     AjaxResult getMedicalRecord(String beginTime, String endTime,Long patientId);
 
-    AjaxResult getDgByCard(String card);
+    List<Dg> getDgByCard(String card);
 }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/DgServiceImpl.java

@@ -30,7 +30,7 @@ public class DgServiceImpl extends ServiceImpl<DgMapper, Dg> implements IDgServi
     }
 
     @Override
-    public AjaxResult getDgByCard(String card) {
-        return AjaxResult.success(dgMapper.getDgByCard(card));
+    public List<Dg> getDgByCard(String card) {
+        return dgMapper.getDgByCard(card);
     }
 }