Merge branch 'master' of http://git.ius.plus/Project-Vital/VitalApp

lib/managers/interfaces/service_pack.dart

@@ -9,5 +9,5 @@ abstract class IServicePackManager implements IManager {
 
   /// 获取服务包项目分页列表
   Future<PageCollection<ServiceItemDTO>?> getServiceItemList(
-      PageRequest request);
+      GetServiceItemPageRequest request);
 }

lib/managers/service_pack.dart

@@ -21,7 +21,7 @@ class ServicePackManager implements IServicePackManager {
 
   @override
   Future<PageCollection<ServiceItemDTO>?> getServiceItemList(
-      PageRequest request) async {
+      GetServiceItemPageRequest request) async {
     try {
       request.token = Store.user.token;
       final result =

lib/pages/contract/package_list/controller.dart

@@ -59,7 +59,7 @@ class ServicePackageContractController extends FControllerBase {
     state.servicePackageItems = result?.pageData ?? [];
 
     final getServiceItemResult = await _servicePackManager.getServiceItemList(
-      PageRequest(
+      GetServiceItemPageRequest(
         pageIndex: 1,
         pageSize: 100,
       ),

lib/pages/medical_checkup_station/registration/widgets/filter/index.dart

@@ -219,10 +219,6 @@ class RegistrationFilter extends GetView<RegistrationController> {
         ),
         isVital: isVital!,
       );
-      // final hasConfirmed = await FaceResultDialog.show(patient, true);
-      // if (hasConfirmed) {
-      //   await _checkinPatient(patient);
-      // }
     } else {
       print("识别取消");
     }

lib/pages/patient/create/widgets/face_result_dialog.dart

@@ -1,5 +1,4 @@
 import 'package:fis_jsonrpc/rpc.dart';
-import 'package:fis_jsonrpc/services/patient.m.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:vitalapp/architecture/utils/datetime.dart';
@@ -52,9 +51,10 @@ class FaceResultDialog extends StatelessWidget {
         children: [
           _buildRow("姓名", data.patientName!),
           _buildRow("性别", RpcEnumLabels.gender[data.patientGender]!),
-          // _buildRow("出生日期", DateFormat('yyyy-MM-dd').format(data.birthday!)),
           _buildRow("年龄", DataTimeUtils.calculateAge(data.birthday!)),
           _buildRow("身份证", data.cardNo!),
+          if (hasCreateRecord!) _buildRow("建档机构", data.createdOrgName ?? ''),
+          if (hasCreateRecord!) _buildRow("建档医生", data.createdDoctorName ?? ''),
         ],
       ),
     );

pubspec.lock

@@ -415,8 +415,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: a4f9963351
-      resolved-ref: a4f9963351ec13cad26bc336b3a827462793adeb
+      ref: d996db0fdbbcf52c733d7e115e3bfe60b947b131
+      resolved-ref: d996db0fdbbcf52c733d7e115e3bfe60b947b131
       url: "http://git.ius.plus:88/Project-Wing/fis_lib_jsonrpc.git"
     source: git
     version: "0.0.1"

pubspec.yaml

@@ -48,7 +48,7 @@ dependencies:
   fis_jsonrpc:
     git:
       url: http://git.ius.plus:88/Project-Wing/fis_lib_jsonrpc.git
-      ref: a4f9963351
+      ref: c8395dd
   vnote_device_plugin:
     git:
       url: http://git.ius.plus/Project-Vital/FlutterDevicePlugin.git
@@ -163,7 +163,7 @@ dependency_overrides:
   fis_jsonrpc:
     git:
       url: http://git.ius.plus:88/Project-Wing/fis_lib_jsonrpc.git
-      ref: a4f9963351
+      ref: d996db0fdbbcf52c733d7e115e3bfe60b947b131
     #path: ../fis_lib_jsonrpc
   fis_theme:
     git: