diff --git a/resources/views/form/rapport-team2/1756965702-68add159-7312-476d-8c92-0c7683015351.blade.php b/resources/views/form/rapport-team2/1756965702-68add159-7312-476d-8c92-0c7683015351.blade.php
index 09792fce..3b4b2737 100644
--- a/resources/views/form/rapport-team2/1756965702-68add159-7312-476d-8c92-0c7683015351.blade.php
+++ b/resources/views/form/rapport-team2/1756965702-68add159-7312-476d-8c92-0c7683015351.blade.php
@@ -59,14 +59,28 @@ $brandData = [
 @endphp
 
 @php
+    // $submissions = Formhelper::getMultiformData($form->partition, $form_id, $form->user_id);
+    // $submission = null;
+    // if(isset($submissions->data->submissions) && count($submissions->data->submissions) > 0) {
+    //     $submission = $submissions->data->submissions[0];
+    //     $formdata = $submission->formdata ?? (object)[];
+    // } else {
+    //     $formdata = [];
+    // }
+
     $submissions = Formhelper::getMultiformData($form->partition, $form_id, $form->user_id);
-    $submission = null;
-    if(isset($submissions->data->submissions) && count($submissions->data->submissions) > 0) {
-        $submission = $submissions->data->submissions[0];
-        $formdata = $submission->formdata ?? (object)[];
-    } else {
-        $formdata = [];
+    
+
+    $formdata = null;
+
+if (!empty($submissions->data->submissions)) {
+    foreach ($submissions->data->submissions as $submission) {
+        if ($submission->id == $id) {
+            $formdata = $submission->formdata ?? null;
+            break;
+        }
     }
+}
 
     // echo "<pre>";
     // print_r($formdata);
@@ -163,34 +177,64 @@ $brandData = [
                                     @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
-                                    </select>
-                                    @else
-
-                                    <select class="form-control" id="field-{{ $question->code }}" name="{{ $question->code }}" {{ $question->required == 'yes' ? 'required' : '' }}>
+                                        <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(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
                                         </select>
+                                    @elseif($question->code == 'chemist_list')
+                                        <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) == 'chemist')
+                                                    <option value="{{ $option->value }}"
+                                                        {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }}>
+                                                        {{ $option->display }}
+                                                    </option>
+                                                @endif --}}
 
-                                        @endif
+                                                    @if(
+                                                        isset($option->contact->type) &&
+                                                        strtolower(trim($option->contact->type)) == 'chemist' &&
+                                                        empty(trim($option->contact->source ?? ''))
+                                                    )
+
+                                                        <option value="{{ $option->value }}"
+                                                            {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }}>
+
+                                                            {{ $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>
+
+                                                @endforeach
+                                        </select>
+
+                                    @endif
                                     @break
                                     @case('checkbox')
                                     @foreach($question->options as $option)
@@ -348,6 +392,22 @@ $brandData = [
                		 $('#field-pcode').val($('option:selected', this).attr('msl_code'))
         })
 
+        $('#field-cheemist_name').parent().hide();
+        $('#field-cheemist_name').attr('required',false);
+
+        $('#field-chemist_list').on('change',function(){
+            let value=$(this).val();
+            if(value==='Others'){
+                $('#field-cheemist_name').parent().show();
+                $('#field-cheemist_name').attr('required',true);
+            }
+            else{
+                $('#field-cheemist_name').parent().hide();
+        $('#field-cheemist_name').attr('required',false);
+            }
+        })
+
+
             $('#field-chemist_name').parent().hide();
             $("#field-chemist_name").prop({"required":false});
             $('#field-pcode').prop('readonly',true);