fix master

merge-requests/89/merge
Mohammad ALjammal 6 years ago
parent 936c2c1b54
commit 01f32a39f6

@ -34,15 +34,15 @@ class PatientsProvider with ChangeNotifier {
List<LabOrdersResModel> patientLabResultOrdersList = []; List<LabOrdersResModel> patientLabResultOrdersList = [];
List<PrescriptionResModel> patientPrescriptionsList = []; List<PrescriptionResModel> patientPrescriptionsList = [];
List<RadiologyResModel> patientRadiologyList = []; List<RadiologyResModel> patientRadiologyList = [];
<<<<<<< HEAD
/*@author: ibrahe albitar /*@author: ibrahe albitar
*@Date:2/6/2020 *@Date:2/6/2020
*@desc: getPatientPrescriptions *@desc: getPatientPrescriptions
*/ */
=======
List<LabResult> labResultList = []; List<LabResult> labResultList = [];
>>>>>>> 4afca06aec89273155b264baea03db8fc2a9051d
var patientProgressNoteList = []; var patientProgressNoteList = [];
var insuranceApporvalsList = []; var insuranceApporvalsList = [];
@ -144,9 +144,7 @@ class PatientsProvider with ChangeNotifier {
patientVitalSignOrderdSubList patientVitalSignOrderdSubList
.add(patientVitalSignOrderdSubListTemp[x]); .add(patientVitalSignOrderdSubListTemp[x]);
} }
var asd = "";
} }
// patientVitalSignList = res['List_DoctorPatientVitalSign'];
} else { } else {
isError = true; isError = true;
error = res['ErrorMessage'] ?? res['ErrorEndUserMessage']; error = res['ErrorMessage'] ?? res['ErrorEndUserMessage'];
@ -312,20 +310,39 @@ class PatientsProvider with ChangeNotifier {
} }
} }
<<<<<<< HEAD
/*@author: ibrahe albitar getLabResult(LabOrdersResModel labOrdersResModel) async {
*@Date:2/6/2020 labResultList.clear();
*@desc: getPatientPrescriptions isLoading = true;
*/ notifyListeners();
getPatientProgressNote(patient) async{ RequestLabResult requestLabResult = RequestLabResult();
======= requestLabResult.sessionID = labOrdersResModel.setupID;
getPatientProgressNote(patient) async { requestLabResult.orderNo = labOrdersResModel.orderNo;
>>>>>>> 4afca06aec89273155b264baea03db8fc2a9051d requestLabResult.invoiceNo = labOrdersResModel.invoiceNo;
requestLabResult.patientTypeID = labOrdersResModel.patientType;
await BaseAppClient.post(
'DoctorApplication.svc/REST/GetPatientLabResults',
onSuccess: (dynamic response, int statusCode) {
isError = false;
isLoading = false;
response['List_GetLabNormal'].forEach((v) {
labResultList.add(new LabResult.fromJson(v));
});
}, onFailure: (String error, int statusCode) {
isError = true;
isLoading = false;
this.error = error;
}, body: requestLabResult.toJson());
notifyListeners();
}
getPatientInsuranceApprovals(patient) async {
setBasicData(); setBasicData();
try { try {
if (await Helpers.checkConnection()) { if (await Helpers.checkConnection()) {
final response = await AppClient.post(PATIENT_PROGRESS_NOTE_URL, final response = await AppClient.post(
body: json.encode(patient)); PATIENT_INSURANCE_APPROVALS_URL, body: json.encode(patient));
final int statusCode = response.statusCode; final int statusCode = response.statusCode;
isLoading = false; isLoading = false;
@ -336,7 +353,8 @@ class PatientsProvider with ChangeNotifier {
var res = json.decode(response.body); var res = json.decode(response.body);
print('$res'); print('$res');
if (res['MessageStatus'] == 1) { if (res['MessageStatus'] == 1) {
patientProgressNoteList = res['List_GetPregressNoteForInPatient']; //patientRadiologyList = [];
insuranceApporvalsList = res['List_ApprovalMain_InPatient'];
} else { } else {
isError = true; isError = true;
error = res['ErrorMessage'] ?? res['ErrorEndUserMessage']; error = res['ErrorMessage'] ?? res['ErrorEndUserMessage'];
@ -352,46 +370,17 @@ class PatientsProvider with ChangeNotifier {
handelCatchErrorCase(err); handelCatchErrorCase(err);
} }
} }
<<<<<<< HEAD
/*@author: ibrahe albitar /*@author: ibrahe albitar
*@Date:2/6/2020 *@Date:2/6/2020
*@desc: getPatientPrescriptions *@desc: getPatientPrescriptions
*/ */
getPatientInsuranceApprovals(patient) async{ getPatientProgressNote(patient) async {
=======
getLabResult(LabOrdersResModel labOrdersResModel) async {
labResultList.clear();
isLoading = true;
notifyListeners();
RequestLabResult requestLabResult = RequestLabResult();
requestLabResult.sessionID = labOrdersResModel.setupID;
requestLabResult.orderNo = labOrdersResModel.orderNo;
requestLabResult.invoiceNo = labOrdersResModel.invoiceNo;
requestLabResult.patientTypeID = labOrdersResModel.patientType;
await BaseAppClient.post('DoctorApplication.svc/REST/GetPatientLabResults',
onSuccess: (dynamic response, int statusCode) {
isError = false;
isLoading = false;
response['List_GetLabNormal'].forEach((v) {
labResultList.add(new LabResult.fromJson(v));
});
}, onFailure: (String error, int statusCode) {
isError = true;
isLoading = false;
this.error = error;
}, body: requestLabResult.toJson());
notifyListeners();
}
>>>>>>> 4afca06aec89273155b264baea03db8fc2a9051d
getPatientInsuranceApprovals(patient) async {
setBasicData(); setBasicData();
try { try {
if (await Helpers.checkConnection()) { if (await Helpers.checkConnection()) {
final response = await AppClient.post( final response = await AppClient.post(PATIENT_PROGRESS_NOTE_URL,
PATIENT_INSURANCE_APPROVALS_URL, body: json.encode(patient)); body: json.encode(patient));
final int statusCode = response.statusCode; final int statusCode = response.statusCode;
isLoading = false; isLoading = false;
@ -402,8 +391,7 @@ class PatientsProvider with ChangeNotifier {
var res = json.decode(response.body); var res = json.decode(response.body);
print('$res'); print('$res');
if (res['MessageStatus'] == 1) { if (res['MessageStatus'] == 1) {
//patientRadiologyList = []; patientProgressNoteList = res['List_GetPregressNoteForInPatient'];
insuranceApporvalsList = res['List_ApprovalMain_InPatient'];
} else { } else {
isError = true; isError = true;
error = res['ErrorMessage'] ?? res['ErrorEndUserMessage']; error = res['ErrorMessage'] ?? res['ErrorEndUserMessage'];
@ -421,4 +409,6 @@ class PatientsProvider with ChangeNotifier {
} }
} }

Loading…
Cancel
Save