Browse Source

0018690: 【超声工作站软件】“搜索”和“重置”按键:1、点击不生效;2、文字颜色是白色;3、开始时间和结束时间的日历显示不完整,不能使用

finlay 10 months ago
parent
commit
bbb829558b

+ 6 - 3
lib/managers/remedical_Manager.dart

@@ -282,6 +282,10 @@ class RemedicalManager extends BaseManager implements IRemedicalManager {
     int pageSize = 20,
   }) async {
     try {
+      var startTimeTemporaryVariable =
+          UtcDateConverter.getDayStartOrEndUTCTime(startTime);
+      var endTimeTemporaryVariable =
+          UtcDateConverter.getDayStartOrEndUTCTime(endTime, isEnd: true);
       var records = await rpc.remoteUltrasound.vitalFindRecordPagesAsync(
         FindRecordPagesRequest(
           token: token,
@@ -294,9 +298,8 @@ class RemedicalManager extends BaseManager implements IRemedicalManager {
           language: i18nBook.locale.toCodeString('-'),
           recordProcessState: recordProcessState,
           patientCode: patientCode,
-          startTime: UtcDateConverter.getDayStartOrEndUTCTime(startTime),
-          endTime:
-              UtcDateConverter.getDayStartOrEndUTCTime(endTime, isEnd: true),
+          startTime: startTimeTemporaryVariable,
+          endTime: endTimeTemporaryVariable,
         ),
       );
       return records;

+ 7 - 1
lib/pages/consultation_record_view/widgets/consultation_record_filter_drawer.dart

@@ -1,3 +1,4 @@
+import 'package:fis_common/env/env.dart';
 import 'package:fis_i18n/i18n.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
@@ -5,6 +6,7 @@ import 'package:intl/intl.dart';
 import 'package:fis_ui/base_define/page.dart';
 import 'package:fis_ui/index.dart';
 import 'package:fis_jsonrpc/rpc.dart';
+import 'package:vitalapp/global.dart';
 
 import 'package:vitalapp/managers/interfaces/models/selected_model.dart';
 import 'package:vitalapp/pages/consultation_record_view/controller.dart';
@@ -118,7 +120,10 @@ class _RecordFilterDrawerState extends State<RecordFilterDrawer> {
     required GlobalKey globalKey,
   }) {
     void selectInput() {
-      var timePosition = _findRenderObject(globalKey);
+      var timePosition = [
+        MediaQuery.of(context).size.width / (FPlatform.isWindows ? 4 : 1.5),
+        MediaQuery.of(context).size.height / (FPlatform.isWindows ? 4 : 3),
+      ];
       showDialog(
         context: context,
         barrierDismissible: false,
@@ -297,6 +302,7 @@ class _RecordFilterDrawerState extends State<RecordFilterDrawer> {
             horizontal: 15,
           ),
         ),
+        backgroundColor: MaterialStatePropertyAll<Color>(Colors.blue),
         fixedSize: fixedSize ?? MaterialStateProperty.all(Size(210, 40)),
       ),
     );

+ 1 - 3
lib/pages/consultation_record_view/widgets/inspection_details_dialog.dart

@@ -166,9 +166,7 @@ class InspectionDetailsDiaLog extends FStatelessWidget {
           FText(
             (sex.isEmpty || sex == "NotFilled")
                 ? i18nBook.remedical.notFill.t
-                : sex == "Female"
-                    ? "女"
-                    : "男",
+                : sexMap[sex] ?? '',
           ),
           sizeAfter: 0,
         ),

+ 4 - 0
lib/pages/patient/list/controller.dart

@@ -183,6 +183,10 @@ class PatientListController extends FControllerBase
     }
   }
 
+  void changeFilterFounder(int value) {
+    state.selectBoxFilterFounder = value;
+  }
+
   Future<bool> _verifyCameraPermissions() async {
     IPermissionManager permissionManager = Get.find<IPermissionManager>();
     var isCameraPermissions =

+ 5 - 0
lib/pages/patient/list/state.dart

@@ -21,6 +21,11 @@ class PatientListState with PagedStateMixin<PatientModelDTO> {
   final RxList<String> _offlineCodes = RxList<String>();
   final RxInt _statisticTotalCount = RxInt(0);
   final RxInt _statisticTodayCount = RxInt(0);
+  final RxInt _selectBoxFilterFounder = RxInt(0);
+
+  int get selectBoxFilterFounder => _selectBoxFilterFounder.value;
+  set selectBoxFilterFounder(int val) =>
+      _selectBoxFilterFounder.updateValue(val);
 
   int get currentTabIndex => _currentTabIndex.value;
   set currentTabIndex(int val) => _currentTabIndex.updateValue(val);

+ 51 - 3
lib/pages/patient/list/view.dart

@@ -179,9 +179,9 @@ class PatientListPage extends GetView<PatientListController> {
                     )
                   ],
                 ),
-                // const SizedBox(
-                //   height: 20,
-                // ),
+                const SizedBox(
+                  height: 20,
+                ),
                 // const Text(
                 //   '人群分类:',
                 //   style: TextStyle(fontSize: 20),
@@ -192,6 +192,21 @@ class PatientListPage extends GetView<PatientListController> {
                 // CrowdSelectLabelView(
                 //   controller: controller.crowdLabelsController,
                 // ),
+                // const Text(
+                //   '创建者:',
+                //   style: TextStyle(fontSize: 20),
+                // ),
+                // const SizedBox(
+                //   height: 20,
+                // ),
+                // Obx(
+                //   () => Row(
+                //     children: [
+                //       _tabRadio(title: "建档医生", value: 0),
+                //       _tabRadio(title: "团队", value: 1)
+                //     ],
+                //   ),
+                // ),
               ],
             ),
           ),
@@ -200,6 +215,39 @@ class PatientListPage extends GetView<PatientListController> {
     );
   }
 
+  Widget _tabRadio({
+    required String title,
+    required dynamic value,
+  }) {
+    return InkWell(
+      onTap: () {
+        controller.changeFilterFounder(value);
+      },
+      child: Container(
+        margin: EdgeInsets.only(right: 15),
+        child: Row(
+          children: [
+            Radio(
+              value: value,
+              groupValue: controller.state.selectBoxFilterFounder,
+              onChanged: (v) {
+                controller.changeFilterFounder(value);
+              },
+            ),
+            Text(
+              title,
+              style: TextStyle(
+                color: controller.state.selectBoxFilterFounder == value
+                    ? const Color(0xff2c77e5)
+                    : const Color(0xff4c4948),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
   Widget _buildListView() {
     final scrollController = ScrollController();
     scrollController.addListener(