diff --git a/resources/views/form/rapport-vitalis/1776765811-664dd43c-0466-4e4d-9a15-0adaa01f5b94.blade.php b/resources/views/form/rapport-vitalis/1776765811-664dd43c-0466-4e4d-9a15-0adaa01f5b94.blade.php
index cf3e0c2e..6d0decbe 100644
--- a/resources/views/form/rapport-vitalis/1776765811-664dd43c-0466-4e4d-9a15-0adaa01f5b94.blade.php
+++ b/resources/views/form/rapport-vitalis/1776765811-664dd43c-0466-4e4d-9a15-0adaa01f5b94.blade.php
@@ -83,14 +83,20 @@
                                         <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($question->code == 'contact_id'  && isset($option->contact->type) && $option->contact->type != 'chemist' )
-                                            <option value="{{ $option->value }}" {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }} {{ $question->code == 'contact_id' ? 'msl_code= ' . (isset($option->contact->msl_code)?$option->contact->msl_code:'') . ' ' : '' }} {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }} {{ $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->legacy_code) ? $option->contact->legacy_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>
+                                                        <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
                                             
                                             
@@ -239,7 +245,7 @@
                     $('#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).attr('speciality',itm.contact.speciality));
+                        $('#field-contact_id').append($("<option></option>").attr("value",itm.value).text(itm.display).attr("msl_code", itm.contact.legacy_code).attr('speciality',itm.contact.speciality));
                     }
 
                     $('#field-contact_id').change(function() {
@@ -257,17 +263,17 @@
 
         $('#field-legacy_code,#field-speciality').attr('readonly',true);
 
-        /* $('#field-contact_id').change(function() {
+         $('#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'))
+               		 $('#field-legacy_code').val($('option:selected', this).attr('msl_code'))
         })
 
         
         
-        $('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').prop({"required":false});
+        /*$('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').prop({"required":false});
         $('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').parent().hide();
         
         $('#field-contact_id').on('change',function(){