diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart
index 8eb85576..a43a070c 100644
--- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart
+++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart
@@ -169,6 +169,14 @@ class _CurrentDiagnosisState extends State<CurrentDiagnosis> {
                                         "Deleted") {
                                       DrAppToastMsg.showErrorToast(TranslationBase.of(context).diagnosisAlreadyDeleted);
                                       return;
+                                    }
+                                    if (widget.currentDiagnosisItems[index]
+                                        .resolved ==
+                                        true) {
+                                      DrAppToastMsg.showErrorToast(
+                                          TranslationBase.of(context)
+                                              .diagnosisAlreadyResolved);
+                                      return;
                                     }
                                       showConfirmationDialog(context,
                                           "${TranslationBase.of(context).delete} ${TranslationBase.of(context).diagnosis}",
diff --git a/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart b/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart
index 3ba16bef..df5b8c20 100644
--- a/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart
+++ b/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart
@@ -29,56 +29,57 @@ class SoapDetailItem extends StatelessWidget {
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          Stack(
+          Row(
             children: [
-              Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  AppText(
-                    title,
-                    color: Color(0XFF2B353E),
-                    fontSize: 12,
-                    fontWeight: FontWeight.bold,
-                  ),
-                  Row(
-                    children: [
-                      AppText(
-                        "${TranslationBase.of(context).condition}:",
-                        color: Color(0XFF2B353E),
-                        fontSize: 10,
-                        fontWeight: FontWeight.w500,
-                      ),
-                      SizedBox(
-                        width: 4,
-                      ),
-                      AppText(
-                        condition,
-                        color: Color(0xffD02127),
-                        fontSize: 10,
-                        fontWeight: FontWeight.w500,
-                      ),
-                    ],
-                  ),
-                  Visibility(
-                      visible: remarks.isNotEmpty,
-                      child: Column(
-                        children: [
-                          SizedBox(
-                            height: 8,
-                          ),
-                          AppText(
-                            remarks,
-                            color: Color(0XFF2B353E),
-                            fontSize: 10,
-                            fontWeight: FontWeight.w400,
-                          ),
-                        ],
-                      ))
-                ],
+              Expanded(
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    AppText(
+                      title,
+                      color: Color(0XFF2B353E),
+                      fontSize: 12,
+                      fontWeight: FontWeight.bold,
+                    ),
+                    Row(
+                      children: [
+                        AppText(
+                          "${TranslationBase.of(context).condition}:",
+                          color: Color(0XFF2B353E),
+                          fontSize: 10,
+                          fontWeight: FontWeight.w500,
+                        ),
+                        SizedBox(
+                          width: 4,
+                        ),
+                        AppText(
+                          condition,
+                          color: Color(0xffD02127),
+                          fontSize: 10,
+                          fontWeight: FontWeight.w500,
+                        ),
+                      ],
+                    ),
+                    Visibility(
+                        visible: remarks.isNotEmpty,
+                        child: Column(
+                          children: [
+                            SizedBox(
+                              height: 8,
+                            ),
+                            AppText(
+                              remarks,
+                              color: Color(0XFF2B353E),
+                              fontSize: 10,
+                              fontWeight: FontWeight.w400,
+                            ),
+                          ],
+                        ))
+                  ],
+                ),
               ),
-              Align(
-                  alignment: Alignment.topRight, child: Status(status: status))
+              Status(status: status)
             ],
           ),
           SizedBox(