1、更新jsonrpc

lib/managers/index.dart

@@ -1,12 +1,3 @@
-/*
- * @Descripttion: 
- * @version: 
- * @Author: guanxiaoxin
- * @Date: 2023-09-11 20:46:24
- * @LastEditors: guanxiaoxin
- * @LastEditTime: 2023-09-14 09:25:42
- * @FilePath: \VNoteApp\lib\managers\index.dart
- */
 import 'package:get/get.dart';
 import 'package:vnoteapp/managers/account.dart';
 import 'package:vnoteapp/managers/contract.dart';

lib/managers/interfaces/patient.dart

@@ -9,7 +9,7 @@ abstract class IPatientManager implements IManager {
   Future<String?> create(CreatePatientRequest request);
 
   /// 获取病人分页列表
-  Future<PageCollection<PatientDTO>?> getPagedList(PageRequest request);
+  Future<PageCollection<PatientDTO>?> getPagedList(PatientPageRequest request);
 
   /// 获取病人详情
   Future<PatientDTO?> getDetail(String code);

lib/managers/interfaces/service_pack.dart

@@ -1,12 +1,3 @@
-/*
- * @Descripttion: 
- * @version: 
- * @Author: guanxiaoxin
- * @Date: 2023-09-13 13:12:23
- * @LastEditors: guanxiaoxin
- * @LastEditTime: 2023-09-14 15:20:50
- * @FilePath: \VNoteApp\lib\managers\interfaces\service_pack.dart
- */
 import 'package:fis_jsonrpc/rpc.dart';
 
 import 'base.dart';
@@ -14,7 +5,7 @@ import 'base.dart';
 abstract class IServicePackManager implements IManager {
   /// 获取服务包分页列表
   Future<PageCollection<ServicePackDTO>?> getServicePackList(
-      PageRequest request);
+      ServicePackPageRequest request);
 
   /// 获取服务包项目分页列表
   Future<PageCollection<ServiceItemDTO>?> getServiceItemList(

lib/managers/patient.dart

@@ -31,7 +31,8 @@ class PatientManager implements IPatientManager {
   }
 
   @override
-  Future<PageCollection<PatientDTO>?> getPagedList(PageRequest request) async {
+  Future<PageCollection<PatientDTO>?> getPagedList(
+      PatientPageRequest request) async {
     try {
       request.token = Store.user.token;
       final result = await rpc.patient.getPatientPageAsync(request);

lib/managers/service_pack.dart

@@ -7,13 +7,10 @@ import 'package:vnoteapp/store/store.dart';
 class ServicePackManager implements IServicePackManager {
   @override
   Future<PageCollection<ServicePackDTO>?> getServicePackList(
-      PageRequest request) async {
+      ServicePackPageRequest request) async {
     try {
       request.token = Store.user.token;
       final result = await rpc.servicePack.getServicePackPageAsync(request);
-      print('🥔');
-      print(result);
-      print('🥔');
       return result;
     } catch (e) {
       logger.e("getServicePackPageAsync query patient paged list error.", e);

lib/pages/contract/package_list/controller.dart

@@ -28,23 +28,15 @@ class ServicePackageContractController extends FControllerBase {
   Future<void> _loadData() async {
     final dto = await _patientManager.getDetail(state.patientCode);
 
-    try {
-      /// server 暂时没根据人群获取服务包列表这边先用全部服务包
-      final result = await _servicePackManager.getServicePackList(
-        PageRequest(
-          pageIndex: 1,
-          pageSize: 10,
-        ),
-      );
-      print('🌶');
-
-      print(result);
-
-      normalOptions = Get.find<CrowdLabelsController>().state.normalOptions;
-      state.servicePackageItems = result?.pageData ?? [];
-    } catch (e) {
-      print(e);
-    }
+    /// server 暂时没根据人群获取服务包列表这边先用全部服务包
+    final result = await _servicePackManager.getServicePackList(
+      ServicePackPageRequest(
+        pageIndex: 1,
+        pageSize: 20,
+      ),
+    );
+    normalOptions = Get.find<CrowdLabelsController>().state.normalOptions;
+    state.servicePackageItems = result?.pageData ?? [];
 
     final getServiceItemResult = await _servicePackManager.getServiceItemList(
       PageRequest(

lib/pages/patient/list/controller.dart

@@ -47,7 +47,7 @@ class PatientListController extends FControllerBase {
 
   /// 加载下一页列表
   Future<void> loadNextPageList() async {
-    final request = PageRequest(
+    final request = PatientPageRequest(
       pageIndex: state.pageIndex + 1,
       pageSize: state.pageSize,
     );

pubspec.yaml

@@ -62,7 +62,7 @@ dependencies_overrides:
   fis_jsonrpc:
     git:
       url: http://git.ius.plus:88/Project-VNOTE/FlutterJsonRPC.git
-      ref: "f860141fef"
+      ref: c26ed7a
   # fis_ui:
   #   git:
   #     url: http://git.ius.plus:88/Project-Wing/fis_lib_ui.git