development-3.3
haroon amjad 2 years ago
parent d0163d5a38
commit ad1f1e133c

@ -7,9 +7,9 @@ const ONLY_DATE = "[0-9/]";
const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/'; const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/';
const DOCTOR_ROTATION = 'https://doctorrota.hmg.com/'; const DOCTOR_ROTATION = 'https://doctorrota.hmg.com/';
// const BASE_URL_LIVE_CARE = 'https://livecareuat.hmg.com/'; // const BASE_URL_LIVE_CARE = 'https://livecareuat.hmg.com/';
// 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 BASE_URL = 'https://webservices.hmg.com/'; // const BASE_URL = 'https://webservices.hmg.com/';
@ -190,7 +190,8 @@ const GET_MY_REFERRAL_OUT_PATIENT = "Services/DoctorApplication.svc/REST/GtMyRef
const GET_MY_DISCHARGE_PATIENT = "Services/DoctorApplication.svc/REST/GtMyDischargeReferralPatient"; const GET_MY_DISCHARGE_PATIENT = "Services/DoctorApplication.svc/REST/GtMyDischargeReferralPatient";
const GET_DISCHARGE_PATIENT = "Services/DoctorApplication.svc/REST/GtMyDischargePatient"; const GET_DISCHARGE_PATIENT = "Services/DoctorApplication.svc/REST/GtMyDischargePatient";
const GET_PAtIENTS_INSURANCE_APPROVALS = "Services/Patients.svc/REST/GetApprovalStatus"; // const GET_PAtIENTS_INSURANCE_APPROVALS = "Services/Patients.svc/REST/GetApprovalStatus";
const GET_PAtIENTS_INSURANCE_APPROVALS = "Services/Patients.svc/REST/GetApprovalStatus_Async";
const GET_RAD_IMAGE_URL = 'Services/Patients.svc/Rest/GetRadImageURL'; const GET_RAD_IMAGE_URL = 'Services/Patients.svc/Rest/GetRadImageURL';
const GET_PATIENT_ORDERS = 'Services/Patients.svc/REST/GetPatientRadOrders'; const GET_PATIENT_ORDERS = 'Services/Patients.svc/REST/GetPatientRadOrders';

@ -3,6 +3,7 @@ import 'package:doctor_app_flutter/core/viewModel/InsuranceViewModel.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/model/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/In_patient/NoData.dart';
import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart';
import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart'; import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart';
@ -714,7 +715,7 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Padding( Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 8.0), horizontal: 8.0),
child: ListView.builder( child: (model.insuranceApproval[indexInsurance].apporvalDetails != null && model.insuranceApproval[indexInsurance].apporvalDetails.isNotEmpty) ? ListView.builder(
shrinkWrap: true, shrinkWrap: true,
physics: ScrollPhysics(), physics: ScrollPhysics(),
itemCount: model itemCount: model
@ -789,7 +790,7 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
], ],
), ),
); );
}), }) : NoData(),
), ),
], ],
), ),

