Merge branch 'medical-profile-services' into 'development'

procedure hot fix

See merge request Cloud_Solution/doctor_app_flutter!702
merge-requests/703/merge
Mohammad Aljammal 5 years ago
commit b06d286c81

@ -64,20 +64,27 @@ class ProcedureService extends BaseService {
); );
Future getProcedureTemplate( Future getProcedureTemplate(
{int doctorId, int projectId, int clinicId}) async { {int doctorId, int projectId, int clinicId, String categoryID}) async {
_procedureTempleteRequestModel = ProcedureTempleteRequestModel( _procedureTempleteRequestModel = ProcedureTempleteRequestModel(
tokenID: "@dm!n", tokenID: "@dm!n",
patientID: 0, patientID: 0,
searchType: 1, searchType: 1,
); );
hasError = false; hasError = false;
//insuranceApprovalInPatient.clear();
await baseAppClient.post(GET_TEMPLETE_LIST/*GET_PROCEDURE_TEMPLETE*/, await baseAppClient.post(GET_TEMPLETE_LIST/*GET_PROCEDURE_TEMPLETE*/,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
templateList.clear(); templateList.clear();
response['DAPP_TemplateGetList'].forEach((template) { response['DAPP_TemplateGetList'].forEach((template) {
templateList.add(ProcedureTempleteDetailsModel.fromJson(template)); ProcedureTempleteDetailsModel templateElement = ProcedureTempleteDetailsModel.fromJson(template);
if(categoryID != null){
if(categoryID == templateElement.categoryID){
templateList.add(templateElement);
}
} else {
templateList.add(templateElement);
}
}); });
// response['HIS_ProcedureTemplateList'].forEach((template) { // response['HIS_ProcedureTemplateList'].forEach((template) {
// _templateList.add(ProcedureTempleteModel.fromJson(template)); // _templateList.add(ProcedureTempleteModel.fromJson(template));

@ -108,11 +108,11 @@ class ProcedureViewModel extends BaseViewModel {
setState(ViewState.Idle); setState(ViewState.Idle);
} }
Future getProcedureTemplate() async { Future getProcedureTemplate({String categoryID}) async {
hasError = false; hasError = false;
//_insuranceCardService.clearInsuranceCard(); //_insuranceCardService.clearInsuranceCard();
setState(ViewState.Busy); setState(ViewState.Busy);
await _procedureService.getProcedureTemplate(); await _procedureService.getProcedureTemplate(categoryID: categoryID);
if (_procedureService.hasError) { if (_procedureService.hasError) {
error = _procedureService.error; error = _procedureService.error;
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);

Loading…
Cancel
Save