diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 81609625..0f38634e 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1336,4 +1336,5 @@ const Map> localizedValues = { }, "morphologyCode": {"en": "Morphology Code", "ar": "كود الشكل"}, "intendedLengthOfStay": {"en": "Intended Length Of Stay", "ar": "مدة الإقامة المقصودة"}, + "pleasFillMorphology": {"en": "Pleas Select Morphology", "ar": "مناشدات تحديد التشكل"}, }; diff --git a/lib/core/model/admissionRequest/admission-request.dart b/lib/core/model/admissionRequest/admission-request.dart index 1d4a95ef..d19362e1 100644 --- a/lib/core/model/admissionRequest/admission-request.dart +++ b/lib/core/model/admissionRequest/admission-request.dart @@ -43,6 +43,9 @@ class AdmissionRequest { int? admissionRequestNo; dynamic? intendedLengthOfStayId; String? expectedAdmissionDate; + String? morphologyCode; + String? morphologyDescription; + AdmissionRequest( {this.patientMRN, this.admitToClinic, @@ -87,7 +90,9 @@ class AdmissionRequest { this.episodeID, this.admissionRequestNo, this.intendedLengthOfStayId, - this.expectedAdmissionDate + this.expectedAdmissionDate, + this.morphologyCode, + this.morphologyDescription }); AdmissionRequest.fromJson(Map json) { @@ -148,6 +153,8 @@ class AdmissionRequest { appointmentNo = json['appointmentNo']; episodeID = json['episodeID']; admissionRequestNo = json['admissionRequestNo']; + morphologyCode = json['morphologyCode']; + morphologyDescription = json['morphologyDescription']; } Map toJson() { @@ -200,6 +207,8 @@ class AdmissionRequest { data['episodeID'] = this.episodeID; data['admissionRequestNo'] = this.admissionRequestNo; data['intendedLengthOfStayId'] = this.intendedLengthOfStayId; + data['morphologyDescription'] = this.morphologyDescription; + data['morphologyCode'] = this.morphologyCode; return data; } } diff --git a/lib/screens/patients/profile/admission_request/admission_request_third_screen.dart b/lib/screens/patients/profile/admission_request/admission_request_third_screen.dart index d90474d0..2aee8802 100644 --- a/lib/screens/patients/profile/admission_request/admission_request_third_screen.dart +++ b/lib/screens/patients/profile/admission_request/admission_request_third_screen.dart @@ -41,6 +41,7 @@ class _AdmissionRequestThirdScreenState extends State( + onModelReady: (model){ + viewmodel = model; + }, builder: (_, soapModel, w) => Column(children: [ AppTextFieldCustom( @@ -381,6 +385,11 @@ class _AdmissionRequestThirdScreenState extends State localizedValues['remarks']![locale.languageCode]!; String get pleaseFill => localizedValues['pleaseFill']![locale.languageCode]!; + String get pleasFillMorphology => localizedValues['pleasFillMorphology']![locale.languageCode]!; String get replay2 => localizedValues['replay2']![locale.languageCode]!;