referral details fix bugs

merge-requests/407/head
mosazaid 4 years ago
parent c73efe3681
commit cc7c5af1d0

@ -121,7 +121,7 @@ const GET_DASHBOARD =
const GET_SICKLEAVE_STATISTIC =
'Services/DoctorApplication.svc/REST/PreSickLeaveStatistics';
const ARRIVED_PATIENT_URL =
'Services/DoctorApplication.svc/REST/PatientArrivalList';
'Services/DoctorApplication.svc/REST/PatientArrivalList';
const ADD_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/PostSickLeave';
const GET_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/GetAllSickLeaves';
const EXTEND_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/ExtendSickLeave';
@ -143,9 +143,6 @@ const GET_PROCEDURE_LIST =
'Services/DoctorApplication.svc/REST/GetOrderedProcedure';
const POST_PROCEDURE_LIST = 'Services/DoctorApplication.svc/REST/PostProcedure';
const GET_PATIENT_ARRIVAL_LIST =
'Services/DoctorApplication.svc/REST/PatientArrivalList';
///Lab Order
const GET_Patient_LAB_ORDERS = 'Services/Patients.svc/REST/GetPatientLabOrders';
const GET_Patient_LAB_SPECIAL_RESULT =

@ -38,15 +38,15 @@ class BaseService {
body['To'] = date;
body['PageIndex'] = 0;
body['PageSize'] = 0;
if(patientMrn == -1){
if(patientMrn != -1){
body['PatientMRN'] = patientMrn;
}
if(appointmentNo == -1){
if(appointmentNo != -1){
body['AppointmentNo'] = appointmentNo;
}
await baseAppClient.post(
GET_PATIENT_ARRIVAL_LIST,
ARRIVED_PATIENT_URL,
onSuccess: (dynamic response, int statusCode) {
patientArrivalList.clear();

@ -158,8 +158,7 @@ class PatientReferralViewModel extends BaseViewModel {
await _referralPatientService.getPatientArrivalList(toDate,
fromDate: fromDate,
patientMrn: patientMrn,
appointmentNo: appointmentNo);
patientMrn: patientMrn);
if (_referralPatientService.hasError) {
error = _referralPatientService.error;
setState(ViewState.Error);

@ -70,12 +70,14 @@ class MyReferralDetailScreen extends StatelessWidget {
color: Colors.black, //Colors.black,
onPressed: () => Navigator.pop(context),
),
AppText(
(Helpers.capitalize(model.patientArrivalList[0].patientDetails.fullName)),
fontSize: SizeConfig.textMultiplier * 3,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.white,
fontFamily: 'Poppins',
Expanded(
child: AppText(
(Helpers.capitalize(model.patientArrivalList[0].patientDetails.fullName)),
fontSize: SizeConfig.textMultiplier * 3,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.white,
fontFamily: 'Poppins',
),
),
model.patientArrivalList[0].patientDetails.gender == 1
? Icon(

@ -42,10 +42,11 @@ class PatientProfileHeaderNewDesign extends StatelessWidget {
onPressed: () => Navigator.pop(context),
),
AppText(
patient.firstName != null ?
(Helpers.capitalize(patient.firstName) +
" " +
Helpers.capitalize(
patient.lastName)),
patient.lastName)) : Helpers.capitalize(patient.patientDetails.fullName),
fontSize: SizeConfig.textMultiplier * 3,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.white,

Loading…
Cancel
Save