Merge branch 'in_patient_soap' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes_dev

 Conflicts:
	lib/screens/patients/profile/soap_update/objective/update_objective_page.dart
	lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart
merge-requests/787/head
Elham Rababh 5 years ago
commit 8147d20fc6

@ -280,7 +280,6 @@ var SERVICES_PATIANT_HEADER_AR = [
"المريض الواصل" "المريض الواصل"
]; ];
const PRIMARY_COLOR = 0xff515B5D; const PRIMARY_COLOR = 0xff515B5D;
const TRANSACTION_NO = 0; const TRANSACTION_NO = 0;

@ -4,9 +4,10 @@ class GetChiefComplaintReqModel {
int episodeId; int episodeId;
int episodeID; int episodeID;
dynamic doctorID; dynamic doctorID;
int admissionNo;
GetChiefComplaintReqModel( 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<String, dynamic> json) { GetChiefComplaintReqModel.fromJson(Map<String, dynamic> json) {
patientMRN = json['PatientMRN']; patientMRN = json['PatientMRN'];
@ -14,8 +15,8 @@ class GetChiefComplaintReqModel {
episodeId = json['EpisodeId']; episodeId = json['EpisodeId'];
episodeID = json['EpisodeID']; episodeID = json['EpisodeID'];
doctorID = json['DoctorID']; doctorID = json['DoctorID'];
admissionNo = json['AdmissionNo'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String, dynamic> data = new Map<String, dynamic>();
@ -24,6 +25,9 @@ class GetChiefComplaintReqModel {
data['EpisodeId'] = this.episodeId; data['EpisodeId'] = this.episodeId;
data['EpisodeID'] = this.episodeID; data['EpisodeID'] = this.episodeID;
data['DoctorID'] = this.doctorID; data['DoctorID'] = this.doctorID;
if (this.admissionNo != null) {
data['AdmissionNo'] = this.admissionNo;
}
return data; return data;
} }

@ -39,6 +39,7 @@ class GetPhysicalExamReqModel {
data['To'] = this.to; data['To'] = this.to;
data['DoctorID'] = this.doctorID; data['DoctorID'] = this.doctorID;
data['EditedBy'] = this.editedBy; data['EditedBy'] = this.editedBy;
return data; return data;
} }
} }

@ -2,6 +2,7 @@ class PostChiefComplaintRequestModel {
int appointmentNo; int appointmentNo;
int episodeID; int episodeID;
int patientMRN; int patientMRN;
int admissionNo;
String chiefComplaint; String chiefComplaint;
String hopi; String hopi;
String currentMedication; String currentMedication;
@ -11,7 +12,6 @@ class PostChiefComplaintRequestModel {
dynamic doctorID; dynamic doctorID;
dynamic editedBy; dynamic editedBy;
PostChiefComplaintRequestModel( PostChiefComplaintRequestModel(
{this.appointmentNo, {this.appointmentNo,
this.episodeID, this.episodeID,
@ -23,7 +23,8 @@ class PostChiefComplaintRequestModel {
this.isLactation, this.isLactation,
this.doctorID, this.doctorID,
this.editedBy, this.editedBy,
this.numberOfWeeks}); this.numberOfWeeks,
this.admissionNo});
PostChiefComplaintRequestModel.fromJson(Map<String, dynamic> json) { PostChiefComplaintRequestModel.fromJson(Map<String, dynamic> json) {
appointmentNo = json['AppointmentNo']; appointmentNo = json['AppointmentNo'];
@ -37,6 +38,7 @@ class PostChiefComplaintRequestModel {
numberOfWeeks = json['numberOfWeeks']; numberOfWeeks = json['numberOfWeeks'];
doctorID = json['DoctorID']; doctorID = json['DoctorID'];
editedBy = json['EditedBy']; editedBy = json['EditedBy'];
admissionNo = json['AdmissionNo'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -52,6 +54,9 @@ class PostChiefComplaintRequestModel {
data['numberOfWeeks'] = this.numberOfWeeks; data['numberOfWeeks'] = this.numberOfWeeks;
data['DoctorID'] = this.doctorID; data['DoctorID'] = this.doctorID;
data['EditedBy'] = this.editedBy; data['EditedBy'] = this.editedBy;
if (this.admissionNo != null) {
data['AdmissionNo'] = this.admissionNo;
}
return data; return data;
} }

@ -95,8 +95,7 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage>
id: element.historyId, id: element.historyId,
); );
if (history != null) { if (history != null) {
MySelectedHistory mySelectedHistory = MySelectedHistory mySelectedHistory = SoapUtils.generateMySelectedHistory(
SoapUtils.generateMySelectedHistory(
history: history, history: history,
isChecked: element.isChecked, isChecked: element.isChecked,
remark: element.remarks, remark: element.remarks,
@ -111,8 +110,7 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage>
id: element.historyId, id: element.historyId,
); );
if (history != null) { if (history != null) {
MySelectedHistory mySelectedHistory = MySelectedHistory mySelectedHistory = SoapUtils.generateMySelectedHistory(
SoapUtils.generateMySelectedHistory(
history: history, history: history,
isChecked: element.isChecked, isChecked: element.isChecked,
remark: element.remarks, remark: element.remarks,
@ -127,8 +125,7 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage>
id: element.historyId, id: element.historyId,
); );
if (history != null) { if (history != null) {
MySelectedHistory mySelectedHistory = MySelectedHistory mySelectedHistory = SoapUtils.generateMySelectedHistory(
SoapUtils.generateMySelectedHistory(
history: history, history: history,
isChecked: element.isChecked, isChecked: element.isChecked,
remark: element.remarks, remark: element.remarks,
@ -143,8 +140,7 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage>
id: element.historyId, id: element.historyId,
); );
if (history != null) { if (history != null) {
MySelectedHistory mySelectedHistory = MySelectedHistory mySelectedHistory = SoapUtils.generateMySelectedHistory(
SoapUtils.generateMySelectedHistory(
history: history, history: history,
isChecked: element.isChecked, isChecked: element.isChecked,
remark: element.remarks, remark: element.remarks,
@ -213,7 +209,7 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage>
model.setSubjectiveCallBack(this); model.setSubjectiveCallBack(this);
GetChiefComplaintReqModel getChiefComplaintReqModel = GetChiefComplaintReqModel getChiefComplaintReqModel =
GetChiefComplaintReqModel( GetChiefComplaintReqModel(
patientMRN: widget.patientInfo.patientMRN, admissionNo: int.parse(widget.patientInfo.admissionNo),patientMRN: widget.patientInfo.patientMRN,
appointmentNo: appointmentNo:
int.parse(widget.patientInfo.appointmentNo.toString()), int.parse(widget.patientInfo.appointmentNo.toString()),
episodeId: widget.patientInfo.episodeNo, episodeId: widget.patientInfo.episodeNo,
@ -472,7 +468,7 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage>
if (formKey.currentState.validate()) { if (formKey.currentState.validate()) {
PostChiefComplaintRequestModel postChiefComplaintRequestModel = PostChiefComplaintRequestModel postChiefComplaintRequestModel =
new PostChiefComplaintRequestModel( new PostChiefComplaintRequestModel(
patientMRN: widget.patientInfo.patientMRN, admissionNo: int.parse(widget.patientInfo.admissionNo),patientMRN: widget.patientInfo.patientMRN,
episodeID: widget.patientInfo.episodeNo, episodeID: widget.patientInfo.episodeNo,
appointmentNo: widget.patientInfo.appointmentNo, appointmentNo: widget.patientInfo.appointmentNo,
chiefComplaint: complaintsController.text, chiefComplaint: complaintsController.text,

@ -657,7 +657,7 @@ packages:
name: meta name: meta
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.3.0-nullsafety.3" version: "1.3.0-nullsafety.4"
mime: mime:
dependency: transitive dependency: transitive
description: description:
@ -949,7 +949,7 @@ packages:
name: stack_trace name: stack_trace
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.10.0-nullsafety.1" version: "1.10.0-nullsafety.2"
sticky_headers: sticky_headers:
dependency: "direct main" dependency: "direct main"
description: description:
@ -1147,5 +1147,5 @@ packages:
source: hosted source: hosted
version: "2.2.1" version: "2.2.1"
sdks: 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" flutter: ">=1.22.0 <2.0.0"

Loading…
Cancel
Save