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

lib/managers/data_convert.dart

@@ -18,7 +18,6 @@ class DataConvertManager implements IDataConvertManager {
     return "心率值未见异常";
   }
 
-
   @override
   Future<List<List<String>>> getTableData(String data) async {
     var currentDiagnosis = <List<String>>[];
@@ -53,6 +52,7 @@ class DataConvertManager implements IDataConvertManager {
         dto.name ?? '',
         value,
         dto.unit ?? '',
+        key,
       ]);
     }
 

lib/managers/registration.dart

@@ -99,7 +99,7 @@ class RegistrationManager implements IRegistrationManager {
       {required String physicalExamNumber}) async {
     try {
       var request = GetVitalReportInfoByPhysicalExamNumberRequest();
-      // request.token = Store.user.token;
+      request.token = Store.user.token;
       request.physicalExamNumber = physicalExamNumber;
       final examList = await rpc.report.getVitalReportInfoAsync(
         request,
@@ -152,6 +152,7 @@ class RegistrationManager implements IRegistrationManager {
     try {
       var request = GetElectrocardiogramRecordByPhysicalExamNumberRequest();
       request.physicalExamNumber = physicalExamNumber;
+      request.token = Store.user.token;
       final examList = await rpc.vitalElectrocardiogram
           .getElectrocardiogramRecordByPhysicalExamNumberAsync(
         request,

lib/pages/medical/views/blood_check.dart

@@ -39,7 +39,7 @@ class BloodCheck extends StatelessWidget {
             tableData.forEach((element) {
               tableDataConfig.add(
                 TableElementConfig(
-                  id: "",
+                  id: element.length > 3 ? element[3] : "",
                   name: element[0],
                   initValue: element[1],
                   unit: element[2],

lib/pages/medical_checkup_station/registration/controller.dart

@@ -74,6 +74,8 @@ class RegistrationController extends GetxController
   }
 
   Future<void> getExamLabelsByExamNoAsync(ResidentModel rowData) async {
+    // await drawBarcode(HealthExamLabelDTO(uniquedCode: "123"), rowData);
+    // Future.delayed(Duration(milliseconds: 2000));
     var labels = await registrationManager.getExamLabelsByExamNoAsync(
         physicalExamNumber: rowData.physicalExamNumber!);
     barCodeList.clear();
@@ -99,6 +101,7 @@ class RegistrationController extends GetxController
       labelDto.uniquedCode!,
       width: 350,
       height: 120,
+      fontFamily: "NotoSansSC",
     );
     final PictureInfo pictureInfo =
         await vg.loadPicture(SvgStringLoader(svg), null);
@@ -117,6 +120,7 @@ class RegistrationController extends GetxController
       labelDto.uniquedCode!,
       width: 190,
       height: 190,
+      fontFamily: "NotoSansSC",
     );
     final PictureInfo pictureInfo =
         await vg.loadPicture(SvgStringLoader(svg), null);
@@ -190,7 +194,12 @@ class InfoPainter extends CustomPainter {
     // Simulate drawing the content
     TextSpan titleSpan = TextSpan(
       text: '${labelDto.title ?? ''}',
-      style: TextStyle(fontSize: 40, height: 1, color: Colors.black),
+      style: TextStyle(
+        fontSize: 40,
+        height: 1,
+        color: Colors.black,
+        fontFamily: "NotoSansSC",
+      ),
     );
     TextPainter titleTp = TextPainter(
       text: titleSpan,
@@ -202,7 +211,12 @@ class InfoPainter extends CustomPainter {
 
     TextSpan subTitleSpanName = TextSpan(
       text: '${resident.name} ',
-      style: TextStyle(fontSize: 26, height: 1, color: Colors.black),
+      style: TextStyle(
+        fontSize: 26,
+        height: 1,
+        color: Colors.black,
+        fontFamily: "NotoSansSC",
+      ),
     );
     TextPainter subTitleTp1 = TextPainter(
       text: subTitleSpanName,
@@ -214,7 +228,12 @@ class InfoPainter extends CustomPainter {
 
     TextSpan subTitleSpanAge = TextSpan(
       text: '${resident.age} 岁',
-      style: TextStyle(fontSize: 26, height: 1, color: Colors.black),
+      style: TextStyle(
+        fontSize: 26,
+        height: 1,
+        color: Colors.black,
+        fontFamily: "NotoSansSC",
+      ),
     );
     TextPainter subTitleTpAge = TextPainter(
       text: subTitleSpanAge,
@@ -226,7 +245,12 @@ class InfoPainter extends CustomPainter {
 
     TextSpan subTitleSpanGender = TextSpan(
       text: '${resident.sex}',
-      style: TextStyle(fontSize: 26, height: 1, color: Colors.black),
+      style: TextStyle(
+        fontSize: 26,
+        height: 1,
+        color: Colors.black,
+        fontFamily: "NotoSansSC",
+      ),
     );
     TextPainter subTitleTpGender = TextPainter(
       text: subTitleSpanGender,
@@ -279,7 +303,12 @@ class QRInfoPainter extends CustomPainter {
     // Simulate drawing the content
     TextSpan titleSpan = TextSpan(
       text: '${labelDto.title ?? ''}',
-      style: TextStyle(fontSize: 40, height: 1, color: Colors.black),
+      style: TextStyle(
+        fontSize: 40,
+        height: 1,
+        color: Colors.black,
+        fontFamily: "NotoSansSC",
+      ),
     );
     TextPainter titleTp = TextPainter(
       text: titleSpan,
@@ -291,7 +320,12 @@ class QRInfoPainter extends CustomPainter {
 
     TextSpan subTitleSpanName = TextSpan(
       text: '${resident.name} ',
-      style: TextStyle(fontSize: 30, height: 1, color: Colors.black),
+      style: TextStyle(
+        fontSize: 30,
+        height: 1,
+        color: Colors.black,
+        fontFamily: "NotoSansSC",
+      ),
     );
     TextPainter subTitleTp1 = TextPainter(
       text: subTitleSpanName,
@@ -303,7 +337,12 @@ class QRInfoPainter extends CustomPainter {
 
     TextSpan subTitleSpanAge = TextSpan(
       text: '${resident.age} 岁',
-      style: TextStyle(fontSize: 30, height: 1, color: Colors.black),
+      style: TextStyle(
+        fontSize: 30,
+        height: 1,
+        color: Colors.black,
+        fontFamily: "NotoSansSC",
+      ),
     );
     TextPainter subTitleTpAge = TextPainter(
       text: subTitleSpanAge,
@@ -315,7 +354,12 @@ class QRInfoPainter extends CustomPainter {
 
     TextSpan subTitleSpanGender = TextSpan(
       text: '${resident.sex}',
-      style: TextStyle(fontSize: 30, height: 1, color: Colors.black),
+      style: TextStyle(
+        fontSize: 30,
+        height: 1,
+        color: Colors.black,
+        fontFamily: "NotoSansSC",
+      ),
     );
     TextPainter subTitleTpGender = TextPainter(
       text: subTitleSpanGender,
@@ -327,7 +371,12 @@ class QRInfoPainter extends CustomPainter {
 
     TextSpan uniqueCode = TextSpan(
       text: '${labelDto.uniquedCode}',
-      style: TextStyle(fontSize: 24, height: 1, color: Colors.black),
+      style: TextStyle(
+        fontSize: 24,
+        height: 1,
+        color: Colors.black,
+        fontFamily: "NotoSansSC",
+      ),
     );
     TextPainter uniqueCodePainter = TextPainter(
       text: uniqueCode,

pubspec.lock

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

pubspec.yaml

@@ -163,7 +163,7 @@ dependency_overrides:
   fis_jsonrpc:
     git:
       url: http://git.ius.plus:88/Project-Wing/fis_lib_jsonrpc.git
-      ref: ca096e4434
+      ref: 3f85d34cc7b600f86a02d1452811edace32ff5a6
     #path: ../fis_lib_jsonrpc
   fis_theme:
     git: