diff --git a/core/apps/dashboard/serializers/plan.py b/core/apps/dashboard/serializers/plan.py
index ac620e5..6eac5f1 100644
--- a/core/apps/dashboard/serializers/plan.py
+++ b/core/apps/dashboard/serializers/plan.py
@@ -5,24 +5,31 @@ from django.db import transaction
 from rest_framework import serializers
 
 # shared
-from core.apps.shared.models import Plan
+from core.apps.shared.models import Plan, Doctor, Pharmacy
 # accounts
 from core.apps.accounts.models import User
 
 
 class PlanListSerializer(serializers.ModelSerializer):
     user = serializers.SerializerMethodField(method_name='get_user')
-    
+    doctor = serializers.SerializerMethodField(method_name='get_doctor')
+    pharmacy = serializers.SerializerMethodField(method_name='get_pharmacy')
+
     class Meta:
         model = Plan
         fields = [
-            'id',
-            'title',
-            'description',
+            'id', 
+            'title', 
+            'description', 
             'date',
+            'comment', 
+            'doctor', 
+            'pharmacy',
             'user',
-            'is_done',
-            'created_at'
+            'longitude', 
+            'latitude', 
+            'extra_location',
+            'created_at',
         ]
     
     def get_user(self, obj):
@@ -31,6 +38,19 @@ class PlanListSerializer(serializers.ModelSerializer):
             'first_name': obj.user.first_name,
             'last_name': obj.user.last_name,
         }
+    
+    def get_doctor(self, obj):
+        return {
+            "id": obj.doctor.id,
+            "first_name": obj.doctor.first_name,
+            "last_name": obj.doctor.last_name
+        } if obj.doctor is not None else None
+
+    def get_pharmacy(self, obj):
+        return {
+            "id": obj.pharmacy.id,
+            "name": obj.pharmacy.name,
+        } if obj.pharmacy is not None else None
 
 
 class AdminPlanCreateSerializer(serializers.Serializer):
@@ -38,12 +58,29 @@ class AdminPlanCreateSerializer(serializers.Serializer):
     description = serializers.CharField()
     date = serializers.DateField()
     user_id = serializers.IntegerField()
+    doctor_id = serializers.IntegerField(required=False, allow_null=True)
+    pharmacy_id = serializers.IntegerField(required=False, allow_null=True)
+
+    longitude = serializers.FloatField(required=False, default=0.0)
+    latitude = serializers.FloatField(required=False, default=0.0)
+    extra_location = serializers.JSONField(required=False, allow_null=True)
+
 
     def validate(self, data):
         user = User.objects.filter(id=data['user_id']).first()
         if not user:
             raise serializers.ValidationError({"user_id": "Foydalanuvchi topilmadi"})
         data['user'] = user
+        if data.get('doctor_id'):
+            doctor = Doctor.objects.filter(id=data.get('doctor_id')).first()
+            if not doctor:
+                raise serializers.ValidationError({"doctor": "Doctor not found"})
+            data['doctor'] = doctor
+        if data.get('pharmacy_id'):
+            pharmacy = Pharmacy.objects.filter(id=data.get('pharmacy_id')).first()
+            if not pharmacy:
+                raise serializers.ValidationError({"pharmacy_id": "Pharmacy not found"})
+            data['pharmacy'] = pharmacy
         return data
 
     def create(self, validated_data):
@@ -53,6 +90,11 @@ class AdminPlanCreateSerializer(serializers.Serializer):
                 description=validated_data.get('description'),
                 user=validated_data.get('user'),
                 date=validated_data.get('date'),
+                doctor=validated_data.get('doctor'),
+                pharmacy=validated_data.get('pharmacy'),
+                longitude=validated_data.get('longitude'),
+                latitude=validated_data.get('latitude'),
+                extra_location=validated_data.get('extra_location'),
             )
 
 
@@ -60,10 +102,9 @@ class PlanUpdateSerializer(serializers.ModelSerializer):
     class Meta:
         model = Plan
         fields = [
-            'title',
-            'description',
-            'date',
-            'user',
+            'title', 'description', 'date',
+            'comment', 'doctor', 'pharmacy',
+            'longitude', 'latitude', 'extra_location',
         ]
     extra_kwargs = {
         "user": {"required": False}
@@ -71,10 +112,8 @@ class PlanUpdateSerializer(serializers.ModelSerializer):
     
     def update(self, instance, validated_data):
         with transaction.atomic():
-            instance.title = validated_data.get('title', instance.title)
-            instance.description = validated_data.get('description', instance.description)
-            instance.user = validated_data.get('user', instance.user)
-            instance.date = validated_data.get('date', instance.date)
+            for field, value in validated_data.items():
+                setattr(instance, field, value)
             instance.save()
             return instance
-    
\ No newline at end of file
+        
\ No newline at end of file