Merge branch 'fix-bugs10_2' into 'development'

Fix bugs10 2

See merge request Cloud_Solution/doctor_app_flutter!303
merge-requests/302/merge
Mohammad Aljammal 5 years ago
commit 3d36c8b7a0

@ -198,9 +198,9 @@ class PatientReferralService extends LookupService {
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
body['PatientMRN'] = pendingReferral.patientID; body['PatientMRN'] = pendingReferral.patientID;
body['AppointmentNo'] = pendingReferral.sourceAppointmentNo; body['AppointmentNo'] = pendingReferral.targetAppointmentNo;
body['SetupID'] = pendingReferral.sourceSetupID; body['SetupID'] = pendingReferral.targetSetupID;
body['ProjectID'] = pendingReferral.sourceProjectId; body['ProjectID'] = pendingReferral.targetProjectId;
body['IsAccepted'] = isAccepted; body['IsAccepted'] = isAccepted;
body['PatientName'] = pendingReferral.patientName; body['PatientName'] = pendingReferral.patientName;
body['ReferralResponse'] = pendingReferral.remarksFromSource; body['ReferralResponse'] = pendingReferral.remarksFromSource;

@ -106,8 +106,8 @@ class UcafService extends LookupService {
hasError = false; hasError = false;
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
body['PatientMRN'] = patient.patientMRN; body['PatientMRN'] = patient.patientMRN;
// body['AppointmentNo'] = patient.appointmentNo; body['AppointmentNo'] = patient.appointmentNo;
// body['EpisodeID'] = patient.episodeNo; body['EpisodeID'] = patient.episodeNo;
await baseAppClient.post (GET_ORDER_PROCEDURE, await baseAppClient.post (GET_ORDER_PROCEDURE,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {

@ -54,6 +54,7 @@ class PatiantInformtion {
String genderDescription; String genderDescription;
String nursingStationName; String nursingStationName;
String startTime; String startTime;
String visitType;
PatiantInformtion({ PatiantInformtion({
this.list, this.list,
@ -105,7 +106,9 @@ class PatiantInformtion {
this.genderInt, this.genderInt,
this.isSigned, this.isSigned,
this.medicationOrders, this.medicationOrders,
this.nationality,this.patientMRN this.nationality,
this.patientMRN,
this.visitType,
}); });
factory PatiantInformtion.fromJson(Map<String, dynamic> json) => factory PatiantInformtion.fromJson(Map<String, dynamic> json) =>
@ -159,6 +162,7 @@ class PatiantInformtion {
medicationOrders :json['medicationOrders'], medicationOrders :json['medicationOrders'],
nationality :json['nationality']??json['NationalityNameN'], nationality :json['nationality']??json['NationalityNameN'],
patientMRN :json['patientMRN'] ?? json['PatientMRN'], patientMRN :json['patientMRN'] ?? json['PatientMRN'],
visitType :json['visitType'] ?? json['visitType'],
); );
} }

@ -157,6 +157,7 @@ class MyReferralDetailScreen extends StatelessWidget {
} else { } else {
DrAppToastMsg.showSuccesToast(TranslationBase.of(context).referralSuccessMsgAccept); DrAppToastMsg.showSuccesToast(TranslationBase.of(context).referralSuccessMsgAccept);
Navigator.pop(context); Navigator.pop(context);
Navigator.pop(context);
} }
}, },
), ),
@ -180,6 +181,7 @@ class MyReferralDetailScreen extends StatelessWidget {
} else { } else {
DrAppToastMsg.showSuccesToast(TranslationBase.of(context).referralSuccessMsgReject); DrAppToastMsg.showSuccesToast(TranslationBase.of(context).referralSuccessMsgReject);
Navigator.pop(context); Navigator.pop(context);
Navigator.pop(context);
} }
}, },
), ),

@ -43,7 +43,7 @@ class PatientHeaderWidgetNoAvatar extends StatelessWidget {
], ],
), ),
AppText( AppText(
"NEW VISIT", patient.visitType ?? "",
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: SizeConfig.textMultiplier * 2.0, fontSize: SizeConfig.textMultiplier * 2.0,
), ),

Loading…
Cancel
Save