diff --git a/lib/config/config.dart b/lib/config/config.dart
index 4e96c39c..26c0445b 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -5,8 +5,8 @@ const ONLY_NUMBERS = "[0-9]";
 const ONLY_LETTERS = "[a-zA-Z &'\"]";
 const ONLY_DATE = "[0-9/]";
 const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/';
-const BASE_URL = 'https://hmgwebservices.com/';
-// const BASE_URL = 'https://uat.hmgwebservices.com/';
+// const BASE_URL = 'https://hmgwebservices.com/';
+const BASE_URL = 'https://uat.hmgwebservices.com/';
 const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh";
 const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList";
 const PATIENT_PROGRESS_NOTE_URL = "Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient";
diff --git a/lib/models/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart b/lib/models/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart
index 45e0dae6..6be95372 100644
--- a/lib/models/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart
+++ b/lib/models/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart
@@ -15,7 +15,7 @@ class GetChiefComplaintReqModel {
     episodeId = json['EpisodeId'];
     episodeID = json['EpisodeID'];
     doctorID = json['DoctorID'];
-    admissionNo = json['AdmissionNo'];
+    admissionNo = json['admissionNo'];
   }
 
   Map<String, dynamic> toJson() {
@@ -34,7 +34,7 @@ class GetChiefComplaintReqModel {
       data['DoctorID'] = this.doctorID;
     }
     if (this.admissionNo != null) {
-      data['AdmissionNo'] = this.admissionNo;
+      data['admissionNo'] = this.admissionNo;
     }
 
     return data;
diff --git a/lib/models/SOAP/post_chief_complaint_request_model.dart b/lib/models/SOAP/post_chief_complaint_request_model.dart
index 682342df..eb3bea7f 100644
--- a/lib/models/SOAP/post_chief_complaint_request_model.dart
+++ b/lib/models/SOAP/post_chief_complaint_request_model.dart
@@ -62,7 +62,7 @@ class PostChiefComplaintRequestModel {
       data['EditedBy'] = this.editedBy;
     }
     if (admissionNo != null) {
-      data['AdmissionNo'] = this.admissionNo;
+      data['admissionNo'] = this.admissionNo;
     }
 
     return data;
diff --git a/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart b/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart
index 1a1dd2f8..7234d822 100644
--- a/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart
+++ b/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart
@@ -423,8 +423,8 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage> implements
       PostChiefComplaintRequestModel postChiefComplaintRequestModel = new PostChiefComplaintRequestModel(
           admissionNo: widget.patientInfo.admissionNo != null ? int.parse(widget.patientInfo.admissionNo) : null,
           patientMRN: widget.patientInfo.patientMRN,
-          episodeID: widget.patientInfo.episodeNo,
-          appointmentNo: widget.patientInfo.appointmentNo,
+          episodeID: widget.patientInfo.episodeNo ?? 0,
+          appointmentNo: widget.patientInfo.appointmentNo ?? 0,
           chiefComplaint: complaintsController.text,
           currentMedication: medicationController.text,
           hopi: illnessController.text,