Jelajahi Sumber

接入开始扫查接口

loki.wu 11 bulan lalu
induk
melakukan
b2f4cfc847

+ 2 - 0
lib/managers/interfaces/scanning_image.dart

@@ -1,3 +1,5 @@
 abstract class IScanningImage {
   Future<bool> startScan(String recordCode);
+
+   Future<bool> checkCollectingImgAsync() ;
 }

+ 17 - 0
lib/managers/scanning_image.dart

@@ -15,10 +15,27 @@ class ScanningImage extends BaseManager implements IScanningImage {
           .startCollectingImgAsync(StartCollectingImgRequest(
         recordCode: recordCode,
         token: Store.user.token,
+        isVital: true,
       ));
     } catch (e) {
       logger.e("ScanningImage startScan ex:", e);
     }
     return result;
   }
+
+  ///检查采图是否空闲
+  @override
+  Future<bool> checkCollectingImgAsync() async {
+    bool result = false;
+    try {
+      result = await rpc.recordInfo
+          .checkCollectingImgAsync(CheckCollectingImgRequest(
+        token: Store.user.token,
+        isVital: true,
+      ));
+    } catch (e) {
+      logger.e("ScanningImage checkCollectingImgAsync ex:", e);
+    }
+    return result;
+  }
 }

+ 18 - 12
lib/pages/consultation_record_view/controller.dart

@@ -20,6 +20,7 @@ import 'package:vitalapp/managers/interfaces/models/selected_model.dart';
 import 'package:vitalapp/managers/interfaces/patient.dart';
 import 'package:vitalapp/managers/interfaces/remedical.dart';
 import 'package:vitalapp/managers/interfaces/report.dart';
+import 'package:vitalapp/managers/interfaces/scanning_image.dart';
 import 'package:vitalapp/pages/consultation_record_view/widgets/capture_page.dart';
 import 'package:vitalapp/pages/image_report_inner_view/controller.dart';
 import 'package:vitalapp/rpc.dart';
@@ -918,18 +919,23 @@ class ConsultationRecordViewController extends GetxController
         .getRegisterPersonInfoByPhysicalExamNumberAsync(
             physicalExamNumber: medicalNumber);
     if (queryData != null && queryData.code != null) {
-      Get.dialog(
-        VAlertDialog(
-          title: "图像采集-居民[${queryData.name}]",
-          width: 500,
-          content: CapturePage(),
-          showCancel: false,
-          confirmLabel: "完成",
-          onConfirm: () {
-            Get.back();
-          },
-        ),
-      );
+      var scanningImageManager = Get.find<IScanningImage>();
+      bool canScanning = await scanningImageManager.checkCollectingImgAsync();
+      if (canScanning) {
+        scanningImageManager.startScan(queryData.code ?? '');
+        Get.dialog(
+          VAlertDialog(
+            title: "图像采集-居民[${queryData.name}]",
+            width: 500,
+            content: CapturePage(),
+            showCancel: false,
+            confirmLabel: "完成",
+            onConfirm: () {
+              Get.back();
+            },
+          ),
+        );
+      }
     } else {
       PromptBox.toast("体检号不存在");
     }

+ 2 - 1
lib/pages/consultation_record_view/widgets/consultation_record_filter.dart

@@ -1,5 +1,6 @@
 import 'package:fis_common/index.dart';
 import 'package:fis_ui/index.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:fis_i18n/i18n.dart';
 import 'package:fis_jsonrpc/rpc.dart';
@@ -42,7 +43,7 @@ class ConsultationRecordFilter extends GetView<ConsultationRecordViewController>
                 ),
               ),
               Expanded(child: FSizedBox()),
-              if (FPlatform.isWindows)
+              if (FPlatform.isWindows || kDebugMode)
                 SizedBox(
                   width: 200,
                   height: 36,

+ 2 - 2
pubspec.lock

@@ -407,8 +407,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: b3dc4b3
-      resolved-ref: b3dc4b3648932fb9de9927a853d599fb51f61b25
+      ref: "1cfb365"
+      resolved-ref: "1cfb365a7e779cc6a0b814796f9265389a2b789b"
       url: "http://git.ius.plus:88/Project-Wing/fis_lib_jsonrpc.git"
     source: git
     version: "0.0.1"

+ 1 - 1
pubspec.yaml

@@ -162,7 +162,7 @@ dependency_overrides:
   fis_jsonrpc:
     git:
       url: http://git.ius.plus:88/Project-Wing/fis_lib_jsonrpc.git
-      ref: b3dc4b3
+      ref: 1cfb365
     #path: ../fis_lib_jsonrpc
   fis_theme:
     git: