Merge branch 'fix-bugs10_2' into 'development'

Fix bugs10 2

See merge request Cloud_Solution/doctor_app_flutter!303

lib/core/service/patient-doctor-referral-service.dart

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

lib/core/service/patient-ucaf-service.dart

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

lib/models/patient/patiant_info_model.dart

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

lib/screens/patients/profile/referral/my-referral-detail-screen.dart

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

lib/widgets/patients/profile/PatientHeaderWidgetNoAvatar.dart

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