Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into live_cear_services

merge-requests/693/head
Mohammad Aljammal 5 years ago
commit e89d5b13ab

@ -4,8 +4,8 @@ const MAX_SMALL_SCREEN = 660;
const ONLY_NUMBERS = "[0-9]"; const ONLY_NUMBERS = "[0-9]";
const ONLY_LETTERS = "[a-zA-Z &'\"]"; const ONLY_LETTERS = "[a-zA-Z &'\"]";
const ONLY_DATE = "[0-9/]"; const ONLY_DATE = "[0-9/]";
// const BASE_URL = 'https://hmgwebservices.com/'; const BASE_URL = 'https://hmgwebservices.com/';
const BASE_URL = 'https://uat.hmgwebservices.com/'; // const BASE_URL = 'https://uat.hmgwebservices.com/';
const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh"; const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh";
const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList"; const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList";
const PATIENT_PROGRESS_NOTE_URL = const PATIENT_PROGRESS_NOTE_URL =

@ -105,13 +105,16 @@ class LabsService extends BaseService {
await baseAppClient.postPatient(url, patient: patient, await baseAppClient.postPatient(url, patient: patient,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
// patientLabSpecialResult.clear(); patientLabSpecialResult = [];
labResultList.clear(); labResultList = [];
if (isInpatient) { if (isInpatient) {
response['List_GetLabNormal'].forEach((hospital) { response['List_GetLabNormal'].forEach((hospital) {
labResultList.add(LabResult.fromJson(hospital)); labResultList.add(LabResult.fromJson(hospital));
}); });
response['List_GetLabSpecial'].forEach((hospital) {
patientLabSpecialResult.add(PatientLabSpecialResult.fromJson(hospital));
});
} else { } else {
response['ListPLR'].forEach((lab) { response['ListPLR'].forEach((lab) {
labResultList.add(LabResult.fromJson(lab)); labResultList.add(LabResult.fromJson(lab));

@ -11,7 +11,9 @@ class PatientMedicalReportService extends BaseService {
Future getMedicalReportList(PatiantInformtion patient) async { Future getMedicalReportList(PatiantInformtion patient) async {
hasError = false; hasError = false;
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
await getDoctorProfile();
body['AdmissionNo'] = patient.admissionNo; body['AdmissionNo'] = patient.admissionNo;
body['SetupID'] = doctorProfile.setupID;
await baseAppClient.postPatient(PATIENT_MEDICAL_REPORT_GET_LIST, await baseAppClient.postPatient(PATIENT_MEDICAL_REPORT_GET_LIST,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {

@ -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,

@ -30,11 +30,15 @@ class _LaboratoryResultPageState extends State<LaboratoryResultPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BaseView<LabsViewModel>( return BaseView<LabsViewModel>(
onModelReady: (model) => model.getLaboratoryResult( // onModelReady: (model) => model.getLaboratoryResult(
invoiceNo: widget.patientLabOrders.invoiceNo, // invoiceNo: widget.patientLabOrders.invoiceNo,
clinicID: widget.patientLabOrders.clinicID, // clinicID: widget.patientLabOrders.clinicID,
projectID: widget.patientLabOrders.projectID, // projectID: widget.patientLabOrders.projectID,
orderNo: widget.patientLabOrders.orderNo, // orderNo: widget.patientLabOrders.orderNo,
// patient: widget.patient,
// isInpatient: widget.patientType == "1"),
onModelReady: (model) => model.getPatientLabResult(
patientLabOrder: widget.patientLabOrders,
patient: widget.patient, patient: widget.patient,
isInpatient: widget.patientType =="1"), isInpatient: widget.patientType =="1"),
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(

@ -45,10 +45,10 @@ class _LaboratoryResultWidgetState extends State<LaboratoryResultWidget> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
projectViewModel = Provider.of(context); projectViewModel = Provider.of(context);
return BaseView<LabsViewModel>( return BaseView<LabsViewModel>(
onModelReady: (model) => model.getPatientLabResult( // onModelReady: (model) => model.getPatientLabResult(
patientLabOrder: widget.patientLabOrder, // patientLabOrder: widget.patientLabOrder,
patient: widget.patient, // patient: widget.patient,
isInpatient: widget.isInpatient), // isInpatient: widget.isInpatient),
builder: (_, model, w) => NetworkBaseView( builder: (_, model, w) => NetworkBaseView(
baseViewModel: model, baseViewModel: model,
child: Container( child: Container(

@ -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,8 +254,8 @@ 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),

@ -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,
), ),
@ -109,8 +107,7 @@ class ProcedureScreen extends StatelessWidget {
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 ||

@ -139,6 +139,7 @@ class DoctorCard extends StatelessWidget {
), ),
if (clinic != null) if (clinic != null)
Row( Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
TranslationBase.of(context).clinic + TranslationBase.of(context).clinic +
@ -146,9 +147,11 @@ class DoctorCard extends StatelessWidget {
color: Colors.grey[500], color: Colors.grey[500],
fontSize: 14, fontSize: 14,
), ),
AppText( Expanded(
child: AppText(
clinic, clinic,
fontSize: 14, fontSize: 14,
),
) )
], ],
), ),

Loading…
Cancel
Save