Merge branch 'prescription_changes' into 'development'

procedure changes

See merge request Cloud_Solution/doctor_app_flutter!691
merge-requests/692/merge
Mohammad Aljammal 5 years ago
commit 7d423d9457

@ -60,6 +60,8 @@ class ProcedureViewModel extends BaseViewModel {
Future getProcedure({int mrn, String patientType}) async { Future getProcedure({int mrn, String patientType}) async {
hasError = false; hasError = false;
await getDoctorProfile();
doctorProfile.doctorID;
//_insuranceCardService.clearInsuranceCard(); //_insuranceCardService.clearInsuranceCard();
setState(ViewState.Busy); setState(ViewState.Busy);
await _procedureService.getProcedure(mrn: mrn); await _procedureService.getProcedure(mrn: mrn);
@ -289,7 +291,6 @@ class ProcedureViewModel extends BaseViewModel {
} }
} }
getPatientLabOrdersResults( getPatientLabOrdersResults(
{PatientLabOrders patientLabOrder, {PatientLabOrders patientLabOrder,
String procedure, String procedure,

@ -28,6 +28,7 @@ class ProcedureCard extends StatelessWidget {
this.patient, this.patient,
this.doctorID, this.doctorID,
}) : super(key: key); }) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
@ -253,9 +254,9 @@ class ProcedureCard extends StatelessWidget {
fontSize: 12, fontSize: 12,
), ),
), ),
if (entityList.categoryID == 2 || if ((entityList.categoryID == 2 ||
entityList.categoryID == 4 && entityList.categoryID == 4) &&
doctorID == entityList.doctorID) doctorID == entityList.doctorID)
InkWell( InkWell(
child: Icon(DoctorApp.edit), child: Icon(DoctorApp.edit),
onTap: onTap, onTap: onTap,

@ -92,9 +92,7 @@ class ProcedureScreen extends StatelessWidget {
fontSize: 13, fontSize: 13,
), ),
AppText( AppText(
TranslationBase TranslationBase.of(context).procedure,
.of(context)
.procedure,
bold: true, bold: true,
fontSize: 22, fontSize: 22,
), ),
@ -102,15 +100,14 @@ class ProcedureScreen extends StatelessWidget {
), ),
), ),
if ((patient.patientStatusType != null && if ((patient.patientStatusType != null &&
patient.patientStatusType == 43) || patient.patientStatusType == 43) ||
(isFromLiveCare && patient.appointmentNo != null)) (isFromLiveCare && patient.appointmentNo != null))
InkWell( InkWell(
onTap: () { onTap: () {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => builder: (context) => AddProcedureHome(
AddProcedureHome(
patient: patient, patient: patient,
model: model, model: model,
)), )),
@ -192,7 +189,7 @@ class ProcedureScreen extends StatelessWidget {
// 'You Cant Update This Procedure'); // 'You Cant Update This Procedure');
}, },
patient: patient, patient: patient,
doctorID: doctorNameP, doctorID: model.doctorProfile.doctorID,
), ),
), ),
if (model.state == ViewState.ErrorLocal || if (model.state == ViewState.ErrorLocal ||

Loading…
Cancel
Save