diff --git a/lib/config/config.dart b/lib/config/config.dart index bf398791..26c0445b 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -280,7 +280,6 @@ var SERVICES_PATIANT_HEADER_AR = [ "المريض الواصل" ]; - const PRIMARY_COLOR = 0xff515B5D; const TRANSACTION_NO = 0; diff --git a/lib/models/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart b/lib/models/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart index 80188dfe..8e253151 100644 --- a/lib/models/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart +++ b/lib/models/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart @@ -4,9 +4,10 @@ class GetChiefComplaintReqModel { int episodeId; int episodeID; dynamic doctorID; + int admissionNo; GetChiefComplaintReqModel( - {this.patientMRN, this.appointmentNo, this.episodeId, this.episodeID, this.doctorID}); + {this.patientMRN, this.appointmentNo, this.episodeId, this.episodeID, this.doctorID, this.admissionNo}); GetChiefComplaintReqModel.fromJson(Map json) { patientMRN = json['PatientMRN']; @@ -14,8 +15,8 @@ class GetChiefComplaintReqModel { episodeId = json['EpisodeId']; episodeID = json['EpisodeID']; doctorID = json['DoctorID']; - -} + admissionNo = json['AdmissionNo']; + } Map toJson() { final Map data = new Map(); @@ -24,6 +25,9 @@ class GetChiefComplaintReqModel { data['EpisodeId'] = this.episodeId; data['EpisodeID'] = this.episodeID; data['DoctorID'] = this.doctorID; + if (this.admissionNo != null) { + data['AdmissionNo'] = this.admissionNo; + } return data; } diff --git a/lib/models/SOAP/GetPhysicalExamReqModel.dart b/lib/models/SOAP/GetPhysicalExamReqModel.dart index 241bac57..710dafd1 100644 --- a/lib/models/SOAP/GetPhysicalExamReqModel.dart +++ b/lib/models/SOAP/GetPhysicalExamReqModel.dart @@ -39,6 +39,7 @@ class GetPhysicalExamReqModel { data['To'] = this.to; data['DoctorID'] = this.doctorID; data['EditedBy'] = this.editedBy; + 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 f1e9c2b4..5f5fe721 100644 --- a/lib/models/SOAP/post_chief_complaint_request_model.dart +++ b/lib/models/SOAP/post_chief_complaint_request_model.dart @@ -2,6 +2,7 @@ class PostChiefComplaintRequestModel { int appointmentNo; int episodeID; int patientMRN; + int admissionNo; String chiefComplaint; String hopi; String currentMedication; @@ -11,7 +12,6 @@ class PostChiefComplaintRequestModel { dynamic doctorID; dynamic editedBy; - PostChiefComplaintRequestModel( {this.appointmentNo, this.episodeID, @@ -23,7 +23,8 @@ class PostChiefComplaintRequestModel { this.isLactation, this.doctorID, this.editedBy, - this.numberOfWeeks}); + this.numberOfWeeks, + this.admissionNo}); PostChiefComplaintRequestModel.fromJson(Map json) { appointmentNo = json['AppointmentNo']; @@ -37,6 +38,7 @@ class PostChiefComplaintRequestModel { numberOfWeeks = json['numberOfWeeks']; doctorID = json['DoctorID']; editedBy = json['EditedBy']; + admissionNo = json['AdmissionNo']; } Map toJson() { @@ -52,6 +54,9 @@ class PostChiefComplaintRequestModel { data['numberOfWeeks'] = this.numberOfWeeks; data['DoctorID'] = this.doctorID; data['EditedBy'] = this.editedBy; + if (this.admissionNo != null) { + 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 137d9faf..269f20a5 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 @@ -95,8 +95,7 @@ class _UpdateSubjectivePageState extends State id: element.historyId, ); if (history != null) { - MySelectedHistory mySelectedHistory = - SoapUtils.generateMySelectedHistory( + MySelectedHistory mySelectedHistory = SoapUtils.generateMySelectedHistory( history: history, isChecked: element.isChecked, remark: element.remarks, @@ -111,8 +110,7 @@ class _UpdateSubjectivePageState extends State id: element.historyId, ); if (history != null) { - MySelectedHistory mySelectedHistory = - SoapUtils.generateMySelectedHistory( + MySelectedHistory mySelectedHistory = SoapUtils.generateMySelectedHistory( history: history, isChecked: element.isChecked, remark: element.remarks, @@ -127,8 +125,7 @@ class _UpdateSubjectivePageState extends State id: element.historyId, ); if (history != null) { - MySelectedHistory mySelectedHistory = - SoapUtils.generateMySelectedHistory( + MySelectedHistory mySelectedHistory = SoapUtils.generateMySelectedHistory( history: history, isChecked: element.isChecked, remark: element.remarks, @@ -143,8 +140,7 @@ class _UpdateSubjectivePageState extends State id: element.historyId, ); if (history != null) { - MySelectedHistory mySelectedHistory = - SoapUtils.generateMySelectedHistory( + MySelectedHistory mySelectedHistory = SoapUtils.generateMySelectedHistory( history: history, isChecked: element.isChecked, remark: element.remarks, @@ -213,7 +209,7 @@ class _UpdateSubjectivePageState extends State model.setSubjectiveCallBack(this); GetChiefComplaintReqModel getChiefComplaintReqModel = GetChiefComplaintReqModel( - patientMRN: widget.patientInfo.patientMRN, + admissionNo: int.parse(widget.patientInfo.admissionNo),patientMRN: widget.patientInfo.patientMRN, appointmentNo: int.parse(widget.patientInfo.appointmentNo.toString()), episodeId: widget.patientInfo.episodeNo, @@ -472,7 +468,7 @@ class _UpdateSubjectivePageState extends State if (formKey.currentState.validate()) { PostChiefComplaintRequestModel postChiefComplaintRequestModel = new PostChiefComplaintRequestModel( - patientMRN: widget.patientInfo.patientMRN, + admissionNo: int.parse(widget.patientInfo.admissionNo),patientMRN: widget.patientInfo.patientMRN, episodeID: widget.patientInfo.episodeNo, appointmentNo: widget.patientInfo.appointmentNo, chiefComplaint: complaintsController.text, diff --git a/pubspec.lock b/pubspec.lock index c90d86d9..491e4c5b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -657,7 +657,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.3" + version: "1.3.0-nullsafety.4" mime: dependency: transitive description: @@ -949,7 +949,7 @@ packages: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.10.0-nullsafety.1" + version: "1.10.0-nullsafety.2" sticky_headers: dependency: "direct main" description: @@ -1147,5 +1147,5 @@ packages: source: hosted version: "2.2.1" sdks: - dart: ">=2.10.0 <2.11.0" + dart: ">=2.10.0 <=2.11.0-213.1.beta" flutter: ">=1.22.0 <2.0.0"