MDS changes done.

lib/core/model/admissionRequest/admission-request.dart

@@ -155,6 +155,7 @@ class AdmissionRequest {
     admissionRequestNo = json['admissionRequestNo'];
     morphologyCode = json['morphologyCode'];
     morphologyDescription  = json['morphologyDescription'];
+    expectedAdmissionDate =json['expectedAdmissionDate'];
   }
 
   Map<String, dynamic> toJson() {
@@ -209,6 +210,7 @@ class AdmissionRequest {
     data['intendedLengthOfStayId'] = this.intendedLengthOfStayId;
     data['morphologyDescription'] = this.morphologyDescription;
     data['morphologyCode'] = this.morphologyCode;
+    data['expectedAdmissionDate'] =this.expectedAdmissionDate;
     return data;
   }
 }

lib/core/service/patient_medical_file/soap/SOAP_service.dart

@@ -184,9 +184,7 @@ class SOAPService extends LookupService {
 
   Future postAssessment(
       PostAssessmentRequestModel postAssessmentRequestModel) async {
-    var request = {
-      'AssessmenttRequestViewModel':postAssessmentRequestModel.toJson()
-    };
+
     hasError = false;
     await baseAppClient.post(POST_ASSESSMENT,
         onSuccess: (dynamic response, int statusCode) {
@@ -194,7 +192,7 @@ class SOAPService extends LookupService {
     }, onFailure: (String error, int statusCode) {
       hasError = true;
       super.error = error;
-    }, body: request );
+    }, body: postAssessmentRequestModel.toJson() );
   }
 
   Future patchAllergy(PostAllergyRequestModel patchAllergyRequestModel) async {
@@ -1573,7 +1571,7 @@ class SOAPService extends LookupService {
       hasError = true;
       super.error = error;
       return false;
-    }, body: {"selectedIcdCode": "C00.0"}); //icd10Code commented for testing
+    }, body: {"selectedIcdCode":icd10Code}); // commented for testing
   }
 
   Future getMorphologyDiagnosis() async {

lib/screens/patients/profile/admission_request/admission_request_first_screen.dart

@@ -339,7 +339,6 @@ class _AdmissionRequestThirdScreenState extends State<AdmissionRequestFirstScree
             model.admissionRequestData = AdmissionRequest();
             if (_selectedClinic != null &&
                 _selectedDoctor != null &&
-                _sickLeaveCommentsController.text != "" &&
                 _postMedicalHistoryController.text != "" &&
                 _postSurgicalHistoryController.text != "") {
               model.admissionRequestData.patientMRN = patient.patientMRN;

lib/screens/patients/profile/admission_request/admission_request_second_screen.dart

@@ -252,7 +252,7 @@ class _AdmissionRequestSecondScreenState
                                 dropDownText:
                                     _selectedIntendedStayLength != null
                                         ? _selectedIntendedStayLength['nameEn']
-                                        :  model.intendedStayLength.first['nameEn'],
+                                        :  "",
                                 enabled: false,
                                 isTextFieldHasSuffix: true,
                                 validationError: stayLengthError,

lib/screens/patients/profile/admission_request/admission_request_third_screen.dart

@@ -166,10 +166,12 @@ class _AdmissionRequestThirdScreenState extends State<AdmissionRequestThirdScree
                                     await model.getICDCodes(patient.patientMRN!).then((_) => GifLoaderDialogUtils.hideDialog(context));
                                     if (model.state == ViewState.Idle && model.icdCodes.length > 0) {
                                       openListDialogField('description', 'code', model.icdCodes, (selectedValue) {
+                                        GifLoaderDialogUtils.showMyDialog(context);
                                         soapModel.getMorphologyDiagnosis(selectedValue['code']
                                             .toString()
                                             .trim());
                                         setState(() {
+                                          GifLoaderDialogUtils.hideDialog(context);
                                           _selectedIcd = selectedValue;
                                         });
                                       });
@@ -408,7 +410,7 @@ class _AdmissionRequestThirdScreenState extends State<AdmissionRequestThirdScree
                     model.admissionRequestData.diagnosis = "${_selectedIcd['code']} : ${_selectedIcd['description']}; ";
 
                     model.admissionRequestData!.admissionRequestDiagnoses = admissionRequestDiagnoses;
-                    model.admissionRequestData!.morphologyCode = morphologyCode;
+                    model.admissionRequestData!.morphologyCode = morphologyCode.toString();
                     model.admissionRequestData!.morphologyDescription = morphologyController.text;
 
                     await model.makeAdmissionRequest();