diff --git a/lib/core/model/admissionRequest/admission-request.dart b/lib/core/model/admissionRequest/admission-request.dart index d19362e1..925cb07f 100644 --- a/lib/core/model/admissionRequest/admission-request.dart +++ b/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 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; } } diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index 9756ad23..8fa521bb 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/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 { diff --git a/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart b/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart index 9748b684..8acd22f9 100644 --- a/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart +++ b/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart @@ -339,7 +339,6 @@ class _AdmissionRequestThirdScreenState extends State 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