diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index f03c1d03..df70b1ec 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -1141,4 +1141,5 @@ const Map<String, Map<String, String>> localizedValues = {
   "selectCondition": {"en": "Select Condition", "ar":"قم بتحديد الشرط"},
   "yourOrderAddedSuccessfully": {"en": "Your Order Added Successfully", "ar":"تم إضافة طلبك بنجاح"},
   "youCannotAddOnlySpaces": {"en": "You Can't Add Only Spaces", "ar":"تم إضافة طلبك بنجاح"},
+  "conditionDescription": {"en": "Condition Description", "ar":"وصف الحالة"},
 };
diff --git a/lib/core/model/note/note_model.dart b/lib/core/model/note/note_model.dart
index 29a891fa..bef3a973 100644
--- a/lib/core/model/note/note_model.dart
+++ b/lib/core/model/note/note_model.dart
@@ -19,6 +19,8 @@ class NoteModel {
   Null doctorClinicName;
   String doctorName;
   String visitTypeDesc;
+  int condition;
+  String conditionDescription;
 
   NoteModel(
       {this.setupID,
@@ -40,7 +42,10 @@ class NoteModel {
       this.admissionClinicName,
       this.doctorClinicName,
       this.doctorName,
-      this.visitTypeDesc});
+      this.visitTypeDesc,
+      this.condition,
+      this.conditionDescription,
+      });
 
   NoteModel.fromJson(Map<String, dynamic> json) {
     setupID = json['SetupID'];
@@ -63,6 +68,8 @@ class NoteModel {
     doctorClinicName = json['DoctorClinicName'];
     doctorName = json['DoctorName'];
     visitTypeDesc = json['VisitTypeDesc'];
+    condition = json['Condition'];
+    conditionDescription = json['ConditionDescription'];
   }
 
   Map<String, dynamic> toJson() {
@@ -87,6 +94,8 @@ class NoteModel {
     data['DoctorClinicName'] = this.doctorClinicName;
     data['DoctorName'] = this.doctorName;
     data['VisitTypeDesc'] = this.visitTypeDesc;
+    data['Condition'] = this.condition;
+    data['ConditionDescription'] = this.conditionDescription;
     return data;
   }
 }
diff --git a/lib/screens/patients/profile/notes/note/progress_note_screen.dart b/lib/screens/patients/profile/notes/note/progress_note_screen.dart
index 8f9664ea..657e5ed6 100644
--- a/lib/screens/patients/profile/notes/note/progress_note_screen.dart
+++ b/lib/screens/patients/profile/notes/note/progress_note_screen.dart
@@ -456,7 +456,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
                                                         AppText(
                                                           TranslationBase.of(
                                                                   context)
-                                                              .createdBy,
+                                                              .createdBy + ' ',
                                                           fontSize: 10,
                                                         ),
                                                         Expanded(
@@ -474,6 +474,26 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
                                                         ),
                                                       ],
                                                     ),
+                                                    Row(
+                                                      crossAxisAlignment:
+                                                      CrossAxisAlignment
+                                                          .start,
+                                                      children: [
+                                                        AppText(
+                                                          TranslationBase.of(context).conditionDescription + ' : ',
+                                                          fontSize: 10,
+                                                        ),
+                                                        Expanded(
+                                                          child: AppText(
+                                                            model.patientProgressNoteList[index].conditionDescription ?? '',
+                                                            fontWeight:
+                                                            FontWeight.w600,
+                                                            fontSize: 12,
+                                                            isCopyable: true,
+                                                          ),
+                                                        ),
+                                                      ],
+                                                    ),
                                                   ],
                                                 ),
                                               ),
diff --git a/lib/screens/patients/profile/notes/note/update_note.dart b/lib/screens/patients/profile/notes/note/update_note.dart
index 0bc38ea4..be42eb59 100644
--- a/lib/screens/patients/profile/notes/note/update_note.dart
+++ b/lib/screens/patients/profile/notes/note/update_note.dart
@@ -91,6 +91,11 @@ class _UpdateNoteOrderState extends State<UpdateNoteOrder> {
 
     if (widget.note != null) {
       progressNoteController.text = widget.note.notes;
+      if(selectValue==null)
+        selectValue={};
+        selectValue['parameterCode'] = widget.note.condition;
+        selectValue['description'] = widget.note.conditionDescription;
+
     }
 
     return BaseView<PatientViewModel>(
diff --git a/lib/util/translations_delegate_base.dart b/lib/util/translations_delegate_base.dart
index 481ea966..e433df63 100644
--- a/lib/util/translations_delegate_base.dart
+++ b/lib/util/translations_delegate_base.dart
@@ -1722,6 +1722,8 @@ class TranslationBase {
 
   String get youCannotAddOnlySpaces => localizedValues['youCannotAddOnlySpaces'][locale.languageCode];
 
+  String get conditionDescription => localizedValues['conditionDescription'][locale.languageCode];
+
 
 }