diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index c013da19..bfaf38ad 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -58,10 +58,12 @@ import '../../locator.dart'; import '../model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart'; import '../model/SOAP/assessment/patch_assessment_req_model.dart'; import '../model/SOAP/physical_exam/GeneralSpeciality.dart'; +import '../service/patient_medical_file/admission_request/patient-admission-request-service.dart'; import 'base_view_model.dart'; class SOAPViewModel extends BaseViewModel { SOAPService _SOAPService = locator(); + AdmissionRequestService _admissionRequestService = locator(); PrescriptionService _prescriptionService = locator(); @@ -1508,7 +1510,9 @@ class SOAPViewModel extends BaseViewModel { Future getMorphologyDiagnosis(String icdCode10) async { setState(ViewState.BusyLocal); await _SOAPService.isMorphology(icdCode10); - if (_SOAPService.isMorphology_) { + await _admissionRequestService.getKSAProjectValue(); + + if (_SOAPService.isMorphology_ && _admissionRequestService.isKSAProject) { await _SOAPService.getMorphologyDiagnosis(); } if (_SOAPService.hasError) { diff --git a/lib/widgets/auth/sms-popup.dart b/lib/widgets/auth/sms-popup.dart index 87f341eb..e39fca7e 100644 --- a/lib/widgets/auth/sms-popup.dart +++ b/lib/widgets/auth/sms-popup.dart @@ -265,33 +265,33 @@ class SMSOTP { ) ]), SizedBox(height: 10,), - Column(children: [ - CloudflareTurnstile( - siteKey: '0x4AAAAAAAkmbvEy63pcxBBt', - baseUrl: BASE_URL, - options: _options, - controller: _controller, - onTokenReceived: (token) { - setState(() { - print("Cloudflare token: $token"); - //todo pass this token to checkActivcationCode - _token = token; - checkValue(); - }); - }, - // onTokenRecived: (token) { - // setState(() { - // print("Cloudflare token: $token"); - // _token = token; - // }); - // }, - onTokenExpired: () {}, - // mode: TurnstileMode.managed, - // errorBuilder: (context, error) { - // return Text(error.message); - // }, - ), - ],), + // Column(children: [ + // CloudflareTurnstile( + // siteKey: '0x4AAAAAAAkmbvEy63pcxBBt', + // baseUrl: BASE_URL, + // options: _options, + // controller: _controller, + // onTokenReceived: (token) { + // setState(() { + // print("Cloudflare token: $token"); + // //todo pass this token to checkActivcationCode + // _token = token; + // checkValue(); + // }); + // }, + // // onTokenRecived: (token) { + // // setState(() { + // // print("Cloudflare token: $token"); + // // _token = token; + // // }); + // // }, + // onTokenExpired: () {}, + // // mode: TurnstileMode.managed, + // // errorBuilder: (context, error) { + // // return Text(error.message); + // // }, + // ), + // ],), ], ), ),