Merge branch 'referral_in_patient' into 'development'

hot fixes

See merge request Cloud_Solution/doctor_app_flutter!584
merge-requests/585/merge
Mohammad Aljammal 5 years ago
commit 4f44aa145e

@ -241,6 +241,7 @@ const GET_ECG = "Services/Patients.svc/REST/HIS_GetPatientMuseResults";
const GET_MY_REFERRAL_INPATIENT = "Services/DoctorApplication.svc/REST/GtMyReferralPatient"; const GET_MY_REFERRAL_INPATIENT = "Services/DoctorApplication.svc/REST/GtMyReferralPatient";
const GET_MY_DISCHARGE_PATIENT = "Services/DoctorApplication.svc/REST/GtMyDischargeReferralPatient"; const GET_MY_DISCHARGE_PATIENT = "Services/DoctorApplication.svc/REST/GtMyDischargeReferralPatient";
const GET_DISCHARGE_PATIENT = "Services/DoctorApplication.svc/REST/GtMyDischargePatient";
const GET_PAtIENTS_INSURANCE_APPROVALS = const GET_PAtIENTS_INSURANCE_APPROVALS =
"Services/Patients.svc/REST/GetApprovalStatus"; "Services/Patients.svc/REST/GetApprovalStatus";

@ -72,7 +72,7 @@ class PatientLabOrders {
PatientLabOrders.fromJson(Map<String, dynamic> json) { PatientLabOrders.fromJson(Map<String, dynamic> json) {
actualDoctorRate = json['ActualDoctorRate']; actualDoctorRate = json['ActualDoctorRate'];
clinicDescription = json['ClinicDescription']; clinicDescription = json['ClinicDescription']?? json['ClinicName'];
clinicDescriptionEnglish = json['ClinicDescriptionEnglish']; clinicDescriptionEnglish = json['ClinicDescriptionEnglish'];
clinicDescriptionN = json['ClinicDescriptionN']; clinicDescriptionN = json['ClinicDescriptionN'];
clinicID = json['ClinicID']; clinicID = json['ClinicID'];

@ -108,7 +108,7 @@ class FinalRadiology {
admissionNo = json['AdmissionNo']; admissionNo = json['AdmissionNo'];
isInOutPatient = json['IsInOutPatient']; isInOutPatient = json['IsInOutPatient'];
actualDoctorRate = json['ActualDoctorRate']; actualDoctorRate = json['ActualDoctorRate'];
clinicDescription = json['ClinicDescription']; clinicDescription = json['ClinicDescription']?? json['ClinicName'];
dIAPACSURL = json['DIA_PACS_URL']; dIAPACSURL = json['DIA_PACS_URL'];
doctorImageURL = json['DoctorImageURL']; doctorImageURL = json['DoctorImageURL'];
doctorName = json['DoctorName']; doctorName = json['DoctorName'];

@ -28,7 +28,7 @@ class DischargedPatientService extends BaseService {
body['PatientTypeID'] = 1; body['PatientTypeID'] = 1;
hasError = false; hasError = false;
myDischargedPatients.clear(); myDischargedPatients.clear();
await baseAppClient.post(GET_MY_DISCHARGE_PATIENT, await baseAppClient.post(GET_DISCHARGE_PATIENT,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
if (response['List_MyDischargePatient'] != null) { if (response['List_MyDischargePatient'] != null) {
response['List_MyDischargePatient'].forEach((v) { response['List_MyDischargePatient'].forEach((v) {

@ -386,7 +386,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
}); });
}, },
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
appBarTitle: patientTypeTitle, appBarTitle: isSearch? "Search Patient": patientTypeTitle,
isShowAppBar: widget.isAppbar, isShowAppBar: widget.isAppbar,
isLoading: _isLoading, isLoading: _isLoading,
body: _isLoading body: _isLoading

@ -183,23 +183,8 @@ class ProcedureScreen extends StatelessWidget {
doctorName: doctorNameP, doctorName: doctorNameP,
), ),
), ),
if (model.procedureList.isEmpty) if (model.state == ViewState.ErrorLocal || (model.procedureList.isNotEmpty && model.procedureList[0].entityList.isEmpty))
Center(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
height: 100,
),
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: AppText('No Procedure Found 0000'),
)
],
),
),
if (model.state == ViewState.ErrorLocal)
Center( Center(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
@ -210,7 +195,7 @@ class ProcedureScreen extends StatelessWidget {
Image.asset('assets/images/no-data.png'), Image.asset('assets/images/no-data.png'),
Padding( Padding(
padding: const EdgeInsets.all(22.0), padding: const EdgeInsets.all(22.0),
child: AppText(model.error), child: AppText(model.procedureList.isEmpty ? model.error: 'No Procedure Found '),
) )
], ],
), ),

@ -239,16 +239,15 @@ class DateUtils {
static DateTime convertStringToDate(String date) { static DateTime convertStringToDate(String date) {
// /Date(1585774800000+0300)/ // /Date(1585774800000+0300)/
if (date != null) { if (date != null) {
const start = "/Date("; const start = "/Date(";
const end = "+0300)"; const end = "+0300)";
final startIndex = date.indexOf(start); final startIndex = date.indexOf(start);
final endIndex = date.indexOf(end, startIndex + start.length); final endIndex = date.indexOf(end, startIndex + start.length);
return DateTime.fromMillisecondsSinceEpoch( DateTime newDate = DateTime.fromMillisecondsSinceEpoch(
int.parse( int.parse(date.substring(startIndex + start.length, endIndex),),);
date.substring(startIndex + start.length, endIndex), return newDate;
),
);
} else } else
return DateTime.now(); return DateTime.now();
} }

@ -367,7 +367,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget
AppText(branch ?? '', fontSize: 12) AppText(branch ?? '', fontSize: 12)
], ],
), ),
if (isPrescriptions)
if (clinic != null) if (clinic != null)
Row( Row(
children: [ children: [

Loading…
Cancel
Save