@ -50,6 +50,7 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
GlobalKey key = new GlobalKey<AutoCompleteTextFieldState<MasterKeyModel>>(); GlobalKey key = new GlobalKey<AutoCompleteTextFieldState<MasterKeyModel>>();
bool isFormSubmitted = false; bool isFormSubmitted = false;
bool complexDiagnosis = true; bool complexDiagnosis = true;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
@ -116,16 +117,13 @@ Row(children: [
value: complexDiagnosis, value: complexDiagnosis,
onChanged: (bool value) { onChanged: (bool value) {
complexDiagnosis = value; complexDiagnosis = value;
setState(() { setState(() {});
});
}, },
checkColor: Colors.white, checkColor: Colors.white,
activeColor: Colors.green, activeColor: Colors.green,
), ),
Text( Text(
TranslationBase.of(context).complexDiagnosis, TranslationBase.of(context).complexDiagnosis,
), ),
]), ]),
SizedBox( SizedBox(
@ -145,8 +143,8 @@ Row(children: [
SizedBox( SizedBox(
height: 10, height: 10,
), ),
Column( Column(children: [
children:[ InkWell( InkWell(
onTap: model.listOfICD10 != null onTap: model.listOfICD10 != null
? () { ? () {
setState(() { setState(() {
@ -178,8 +176,8 @@ Row(children: [
isTextFieldHasSuffix: true, isTextFieldHasSuffix: true,
suffixIcon: IconButton( suffixIcon: IconButton(
onPressed: () { onPressed: () {
if (icdNameController.text.length <= 3) { if (icdNameController.text.length <= 2) {
DrAppToastMsg.showErrorToast("Please enter 4 or more characters"); DrAppToastMsg.showErrorToast("Please enter 3 or more characters");
} else { } else {
model.listOfICD10.clear(); model.listOfICD10.clear();
model.callAddAssessmentLookupsServices(searchKey: icdNameController.text); model.callAddAssessmentLookupsServices(searchKey: icdNameController.text);
@ -191,28 +189,25 @@ Row(children: [
)), )),
)), )),
model.listOfICD10.length >0 && icdNameController.text.isNotEmpty ? Container( model.listOfICD10.length > 0 && icdNameController.text.isNotEmpty
? Container(
color: Colors.white, color: Colors.white,
height: MediaQuery.of(context).size.height * 0.4, //height to 9% of screen height, height: MediaQuery.of(context).size.height * 0.4, //height to 9% of screen height,
child: ListView.builder( child: ListView.builder(
shrinkWrap: true, shrinkWrap: true,
itemCount: model.listOfICD10.length, itemCount: model.listOfICD10.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
return InkWell(child:ListTile( return InkWell(
title: AppText( model.listOfICD10[index].description + " / " + model.listOfICD10[index].code.toString(), fontSize: 12.0)), child: ListTile(title: AppText(model.listOfICD10[index].description + " / " + model.listOfICD10[index].code.toString(), fontSize: 12.0)),
onTap: () { onTap: () {
widget.mySelectedAssessment.selectedICD = model.listOfICD10[index]; widget.mySelectedAssessment.selectedICD = model.listOfICD10[index];
icdNameController.text = model.listOfICD10[index].description; icdNameController.text = model.listOfICD10[index].description;
model.listOfICD10.clear(); model.listOfICD10.clear();
setState(() { setState(() {});
}); });
}
);
}, },
)) :SizedBox() ))
: SizedBox()
// CustomAutoCompleteTextField( // CustomAutoCompleteTextField(
// isShowError: isFormSubmitted && widget.mySelectedAssessment.selectedICD == null, // isShowError: isFormSubmitted && widget.mySelectedAssessment.selectedICD == null,
// child: Row( // child: Row(
@ -259,7 +254,6 @@ Row(children: [
// ], // ],
// ), // ),
// ) // )
]), ]),
if (widget.mySelectedAssessment.selectedICD != null) if (widget.mySelectedAssessment.selectedICD != null)
Column( Column(
@ -411,7 +405,6 @@ Row(children: [
DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile);
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
if (isUpdate) { if (isUpdate) {
PostAssessmentRequestUpdateModel patchAssessmentReqModel = PostAssessmentRequestUpdateModel( PostAssessmentRequestUpdateModel patchAssessmentReqModel = PostAssessmentRequestUpdateModel(
patientMRN: widget.patientInfo.patientMRN, patientMRN: widget.patientInfo.patientMRN,
episodeId: widget.patientInfo.episodeNo, episodeId: widget.patientInfo.episodeNo,
@ -425,7 +418,8 @@ Row(children: [
conditionId: mySelectedAssessment.selectedDiagnosisCondition.id, conditionId: mySelectedAssessment.selectedDiagnosisCondition.id,
prevIcdCode10ID: mySelectedAssessment.icdCode10ID, prevIcdCode10ID: mySelectedAssessment.icdCode10ID,
diagnosisTypeId: mySelectedAssessment.selectedDiagnosisType.id, diagnosisTypeId: mySelectedAssessment.selectedDiagnosisType.id,
icdcode10Id: mySelectedAssessment.selectedICD.code)]); icdcode10Id: mySelectedAssessment.selectedICD.code)
]);
await model.patchAssessment(patchAssessmentReqModel); await model.patchAssessment(patchAssessmentReqModel);
} else { } else {

Loading…
Cancel
Save