1. 0009716: 【AI】上传腹部相关图像，生成的AI角标存在肾脏角标，应该统一改为”肝脏样式“ 2. 0009604: 【AI】颈动脉3D图像缩略图不显示AI角标和3D样式、乳腺腹部图像缩略图部分图像不显示角标 reviewed by gavin

lib/components/picture_components.dart

@@ -167,6 +167,18 @@ class FContentImage extends StatelessWidget implements FWidget {
     }
   }
 
+  ///判断是否是肝脏、胆囊、肾脏、脾脏、腹部器官
+  bool _ifAbdominalOrgans(DiagnosisOrganEnum diagnosisOrgan) {
+    final abdominalOrgansList = [
+      DiagnosisOrganEnum.Liver,
+      DiagnosisOrganEnum.Cholecyst,
+      DiagnosisOrganEnum.Kidney,
+      DiagnosisOrganEnum.Spleen,
+      DiagnosisOrganEnum.Abdomen
+    ];
+    return abdominalOrgansList.contains(diagnosisOrgan);
+  }
+
   FWidget _buildLeftAIOrCarotidLogo() {
     if (isCarotidResult) {
       return FPositioned(
@@ -179,13 +191,25 @@ class FContentImage extends StatelessWidget implements FWidget {
       );
     }
     if (hasDiagnosisOrgans) {
+      int count = 0;
       final List<FWidget> aIDiagnosticOrgansIconList = [];
+
       for (var i = 0; i < diagnosisOrgans!.length; i++) {
-        aIDiagnosticOrgansIconList.add(
-          _buildAIDiagnosticOrgans(
-            diagnosisOrgans?[i],
-          ),
-        );
+        if (_ifAbdominalOrgans(diagnosisOrgans![i])) {
+          //当diagnosisOrgans返回值为肝脏、胆囊、肾脏、脾脏,都只显示一个“腹部”图标
+          if (count <= 0) {
+            aIDiagnosticOrgansIconList.add(
+              _buildAIDiagnosticOrgans(DiagnosisOrganEnum.Abdomen),
+            );
+          }
+          count++;
+        } else {
+          aIDiagnosticOrgansIconList.add(
+            _buildAIDiagnosticOrgans(
+              diagnosisOrgans?[i],
+            ),
+          );
+        }
       }
 
       return FPositioned(
@@ -412,25 +436,36 @@ class FContentImage extends StatelessWidget implements FWidget {
           ),
         );
       case DiagnosisOrganEnum.CarotidArtery:
-        return FText(
-          " 图标待定 ",
-          style: TextStyle(color: Colors.white),
+        return FIcon(
+          FIcons.arteria_carotis,
+          color: _buildAITextColor(
+            diagnosisConclusion,
+          ),
         );
+
       case DiagnosisOrganEnum.Thyroid:
-        return FText(
-          " 图标待定 ",
-          style: TextStyle(color: Colors.white),
+        return FIcon(
+          FIcons.fis_thyroid,
+          color: _buildAITextColor(
+            diagnosisConclusion,
+          ),
         );
       case DiagnosisOrganEnum.Neck:
-        return FText(
-          " 图标待定 ",
-          style: TextStyle(color: Colors.white),
+        return FIcon(
+          //图标待定
+          FIcons.fis_thyroid,
+          color: _buildAITextColor(
+            diagnosisConclusion,
+          ),
         );
       case DiagnosisOrganEnum.Null:
-        return FText(
-          i18nBook.remedical.didNotIdentify.t,
-          style: TextStyle(color: Colors.white),
-        );
+        if (diagnosisOrgans?.length == 1) {
+          //如果diagnosisOrgans只有一个值且该值为null值，就返回文字，否则返回空
+          return _buildApplication();
+        } else {
+          return FText('');
+        }
+
       default:
         return _buildApplication();
     }

pubspec.yaml

@@ -46,7 +46,7 @@ dependency_overrides:
   fis_jsonrpc:
     git:
       url: http://git.ius.plus:88/Project-Wing/fis_lib_jsonrpc.git
-      ref: 788d315
+      ref: 10d6890
   fis_i18n:
     git:
       url: http://git.ius.plus:88/Project-Wing/fis_lib_i18n.git
@@ -54,7 +54,8 @@ dependency_overrides:
   fis_ui:
     git:
       url: http://git.ius.plus:88/Project-Wing/fis_lib_ui.git
-      ref: 896ffe4    
+      ref:  1b682bd  
+      # path: ../fis_lib_ui  
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec