diff --git a/resources/views/form/rapport-demo/1706001346-9b6b0b23-c3b5-4b9c-a2dd-681c5787a16c.blade.php b/resources/views/form/rapport-demo/1706001346-9b6b0b23-c3b5-4b9c-a2dd-681c5787a16c.blade.php
index 58db1b5e..6e7e53dc 100644
--- a/resources/views/form/rapport-demo/1706001346-9b6b0b23-c3b5-4b9c-a2dd-681c5787a16c.blade.php
+++ b/resources/views/form/rapport-demo/1706001346-9b6b0b23-c3b5-4b9c-a2dd-681c5787a16c.blade.php
@@ -83,15 +83,24 @@
                                         <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' : '' }}
-                                                    msl_code="{{ $option->contact->msl_code ?? '' }}"
-                                                    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>
@@ -181,12 +190,18 @@
                     $('#field-contact_id').html('')
                     $('#field-contact_id').append($("<option></option>").attr("value",'').text('-- Select --'));
                     for (let itm of data) {
-                        $('#field-contact_id').append($("<option></option>").attr("value",itm.value).text(itm.display).attr("msl_code", itm.contact.msl_code));
+                        if (itm.contact && itm.contact.type === 'doctor') {
+                            $('#field-contact_id').append($("<option></option>").attr("value",itm.value).text(itm.display).attr("msl_code", itm.contact.msl_code));
+                        }
                     }
 
                     $('#field-contact_id').change(function() {
                         $('#field-msl_code').val($('option:selected', this).attr('msl_code'))
-                    })            
+                    }) 
+                    
+                    $('#field-contact_id').change(function() {
+                        $('#field-speciality').val($('option:selected', this).attr('speciality'))
+                    })
                 },
             });
 
@@ -195,7 +210,7 @@
 
         $('#field-contact_id').change(function() {
                         $('#field-speciality').val($('option:selected', this).attr('speciality'))
-                    })
+        })
         
         $('#field-contact_id').change(function() {
                		 $('#field-msl_code').val($('option:selected', this).attr('msl_code'))