diff --git a/resources/views/form/rapport-team2/1756963324-cff50674-e0a8-4372-9f50-74a04f0b307e.blade.php b/resources/views/form/rapport-team2/1756963324-cff50674-e0a8-4372-9f50-74a04f0b307e.blade.php
index aac9400b..dab845ad 100644
--- a/resources/views/form/rapport-team2/1756963324-cff50674-e0a8-4372-9f50-74a04f0b307e.blade.php
+++ b/resources/views/form/rapport-team2/1756963324-cff50674-e0a8-4372-9f50-74a04f0b307e.blade.php
@@ -183,39 +183,28 @@
                                                 @break
 
                                                 @case('dropdown')
-                                                    @if($question->code == 'contact_id')
-                                                        <select class="form-control" id="field-{{ $question->code }}"
-                                                        name="{{ $question->code }}"
-                                                        {{ $question->required == 'yes' ? 'required' : '' }}>
-                                                        <option value=""> -- Select -- </option>
-                                                        @foreach ($question->options as $option)
-                                                            @if(isset($option->contact->type) && strtolower($option->contact->type) == 'doctor')
-                                                                <option value="{{ $option->value }}"
-                                                                    {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }}
-                                                                    {{ $question->code == 'contact_id' ? 'msl_code= ' . $option->contact->msl_code . ' ' : '' }}
-                                                                    {{ $question->code == 'contact_id' ? 'speciality= ' . (isset($option->contact->speciality) ? $option->contact->speciality : '') . ' ' : '' }}>
-                                                                    {{ $option->display }}
-                                                                </option>
-                                                            @endif
-                                                        @endforeach
-                                                        <option value="Others">Others</option>
-                                                    </select>
-                                                    @else
                                                     <select class="form-control" id="field-{{ $question->code }}"
                                                         name="{{ $question->code }}"
                                                         {{ $question->required == 'yes' ? 'required' : '' }}>
                                                         <option value=""> -- Select -- </option>
                                                         @foreach ($question->options as $option)
-                                                            <option value="{{ $option->value }}"
-                                                                {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }}
-                                                                {{ $question->code == 'contact_id' ? 'msl_code= ' . $option->contact->msl_code . ' ' : '' }}
-                                                                {{ $question->code == 'contact_id' ? 'speciality= ' . (isset($option->contact->speciality) ? $option->contact->speciality : '') . ' ' : '' }}>
-                                                                {{ $option->display }}
-                                                            </option>
+                                                            @if($question->code == 'contact_id'  && isset($option->contact->type) && $option->contact->type == 'doctor' )
+                                                                    <option value="{{ $option->value }}"
+                                                                        @if(isset($question->value) && $question->value == $option->value) selected @endif
+                                                                            @if($question->code == 'contact_id')
+                                                                                msl_code="{{ (isset($option->contact->msl_code) ? $option->contact->msl_code : '') }}"
+                                                                                speciality="{{ (isset($option->contact->speciality) ? $option->contact->speciality : '') }}"
+                                                                            @endif
+                                                                    >
+                                                                        {{ $option->display }}
+                                                                    </option>
+                                                        @elseif($question->code != 'contact_id')
+                                                                        <option value="{{ $option->value }}" {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }} {{ $question->code == 'contact_id' ? 'pcode= ' . (isset($option->contact->pcode)?$option->contact->pcode:'') . ' ' : '' }} {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }} {{ $question->code == 'contact_id' ? 'speciality= ' . (isset($option->contact->speciality) ? $option->contact->speciality :'') . ' ' : '' }} >
+                                                                            {{ $option->display }}
+                                                                        </option>
+                                                        @endif
                                                         @endforeach
-                                                        
                                                     </select>
-                                                    @endif
                                                 @break
 
                                                 @case('checkbox')