fix load procedure

merge-requests/704/head
Mohammad Aljammal 5 years ago
parent 80a751ae4d
commit 3c325ef199

@ -123,7 +123,7 @@ const Map<String, Map<String, String>> localizedValues = {
'en': 'please enter answer', 'en': 'please enter answer',
'ar': 'الرجاء ادخال اجابة ' 'ar': 'الرجاء ادخال اجابة '
}, },
'replay': {'en': 'Replay', 'ar': 'تاكيد'}, 'replay': {'en': 'Reply', 'ar': 'تاكيد'},
'progressNote': {'en': 'Progress Note', 'ar': 'ملاحظة التقدم'}, 'progressNote': {'en': 'Progress Note', 'ar': 'ملاحظة التقدم'},
'progress': {'en': 'Progress', 'ar': 'التقدم'}, 'progress': {'en': 'Progress', 'ar': 'التقدم'},
'note': {'en': 'Note', 'ar': 'ملاحظة'}, 'note': {'en': 'Note', 'ar': 'ملاحظة'},

@ -145,10 +145,10 @@ class ProcedureService extends BaseService {
}, body: Map()); }, body: Map());
} }
Future getProcedureCategory({String categoryName, String categoryID}) async { Future getProcedureCategory({String categoryName, String categoryID,patientId}) async {
_getProcedureCategoriseReqModel = GetProcedureReqModel( _getProcedureCategoriseReqModel = GetProcedureReqModel(
search: ["$categoryName"], search: ["$categoryName"],
patientMRN: 0, patientMRN: patientId,
pageIndex: 0, pageIndex: 0,
clinicId: 0, clinicId: 0,
pageSize: 0, pageSize: 0,

@ -84,12 +84,11 @@ class ProcedureViewModel extends BaseViewModel {
setState(ViewState.Idle); setState(ViewState.Idle);
} }
Future getProcedureCategory({String categoryName, String categoryID}) async { Future getProcedureCategory({String categoryName, String categoryID, patientId}) async {
hasError = false; hasError = false;
//_insuranceCardService.clearInsuranceCard();
setState(ViewState.Busy); setState(ViewState.Busy);
await _procedureService.getProcedureCategory( await _procedureService.getProcedureCategory(
categoryName: categoryName, categoryID: categoryID); categoryName: categoryName, categoryID: categoryID,patientId: patientId);
if (_procedureService.hasError) { if (_procedureService.hasError) {
error = _procedureService.error; error = _procedureService.error;
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);
@ -111,7 +110,6 @@ class ProcedureViewModel extends BaseViewModel {
Future getProcedureTemplate({String categoryID}) async { Future getProcedureTemplate({String categoryID}) async {
hasError = false; hasError = false;
//_insuranceCardService.clearInsuranceCard();
setState(ViewState.Busy); setState(ViewState.Busy);
await _procedureService.getProcedureTemplate(categoryID: categoryID); await _procedureService.getProcedureTemplate(categoryID: categoryID);
if (_procedureService.hasError) { if (_procedureService.hasError) {
@ -135,10 +133,12 @@ class ProcedureViewModel extends BaseViewModel {
.procedureTemplate .procedureTemplate
.add(element); .add(element);
} else { } else {
templateList.add(ProcedureTempleteDetailsModelList( var template = ProcedureTempleteDetailsModelList(
templateName: element.templateName, templateName: element.templateName,
templateId: element.templateID, templateId: element.templateID,
template: element)); template: element);
if(!templateList.contains(template))
templateList.add(template);
} }
}); });
print(templateList.length.toString()); print(templateList.length.toString());

@ -10,7 +10,7 @@ class PatiantInformtion {
String arrivalTime; String arrivalTime;
String arrivalTimeD; String arrivalTimeD;
int callStatus; int callStatus;
Null callStatusDisc; dynamic callStatusDisc;
int callTypeID; int callTypeID;
String clientRequestID; String clientRequestID;
String clinicName; String clinicName;

@ -3,6 +3,7 @@ import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/screens/patients/profile/lab_result/laboratory_result_page.dart'; import 'package:doctor_app_flutter/screens/patients/profile/lab_result/laboratory_result_page.dart';
import 'package:doctor_app_flutter/screens/procedures/add_lab_home_screen.dart';
import 'package:doctor_app_flutter/screens/procedures/add_lab_orders.dart'; import 'package:doctor_app_flutter/screens/procedures/add_lab_orders.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/add-order/addNewOrder.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/add-order/addNewOrder.dart';
@ -111,7 +112,7 @@ class _LabsHomePageState extends State<LabsHomePage> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => AddSelectedLabOrder( builder: (context) => AddLabHomeScreen(
patient: patient, patient: patient,
model: model, model: model,
)), )),

@ -46,12 +46,8 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BaseView<ProcedureViewModel>( return BaseView<ProcedureViewModel>(
onModelReady: (model) async { onModelReady: (model) =>
// TODO mosa_change model.getProcedureTemplate(categoryID: widget.categoryID),
// if (model.procedureTemplate.length == 0) {
model.getProcedureTemplate();
// }
},
builder: (BuildContext context, ProcedureViewModel model, Widget child) => builder: (BuildContext context, ProcedureViewModel model, Widget child) =>
AppScaffold( AppScaffold(
isShowAppBar: false, isShowAppBar: false,
@ -61,14 +57,12 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
Container( Container(
height: MediaQuery.of(context).size.height * 0.070, height: MediaQuery.of(context).size.height * 0.070,
), ),
if (model.procedureTemplate.length != 0) if (model.templateList.length != 0)
Expanded( Expanded(
child: NetworkBaseView( child: NetworkBaseView(
baseViewModel: model, baseViewModel: model,
child: EntityListCheckboxSearchFavProceduresWidget( child: EntityListCheckboxSearchFavProceduresWidget(
model: widget.model, model: model,
// masterList: widget.model.procedureTemplate,
//TODO change it to the new model
removeFavProcedure: (item) { removeFavProcedure: (item) {
setState(() { setState(() {
entityList.remove(item); entityList.remove(item);

@ -203,6 +203,7 @@ class _AddSelectedProcedureState extends State<AddSelectedProcedure> {
if (procedureName.text.isNotEmpty && if (procedureName.text.isNotEmpty &&
procedureName.text.length >= 3) procedureName.text.length >= 3)
model.getProcedureCategory( model.getProcedureCategory(
patientId: patient.patientId,
categoryName: categoryName:
procedureName.text); procedureName.text);
else else
@ -223,8 +224,8 @@ class _AddSelectedProcedureState extends State<AddSelectedProcedure> {
if (procedureName.text.isNotEmpty && if (procedureName.text.isNotEmpty &&
procedureName.text.length >= 3) procedureName.text.length >= 3)
model.getProcedureCategory( model.getProcedureCategory(
categoryName: patientId: patient.patientId,
procedureName.text); categoryName: procedureName.text);
else else
DrAppToastMsg.showErrorToast( DrAppToastMsg.showErrorToast(
TranslationBase.of(context) TranslationBase.of(context)

@ -138,7 +138,7 @@ class _AddSelectedLabOrderState extends State<AddSelectedLabOrder> {
final screenSize = MediaQuery.of(context).size; final screenSize = MediaQuery.of(context).size;
return BaseView<ProcedureViewModel>( return BaseView<ProcedureViewModel>(
onModelReady: (model) => model.getProcedureCategory( onModelReady: (model) => model.getProcedureCategory(
categoryName: "Laboratory", categoryID: "02"), categoryName: "Laboratory", categoryID: "02",patientId: patient.patientId),
builder: (BuildContext context, ProcedureViewModel model, Widget child) => builder: (BuildContext context, ProcedureViewModel model, Widget child) =>
AppScaffold( AppScaffold(
isShowAppBar: false, isShowAppBar: false,
@ -158,26 +158,6 @@ class _AddSelectedLabOrderState extends State<AddSelectedLabOrder> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
AppText(
TranslationBase.of(context).applyForNewLabOrder,
fontWeight: FontWeight.w700,
fontSize: 20,
),
InkWell(
child: Icon(
Icons.close,
size: 28.0,
),
onTap: () {
Navigator.pop(context);
},
),
],
),
SizedBox( SizedBox(
height: 10.0, height: 10.0,
), ),

@ -141,7 +141,7 @@ class _AddSelectedRadiologyOrderState extends State<AddSelectedRadiologyOrder> {
final screenSize = MediaQuery.of(context).size; final screenSize = MediaQuery.of(context).size;
return BaseView<ProcedureViewModel>( return BaseView<ProcedureViewModel>(
onModelReady: (model) => model.getProcedureCategory( onModelReady: (model) => model.getProcedureCategory(
categoryName: "Radiology", categoryID: "03"), categoryName: "Radiology", categoryID: "03",patientId: patient.patientId),
builder: (BuildContext context, ProcedureViewModel model, Widget child) => builder: (BuildContext context, ProcedureViewModel model, Widget child) =>
AppScaffold( AppScaffold(
isShowAppBar: false, isShowAppBar: false,
@ -161,25 +161,6 @@ class _AddSelectedRadiologyOrderState extends State<AddSelectedRadiologyOrder> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
AppText(
TranslationBase.of(context).newRadiologyOrder,
fontWeight: FontWeight.w700,
fontSize: 20,
),
InkWell(
child: Icon(
Icons.close,
size: 28.0,
),
onTap: () {
Navigator.pop(context);
},
),
],
),
SizedBox( SizedBox(
height: 10.0, height: 10.0,
), ),

@ -61,14 +61,13 @@ class _EntityListCheckboxSearchFavProceduresWidgetState
} }
List<ProcedureTempleteModel> items = List(); List<ProcedureTempleteModel> items = List();
List<ProcedureTempleteDetailsModelList> itemss = List();
List<ProcedureTempleteDetailsModel> itemsProcedure = List(); List<ProcedureTempleteDetailsModel> itemsProcedure = List();
List<String> remarksList = List(); List<String> remarksList = List();
List<int> typeList = List(); List<int> typeList = List();
@override @override
void initState() { void initState() {
items.addAll(widget.masterList); //items.addAll(widget.masterList);
super.initState(); super.initState();
} }
@ -103,9 +102,9 @@ class _EntityListCheckboxSearchFavProceduresWidgetState
SizedBox( SizedBox(
height: 15, height: 15,
), ),
items.length != 0 widget.model.templateList.length != 0
? Column( ? Column(
children: itemss.map((historyInfo) { children: widget.model.templateList.map((historyInfo) {
return ExpansionProcedure( return ExpansionProcedure(
procedureTempleteModel: historyInfo, procedureTempleteModel: historyInfo,
model: widget.model, model: widget.model,

Loading…
Cancel
Save