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

lib/pages/consultation_record_view/widgets/consultation_record_filter.dart

@@ -135,13 +135,6 @@ class ConsultationRecordFilter extends GetView<ConsultationRecordViewController>
                 },
               ),
               Expanded(child: FSizedBox()),
-              InkWell(
-                onTap: () {},
-                child: FIcon(
-                  Icons.file_upload,
-                  color: const Color(0xff2c77e5),
-                ),
-              ),
               const SizedBox(width: 10),
               InkWell(
                 onTap: () {

lib/pages/medical/widgets/twelve_ecg.dart

@@ -504,6 +504,7 @@ class _HeartRateState extends State<TwelveHeartRate> {
       title: "结论编辑",
       initialValue: _assess,
       inputHeight: 320,
+      showCancel: true,
       maxLines: 30,
     ).show();
     if (result != null) {

lib/pages/patient/detail/widgets/last_record.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:get/get.dart';
@@ -87,7 +88,11 @@ class LastRecordTable extends StatelessWidget {
         }
         if (label == '心电测量') {
           children.add(_buildImageDataCell(child));
-        } else if (label == '十二导心电(30秒)') {
+        } else if (label == '十二导心电图(30秒)' || label == "十二导心电图（30秒）") {
+          children.add(_buildImageDataCell(child));
+        } else if (label == '十二导心电图(5秒)' ||
+            label == '十二导心电图（5秒）' ||
+            label == '十二导心电图') {
           children.add(_buildImageDataCell(child));
         } else if (label == '十二导分析结果') {
           children.add(_buildEcg12DataCell(child));
@@ -245,7 +250,7 @@ class LastRecordTable extends StatelessWidget {
 
   TableCell _buildImageDataCell(String title) {
     if (title.length > 50) {
-      Uint8List imageBytes = isExistLocalData!
+      Uint8List imageBytes = (isExistLocalData! && !kIsWeb)
           ? base64.decode(title)
           : base64.decode(
               "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=");
@@ -255,7 +260,7 @@ class LastRecordTable extends StatelessWidget {
             print(title);
             Get.dialog(
               EcgImageDialog(
-                image: isExistLocalData!
+                image: (isExistLocalData! && !kIsWeb)
                     ? Image.memory(
                         imageBytes,
                       )