diff --git a/resources/views/form/rapport-demo/1772642221-f77aef51-3671-4205-9650-fa171e1516e4.blade.php b/resources/views/form/rapport-demo/1772642221-f77aef51-3671-4205-9650-fa171e1516e4.blade.php
index 2a732b7c..758d4186 100644
--- a/resources/views/form/rapport-demo/1772642221-f77aef51-3671-4205-9650-fa171e1516e4.blade.php
+++ b/resources/views/form/rapport-demo/1772642221-f77aef51-3671-4205-9650-fa171e1516e4.blade.php
@@ -207,23 +207,20 @@
                                                         {{ $question->required == 'yes' ? 'required' : '' }}>
                                                         <option value=""> -- Select -- </option>
                                                         @foreach ($question->options as $option)
-                                                                @if($question->code=='contact_id' && isset($option->contact->type) && $option->contact->type == 'doctor' )
-                                                                    
-                                                                        
+                                                                @if($question->code == 'contact_id'  && isset($option->contact->type) && $option->contact->type == 'doctor' )
                                                                         <option value="{{ $option->value }}"
-                                                                            {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }}
-                                                                            msl_code="{{ $option->contact->msl_code ?? '' }}"
-                                                                            speciality="{{ $option->contact->speciality ?? '' }}">
-                                                                            {{ $option->display }}
-                                                                        </option>
-                                                                        
-                                                                    @else 
-                                                                    <option value="{{ $option->value }}"
-                                                                            {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }}
-                                                                            msl_code="{{ $option->contact->msl_code ?? '' }}"
-                                                                            speciality="{{ $option->contact->speciality ?? '' }}">
+                                                                            @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>