From 2d5c5391e6930e02123a1f4bb27b6b59622415c4 Mon Sep 17 00:00:00 2001 From: Brady Miller Date: Sat, 7 Jan 2017 00:19:33 -0800 Subject: [PATCH] migrated ubiquitous libraries to composer autoloader (#421) --- composer.json | 9 + contrib/forms/formmaker/formscript.pl | 1 - contrib/forms/xmlformgen/xslt/save.php.xslt | 2 - custom/ajax_download.php | 3 +- custom/download_qrda.php | 17 +- custom/export_qrda_xml.php | 355 ++++++++++----------- interface/batchcom/batch_phone_notification.php | 1 - interface/billing/edit_payment.php | 1 - interface/billing/new_payment.php | 1 - interface/billing/sl_eob_invoice.php | 1 - interface/billing/sl_receipts_report.php | 1 - interface/cmsportal/history_form.php | 1 - interface/cmsportal/insurance_form.php | 1 - interface/cmsportal/issue_form.php | 1 - interface/cmsportal/lbf_form.php | 1 - interface/cmsportal/list_requests.php | 1 - interface/cmsportal/patient_form.php | 1 - interface/cmsportal/patient_form_ajax.php | 1 - interface/cmsportal/patient_select.php | 1 - interface/cmsportal/upload_form.php | 1 - interface/cmsportal/upload_form_show.php | 1 - .../re_identification_op_single_patient.php | 1 - interface/drugs/add_edit_drug.php | 2 - interface/drugs/add_edit_lot.php | 2 - interface/drugs/destroy_lot.php | 2 - interface/drugs/dispense_drug.php | 1 - interface/drugs/drug_inventory.php | 3 +- interface/forms/CAMOS/admin.php | 1 - interface/forms/CAMOS/ajax_save.php | 1 - interface/forms/CAMOS/content_parser.php | 1 - interface/forms/CAMOS/new.php | 1 - interface/forms/CAMOS/notegen.php | 1 - interface/forms/CAMOS/rx_print.php | 1 - interface/forms/CAMOS/save.php | 1 - interface/forms/LBF/new.php | 1 - interface/forms/aftercare_plan/new.php | 53 ++- interface/forms/aftercare_plan/save.php | 1 - interface/forms/care_plan/save.php | 1 - interface/forms/eye_mag/SpectacleRx.php | 157 +++++---- interface/forms/eye_mag/a_issue.php | 2 - interface/forms/eye_mag/js/eye_base.php | 7 +- interface/forms/eye_mag/save.php | 1 - interface/forms/eye_mag/taskman.php | 46 ++- .../forms/functional_cognitive_status/save.php | 1 - interface/forms/misc_billing_options/new.php | 1 - interface/forms/misc_billing_options/save.php | 1 - interface/forms/newpatient/save.php | 1 - interface/forms/observation/save.php | 1 - interface/forms/procedure_order/new.php | 1 - interface/forms/transfer_summary/save.php | 1 - interface/forms/treatment_plan/save.php | 1 - interface/globals.php | 21 +- interface/language/language.php | 1 - interface/logview/erx_logview.php | 1 - interface/logview/logview.php | 1 - interface/main/calendar/add_edit_event.php | 13 +- interface/main/calendar/find_patient.php | 1 - interface/main/calendar/find_patient_popup.php | 1 - interface/main/calendar/findfirstapp.php | 1 - .../pntemplates/default/user/ajax_search.html | 1 - .../main/calendar/modules/PostCalendar/pnuser.php | 1 - interface/main/dated_reminders/dated_reminders.php | 127 ++++---- .../main/dated_reminders/dated_reminders_add.php | 309 +++++++++--------- .../main/dated_reminders/dated_reminders_log.php | 107 +++---- interface/main/finder/dynamic_finder.php | 1 - interface/main/finder/dynamic_finder_ajax.php | 1 - interface/main/finder/patient_select.php | 1 - interface/main/main_screen.php | 1 - interface/main/messages/lab_results_messages.php | 1 - interface/main/messages/messages.php | 1 - interface/new/new_search_popup.php | 1 - interface/orders/lab_exchange.php | 1 - interface/orders/lab_exchange_tools.php | 1 - interface/orders/list_reports.php | 1 - interface/orders/order_manifest.php | 1 - interface/orders/orders_results.php | 1 - interface/orders/patient_match_dialog.php | 1 - interface/orders/pending_orders.php | 1 - interface/orders/procedure_provider_edit.php | 6 +- interface/orders/procedure_provider_list.php | 4 +- interface/orders/procedure_stats.php | 1 - interface/orders/single_order_results.inc.php | 1 - interface/orders/types.php | 1 - interface/orders/types_ajax.php | 1 - interface/orders/types_edit.php | 1 - interface/patient_file/download_template.php | 2 - interface/patient_file/education.php | 1 - interface/patient_file/encounter/diagnosis.php | 1 - .../patient_file/encounter/diagnosis_full.php | 1 - interface/patient_file/encounter/forms.php | 1 - .../patient_file/encounter/superbill_codes.php | 1 - .../encounter/superbill_custom_full.php | 1 - interface/patient_file/history/encounters.php | 1 - interface/patient_file/history/encounters_ajax.php | 1 - interface/patient_file/pos_checkout.php | 1 - .../patient_file/reminder/patient_reminders.php | 1 - interface/patient_file/report/custom_report.php | 2 - interface/patient_file/summary/add_edit_issue.php | 18 +- .../patient_file/summary/advancedirectives.php | 1 - .../patient_file/summary/create_portallogin.php | 1 - .../patient_file/summary/demographics_save.php | 1 - interface/patient_file/summary/stats.php | 1 - interface/patient_file/summary/summary_title.php | 1 - interface/reports/amc_tracking.php | 1 - interface/reports/appointments_report.php | 1 - interface/reports/audit_log_tamper_report.php | 1 - interface/reports/collections_report.php | 1 - interface/reports/cqm.php | 1 - interface/reports/edi_270.php | 1 - interface/reports/encounters_report.php | 1 - interface/reports/external_data.php | 1 - interface/reports/pat_ledger.php | 1 - interface/reports/patient_flow_board_report.php | 1 - interface/reports/prescriptions_report.php | 1 - interface/reports/receipts_by_method_report.php | 1 - interface/reports/referrals_report.php | 1 - interface/reports/report_results.php | 1 - interface/reports/sales_by_item.php | 1 - interface/reports/svc_code_financial_report.php | 1 - interface/super/edit_globals.php | 1 - interface/super/edit_layout.php | 1 - interface/super/edit_list.php | 1 - interface/super/layout_listitems_ajax.php | 1 - interface/super/load_codes.php | 2 - interface/super/manage_document_templates.php | 2 - interface/super/manage_site_files.php | 2 - interface/super/rules/include/common.php | 7 +- interface/usergroup/addrbook_edit.php | 2 - interface/usergroup/addrbook_list.php | 4 +- interface/usergroup/facilities.php | 1 - interface/usergroup/facilities_add.php | 2 - interface/usergroup/facility_admin.php | 1 - interface/usergroup/facility_user.php | 1 - interface/usergroup/facility_user_admin.php | 1 - interface/usergroup/ssl_certificates_admin.php | 1 - interface/usergroup/user_admin.php | 8 +- interface/usergroup/usergroup_admin.php | 1 - interface/usergroup/usergroup_admin_add.php | 6 +- library/ESign/Encounter/Signable.php | 1 - library/ESign/Form/LBF/Signable.php | 1 - library/ESign/Form/Signable.php | 1 - library/FeeSheet.class.php | 1 - library/FeeSheetHtml.class.php | 1 - library/ajax/dated_reminders_counter.php | 1 - library/ajax/find_patients.php | 1 - library/ajax/prescription_drugname_lookup.php | 1 - library/api.inc | 1 - library/auth.inc | 1 - library/classes/Controller.class.php | 1 - library/classes/ORDataObject.class.php | 1 - library/classes/Prescription.class.php | 2 - library/clinical_rules.php | 1 - library/log.inc | 1 - library/log_validation.php | 1 - library/openflashchart/graph_track_anything.php | 1 - library/openflashchart/graphs.php | 1 - library/options.inc.php | 1 - library/patient.inc | 1 - library/report.inc | 1 - library/translation.inc.php | 1 - library/user.inc | 1 - .../batch_phone_notification.php | 1 - myportal/soap_service/server_existingpatient.php | 2 - .../soap_service/server_newpatienttoapprove.php | 1 - vendor/composer/autoload_files.php | 5 + vendor/composer/autoload_static.php | 5 + 166 files changed, 637 insertions(+), 810 deletions(-) diff --git a/composer.json b/composer.json index d8a7e49ef..5af59c912 100644 --- a/composer.json +++ b/composer.json @@ -30,6 +30,15 @@ "phing/phing": "2.14.0" }, + "autoload": { + "files": [ + "library/htmlspecialchars.inc.php", + "library/formdata.inc.php", + "library/sanitize.inc.php", + "library/date_functions.php", + "library/validation/validate_core.php" + ] + }, "config": { "preferred-install": { "doctrine/couchdb": "dist" diff --git a/contrib/forms/formmaker/formscript.pl b/contrib/forms/formmaker/formscript.pl index fb7909c50..8d62d0b1e 100755 --- a/contrib/forms/formmaker/formscript.pl +++ b/contrib/forms/formmaker/formscript.pl @@ -201,7 +201,6 @@ my $save_php=<<'START'; include_once("../../globals.php"); include_once("$srcdir/api.inc"); include_once("$srcdir/forms.inc"); -require_once("$srcdir/formdata.inc.php"); //process form variables here //create an array of all of the existing field names diff --git a/contrib/forms/xmlformgen/xslt/save.php.xslt b/contrib/forms/xmlformgen/xslt/save.php.xslt index 1a1ff2d87..9fca712a2 100644 --- a/contrib/forms/xmlformgen/xslt/save.php.xslt +++ b/contrib/forms/xmlformgen/xslt/save.php.xslt @@ -32,8 +32,6 @@ require_once('../../globals.php'); require_once($GLOBALS['srcdir'].'/api.inc'); /* for ??? */ require_once($GLOBALS['srcdir'].'/forms.inc'); -/* for formDataCore() */ -require_once($GLOBALS['srcdir'].'/formdata.inc.php'); ]]> diff --git a/custom/ajax_download.php b/custom/ajax_download.php index e0c7703b2..0caffdac3 100644 --- a/custom/ajax_download.php +++ b/custom/ajax_download.php @@ -1,7 +1,7 @@ - + - + @@ -68,7 +67,7 @@ $type_report = (($type_report == "amc") || ($type_report == "amc_2011") || ($typ }); }); }); - + function downloadSelected() { zipFileArray.length = 0; var criteriaArray = new Array(); @@ -89,7 +88,7 @@ $type_report = (($type_report == "amc") || ($type_report == "amc_2011") || ($typ downloadXML(checkBoxCounterArray[1],lastOne,ruleID); } } - + function downloadXML(counter,lastOne) { $("#download" + counter).css("display","none"); $("#spin" + counter).css("display","inline"); @@ -133,7 +132,7 @@ $type_report = (($type_report == "amc") || ($type_report == "amc_2011") || ($typ } }); } - + function closeMe() { window.close(); } @@ -143,7 +142,7 @@ $type_report = (($type_report == "amc") || ($type_report == "amc_2011") || ($typ cursor: hand; } .multiDownload { - + } diff --git a/custom/export_qrda_xml.php b/custom/export_qrda_xml.php index ea2094169..33219a871 100644 --- a/custom/export_qrda_xml.php +++ b/custom/export_qrda_xml.php @@ -35,7 +35,6 @@ require_once "../library/options.inc.php"; require_once("../library/clinical_rules.php"); require_once("../library/classes/QRDAXml.class.php"); require_once "$srcdir/report_database.inc"; -require_once("$srcdir/sanitize.inc.php"); require_once "qrda_functions.php"; //Remove time limit, since script can take many minutes @@ -48,34 +47,34 @@ $denExcepNotNeedRules = array('0002', '0018', '0024', '0038', '0043', '0059', '0 $preDefinedUniqIDRules = array(); $preDefPopIdArr = array(); -// CMS147v4/0041 - Preventive Care and Screening: Influenza Immunization HQMF ID: 40280381-4600-425F-0146-EE66F0005509 +// CMS147v4/0041 - Preventive Care and Screening: Influenza Immunization HQMF ID: 40280381-4600-425F-0146-EE66F0005509 $preDefinedUniqIDRules['0041'] = '40280381-4600-425F-0146-EE66F0005509'; $preDefPopIdArr['0041']['IPP'] = 'F48702E6-D39A-49D8-BE3C-8FAB5C6AADDA'; $preDefPopIdArr['0041']['DENOM'] = 'B61EC2DC-0841-4906-A84B-5BE5024DA7F1'; $preDefPopIdArr['0041']['NUMER'] = '0ED7B212-369B-489A-A5B5-07BC146FA557'; $preDefPopIdArr['0041']['DENEXCEP'] = 'B5C9EC50-3011-43DC-AD07-CED2D3B770B2'; -// CMS122v3/0059 - Diabetes: Hemoglobin A1c Poor Control: HQMF_ID: 40280381-4555-E1C1-0145-90AC70DE2C73 +// CMS122v3/0059 - Diabetes: Hemoglobin A1c Poor Control: HQMF_ID: 40280381-4555-E1C1-0145-90AC70DE2C73 $preDefinedUniqIDRules['0059'] = '40280381-4555-E1C1-0145-90AC70DE2C73'; $preDefPopIdArr['0059']['IPP'] = 'EDED90E9-E4FE-47E6-90AC-29D9AA3E861A'; $preDefPopIdArr['0059']['DENOM'] = '6721D6DA-E87D-4E42-A34A-C8490686598C'; $preDefPopIdArr['0059']['NUMER'] = '7549BA9E-1841-4231-8CAA-095BDF0AB8A1'; -//CMS139v3/0101 - Falls: Screening for Future Fall Risk: HQMF_ID: 40280381-4555-E1C1-0145-672613970D15 +//CMS139v3/0101 - Falls: Screening for Future Fall Risk: HQMF_ID: 40280381-4555-E1C1-0145-672613970D15 $preDefinedUniqIDRules['0101'] = '40280381-4555-E1C1-0145-672613970D15'; $preDefPopIdArr['0101']['IPP'] = '2448B0C6-6848-4DCB-AA6D-F199337A2C5C'; $preDefPopIdArr['0101']['DENOM'] = 'EC400908-35BE-439B-92A9-231D99CEA9DF'; $preDefPopIdArr['0101']['NUMER'] = '663FB12B-0FF4-49AB-80A3-624C5E7DF892'; $preDefPopIdArr['0101']['DENEXCEP'] = 'FEC7251A-BF8D-4472-97D8-E2A9C0A42176'; -//CMS127v3/0043 - Pneumonia Vaccination Status for Older Adults: HQMF_ID: 40280381-4555-E1C1-0145-762578A81C4C +//CMS127v3/0043 - Pneumonia Vaccination Status for Older Adults: HQMF_ID: 40280381-4555-E1C1-0145-762578A81C4C $preDefinedUniqIDRules['0043'] = '40280381-4555-E1C1-0145-762578A81C4C'; $preDefPopIdArr['0043']['IPP'] = '873AECC7-E15B-49E7-8391-D73A46201E2E'; $preDefPopIdArr['0043']['DENOM'] = 'FF7016E1-E8C7-43BA-9D56-2BEF649F36FA'; $preDefPopIdArr['0043']['NUMER'] = '201F5A6E-4DDE-43A2-BDFC-CE85A98560DA'; -//CMS69v3/0421 - Preventive Care and Screening: Body Mass Index (BMI) Screening and Follow-Up Plan: HQMF_ID: 40280381-4555-E1C1-0145-D2B36DBB3FE6 +//CMS69v3/0421 - Preventive Care and Screening: Body Mass Index (BMI) Screening and Follow-Up Plan: HQMF_ID: 40280381-4555-E1C1-0145-D2B36DBB3FE6 $preDefinedUniqIDRules['0421']['Numerator 1'] = '40280381-4555-E1C1-0145-D2B36DBB3FE6'; $preDefPopIdArr['0421']['Numerator 1']['IPP'] = '1C936855-E644-44C0-B264-49A28756FDB1'; $preDefPopIdArr['0421']['Numerator 1']['DENOM'] = '27F1591C-2060-462C-B5D7-7FE86A44B534'; @@ -121,7 +120,7 @@ $preDefPopIdArr['0018']['DENOM'] = '26046A5C-E2CC-4A27-B480-FF7E3575691F'; $preDefPopIdArr['0018']['NUMER'] = '0899A359-0CD8-4977-AA29-666892AA3AD4'; $preDefPopIdArr['0018']['DENEX'] = '4327D845-6194-410D-A48D-D6E1802CAD55'; -//CMS155v3/0024 - Weight Assessment and Counseling for Nutrition and Physical Activity for Children and Adolescents: HQMF_ID: 40280381-4555-E1C1-0145-85C7311720F5 +//CMS155v3/0024 - Weight Assessment and Counseling for Nutrition and Physical Activity for Children and Adolescents: HQMF_ID: 40280381-4555-E1C1-0145-85C7311720F5 $preDefinedUniqIDRules['0024']['Population Criteria 1']['Numerator 1'] = '40280381-4555-E1C1-0145-85C7311720F5'; $preDefPopIdArr['0024']['Population Criteria 1']['Numerator 1']['IPP'] = '10127790-AE94-4070-9DD3-1D3776D08D7C'; $preDefPopIdArr['0024']['Population Criteria 1']['Numerator 1']['DENOM'] = '3B3C1568-F875-49B1-9090-E2F494EECBB6'; @@ -290,7 +289,7 @@ if(count($dataSheet) > 0){ } } } - + $stratum = array(); $stratum[1] = array('init_patients' => $stratum_1_ipp, 'exclude_patients' => $stratum_1_exclude, @@ -298,14 +297,14 @@ if(count($dataSheet) > 0){ 'numer_patients' => $stratum_1_numer1, 'numer2' => $stratum_1_numer2, 'numer3' => $stratum_1_numer3); - + $stratum[2] = array('init_patients' => $stratum_2_ipp, 'exclude_patients' => $stratum_2_exclude, 'denom_patients' => $stratum_2_denom, 'numer_patients' => $stratum_2_numer1, 'numer2' => $stratum_2_numer2, 'numer3' => $stratum_2_numer3); - + } } @@ -602,15 +601,15 @@ $cnt=1; $tabArr = array('border'=>1, 'width'=>'100%'); if(count($dataSheet) > 0){ $uniqIdArr = array(); - + //Inner Data Loop foreach ($dataSheet as $row) { $itemized_test_id = $row['itemized_test_id']; $numerator_label = $row['numerator_label']; - + //CQM Rules 2014 set, 0013 is 0018 if($row['cqm_nqf_code'] == "0013") $row['cqm_nqf_code'] = "0018"; - + //Table Start $xml->open_customTag('table', $tabArr); //THEAD Start @@ -628,22 +627,22 @@ if(count($dataSheet) > 0){ //TBOBY START $xml->open_customTag('tbody'); $xml->open_customTag('tr'); - + $tdTitle = generate_display_field(array('data_type'=>'1','list_id'=>'clinical_rules'),$row['id']); - + if (!empty($row['cqm_pqri_code'])) { $tdTitle .= " " . htmlspecialchars( xl('PQRI') . ":" . $row['cqm_pqri_code'], ENT_NOQUOTES) . " "; } if (!empty($row['cqm_nqf_code'])) { $tdTitle .= " " . htmlspecialchars( xl('NQF') . ":" . $row['cqm_nqf_code'], ENT_NOQUOTES) . " "; } - + if ( !(empty($row['concatenated_label'])) ) { $tdTitle .= ", " . htmlspecialchars( xl( $row['concatenated_label'] ), ENT_NOQUOTES) . " "; } - + $tdVersionNeutral = getUuid(); - + if($preDefinedUniqIDRules[$row['cqm_nqf_code']] != ""){ if( ($row['cqm_nqf_code'] == "0421" ) ) $tdVersionSpecific = $preDefinedUniqIDRules[$row['cqm_nqf_code']][$row['numerator_label']]; @@ -651,13 +650,13 @@ if(count($dataSheet) > 0){ $tdVersionSpecific = $preDefinedUniqIDRules[$row['cqm_nqf_code']][$row['population_label']][$row['numerator_label']]; else $tdVersionSpecific = $preDefinedUniqIDRules[$row['cqm_nqf_code']]; - + $uniqIdArr[] = $tdVersionSpecific; }else{ $tdVersionSpecific = getUuid(); $uniqIdArr[] = $tdVersionSpecific; } - + $dataArr = array(0=>$tdTitle, 1=>$tdVersionNeutral, 2=>$tdVersionSpecific); $xml->add_trElementsValues($dataArr); @@ -667,23 +666,23 @@ if(count($dataSheet) > 0){ $xml->close_customTag(); //Table Close $xml->close_customTag(); - + //Open List Item Wise $xml->open_list(); - + //Performance Rate $xml->open_customTag('item'); $arrContent = array('name'=>'Performance Rate', 'value'=>$row['percentage']); $xml->innerContent($arrContent); $xml->close_customTag(); - - + + //All CQM Measures taken here foreach($CQMeausesArr as $cqmKey => $cqmVal){ - + //DENEXCEP(Denominator Exception not needed for some rules are skipping here) if( (in_array($row['cqm_nqf_code'], $denExcepNotNeedRules) ) && ($cqmKey == "exception_patients") ) continue; - + //get Itemized Data if($cqmKey == "init_patients") $itemPatArr = collectItemizedPatientsCdrReport($report_id,$itemized_test_id,$cqmItemizedArr[$cqmKey]); @@ -693,17 +692,17 @@ if(count($dataSheet) > 0){ foreach($itemPatArr as $itemPatInfo){ $fullPatArr[] = $itemPatInfo['pid']; } - + //Initial Patient Population $xml->open_customTag('item'); $arrContent = array('name'=>$cqmVal, 'value'=>count($fullPatArr)); $xml->innerContent($arrContent); - + $detailsArr = getQRDAPatientNeedInfo($fullPatArr); - - //Open Sub List + + //Open Sub List $xml->open_list(); - + //Gender Section Display foreach($mainQrdaGenderCodeArr as $GKey => $GVal){ $xml->open_customTag('item'); @@ -712,7 +711,7 @@ if(count($dataSheet) > 0){ $xml->innerContent($arrContent); $xml->close_customTag(); } - + //Ethnicity Section Display foreach($mainEthiArr as $ethKey => $ethVal){ $ethnicity_data = $detailsArr['ethnicity'][$ethVal]; @@ -721,7 +720,7 @@ if(count($dataSheet) > 0){ $xml->innerContent($arrContent); $xml->close_customTag(); } - + //Race Section Display foreach($mainQrdaRaceArr as $RKey => $RVal){ $race_data = $detailsArr['race'][$RVal]; @@ -730,7 +729,7 @@ if(count($dataSheet) > 0){ $xml->innerContent($arrContent); $xml->close_customTag(); } - + //Payer Type Section Display $payerCheckArr = getQRDAPayerInfo($fullPatArr); foreach($mainQrdaPayerCodeArr as $PKey => $PVal){ @@ -739,7 +738,7 @@ if(count($dataSheet) > 0){ $xml->innerContent($arrContent); $xml->close_customTag(); } - + //close Sub List $xml->close_list(); $xml->close_customTag(); @@ -761,7 +760,7 @@ if(count($dataSheet) > 0){ $skipMultNumArr[$multNumVal] = false; $dataChkArr[$multNumVal] = 0; } - + //Inner Data Loop foreach ($dataSheet as $row) { $itemized_test_id = $row['itemized_test_id']; @@ -776,10 +775,10 @@ if(count($dataSheet) > 0){ if(in_array($row['cqm_nqf_code'], $multNumNQFArr)){ $dataChkArr[$row['cqm_nqf_code']]++; } - + //CQM Rules 2014 set, 0013 is 0018 if($row['cqm_nqf_code'] == "0013") $row['cqm_nqf_code'] = "0018"; - + $tdTitle = generate_display_field(array('data_type'=>'1','list_id'=>'clinical_rules'),$row['id']); if (!empty($row['cqm_pqri_code'])) { $tdTitle .= " " . text( xl('PQRI') . ":" . $row['cqm_pqri_code']) . " "; @@ -787,14 +786,14 @@ if(count($dataSheet) > 0){ if (!empty($row['cqm_nqf_code'])) { $tdTitle .= " " . text( xl('NQF') . ":" . $row['cqm_nqf_code']) . " "; } - + if ( !(empty($row['concatenated_label'])) ) { $tdTitle .= ", " . text( xl( $row['concatenated_label'] )) . " "; } - + ########################################################### if( ( !isset($skipMultNumArr[$row['cqm_nqf_code']]) ) || ($skipMultNumArr[$row['cqm_nqf_code']] == false) ){ - + //Entry open $xml->open_entry(); @@ -841,10 +840,10 @@ if(count($dataSheet) > 0){ //reference Close $xml->close_customTag(); - + ############### Performance Rate for Proportion Measure template START################### $xml->open_loopComponent(); - + //observation Open $xml->open_customTag('observation', array('classCode'=>'OBS', 'moodCode'=>'EVN')); @@ -859,7 +858,7 @@ if(count($dataSheet) > 0){ $arr = array('code'=>'completed'); $xml->self_customTag('statusCode', $arr); - + $percentage = str_replace("%", '', $row['percentage']); $arr = array('xsi:type'=>'REAL', 'value'=>$percentage/100); $xml->self_customTag('value', $arr); @@ -871,11 +870,11 @@ if(count($dataSheet) > 0){ //externalObservation Start $arr = array('classCode'=>'OBS', 'moodCode'=>'EVN'); $xml->open_customTag('externalObservation', $arr); - + //Modified HQMF_ID //$exDocID = getUuid(); - + if( ($row['cqm_nqf_code'] == "0421" )){ $exDocID = $preDefPopIdArr[$row['cqm_nqf_code']][$row['numerator_label']]["NUMER"]; }else if(($row['cqm_nqf_code'] == "0024")){ @@ -886,7 +885,7 @@ if(count($dataSheet) > 0){ else $exDocID = getUuid(); } - + $xml->self_customId($exDocID); $arr = array('code'=>'NUMER', 'displayName'=>'Numerator', 'codeSystem'=>'2.16.840.1.113883.5.1063', 'codeSystemName'=>'ObservationValue'); @@ -905,29 +904,29 @@ if(count($dataSheet) > 0){ ############### Performance Rate for Proportion Measure template END ################### } - + //All CQM Measures taken here foreach($CQMeausesArr as $cqmKey => $cqmVal){ - + //DENEXCEP(Denominator Exception not needed for some rules are skipping here) if( (in_array($row['cqm_nqf_code'], $denExcepNotNeedRules) ) && ($cqmKey == "exception_patients") ) continue; - - //cqm 0024 alllowing only nuemerator 2 and numerator 3 for ipp1,ipp2 and 1pp3 to avoid repeatation + + //cqm 0024 alllowing only nuemerator 2 and numerator 3 for ipp1,ipp2 and 1pp3 to avoid repeatation if($row['cqm_nqf_code'] == '0024' && ($row['numerator_label'] == "Numerator 2" || $row['numerator_label'] == "Numerator 3") && $cqmKey != 'numer_patients') continue; if($row['cqm_nqf_code'] == '0024' && ($row['population_label'] == "Population Criteria 2" || $row['population_label'] == "Population Criteria 3")) continue; - - + + //get Itemized Data if($cqmKey == "init_patients") $itemPatArr = collectItemizedPatientsCdrReport($report_id,$itemized_test_id,$cqmItemizedArr[$cqmKey]); else $itemPatArr = collectItemizedPatientsCdrReport($report_id,$itemized_test_id,$cqmItemizedArr[$cqmKey], $numerator_label); - + $fullPatArr = array(); foreach($itemPatArr as $itemPatInfo){ $fullPatArr[] = $itemPatInfo['pid']; } - + $detailsArr = getQRDAPatientNeedInfo($fullPatArr); ############### Initial patient population template START################### $xml->open_loopComponent(); @@ -949,125 +948,125 @@ if(count($dataSheet) > 0){ $arr = array('xsi:type'=>'CD', 'code'=>$mainQrdaPopulationIncArr[$cqmKey], 'displayName'=>$cqmVal, 'codeSystem' =>'2.16.840.1.113883.5.1063', 'codeSystemName'=>'ObservationValue'); $xml->self_customTag('value', $arr); - + //entryRelationship Open $xml->open_customTag('entryRelationship', array('typeCode'=>'SUBJ', 'inversionInd'=>'true')); - + //observation Open $xml->open_customTag('observation', array('classCode'=>'OBS', 'moodCode'=>'EVN')); - + $tempID = "2.16.840.1.113883.10.20.27.3.3"; $xml->self_templateid($tempID); $tempID = "2.16.840.1.113883.10.20.27.3.24"; $xml->self_templateid($tempID); - + $arr = array('code'=>'MSRAGG', 'displayName'=>'rate aggregation', 'codeSystem'=>'2.16.840.1.113883.5.4', 'codeSystemName'=>'ActCode'); $xml->self_codeCustom($arr); - + //$arr = array('code'=>'completed'); //$xml->self_customTag('statusCode', $arr); $arr = array('xsi:type'=>'INT', 'value'=>count($fullPatArr)); $xml->self_customTag('value', $arr); - + $arr = array('code'=>'COUNT', 'displayName'=>'Count', 'codeSystem'=>'2.16.840.1.113883.5.84', 'codeSystemName'=>'ObservationMethod'); $xml->self_customTag('methodCode', $arr); - + //observation Close $xml->close_customTag(); - + //entryRelationship Close $xml->close_customTag(); - + #### Stratum Start (Stratification)##### if($row['cqm_nqf_code'] == '0024'){ $strat_count = 1; for(;$strat_count <= 2;$strat_count++){ - + $strata_value = $stratum[$strat_count][$cqmKey]; - + if($row['numerator_label'] == "Numerator 2") $strata_value = $stratum[$strat_count]['numer2']; - + else if($row['numerator_label'] == "Numerator 3") $strata_value = $stratum[$strat_count]['numer3']; - + //entryRelationship Open $xml->open_customTag('entryRelationship', array('typeCode'=>'COMP')); - + //observation Open $xml->open_customTag('observation', array('classCode'=>'OBS', 'moodCode'=>'EVN')); - + $tempID = "2.16.840.1.113883.10.20.27.3.4"; $xml->self_templateid($tempID); - + $tempID = "2.16.840.1.113883.10.20.27.3.20"; $xml->self_templateid($tempID); - + $arr = array('code'=>'ASSERTION', 'displayName'=>'Assertion', 'codeSystem'=>'2.16.840.1.113883.5.4', 'codeSystemName'=>'ActCode'); $xml->self_codeCustom($arr); - + $arr = array('code'=>'completed'); $xml->self_customTag('statusCode', $arr); - + //value open $xml->open_customTag('value', array('xsi:type'=>'CD', 'nullFlavor'=>'OTH')); - + $stratumText = $preDefPopIdArr[$row['cqm_nqf_code']][$row['population_label']][$row['numerator_label']]['DISPLAY_TEXT']; $xml->element('originalText', "Stratum ".$strat_count); - + //value Close $xml->close_customTag(); - + //entryRelationship Open $xml->open_customTag('entryRelationship', array('typeCode'=>'SUBJ', 'inversionInd' => 'true')); - + //observation Open $xml->open_customTag('observation', array('classCode'=>'OBS', 'moodCode'=>'EVN')); - + $tempID = "2.16.840.1.113883.10.20.27.3.3"; $xml->self_templateid($tempID); - + $arr = array('code'=>'MSRAGG', 'displayName'=>'rate aggregation', 'codeSystem'=>'2.16.840.1.113883.5.4', 'codeSystemName'=>'ActCode'); $xml->self_codeCustom($arr); - + $arr = array('xsi:type'=>'INT', 'value'=>$strata_value); $xml->self_customTag('value', $arr); - + $arr = array('code'=>'COUNT', 'displayName'=>'Count', 'codeSystem'=>'2.16.840.1.113883.5.84', 'codeSystemName'=>'ObservationMethod'); $xml->self_customTag('methodCode', $arr); - + //observation Close $xml->close_customTag(); - + //entryRelationship Close $xml->close_customTag(); - + //reference Start $arr = array('typeCode'=>'REFR'); $xml->open_customTag('reference', $arr); - + //externalObservation Start $arr = array('classCode'=>'OBS', 'moodCode'=>'EVN'); $xml->open_customTag('externalObservation', $arr); - + //Modified HQMF_ID for CQM IDS //$refID = $preDefPopIdArr[$row['cqm_nqf_code']][$row['population_label']][$row['numerator_label']]['STRAT']; $refID = $preDefPopIdArr[$row['cqm_nqf_code']]['STRAT'.$strat_count]; - + $xml->self_customId($refID); - + //externalObservation Close $xml->close_customTag(); - + //reference Close $xml->close_customTag(); - + //observation Close $xml->close_customTag(); - + //entryRelationship Close $xml->close_customTag(); - + } } #### Stratum END ##### @@ -1081,59 +1080,59 @@ if(count($dataSheet) > 0){ foreach($mainQrdaGenderCodeArr as $GKey => $GVal){ //entryRelationship Open $xml->open_customTag('entryRelationship', array('typeCode'=>'COMP')); - + //observation Open $xml->open_customTag('observation', array('classCode'=>'OBS', 'moodCode'=>'EVN')); - + $tempID = "2.16.840.1.113883.10.20.27.3.6"; $xml->self_templateid($tempID); $tempID = "2.16.840.1.113883.10.20.27.3.21"; $xml->self_templateid($tempID); - + $arr = array('code'=>'184100006', 'displayName'=>'patient sex', 'codeSystem'=>'2.16.840.1.113883.6.96', 'codeSystemName'=>'SNOMED-CT'); $xml->self_codeCustom($arr); - + $arr = array('code'=>'completed'); $xml->self_customTag('statusCode', $arr); - + $arr = array('xsi:type'=>'CD', 'code'=>$GKey, 'codeSystem' =>'2.16.840.1.113883.5.1', 'codeSystemName'=>'AdministrativeGenderCode'); $xml->self_customTag('value', $arr); - + //entryRelationship Open $xml->open_customTag('entryRelationship', array('typeCode'=>'SUBJ', 'inversionInd'=>'true')); - + //observation Open $xml->open_customTag('observation', array('classCode'=>'OBS', 'moodCode'=>'EVN')); - + $tempID = "2.16.840.1.113883.10.20.27.3.3"; $xml->self_templateid($tempID); $tempID = "2.16.840.1.113883.10.20.27.3.24"; $xml->self_templateid($tempID); - + $arr = array('code'=>'MSRAGG', 'displayName'=>'rate aggregation', 'codeSystem'=>'2.16.840.1.113883.5.4', 'codeSystemName'=>'ActCode'); $xml->self_codeCustom($arr); - + //$arr = array('code'=>'completed'); //$xml->self_customTag('statusCode', $arr); $arr = array('xsi:type'=>'INT', 'value'=>$detailsArr['gender'][$GVal]); $xml->self_customTag('value', $arr); - + $arr = array('code'=>'COUNT', 'displayName'=>'Count', 'codeSystem'=>'2.16.840.1.113883.5.84', 'codeSystemName'=>'ObservationMethod'); $xml->self_customTag('methodCode', $arr); - + //observation Close $xml->close_customTag(); - + //entryRelationship Close $xml->close_customTag(); - - + + //observation Close $xml->close_customTag(); - + //entryRelationship Close $xml->close_customTag(); } @@ -1152,62 +1151,62 @@ if(count($dataSheet) > 0){ foreach($mainEthiArr as $ethKey => $ethVal){ //entryRelationship Open $xml->open_customTag('entryRelationship', array('typeCode'=>'COMP')); - + //observation Open $xml->open_customTag('observation', array('classCode'=>'OBS', 'moodCode'=>'EVN')); - + $tempID = "2.16.840.1.113883.10.20.27.3.7"; $xml->self_templateid($tempID); $tempID = "2.16.840.1.113883.10.20.27.3.22"; $xml->self_templateid($tempID); - + $arr = array('code'=>'364699009', 'displayName'=>'Ethnic Group', 'codeSystem'=>'2.16.840.1.113883.6.96', 'codeSystemName'=>'SNOMED-CT'); $xml->self_codeCustom($arr); - + $arr = array('code'=>'completed'); $xml->self_customTag('statusCode', $arr); - + $arr = array('xsi:type'=>'CD', 'code'=>$mainEthiCodeArr[$ethKey], 'displayName'=>$ethVal, 'codeSystem' =>'2.16.840.1.113883.6.238', 'codeSystemName'=>'Race & Ethnicity - CDC'); $xml->self_customTag('value', $arr); - + //entryRelationship Open $xml->open_customTag('entryRelationship', array('typeCode'=>'SUBJ', 'inversionInd'=>'true')); - + //observation Open $xml->open_customTag('observation', array('classCode'=>'OBS', 'moodCode'=>'EVN')); - + $tempID = "2.16.840.1.113883.10.20.27.3.3"; $xml->self_templateid($tempID); $tempID = "2.16.840.1.113883.10.20.27.3.24"; $xml->self_templateid($tempID); - + $arr = array('code'=>'MSRAGG', 'displayName'=>'rate aggregation', 'codeSystem'=>'2.16.840.1.113883.5.4', 'codeSystemName'=>'ActCode'); $xml->self_codeCustom($arr); - + //$arr = array('code'=>'completed'); //$xml->self_customTag('statusCode', $arr); $arr = array('xsi:type'=>'INT', 'value'=>$detailsArr['ethnicity'][$ethVal]); $xml->self_customTag('value', $arr); - + $arr = array('code'=>'COUNT', 'displayName'=>'Count', 'codeSystem'=>'2.16.840.1.113883.5.84', 'codeSystemName'=>'ObservationMethod'); $xml->self_customTag('methodCode', $arr); - + //observation Close $xml->close_customTag(); - + //entryRelationship Close $xml->close_customTag(); - - + + //observation Close $xml->close_customTag(); - + //entryRelationship Close $xml->close_customTag(); - + } #################################################### #################################################### @@ -1215,7 +1214,7 @@ if(count($dataSheet) > 0){ #################################################### #################################################### - + #################################################### #################################################### //Race Supplemental Data Element (CMS EP) START @@ -1225,70 +1224,70 @@ if(count($dataSheet) > 0){ foreach($mainQrdaRaceArr as $RKey => $RVal){ //entryRelationship Open $xml->open_customTag('entryRelationship', array('typeCode'=>'COMP')); - + //observation Open $xml->open_customTag('observation', array('classCode'=>'OBS', 'moodCode'=>'EVN')); - + $tempID = "2.16.840.1.113883.10.20.27.3.8"; $xml->self_templateid($tempID); $tempID = "2.16.840.1.113883.10.20.27.3.19"; $xml->self_templateid($tempID); - + $arr = array('code'=>'103579009', 'displayName'=>'Race', 'codeSystem'=>'2.16.840.1.113883.6.96', 'codeSystemName'=>'SNOMED-CT'); $xml->self_codeCustom($arr); - + $arr = array('code'=>'completed'); $xml->self_customTag('statusCode', $arr); - + $arr = array('xsi:type'=>'CD', 'code'=>$mainQrdaRaceCodeArr[$RKey], 'displayName'=>$RVal, 'codeSystem' =>'2.16.840.1.113883.6.238', 'codeSystemName'=>'Race & Ethnicity - CDC'); $xml->self_customTag('value', $arr); - + //entryRelationship Open $xml->open_customTag('entryRelationship', array('typeCode'=>'SUBJ', 'inversionInd'=>'true')); - + //observation Open $xml->open_customTag('observation', array('classCode'=>'OBS', 'moodCode'=>'EVN')); - + $tempID = "2.16.840.1.113883.10.20.27.3.3"; $xml->self_templateid($tempID); $tempID = "2.16.840.1.113883.10.20.27.3.24"; $xml->self_templateid($tempID); - + $arr = array('code'=>'MSRAGG', 'displayName'=>'rate aggregation', 'codeSystem'=>'2.16.840.1.113883.5.4', 'codeSystemName'=>'ActCode'); $xml->self_codeCustom($arr); - + //$arr = array('code'=>'completed'); //$xml->self_customTag('statusCode', $arr); $arr = array('xsi:type'=>'INT', 'value'=>$detailsArr['race'][$RVal]); $xml->self_customTag('value', $arr); - + $arr = array('code'=>'COUNT', 'displayName'=>'Count', 'codeSystem'=>'2.16.840.1.113883.5.84', 'codeSystemName'=>'ObservationMethod'); $xml->self_customTag('methodCode', $arr); - + //observation Close $xml->close_customTag(); - + //entryRelationship Close $xml->close_customTag(); - - + + //observation Close $xml->close_customTag(); - + //entryRelationship Close $xml->close_customTag(); } - + #################################################### #################################################### //Race Supplemental Data Element (CMS EP) END #################################################### #################################################### - + #################################################### #################################################### //Payer Supplemental Data Element (CMS EP) START @@ -1298,80 +1297,80 @@ if(count($dataSheet) > 0){ foreach($mainQrdaPayerCodeArr as $PKey => $PVal){ //entryRelationship Open $xml->open_customTag('entryRelationship', array('typeCode'=>'COMP')); - + //observation Open $xml->open_customTag('observation', array('classCode'=>'OBS', 'moodCode'=>'EVN')); - + $tempID = "2.16.840.1.113883.10.20.27.3.9"; $xml->self_templateid($tempID); $tempID = "2.16.840.1.113883.10.20.24.3.55"; $xml->self_templateid($tempID); - + $tempID = "2.16.840.1.113883.10.20.27.3.18"; $xml->self_templateid($tempID); - + $xml->self_setpatientRoleid(); - + $arr = array('code'=>'48768-6', 'displayName'=>'Payment source', 'codeSystem'=>'2.16.840.1.113883.6.1', 'codeSystemName'=>'SNOMED-CT'); $xml->self_codeCustom($arr); - + $arr = array('code'=>'completed'); $xml->self_customTag('statusCode', $arr); - + $timeArr = array('low'=>date('Ymd', strtotime($from_date))); $xml->add_entryEffectTime($timeArr); - + /* //Value Tag Open $xml->open_customTag('value', array('xsi:type'=>'CD', 'nullFlavor'=>'OTH')); - + $xml->self_customTag('translation', array('code'=>$PKey, 'displayName'=>$PVal, 'codeSystem'=>'2.16.840.1.113883.3.249.12', 'codeSystemName'=>'CMS Clinical Codes')); - + //Value Tag Close $xml->close_customTag(); */ - - //Value Tag + + //Value Tag $xml->self_customTag('value', array('xsi:type'=>'CD', 'code'=>$mainQrdaPayerCodeSendArr[$PKey], 'codeSystem'=>'2.16.840.1.113883.3.221.5' , 'codeSystemName'=>'SOP', 'displayName'=>$PVal)); - + //entryRelationship Open $xml->open_customTag('entryRelationship', array('typeCode'=>'SUBJ', 'inversionInd'=>'true')); - + //observation Open $xml->open_customTag('observation', array('classCode'=>'OBS', 'moodCode'=>'EVN')); - + $tempID = "2.16.840.1.113883.10.20.27.3.3"; $xml->self_templateid($tempID); $tempID = "2.16.840.1.113883.10.20.27.3.24"; $xml->self_templateid($tempID); - + $arr = array('code'=>'MSRAGG', 'displayName'=>'rate aggregation', 'codeSystem'=>'2.16.840.1.113883.5.4', 'codeSystemName'=>'ActCode'); $xml->self_codeCustom($arr); - + //$arr = array('code'=>'completed'); //$xml->self_customTag('statusCode', $arr); $arr = array('xsi:type'=>'INT', 'value'=>$payerCheckArr[$PVal]); $xml->self_customTag('value', $arr); - + $arr = array('code'=>'COUNT', 'displayName'=>'Count', 'codeSystem'=>'2.16.840.1.113883.5.84', 'codeSystemName'=>'ObservationMethod'); $xml->self_customTag('methodCode', $arr); - + //observation Close $xml->close_customTag(); - + //entryRelationship Close $xml->close_customTag(); - - + + //observation Close $xml->close_customTag(); - + //entryRelationship Close $xml->close_customTag(); - + } #################################################### #################################################### @@ -1383,11 +1382,11 @@ if(count($dataSheet) > 0){ //reference Start $arr = array('typeCode'=>'REFR'); $xml->open_customTag('reference', $arr); - + //externalObservation Start $arr = array('classCode'=>'OBS', 'moodCode'=>'EVN'); $xml->open_customTag('externalObservation', $arr); - + //Modified HQMF_ID for CQM IDS if( ($row['cqm_nqf_code'] == "0421" ) ){ $refID = $preDefPopIdArr[$row['cqm_nqf_code']][$row['numerator_label']][$mainQrdaPopulationIncArr[$cqmKey]]; @@ -1400,10 +1399,10 @@ if(count($dataSheet) > 0){ $refID = getUuid(); } $xml->self_customId($refID); - + //externalObservation Close $xml->close_customTag(); - + //reference Close $xml->close_customTag(); ######################################################################## @@ -1414,7 +1413,7 @@ if(count($dataSheet) > 0){ $xml->close_loopComponent(); ############### Initial patient population template END##################### } - + //Multiple Numerator Handling if(in_array($row['cqm_nqf_code'], $multNumNQFArr)){ //Skipping Multiple Numerator(s) @@ -1431,7 +1430,7 @@ if(count($dataSheet) > 0){ $xml->close_customTag(); $xml->close_entry(); } - + ########################################################### $innrCnt++; @@ -1474,13 +1473,13 @@ fclose($fileQRDAOPen); - + <?php echo xlt('Export QRDA Report'); ?> - diff --git a/interface/batchcom/batch_phone_notification.php b/interface/batchcom/batch_phone_notification.php index 1ace3d0a3..281c12a52 100644 --- a/interface/batchcom/batch_phone_notification.php +++ b/interface/batchcom/batch_phone_notification.php @@ -31,7 +31,6 @@ $fake_register_globals=false; require_once("../../interface/globals.php"); require_once("$srcdir/maviq_phone_api.php"); -require_once("$srcdir/formdata.inc.php"); $type = "Phone"; $before_trigger_hours = 72; // 3 days is default diff --git a/interface/billing/edit_payment.php b/interface/billing/edit_payment.php index 75878020c..d388f7d03 100644 --- a/interface/billing/edit_payment.php +++ b/interface/billing/edit_payment.php @@ -36,7 +36,6 @@ require_once("$srcdir/parse_era.inc.php"); require_once("../../library/acl.inc"); require_once("$srcdir/sql.inc"); require_once("$srcdir/auth.inc"); -require_once("$srcdir/formdata.inc.php"); require_once("../../custom/code_types.inc.php"); require_once("$srcdir/patient.inc"); require_once("$srcdir/billrep.inc"); diff --git a/interface/billing/new_payment.php b/interface/billing/new_payment.php index 66c37f14c..aadd1d14c 100644 --- a/interface/billing/new_payment.php +++ b/interface/billing/new_payment.php @@ -32,7 +32,6 @@ require_once("$srcdir/parse_era.inc.php"); require_once("../../library/acl.inc"); require_once("$srcdir/sql.inc"); require_once("$srcdir/auth.inc"); -require_once("$srcdir/formdata.inc.php"); require_once("../../custom/code_types.inc.php"); require_once("$srcdir/patient.inc"); require_once("$srcdir/billrep.inc"); diff --git a/interface/billing/sl_eob_invoice.php b/interface/billing/sl_eob_invoice.php index c6c5f2a2f..57855a00c 100644 --- a/interface/billing/sl_eob_invoice.php +++ b/interface/billing/sl_eob_invoice.php @@ -31,7 +31,6 @@ require_once("$srcdir/sl_eob.inc.php"); require_once("$srcdir/invoice_summary.inc.php"); require_once("../../custom/code_types.inc.php"); - require_once("$srcdir/formdata.inc.php"); $debug = 0; // set to 1 for debugging mode diff --git a/interface/billing/sl_receipts_report.php b/interface/billing/sl_receipts_report.php index 0a38559e7..e2e43f0fe 100644 --- a/interface/billing/sl_receipts_report.php +++ b/interface/billing/sl_receipts_report.php @@ -29,7 +29,6 @@ require_once($GLOBALS['srcdir'].'/patient.inc'); require_once($GLOBALS['srcdir'].'/acl.inc'); require_once($GLOBALS['srcdir'].'/formatting.inc.php'); require_once($GLOBALS['srcdir'].'/options.inc.php'); -require_once($GLOBALS['srcdir'].'/formdata.inc.php'); require_once($GLOBALS['fileroot'].'/custom/code_types.inc.php'); // This determines if a particular procedure code corresponds to receipts diff --git a/interface/cmsportal/history_form.php b/interface/cmsportal/history_form.php index ebf7c9f98..7cdc08dde 100644 --- a/interface/cmsportal/history_form.php +++ b/interface/cmsportal/history_form.php @@ -24,7 +24,6 @@ $fake_register_globals = false; require_once("../globals.php"); require_once("$srcdir/patient.inc"); -require_once("$srcdir/formdata.inc.php"); require_once("$srcdir/options.inc.php"); require_once("portal.inc.php"); diff --git a/interface/cmsportal/insurance_form.php b/interface/cmsportal/insurance_form.php index c4e9e5488..d662458ed 100644 --- a/interface/cmsportal/insurance_form.php +++ b/interface/cmsportal/insurance_form.php @@ -22,7 +22,6 @@ $fake_register_globals = false; require_once("../globals.php"); require_once("$srcdir/patient.inc"); -require_once("$srcdir/formdata.inc.php"); require_once("$srcdir/options.inc.php"); require_once("portal.inc.php"); diff --git a/interface/cmsportal/issue_form.php b/interface/cmsportal/issue_form.php index 72d88be36..fedc4e1ec 100644 --- a/interface/cmsportal/issue_form.php +++ b/interface/cmsportal/issue_form.php @@ -23,7 +23,6 @@ $sanitize_all_escapes = true; $fake_register_globals = false; require_once("../globals.php"); -require_once("$srcdir/formdata.inc.php"); require_once("$srcdir/options.inc.php"); require_once("$srcdir/patient.inc"); require_once("$srcdir/lists.inc"); diff --git a/interface/cmsportal/lbf_form.php b/interface/cmsportal/lbf_form.php index 47103f72c..41563aee4 100644 --- a/interface/cmsportal/lbf_form.php +++ b/interface/cmsportal/lbf_form.php @@ -22,7 +22,6 @@ $fake_register_globals = false; require_once("../globals.php"); require_once("$srcdir/patient.inc"); -require_once("$srcdir/formdata.inc.php"); require_once("$srcdir/options.inc.php"); require_once("portal.inc.php"); diff --git a/interface/cmsportal/list_requests.php b/interface/cmsportal/list_requests.php index 4d3518215..e5bc79789 100644 --- a/interface/cmsportal/list_requests.php +++ b/interface/cmsportal/list_requests.php @@ -24,7 +24,6 @@ $fake_register_globals = false; require_once("../globals.php"); require_once("$srcdir/log.inc"); require_once("$srcdir/acl.inc"); -require_once("$srcdir/formdata.inc.php"); require_once("$srcdir/options.inc.php"); require_once("$srcdir/formatting.inc.php"); require_once("portal.inc.php"); diff --git a/interface/cmsportal/patient_form.php b/interface/cmsportal/patient_form.php index 76ac8997e..ee6b8f614 100644 --- a/interface/cmsportal/patient_form.php +++ b/interface/cmsportal/patient_form.php @@ -24,7 +24,6 @@ $fake_register_globals = false; require_once("../globals.php"); require_once("$srcdir/patient.inc"); -require_once("$srcdir/formdata.inc.php"); require_once("$srcdir/options.inc.php"); require_once("portal.inc.php"); diff --git a/interface/cmsportal/patient_form_ajax.php b/interface/cmsportal/patient_form_ajax.php index 15b205f4d..138cfe8b6 100644 --- a/interface/cmsportal/patient_form_ajax.php +++ b/interface/cmsportal/patient_form_ajax.php @@ -23,7 +23,6 @@ $sanitize_all_escapes = true; $fake_register_globals = false; require_once("../globals.php"); -require_once("$srcdir/formdata.inc.php"); require_once("portal.inc.php"); $result = cms_portal_call(array( diff --git a/interface/cmsportal/patient_select.php b/interface/cmsportal/patient_select.php index 685bad87f..ef801de1b 100644 --- a/interface/cmsportal/patient_select.php +++ b/interface/cmsportal/patient_select.php @@ -22,7 +22,6 @@ $fake_register_globals = false; require_once("../globals.php"); require_once("$srcdir/patient.inc"); -require_once("$srcdir/formdata.inc.php"); require_once("$srcdir/options.inc.php"); require_once("portal.inc.php"); diff --git a/interface/cmsportal/upload_form.php b/interface/cmsportal/upload_form.php index 057d9f4c6..37965ddfb 100644 --- a/interface/cmsportal/upload_form.php +++ b/interface/cmsportal/upload_form.php @@ -23,7 +23,6 @@ $sanitize_all_escapes = true; $fake_register_globals = false; require_once("../globals.php"); -require_once("$srcdir/formdata.inc.php"); require_once("$srcdir/classes/Document.class.php"); require_once("portal.inc.php"); diff --git a/interface/cmsportal/upload_form_show.php b/interface/cmsportal/upload_form_show.php index 93b88eb75..83a2858df 100644 --- a/interface/cmsportal/upload_form_show.php +++ b/interface/cmsportal/upload_form_show.php @@ -23,7 +23,6 @@ $sanitize_all_escapes = true; $fake_register_globals = false; require_once("../globals.php"); -require_once("$srcdir/formdata.inc.php"); require_once("portal.inc.php"); $uploadid = $_REQUEST['id']; diff --git a/interface/de_identification_forms/re_identification_op_single_patient.php b/interface/de_identification_forms/re_identification_op_single_patient.php index 5395ac06a..9e186bed5 100644 --- a/interface/de_identification_forms/re_identification_op_single_patient.php +++ b/interface/de_identification_forms/re_identification_op_single_patient.php @@ -22,7 +22,6 @@ require_once("$srcdir/patient.inc"); require_once("$srcdir/acl.inc"); require_once("$srcdir/options.inc.php"); include_once("../../library/sql.inc"); -require_once("$srcdir/formdata.inc.php"); $query = "SELECT status FROM re_identification_status"; $res = sqlStatement($query); if ($row = sqlFetchArray($res)) diff --git a/interface/drugs/add_edit_drug.php b/interface/drugs/add_edit_drug.php index f0c0edb18..5066793dc 100644 --- a/interface/drugs/add_edit_drug.php +++ b/interface/drugs/add_edit_drug.php @@ -13,8 +13,6 @@ $fake_register_globals = false; require_once("$srcdir/acl.inc"); require_once("drugs.inc.php"); require_once("$srcdir/options.inc.php"); - require_once("$srcdir/formdata.inc.php"); - require_once("$srcdir/htmlspecialchars.inc.php"); $alertmsg = ''; $drug_id = $_REQUEST['drug']; diff --git a/interface/drugs/add_edit_lot.php b/interface/drugs/add_edit_lot.php index 121416421..74b612451 100644 --- a/interface/drugs/add_edit_lot.php +++ b/interface/drugs/add_edit_lot.php @@ -12,9 +12,7 @@ $fake_register_globals = false; require_once("../globals.php"); require_once("$srcdir/acl.inc"); require_once("drugs.inc.php"); -require_once("$srcdir/formdata.inc.php"); require_once("$srcdir/options.inc.php"); -require_once("$srcdir/htmlspecialchars.inc.php"); function QuotedOrNull($fld) { if ($fld) return "'".add_escape_custom($fld)."'"; diff --git a/interface/drugs/destroy_lot.php b/interface/drugs/destroy_lot.php index 13f8cd3b9..a455b7d27 100644 --- a/interface/drugs/destroy_lot.php +++ b/interface/drugs/destroy_lot.php @@ -12,8 +12,6 @@ require_once("../globals.php"); require_once("$srcdir/acl.inc"); require_once("drugs.inc.php"); - require_once("$srcdir/formdata.inc.php"); - require_once("$srcdir/htmlspecialchars.inc.php"); function QuotedOrNull($fld) { if ($fld) return "'".add_escape_custom($fld)."'"; diff --git a/interface/drugs/dispense_drug.php b/interface/drugs/dispense_drug.php index e711d6cc1..fc9d2bb6d 100644 --- a/interface/drugs/dispense_drug.php +++ b/interface/drugs/dispense_drug.php @@ -13,7 +13,6 @@ require_once("$srcdir/acl.inc"); require_once("drugs.inc.php"); require_once("$srcdir/options.inc.php"); - require_once("$srcdir/htmlspecialchars.inc.php"); function send_email($subject, $body) { $recipient = $GLOBALS['practice_return_email_path']; diff --git a/interface/drugs/drug_inventory.php b/interface/drugs/drug_inventory.php index e1a4f5ff2..64764a5c4 100644 --- a/interface/drugs/drug_inventory.php +++ b/interface/drugs/drug_inventory.php @@ -14,7 +14,6 @@ require_once("drugs.inc.php"); require_once("$srcdir/options.inc.php"); require_once("$srcdir/formatting.inc.php"); - require_once("$srcdir/htmlspecialchars.inc.php"); // Check authorization. $thisauth = acl_check('admin', 'drugs'); @@ -165,7 +164,7 @@ $(document).ready(function() { - formData("category"), 'subcategory' => formData("subcategory"), 'item' => formData("item"), 'content' => strip_escape_custom($_POST['content'])); $camos_array = array(); diff --git a/interface/forms/CAMOS/content_parser.php b/interface/forms/CAMOS/content_parser.php index e899fcf8f..de463ca94 100644 --- a/interface/forms/CAMOS/content_parser.php +++ b/interface/forms/CAMOS/content_parser.php @@ -2,7 +2,6 @@ include_once("../../globals.php"); include_once("../../../library/sql.inc"); -include_once("../../../library/formdata.inc.php"); function addAppt($days,$time) { $days = formDataCore($days); diff --git a/interface/forms/CAMOS/new.php b/interface/forms/CAMOS/new.php index afea26bb3..886306edb 100755 --- a/interface/forms/CAMOS/new.php +++ b/interface/forms/CAMOS/new.php @@ -2,7 +2,6 @@ include_once("../../globals.php"); include_once("../../../library/api.inc"); include_once("../../../library/sql.inc"); -include_once("../../../library/formdata.inc.php"); $out_of_encounter = false; if ( (($_SESSION['encounter'] == '') || ($_SESSION['pid'] == '')) || ($_GET['mode'] == 'external')) { $out_of_encounter = true; diff --git a/interface/forms/CAMOS/notegen.php b/interface/forms/CAMOS/notegen.php index d078830cf..60bf5ad0c 100755 --- a/interface/forms/CAMOS/notegen.php +++ b/interface/forms/CAMOS/notegen.php @@ -1,7 +1,6 @@ $val) { diff --git a/interface/forms/LBF/new.php b/interface/forms/LBF/new.php index d318eed34..ac82482d4 100644 --- a/interface/forms/LBF/new.php +++ b/interface/forms/LBF/new.php @@ -29,7 +29,6 @@ require_once("$srcdir/api.inc"); require_once("$srcdir/forms.inc"); require_once("$srcdir/options.inc.php"); require_once("$srcdir/patient.inc"); -require_once("$srcdir/formdata.inc.php"); require_once("$srcdir/formatting.inc.php"); if ($GLOBALS['gbl_portal_cms_enable']) { require_once("$include_root/cmsportal/portal.inc.php"); diff --git a/interface/forms/aftercare_plan/new.php b/interface/forms/aftercare_plan/new.php index 2557ef915..43ebe86bf 100644 --- a/interface/forms/aftercare_plan/new.php +++ b/interface/forms/aftercare_plan/new.php @@ -18,8 +18,8 @@ * @author Naina Mohamed * @link http://www.open-emr.org */ - - + + //SANITIZE ALL ESCAPES $sanitize_all_escapes=true; @@ -30,7 +30,6 @@ include_once("../../globals.php"); include_once("$srcdir/api.inc"); require_once("$srcdir/patient.inc"); require_once("$srcdir/options.inc.php"); -require_once("$srcdir/htmlspecialchars.inc.php"); formHeader("Form:AfterCare Planning"); $returnurl = 'encounter_top.php'; $formid = 0 + (isset($_GET['id']) ? $_GET['id'] : ''); @@ -71,7 +70,7 @@ echo "
: