add ICD10

merge-requests/202/head
Elham Rababah 5 years ago
parent 4e8de52efe
commit 2f273dcde8

@ -1,18 +1,18 @@
class MasterKeyModel { class MasterKeyModel {
String alias; String alias;
String aliasN; String aliasN;
int code; dynamic code;
Null description; dynamic description;
Null detail1; dynamic detail1;
Null detail2; dynamic detail2;
Null detail3; dynamic detail3;
Null detail4; dynamic detail4;
Null detail5; dynamic detail5;
int groupID; int groupID;
int id; int id;
String nameAr; String nameAr;
String nameEn; String nameEn;
Null remarks; dynamic remarks;
int typeId; int typeId;
String valueList; String valueList;

@ -79,6 +79,7 @@ const String PATIENT_INSURANCE_APPROVALS =
'patients/patient_insurance_approvals'; 'patients/patient_insurance_approvals';
const String VITAL_SIGN_DETAILS = 'patients/vital-sign-details'; const String VITAL_SIGN_DETAILS = 'patients/vital-sign-details';
const String CREATE_EPISODE = 'patients/create-episode'; const String CREATE_EPISODE = 'patients/create-episode';
const String UPDATE_EPISODE = 'patients/create-episode';
const String BODY_MEASUREMENTS = 'patients/body-measurements'; const String BODY_MEASUREMENTS = 'patients/body-measurements';
const String IN_PATIENT_PRESCRIPTIONS_DETAILS = 'patients/prescription-details'; const String IN_PATIENT_PRESCRIPTIONS_DETAILS = 'patients/prescription-details';
@ -89,6 +90,7 @@ const String ORDER_PROCEDURE = 'procedure/procedure';
// const String LIVECARE_END_DIALOG = 'video-call/EndCallDialogBox'; // const String LIVECARE_END_DIALOG = 'video-call/EndCallDialogBox';
const String PATIENT_SICKLEAVE = 'patients/patient_sickleave'; const String PATIENT_SICKLEAVE = 'patients/patient_sickleave';
const String ADD_SICKLEAVE = 'add-sickleave'; const String ADD_SICKLEAVE = 'add-sickleave';
//todo: change the routing way.
var routes = { var routes = {
ROOT: (_) => RootPage(), ROOT: (_) => RootPage(),
HOME: (_) => LandingPage(), HOME: (_) => LandingPage(),
@ -122,6 +124,7 @@ var routes = {
PATIENT_INSURANCE_APPROVALS: (_) => InsuranceApprovalsScreen(), PATIENT_INSURANCE_APPROVALS: (_) => InsuranceApprovalsScreen(),
VITAL_SIGN_DETAILS: (_) => VitalSignDetailsScreen(), VITAL_SIGN_DETAILS: (_) => VitalSignDetailsScreen(),
CREATE_EPISODE: (_) => AddSOAPIndex(), CREATE_EPISODE: (_) => AddSOAPIndex(),
UPDATE_EPISODE: (_) => AddSOAPIndex(isUpdate: true,),
BODY_MEASUREMENTS: (_) => VitalSignItemDetailsScreen(), BODY_MEASUREMENTS: (_) => VitalSignItemDetailsScreen(),
IN_PATIENT_PRESCRIPTIONS_DETAILS: (_) => InpatientPrescriptionDetailsScreen(), IN_PATIENT_PRESCRIPTIONS_DETAILS: (_) => InpatientPrescriptionDetailsScreen(),
// VIDEO_CALL: (_) => VideoCallPage(patientData: null), // VIDEO_CALL: (_) => VideoCallPage(patientData: null),

@ -22,6 +22,9 @@ import '../patient_profile_widget.dart';
import 'steps_widget.dart'; import 'steps_widget.dart';
class AddSOAPIndex extends StatefulWidget { class AddSOAPIndex extends StatefulWidget {
final bool isUpdate;
const AddSOAPIndex({Key key, this.isUpdate}) : super(key: key);
@override @override
_AddSOAPIndexState createState() => _AddSOAPIndexState(); _AddSOAPIndexState createState() => _AddSOAPIndexState();
} }

@ -416,10 +416,9 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
if (model.listOfDiagnosisType.length == 0) { if (model.listOfDiagnosisType.length == 0) {
await model.getMasterLookup(MasterKeysService.DiagnosisType); await model.getMasterLookup(MasterKeysService.DiagnosisType);
} }
// todo return it back when service is fixed. if (model.listOfICD10.length == 0) {
// if (model.listOfICD10.length == 0) { await model.getMasterLookup(MasterKeysService.ICD10);
// await model.getMasterLookup(MasterKeysService.ICD10); }
// }
}, },
builder: (_, model, w) => builder: (_, model, w) =>
AppScaffold( AppScaffold(
@ -469,13 +468,14 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
Container( Container(
height: screenSize.height * 0.070, height: screenSize.height * 0.070,
child: InkWell( child: InkWell(
onTap: model.listOfDiagnosisType != null onTap: model.listOfICD10 != null
? () { ? () {
MasterKeyDailog dialog = MasterKeyDailog( MasterKeyDailog dialog = MasterKeyDailog(
list: model.listOfDiagnosisType, isICD: true,
list: model.listOfICD10,
selectedValue: widget selectedValue: widget
.mySelectedAssessment .mySelectedAssessment
.selectedDiagnosisType, .selectedICD,
okText: TranslationBase okText: TranslationBase
.of(context) .of(context)
.ok, .ok,
@ -483,7 +483,7 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
(MasterKeyModel selectedValue) { (MasterKeyModel selectedValue) {
setState(() { setState(() {
widget.mySelectedAssessment widget.mySelectedAssessment
.selectedDiagnosisType = .selectedICD =
selectedValue; selectedValue;
}); });
}, },
@ -501,10 +501,10 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
decoration: textFieldSelectorDecoration( decoration: textFieldSelectorDecoration(
"Name / ICD", "Name / ICD",
widget.mySelectedAssessment widget.mySelectedAssessment
.selectedDiagnosisType != .selectedICD !=
null null
? widget.mySelectedAssessment ? widget.mySelectedAssessment
.selectedDiagnosisType.nameEn .selectedICD.nameEn
: null, : null,
true), true),
enabled: false, enabled: false,

@ -168,11 +168,6 @@ class _SubjectivePageState extends State<SubjectivePage> {
variant: isHistoryExpand ? "bodyText" : '', variant: isHistoryExpand ? "bodyText" : '',
bold: isHistoryExpand ? true : false, bold: isHistoryExpand ? true : false,
color: Colors.black), color: Colors.black),
Icon(
FontAwesomeIcons.asterisk,
color: AppGlobal.appPrimaryColor,
size: 12,
)
], ],
), ),
InkWell( InkWell(
@ -214,11 +209,6 @@ class _SubjectivePageState extends State<SubjectivePage> {
variant: isAllergiesExpand ? "bodyText" : '', variant: isAllergiesExpand ? "bodyText" : '',
bold: isAllergiesExpand ? true : false, bold: isAllergiesExpand ? true : false,
color: Colors.black), color: Colors.black),
Icon(
FontAwesomeIcons.asterisk,
color: AppGlobal.appPrimaryColor,
size: 12,
)
], ],
), ),
InkWell( InkWell(

@ -18,6 +18,7 @@ import 'PatientProfileButton.dart';
*@desc: Profile Medical Info Widget *@desc: Profile Medical Info Widget
*/ */
class ProfileMedicalInfoWidget extends StatelessWidget { class ProfileMedicalInfoWidget extends StatelessWidget {
ProfileMedicalInfoWidget({Key key, this.patient}) : super(key: key); ProfileMedicalInfoWidget({Key key, this.patient}) : super(key: key);
PatiantInformtion patient; PatiantInformtion patient;
@override @override
@ -35,6 +36,13 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
nameLine2: "Episode", nameLine2: "Episode",
route: CREATE_EPISODE, route: CREATE_EPISODE,
icon: 'heartbeat.png'), icon: 'heartbeat.png'),
PatientProfileButton(
key: key,
patient: patient,
nameLine1: "Update",
nameLine2: "Episode",
route: CREATE_EPISODE,
icon: 'heartbeat.png'),
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,

@ -8,11 +8,14 @@ class MasterKeyDailog extends StatefulWidget {
final okText; final okText;
final Function(MasterKeyModel) okFunction; final Function(MasterKeyModel) okFunction;
MasterKeyModel selectedValue; MasterKeyModel selectedValue;
final bool isICD;
MasterKeyDailog( MasterKeyDailog(
{@required this.list, {@required this.list,
@required this.okText, @required this.okText,
@required this.okFunction, this.selectedValue}); @required this.okFunction,
this.selectedValue,
this.isICD = false});
@override @override
_MasterKeyDailogState createState() => _MasterKeyDailogState(); _MasterKeyDailogState createState() => _MasterKeyDailogState();
@ -63,11 +66,17 @@ class _MasterKeyDailogState extends State<MasterKeyDailog> {
children: [ children: [
...widget.list ...widget.list
.map((item) => RadioListTile( .map((item) => RadioListTile(
title: Text(item.nameEn.toString()), title: Text(
groupValue: widget.selectedValue.id.toString(), '${item.nameEn}' + (widget.isICD ? '/${item.code}' : '')),
value: item.id.toString(), groupValue: widget.isICD
? widget.selectedValue.code.toString()
: widget.selectedValue.id.toString(),
value: widget.isICD ? widget.selectedValue.code.toString() : item
.id.toString(),
activeColor: Colors.blue.shade700, activeColor: Colors.blue.shade700,
selected: item.id.toString() == widget.selectedValue.id.toString(), selected: widget.isICD ? item.code.toString() ==
widget.selectedValue.code.toString() : item.id.toString() ==
widget.selectedValue.id.toString(),
onChanged: (val) { onChanged: (val) {
setState(() { setState(() {
widget.selectedValue = item; widget.selectedValue = item;

Loading…
Cancel
Save