Prescription & medical file fix

merge-requests/262/head
hussam al-habibeh 5 years ago
parent 5150f9b93d
commit e133a014e8

@ -78,7 +78,7 @@ class ProcedureService extends BaseService {
patientMRN: 0, patientMRN: 0,
pageIndex: 1, pageIndex: 1,
clinicId: 0, clinicId: 0,
pageSize: 100, pageSize: 300,
); );
hasError = false; hasError = false;
_categoriesList.clear(); _categoriesList.clear();

@ -632,17 +632,21 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
fontWeight: fontWeight:
FontWeight.w700, FontWeight.w700,
), ),
// AppText( Expanded(
// model child: AppText(
// .medicalFileList[0] model
// .entityList[0] .medicalFileList[
// .timelines[0] 0]
// .timeLineEvents[0] .entityList[0]
// .consulations[0] .timelines[0]
// .lstProcedure[index] .timeLineEvents[0]
// .orderDate .consulations[0]
// .trim(), .lstProcedure[
// ), index]
.orderDate
.trim(),
),
),
], ],
), ),
Row( Row(

@ -47,6 +47,7 @@ postProcedure(
String instruction, String instruction,
PrescriptionViewModel model, PrescriptionViewModel model,
DateTime doseTime, DateTime doseTime,
String doseUnit,
PatiantInformtion patient}) async { PatiantInformtion patient}) async {
PostPrescriptionReqModel postProcedureReqModel = PostPrescriptionReqModel postProcedureReqModel =
new PostPrescriptionReqModel(); new PostPrescriptionReqModel();
@ -59,9 +60,9 @@ postProcedure(
sss.add(PrescriptionRequestModel( sss.add(PrescriptionRequestModel(
covered: true, covered: true,
dose: 1, dose: int.parse(dose),
itemId: drugId.isEmpty ? 1 : int.parse(drugId), itemId: drugId.isEmpty ? 1 : int.parse(drugId),
doseUnitId: 1, doseUnitId: int.parse(doseUnit),
route: route.isEmpty ? 1 : int.parse(route), route: route.isEmpty ? 1 : int.parse(route),
frequency: frequency.isEmpty ? 1 : int.parse(frequency), frequency: frequency.isEmpty ? 1 : int.parse(frequency),
remarks: instruction, remarks: instruction,
@ -114,6 +115,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
dynamic duration; dynamic duration;
dynamic doseTime; dynamic doseTime;
dynamic indication; dynamic indication;
dynamic units;
List<dynamic> strengthList; List<dynamic> strengthList;
List<dynamic> routeList; List<dynamic> routeList;
@ -121,6 +123,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
List<dynamic> durationList; List<dynamic> durationList;
List<dynamic> doseTimeList; List<dynamic> doseTimeList;
List<dynamic> indicationList; List<dynamic> indicationList;
List<dynamic> unitsList;
String routeInatial = 'By Mouth'; String routeInatial = 'By Mouth';
//PatiantInformtion patient; //PatiantInformtion patient;
@ -135,12 +138,22 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
durationList = List(); durationList = List();
doseTimeList = List(); doseTimeList = List();
indicationList = List(); indicationList = List();
unitsList = List();
dynamic unit1 = {"id": 1, "name": "MG"};
dynamic unit2 = {"id": 2, "name": "MCG"};
dynamic unit3 = {"id": 3, "name": "GM"};
dynamic regularOrder = {"id": 1, "name": "regular Order"}; dynamic regularOrder = {"id": 1, "name": "regular Order"};
dynamic urgentOrder = {"id": 2, "name": "urgent Order"}; dynamic urgentOrder = {"id": 2, "name": "urgent Order"};
dynamic strength1 = {"id": 1, "name": "1"}; dynamic strength1 = {"id": 1, "name": "1"};
dynamic strength2 = {"id": 2, "name": "2"}; dynamic strength2 = {"id": 2, "name": "2"};
dynamic strength3 = {"id": 3, "name": "3"}; dynamic strength3 = {"id": 3, "name": "3"};
dynamic strength4 = {"id": 4, "name": "4"};
dynamic strength5 = {"id": 5, "name": "5"};
dynamic strength6 = {"id": 6, "name": "6"};
dynamic strength7 = {"id": 7, "name": "7"};
dynamic strength8 = {"id": 8, "name": "8"};
dynamic strength9 = {"id": 9, "name": "9"};
dynamic route1 = {"id": 7, "name": "By Mouth"}; dynamic route1 = {"id": 7, "name": "By Mouth"};
dynamic route2 = {"id": 10, "name": "Inhale by Mouth"}; dynamic route2 = {"id": 10, "name": "Inhale by Mouth"};
dynamic route3 = {"id": 15, "name": "for INJECTION"}; dynamic route3 = {"id": 15, "name": "for INJECTION"};
@ -169,6 +182,11 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
dynamic duration9 = {"id": 9, "name": "For 9 Days"}; dynamic duration9 = {"id": 9, "name": "For 9 Days"};
dynamic duration10 = {"id": 10, "name": "For 10 Days"}; dynamic duration10 = {"id": 10, "name": "For 10 Days"};
dynamic duration11 = {"id": 14, "name": "For 14 Days"}; dynamic duration11 = {"id": 14, "name": "For 14 Days"};
dynamic duration12 = {"id": 21, "name": "For 21 Days"};
dynamic duration13 = {"id": 30, "name": "For 30 Days"};
dynamic duration14 = {"id": 45, "name": "For 45 Days"};
dynamic duration15 = {"id": 60, "name": "For 60 Days"};
dynamic duration16 = {"id": 90, "name": "For 90 Days"};
dynamic doseTime1 = {"id": 1, "name": "Before Meals"}; dynamic doseTime1 = {"id": 1, "name": "Before Meals"};
dynamic doseTime2 = {"id": 2, "name": "After Meals"}; dynamic doseTime2 = {"id": 2, "name": "After Meals"};
dynamic doseTime3 = {"id": 3, "name": "With Meals"}; dynamic doseTime3 = {"id": 3, "name": "With Meals"};
@ -195,6 +213,9 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
dynamic indication9 = {"id": 554, "name": "Purpuric Dermatitis"}; dynamic indication9 = {"id": 554, "name": "Purpuric Dermatitis"};
dynamic indication10 = {"id": 555, "name": "Systemic Lupus Erythematosus"}; dynamic indication10 = {"id": 555, "name": "Systemic Lupus Erythematosus"};
unitsList.add(unit1);
unitsList.add(unit2);
unitsList.add(unit3);
indicationList.add(indication1); indicationList.add(indication1);
indicationList.add(indication2); indicationList.add(indication2);
indicationList.add(indication3); indicationList.add(indication3);
@ -238,6 +259,12 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
strengthList.add(strength1); strengthList.add(strength1);
strengthList.add(strength2); strengthList.add(strength2);
strengthList.add(strength3); strengthList.add(strength3);
strengthList.add(strength4);
strengthList.add(strength5);
strengthList.add(strength6);
strengthList.add(strength7);
strengthList.add(strength8);
strengthList.add(strength9);
durationList.add(duration1); durationList.add(duration1);
durationList.add(duration2); durationList.add(duration2);
durationList.add(duration3); durationList.add(duration3);
@ -249,6 +276,11 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
durationList.add(duration9); durationList.add(duration9);
durationList.add(duration10); durationList.add(duration10);
durationList.add(duration11); durationList.add(duration11);
durationList.add(duration12);
durationList.add(duration13);
durationList.add(duration14);
durationList.add(duration15);
durationList.add(duration16);
referToList.add(regularOrder); referToList.add(regularOrder);
referToList.add(urgentOrder); referToList.add(urgentOrder);
} }
@ -415,41 +447,103 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
SizedBox(height: spaceBetweenTextFileds), SizedBox(height: spaceBetweenTextFileds),
Container( Container(
height: screenSize.height * 0.070, height: screenSize.height * 0.070,
child: InkWell( width: double.infinity,
onTap: strengthList != null child: Row(
? () { children: [
ListSelectDialog dialog = Container(
ListSelectDialog( width:
list: strengthList, MediaQuery.of(context).size.width *
attributeName: 'name', 0.5,
attributeValueId: 'id', child: InkWell(
okText: onTap: strengthList != null
TranslationBase.of(context) ? () {
.ok, ListSelectDialog dialog =
okFunction: (selectedValue) { ListSelectDialog(
setState(() { list: strengthList,
strength = selectedValue; attributeName: 'name',
}); attributeValueId: 'id',
}, okText: TranslationBase.of(
); context)
showDialog( .ok,
barrierDismissible: false, okFunction:
context: context, (selectedValue) {
builder: (BuildContext context) { setState(() {
return dialog; strength =
}, selectedValue;
); });
} },
: null, );
child: TextField( showDialog(
decoration: textFieldSelectorDecoration( barrierDismissible: false,
TranslationBase.of(context).strength, context: context,
strength != null builder:
? strength['name'] (BuildContext context) {
return dialog;
},
);
}
: null, : null,
true), child: TextField(
enabled: false, decoration:
), textFieldSelectorDecoration(
TranslationBase.of(context)
.strength,
strength != null
? strength['name']
: null,
true),
enabled: false,
),
),
),
SizedBox(
width: 10.0,
),
Container(
width:
MediaQuery.of(context).size.width *
0.40,
child: InkWell(
onTap: unitsList != null
? () {
ListSelectDialog dialog =
ListSelectDialog(
list: unitsList,
attributeName: 'name',
attributeValueId: 'id',
okText: TranslationBase.of(
context)
.ok,
okFunction:
(selectedValue) {
setState(() {
units = selectedValue;
});
},
);
showDialog(
barrierDismissible: false,
context: context,
builder:
(BuildContext context) {
return dialog;
},
);
}
: null,
child: TextField(
decoration:
textFieldSelectorDecoration(
'UNIT Type',
units != null
? units['name']
: null,
true),
enabled: false,
),
),
),
],
), ),
), ),
SizedBox(height: spaceBetweenTextFileds), SizedBox(height: spaceBetweenTextFileds),
@ -761,11 +855,11 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
selectDate(BuildContext context, PrescriptionViewModel model) async { selectDate(BuildContext context, PrescriptionViewModel model) async {
DateTime selectedDate; DateTime selectedDate;
selectedDate = DateTime.now().add(Duration(hours: 15)); selectedDate = DateTime.now();
final DateTime picked = await showDatePicker( final DateTime picked = await showDatePicker(
context: context, context: context,
initialDate: selectedDate, initialDate: selectedDate,
firstDate: DateTime.now().add(Duration(hours: 15)), firstDate: DateTime.now(),
lastDate: DateTime(2040), lastDate: DateTime(2040),
initialEntryMode: DatePickerEntryMode.calendar, initialEntryMode: DatePickerEntryMode.calendar,
); );
@ -826,6 +920,8 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
title: TranslationBase.of(context).addMedication, title: TranslationBase.of(context).addMedication,
onPressed: () { onPressed: () {
postProcedure( postProcedure(
dose: strength['id'].toString(),
doseUnit: units['id'].toString(),
patient: widget.patient, patient: widget.patient,
doseTimeIn: doseTime['id'].toString(), doseTimeIn: doseTime['id'].toString(),
model: widget.model, model: widget.model,

@ -18,6 +18,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_text_form_field.dart'; import 'package:doctor_app_flutter/widgets/shared/app_text_form_field.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/dialogs/dailog-list-select.dart';
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart'; import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
@ -28,10 +29,86 @@ class NewPrescriptionScreen extends StatefulWidget {
} }
class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> { class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
PersistentBottomSheetController _controller;
final _scaffoldKey = GlobalKey<ScaffoldState>();
int testNum = 0; int testNum = 0;
PatiantInformtion patient; PatiantInformtion patient;
dynamic route;
dynamic doseTime;
dynamic frequencyUpdate;
List<dynamic> doseTimeList;
List<dynamic> routeList;
List<dynamic> frequencyList;
@override @override
void initState() {
super.initState();
routeList = List();
doseTimeList = List();
frequencyList = List();
dynamic frequency1 = {"id": 1, "name": "2 Times a day"};
dynamic frequency2 = {"id": 2, "name": "3 Times a day"};
dynamic frequency3 = {"id": 3, "name": "4 Times a day"};
dynamic frequency4 = {"id": 8, "name": "As Needed"};
dynamic frequency5 = {"id": 9, "name": "Bed Time"};
dynamic frequency6 = {"id": 11, "name": "Every Other Day"};
dynamic frequency7 = {"id": 29, "name": "Every Eight Hours"};
dynamic frequency8 = {"id": 34, "name": "As Directed"};
dynamic doseTime1 = {"id": 1, "name": "Before Meals"};
dynamic doseTime2 = {"id": 2, "name": "After Meals"};
dynamic doseTime3 = {"id": 3, "name": "With Meals"};
dynamic doseTime4 = {"id": 4, "name": "In The Morning"};
dynamic doseTime5 = {"id": 5, "name": "In the Evening"};
dynamic doseTime6 = {"id": 6, "name": "After Supper"};
dynamic doseTime7 = {"id": 7, "name": "With Supper"};
dynamic doseTime8 = {"id": 8, "name": "Before Breakfast"};
dynamic doseTime9 = {"id": 9, "name": "In the Afternoon"};
dynamic doseTime10 = {"id": 10, "name": "While wake"};
dynamic doseTime11 = {"id": 12, "name": "Any Time"};
dynamic doseTime12 = {"id": 21, "name": "Bed Time"};
dynamic route1 = {"id": 7, "name": "By Mouth"};
dynamic route2 = {"id": 10, "name": "Inhale by Mouth"};
dynamic route3 = {"id": 15, "name": "for INJECTION"};
dynamic route4 = {"id": 17, "name": "Drops"};
dynamic route5 = {"id": 18, "name": "Rub On"};
dynamic route6 = {"id": 20, "name": "Spary"};
dynamic route7 = {"id": 27, "name": "In Both EYES"};
dynamic route8 = {"id": 28, "name": "In Both Ears"};
dynamic route9 = {"id": 32, "name": "Intramuscular"};
frequencyList.add(frequency1);
frequencyList.add(frequency2);
frequencyList.add(frequency3);
frequencyList.add(frequency4);
frequencyList.add(frequency5);
frequencyList.add(frequency6);
frequencyList.add(frequency7);
frequencyList.add(frequency8);
doseTimeList.add(doseTime1);
doseTimeList.add(doseTime2);
doseTimeList.add(doseTime3);
doseTimeList.add(doseTime4);
doseTimeList.add(doseTime5);
doseTimeList.add(doseTime6);
doseTimeList.add(doseTime7);
doseTimeList.add(doseTime8);
doseTimeList.add(doseTime9);
doseTimeList.add(doseTime10);
doseTimeList.add(doseTime11);
doseTimeList.add(doseTime12);
routeList.add(route1);
routeList.add(route2);
routeList.add(route3);
routeList.add(route4);
routeList.add(route5);
routeList.add(route6);
routeList.add(route7);
routeList.add(route8);
routeList.add(route9);
}
Widget build(BuildContext context) { Widget build(BuildContext context) {
final screenSize = MediaQuery.of(context).size; final screenSize = MediaQuery.of(context).size;
final routeArgs = ModalRoute.of(context).settings.arguments as Map; final routeArgs = ModalRoute.of(context).settings.arguments as Map;
@ -453,6 +530,15 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
.edit), .edit),
onTap: () { onTap: () {
updatePrescriptionForm( updatePrescriptionForm(
doseUnit:
model.prescriptionList[0].entityList[index].doseDailyUnitID
.toString(),
doseStreangth:
model.prescriptionList[0].entityList[index].doseDailyQuantity
.toString(),
duration:
model.prescriptionList[0].entityList[index].doseDurationDays
.toString(),
startDate: startDate:
model.prescriptionList[0].entityList[index].startDate model.prescriptionList[0].entityList[index].startDate
.toString(), .toString(),
@ -463,9 +549,13 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
index] index]
.doseTimingID .doseTimingID
.toString(), .toString(),
frequency: frequency: model
model.prescriptionList[0].entityList[index].frequencyID .prescriptionList[
.toString(), 0]
.entityList[
index]
.frequencyID
.toString(),
rouat: model rouat: model
.prescriptionList[ .prescriptionList[
0] 0]
@ -476,22 +566,13 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
patient: patient:
patient, patient,
drugId: model drugId: model
.prescriptionList[
0]
.entityList[
index]
.medicineCode,
drugName: model
.prescriptionList[
0]
.entityList[
index]
.doseDetail,
remarks: model
.prescriptionList[0] .prescriptionList[0]
.entityList[index] .entityList[index]
.remarks, .medicineCode,
drugName: model.prescriptionList[0].entityList[index].doseDetail,
remarks: model.prescriptionList[0].entityList[index].remarks,
model: model, model: model,
enteredRemarks: model.prescriptionList[0].entityList[index].remarks,
context: context); context: context);
//model.postPrescription(); //model.postPrescription();
}, },
@ -597,6 +678,10 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
String rouat, String rouat,
String frequency, String frequency,
String dose, String dose,
String duration,
String doseStreangth,
String doseUnit,
String enteredRemarks,
String startDate}) { String startDate}) {
TextEditingController remarksController = TextEditingController(); TextEditingController remarksController = TextEditingController();
TextEditingController doseController = TextEditingController(); TextEditingController doseController = TextEditingController();
@ -605,122 +690,213 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
showModalBottomSheet( showModalBottomSheet(
context: context, context: context,
isScrollControlled: true, isScrollControlled: true,
builder: (BuildContext bc) { builder: (BuildContext context) {
return Container( return StatefulBuilder(builder: (BuildContext context,
height: MediaQuery.of(context).size.height * 0.73, StateSetter setState /*You can rename this!*/) {
child: Form( return Container(
child: Padding( height: MediaQuery.of(context).size.height * 0.73,
padding: child: Form(
EdgeInsets.symmetric(horizontal: 20.0, vertical: 12.0), child: Padding(
child: Column( padding:
crossAxisAlignment: CrossAxisAlignment.start, EdgeInsets.symmetric(horizontal: 20.0, vertical: 12.0),
children: [ child: Column(
AppText( crossAxisAlignment: CrossAxisAlignment.start,
drugName.toUpperCase(), children: [
fontWeight: FontWeight.w900, AppText(
), drugName.toUpperCase(),
SizedBox( fontWeight: FontWeight.w900,
height: 30.0, ),
), SizedBox(
Column( height: 30.0,
children: [ ),
Container( Column(
decoration: BoxDecoration( children: [
borderRadius: Container(
BorderRadius.all(Radius.circular(6.0)), height:
border: Border.all( MediaQuery.of(context).size.height * 0.070,
width: 1.0, color: HexColor("#CCCCCC"))), child: InkWell(
child: TextFields( onTap: routeList != null
hintText: 'route', ? () {
controller: routeController, ListSelectDialog dialog =
keyboardType: TextInputType.number, ListSelectDialog(
list: routeList,
attributeName: 'name',
attributeValueId: 'id',
okText:
TranslationBase.of(context).ok,
okFunction: (selectedValue) {
setState(() {
route = selectedValue;
});
if (route == null) {
helpers
.showErrorToast('plase fill');
}
},
);
showDialog(
barrierDismissible: false,
context: context,
builder: (BuildContext context) {
return dialog;
},
);
}
: null,
child: TextField(
decoration: textFieldSelectorDecoration(
TranslationBase.of(context).route,
route != null ? route['name'] : null,
true),
enabled: false,
),
),
), ),
), SizedBox(
SizedBox( height: 12.0,
height: 12.0,
),
Container(
decoration: BoxDecoration(
borderRadius:
BorderRadius.all(Radius.circular(6.0)),
border: Border.all(
width: 1.0, color: HexColor("#CCCCCC"))),
child: TextFields(
hintText: 'Dose Time',
controller: doseController,
keyboardType: TextInputType.number,
), ),
), Container(
SizedBox( height:
height: 12.0, MediaQuery.of(context).size.height * 0.070,
), child: InkWell(
Container( onTap: doseTimeList != null
decoration: BoxDecoration( ? () {
borderRadius: ListSelectDialog dialog =
BorderRadius.all(Radius.circular(6.0)), ListSelectDialog(
border: Border.all( list: doseTimeList,
width: 1.0, color: HexColor("#CCCCCC"))), attributeName: 'name',
child: TextFields( attributeValueId: 'id',
hintText: 'Frequency', okText:
controller: frequencyController, TranslationBase.of(context).ok,
keyboardType: TextInputType.number, okFunction: (selectedValue) {
setState(() {
doseTime = selectedValue;
});
},
);
showDialog(
barrierDismissible: false,
context: context,
builder: (BuildContext context) {
return dialog;
},
);
}
: null,
child: TextField(
decoration: textFieldSelectorDecoration(
TranslationBase.of(context).doseTime,
doseTime != null
? doseTime['name']
: null,
true),
enabled: false,
),
),
), ),
), SizedBox(
SizedBox( height: 12.0,
height: 12.0,
),
Container(
decoration: BoxDecoration(
borderRadius:
BorderRadius.all(Radius.circular(6.0)),
border: Border.all(
width: 1.0, color: HexColor("#CCCCCC"))),
child: TextFields(
hintText: remarks,
controller: remarksController,
maxLines: 7,
minLines: 4,
), ),
), Container(
SizedBox( height:
height: 12.0, MediaQuery.of(context).size.height * 0.070,
), child: InkWell(
SizedBox( onTap: frequencyList != null
height: MediaQuery.of(context).size.height * 0.12, ? () {
), ListSelectDialog dialog =
Container( ListSelectDialog(
margin: list: frequencyList,
EdgeInsets.all(SizeConfig.widthMultiplier * 2), attributeName: 'name',
child: Wrap( attributeValueId: 'id',
alignment: WrapAlignment.center, okText:
children: <Widget>[ TranslationBase.of(context).ok,
AppButton( okFunction: (selectedValue) {
title: 'update prescription'.toUpperCase(), setState(() {
onPressed: () { frequencyUpdate = selectedValue;
updatePrescription( });
startDate: startDate, },
doseId: dose, );
frequencyId: frequency, showDialog(
routeId: rouat, barrierDismissible: false,
patient: patient, context: context,
model: model, builder: (BuildContext context) {
drugId: drugId, return dialog;
remarks: remarksController.text, },
route: routeController.text, );
frequency: frequencyController.text, }
dose: doseController.text); : null,
Navigator.pop(context); child: TextField(
}, decoration: textFieldSelectorDecoration(
TranslationBase.of(context).frequency,
frequencyUpdate != null
? frequencyUpdate['name']
: null,
true),
enabled: false,
), ),
], ),
), ),
), SizedBox(
], height: 12.0,
), ),
], Container(
decoration: BoxDecoration(
borderRadius:
BorderRadius.all(Radius.circular(6.0)),
border: Border.all(
width: 1.0, color: HexColor("#CCCCCC"))),
child: TextFields(
hintText: remarks,
controller: remarksController,
maxLines: 7,
minLines: 4,
),
),
SizedBox(
height: 12.0,
),
SizedBox(
height: MediaQuery.of(context).size.height * 0.12,
),
Container(
margin: EdgeInsets.all(
SizeConfig.widthMultiplier * 2),
child: Wrap(
alignment: WrapAlignment.center,
children: <Widget>[
AppButton(
title: 'update prescription'.toUpperCase(),
onPressed: () {
updatePrescription(
doseUnit: doseUnit,
doseStreangth: doseStreangth,
duration: duration,
startDate: startDate,
doseId: dose,
frequencyId: frequency,
routeId: rouat,
patient: patient,
model: model,
drugId: drugId,
remarks: remarksController.text,
route: route['id'].toString(),
frequency:
frequencyUpdate['id'].toString(),
dose: doseTime['id'].toString(),
enteredRemarks: enteredRemarks);
Navigator.pop(context);
},
),
],
),
),
],
),
],
),
), ),
), ));
)); });
}); });
} }
@ -735,6 +911,10 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
String route, String route,
String routeId, String routeId,
String startDate, String startDate,
String doseUnit,
String doseStreangth,
String duration,
String enteredRemarks,
PatiantInformtion patient}) async { PatiantInformtion patient}) async {
//PrescriptionViewModel model = PrescriptionViewModel(); //PrescriptionViewModel model = PrescriptionViewModel();
PostPrescriptionReqModel updatePrescriptionReqModel = PostPrescriptionReqModel updatePrescriptionReqModel =
@ -748,18 +928,19 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
sss.add(PrescriptionRequestModel( sss.add(PrescriptionRequestModel(
covered: true, covered: true,
dose: 9, //frequency.isNotEmpty ? int.parse(dose) : 1, dose: int.parse(
doseStreangth), //frequency.isNotEmpty ? int.parse(dose) : 1,
itemId: drugId, itemId: drugId,
doseUnitId: 2, doseUnitId: int.parse(doseUnit),
route: route.isNotEmpty ? int.parse(route) : int.parse(routeId), route: route.isNotEmpty ? int.parse(route) : int.parse(routeId),
frequency: frequency.isNotEmpty frequency: frequency.isNotEmpty
? int.parse(frequency) ? int.parse(frequency)
: int.parse(frequencyId), : int.parse(frequencyId),
remarks: remarks.isEmpty ? '' : remarks, remarks: remarks.isEmpty ? enteredRemarks : remarks,
approvalRequired: true, approvalRequired: true,
icdcode10Id: "test2", icdcode10Id: "test2",
doseTime: dose.isNotEmpty ? int.parse(dose) : int.parse(doseId), doseTime: dose.isNotEmpty ? int.parse(dose) : int.parse(doseId),
duration: 2, duration: int.parse(duration),
doseStartDate: startDate)); doseStartDate: startDate));
updatePrescriptionReqModel.prescriptionRequestModel = sss; updatePrescriptionReqModel.prescriptionRequestModel = sss;
//postProcedureReqModel.procedures = controlsProcedure; //postProcedureReqModel.procedures = controlsProcedure;
@ -773,4 +954,36 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
DrAppToastMsg.showSuccesToast('Medication has been updated'); DrAppToastMsg.showSuccesToast('Medication has been updated');
} }
} }
InputDecoration textFieldSelectorDecoration(
String hintText, String selectedText, bool isDropDown,
{Icon suffixIcon}) {
return InputDecoration(
focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: Color(0xFFCCCCCC), width: 2.0),
borderRadius: BorderRadius.circular(8),
),
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Color(0xFFCCCCCC), width: 2.0),
borderRadius: BorderRadius.circular(8),
),
disabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Color(0xFFCCCCCC), width: 2.0),
borderRadius: BorderRadius.circular(8),
),
hintText: selectedText != null ? selectedText : hintText,
suffixIcon: isDropDown
? suffixIcon != null
? suffixIcon
: Icon(
Icons.arrow_drop_down,
color: Colors.black,
)
: null,
hintStyle: TextStyle(
fontSize: 14,
color: Colors.grey.shade600,
),
);
}
} }

@ -646,8 +646,7 @@ postProcedure(
postProcedureReqModel.patientMRN = patient.patientMRN; postProcedureReqModel.patientMRN = patient.patientMRN;
controls.add( controls.add(
Controls( Controls(code: remarks.isEmpty ? '' : remarks, controlValue: 'test'),
code: remarks.isEmpty ? 'ssss' : remarks, controlValue: 'sssssssss'),
); );
entityList.forEach((element) { entityList.forEach((element) {

Loading…
Cancel
Save