diff --git a/resources/views/form/rapport-copd/1785317381-d72b4330-0fad-49a3-913c-98d978cf22f1.blade.php b/resources/views/form/rapport-copd/1785317381-d72b4330-0fad-49a3-913c-98d978cf22f1.blade.php
index fbefe00c..ab920fb6 100644
--- a/resources/views/form/rapport-copd/1785317381-d72b4330-0fad-49a3-913c-98d978cf22f1.blade.php
+++ b/resources/views/form/rapport-copd/1785317381-d72b4330-0fad-49a3-913c-98d978cf22f1.blade.php
@@ -93,7 +93,8 @@
                             
 
                             @endphp
-                            @if(count($submissions)===0 || $id)
+                            
+                            {{-- @if(count($submissions)===0 || $id) --}}
                             <form method="POST" action="/form/submit" id="report-form" enctype="multipart/form-data">
                                 <input type="hidden" name="form_id" value="{{$form_id}}">
                                 @csrf
@@ -175,17 +176,17 @@
                                     @endif
                                     <div class="col-md-12 mb-2">
                                         <label
-    for="field-{{$question->code}}"
-    class="form-label @if($question->code=='contact_id') doctor-name-label @endif">
+                                for="field-{{$question->code}}"
+                                class="form-label @if($question->code=='contact_id') doctor-name-label @endif">
 
-    {{$question->question}}
+                                {{$question->question}}
 
-    @if($question->code=='contact_id')
-        {{1}}
-    @endif
+                                @if($question->code=='contact_id')
+                                    {{1}}
+                                @endif
 
-    {!! $question->required == 'yes' ? '<span class="text-danger">*</span>' : '' !!}
-</label>
+                                {!! $question->required == 'yes' ? '<span class="text-danger">*</span>' : '' !!}
+                                    </label>
                                         @switch($question->type)
                                         @case('hidden')
                                         <input type="{{$question->type}}" id="field-{{$question->code}}"
@@ -302,12 +303,12 @@
                                 </div>
                                 @endif
                             </form>
-                            @elseif(!$id)
+                            {{-- @elseif(!$id)
                             <h4>
                                 You have already submitted Voltido RCPA data for <strong>{{ count($submissions) }}</strong> Doctor(s).
                                 
                             </h4>
-                            @endif
+                            @endif --}}
                         </div> <!-- end card-body -->
                     </div>
                     <!-- end card -->
@@ -806,7 +807,25 @@ preventDuplicateDoctors(filteredSubmittedDoctors);
                 width: '100%',
                 placeholder: '-- Select Doctor --'
             });
-             preventDuplicateDoctors();
+            /* preventDuplicateDoctors(); */
+
+            // ===== NEW CODE =====
+            let activeSelections = [];
+
+            $('select[id^="field-contact_id"]').each(function () {
+                let val = $(this).val();
+                if (val) {
+                    activeSelections.push(val);
+                }
+            });
+
+            let filteredSubmittedDoctors =
+                window.submittedDoctors.filter(
+                    doctor => !activeSelections.includes(doctor)
+                );
+
+            preventDuplicateDoctors(filteredSubmittedDoctors);
+            // ===== END NEW CODE =====
 
 
             $('select[id^="execution-"]').select2({
@@ -896,7 +915,7 @@ if ($('.doctor-wrapper').length < MAX_DOCTORS) {
         $('#report-form').on('submit', function(event) {
     event.preventDefault();
 
-    @if(!$id)
+    /* @if(!$id)
     let totalDoctors = $('.doctor-wrapper').length;
 
     if (totalDoctors < MIN_DOCTORS || totalDoctors > MAX_DOCTORS) {
@@ -909,7 +928,7 @@ if ($('.doctor-wrapper').length < MAX_DOCTORS) {
 
         return;
     }
-    @endif
+    @endif */
 
     $("#pageloader").fadeIn();
             $.ajax({