Commit 4b939f6
committed
Merge upstream/master into comlink-deprecation branch
Resolve conflicts:
- TeleHealthCalendarController: keep CalendarUtils import from master,
drop bogus 'The' import
- TelehealthGlobalConfig: keep OEGlobalsBag usage from PR over raw
$GLOBALS access
- PHPStan baselines: regenerated with composer phpstan-baselineFile tree
2,869 files changed
+432621
-56063
lines changed- .github
- actions/setup-php-composer
- problem-matchers
- workflows
- .phpstan
- baseline
- Documentation
- EHI_Export/schemaspy/schemas
- api
- help_files
- apis
- routes
- bin
- ccdaservice
- ccr
- ci
- nginx
- config
- contrib/util
- ccda_import
- deidentification
- dupecheck
- installScripts
- controllers
- custom
- db
- Migrations
- docker
- development-easy
- development-insane
- library/dockers/dev-nginx
- gacl
- Cache_Lite
- admin
- interface
- batchcom
- billing
- clickmap
- code_systems
- couchdb
- de_identification_forms
- drugs
- easipro
- esign
- fax
- forms_admin
- forms
- CAMOS
- LBF
- aftercare_plan
- ankleinjury
- bronchitis
- care_plan
- templates
- clinic_note
- clinical_instructions
- clinical_notes
- templates
- dictation
- eye_mag
- php
- fee_sheet
- code_choice
- css
- js
- templates
- contraception_products
- ajax
- js
- templates
- review
- js
- views
- functional_cognitive_status
- gad7
- group_attendance
- misc_billing_options
- newGroupEncounter
- newpatient
- templates/newpatient
- partials/common
- note
- observation
- painmap
- phq9
- physical_exam
- prior_auth
- templates/prior_auth
- procedure_order
- templates
- questionnaire_assessments
- requisition
- reviewofs
- ros
- templates/ros
- sdoh
- soap
- track_anything
- transfer_summary
- treatment_plan
- vitals
- growthchart
- templates/vitals
- language
- csv
- login
- logview
- main
- authorizations
- calendar
- includes
- modules/PostCalendar
- plugins
- dated_reminders
- finder
- holidays
- messages
- js
- templates
- onotes
- tabs
- js
- templates
- modules
- custom_modules
- oe-module-claimrev-connect
- public
- src
- templates
- oe-module-comlink-telehealth
- public
- assets
- css
- js
- dist
- src
- src
- Controller
- Admin
- Exception
- Models
- Repository
- Services
- Util
- Validators
- templates
- comlink
- conference-room
- emails
- portal
- emails/partials/patient
- patient/partials
- portal
- tests
- Tests/Unit
- oe-module-dashboard-context
- public
- assets/js
- sql
- src
- Controller
- Services
- oe-module-dorn
- public
- src
- EventSubscriber
- models
- templates
- oe-module-ehi-exporter
- public
- src
- Models
- Services
- TableDefinitions
- templates/oe-module-ehi-exporter
- oe-module-faxsms
- library
- phone-services
- src
- Controller
- Enums
- EtherFax
- Events
- Exception
- RCVoice
- Utils
- oe-module-prior-authorizations
- public
- oe-module-weno
- scripts
- src
- Services
- templates
- zend_modules
- config
- autoload
- module
- Acl
- config
- src/Acl
- Controller
- Model
- Application
- ajax
- config
- src/Application
- Controller
- Helper
- Listener
- Model
- Plugin
- Carecoordination
- config
- src/Carecoordination
- Controller
- Factory
- Form
- Listener
- Model
- Ccr
- config
- src/Ccr
- Controller
- Model
- CodeTypes
- src/CodeTypes/Listener
- Documents
- config
- src/Documents
- Controller
- Model
- Plugin
- FHIR
- src/FHIR/Listener
- Immunization
- config
- src/Immunization
- Controller
- Model
- Installer
- config
- src/Installer
- Controller
- Model
- Multipledb
- config
- src/Multipledb
- Controller
- Model
- view
- layout
- multipledb/multipledb
- PatientFilter
- PatientFlowBoard
- src/PatientFlowBoard/Listener
- Patientvalidation
- config
- src/Patientvalidation
- Controller
- Model
- PrescriptionTemplates
- config
- src/PrescriptionTemplates/Controller
- Syndromicsurveillance
- config
- src/Syndromicsurveillance
- Controller
- Model
- public/js/scripts
- new
- orders
- patient_file
- birthday_alert
- encounter
- history
- reminder
- report
- rules
- summary
- transaction
- patient_tracker
- practice
- procedure_tools
- ereqs
- gen_universal_hl7
- labcorp
- libs
- quest
- product_registration
- exceptions
- reports
- smart
- soap_functions
- super
- rules
- templates
- themes
- core
- misc
- oe-common
- therapy_groups
- therapy_groups_controllers
- therapy_groups_models
- therapy_groups_views
- usergroup
- webhooks/payment
- library
- ESign
- DbRow
- Encounter
- Form
- LBF
- Utils
- css
- js
- views
- default
- encounter
- form
- MedEx
- ajax
- messages
- classes
- fpdf
- font
- rulesets
- Amc
- library
- reports
- AMC_302f_1_STG1
- AMC_302f_2_STG1
- AMC_302f_3_STG1
- AMC_302f_4_STG1
- AMC_302f_STG2
- AMC_302m_STG2
- AMC_304a_1
- AMC_304a_2
- AMC_304a_3
- AMC_304b_1_STG2
- AMC_304b_2_STG2
- AMC_304b_STG1
- AMC_304d_STG2
- AMC_304h_STG2
- AMC_304h
- AMC_304i_STG1
- AMC_304i_STG2
- AMC_314g_1_2_14_STG2
- AMC_314g_1_2_14
- AMC_314g_1_2_19
- AMC_314g_1_2_20
- AMC_314g_1_2_21
- AMC_314g_1_2_22
- AMC_315g_2c
- AMC_315g_7
- Cqm/reports
- NQF_0002
- NQF_0013
- NQF_0028_2014
- NQF_0038_2014
- NQF_0059
- NQF_0101
- NQF_0384
- smtp
- thumbnail
- custom_template
- edihistory
- codes
- js
- dwv
- oeUI
- Error
- insurance
- vendors/validate
- xl
- smarty_legacy/smarty
- internals
- plugins
- smarty/plugins
- templates
- validation
- meta/health
- modules/sms_email_reminder
- oauth2
- portal
- account
- lib
- messaging
- patient
- fwk/libs
- util
- verysimple
- DB/DataDriver
- HTTP
- Phreeze
- Util
- libs
- Controller
- Model/DAO
- Reporter
- scripts/app
- templates
- report
- sign
- assets
- css
- lib
- sites/default
- sphere
- sql
- src
- BC
- Billing
- BillingProcessor
- Tasks
- Traits
- ClinicalDecisionRules
- AMC
- Interface
- Controller
- RuleLibrary
- Common
- Acl
- Auth
- OpenIDConnect
- Entities
- Grant
- JWT
- Validation
- Repositories
- Validators
- Command
- Runner
- Compatibility
- Crypto
- Csrf
- Database
- DirectMessaging
- Enum
- Forms
- Types
- Http
- Logging
- ORDataObject
- Session
- Predis
- Translation
- Twig
- Utils
- Uuid
- ValueObjects
- Controllers
- Interface/Forms/Observation
- Portal
- Core
- Traits
- Cqm
- Qdm
- BaseTypes
- Traits
- QrdaControllers
- Easipro
- Entity/Core
- Events
- Appointments
- Codes
- Command
- Core
- Interfaces
- Sanitize
- Encounter
- Facility
- Main/Tabs
- Messaging
- PatientDocuments
- PatientPortal
- PatientReport
- Patient
- Summary
- Card
- RestApiExtend
- Services
- UserInterface
- User
- FHIR
- Config
- DomainModels
- Export
- SMART
- ExternalClinicalDecisionSupport
- Forms/FeeSheet/Review
- Gacl
- Health
- Check
- Menu
- OeUI
- Patient/Cards
- PaymentProcessing
- Rainforest
- Apis
- Webhooks
- Sphere
- Pdf
- Pharmacy/Services
- Reminder
- Reports/AMC/Trackers
- RestControllers
- Authorization
- Config
- FHIR
- Finder
- Operations
- ProfileMappers
- Finder
- OpenApi
- SMART
- Subscriber
- Services
- Address
- Cda
- DocumentTemplates
- FHIR
- Condition
- Enum
- Trait
- DiagnosticReport
- DocumentReference
- Enum
- Trait
- Document
- Enum
- Group
- MedicationDispense
- Observation
- Trait
- Organization
- Procedure
- QuestionnaireResponse
- Questionnaire
- Serialization
- Traits
- Utils
- Globals
- ImageUtilities
- Qdm
- Interfaces
- Services
- Qrda
- Helpers
- Util
- qrda-export
- catI-r5
- qrda_header
- qrda_templates
- template_partials
- catIII
- Reports
- SDOH
- Search
- Traits
- Trait
- Utils
- Interfaces
- Tabs
- Telemetry
- Tools/Coverage
- USPS
- Validators
- Rules
- swagger
- templates
- core
- document_categories
- documents
- emails/patient/verify_email
- encounter/forms
- hl7
- insurance_numbers
- interface
- main/tabs
- smart/admin-client
- oauth2
- patient_finder
- patient
- card
- demographics
- insurance
- portal_login
- payments
- pharmacies
- portal
- login
- partial
- registration
- prescription
- super
- facilities
- rules
- base/template
- controllers
- edit
- log
- x12_partners
- tests
- PHPStan/Rules
- Rector/Rules
- Fixture
- config
- Tests
- Api
- BC
- Certification/HIT1
- G10_Certification
- SinglePatientApi
- Observation
- Trait
- G9_Certification
- US_Core_311
- Common
- Auth/OpenIDConnect
- Logging
- Uuid
- E2e
- Base
- Email
- Login
- User
- ECQM
- test_patient_qrda
- 2020
- Fixtures
- Integration/RestControllers/Subscriber
- Isolated
- BC
- Billing
- ClinicalDecisionRules
- Common
- Auth/OpenIDConnect/Entities
- Crypto
- Csrf
- Database
- Enum
- Forms
- Http
- Twig
- fixtures/render
- Utils
- ValueObjects
- Core
- Traits
- Cqm/Qdm/BaseTypes
- Events
- PatientDocuments
- Services
- Forms/EyeMag
- Menu
- PaymentProcessing/Rainforest
- RestControllers
- Rules
- Services
- Address
- Cda
- Qrda
- Helpers
- Util
- Search
- Utils
- Telemetry
- Tools/OAuth2
- Validators
- library
- classes
- RestControllers
- Authorization
- FHIR
- SMART
- Subscriber
- Services
- Cda
- FHIR
- Condition
- DocumentReference
- Observation
- QuestionnaireResponse
- Questionnaire
- Modules/Carecoordination/Model
- Qrda
- Reports
- Unit
- ClinicalDecisionRules
- Common
- Acl
- Auth/OpenIDConnect
- Entities
- Grant
- Repositories
- Crypto
- Forms
- Http
- Logging
- Session
- Utils
- Controllers/Interface/Forms/Observation
- FHIR
- Export
- SMART
- ExternalClinicalDecisionSupport
- Forms/FeeSheet/Review
- PaymentProcessing/Rainforest
- Apis
- Webhooks
- RestControllers/Config
- Services/FHIR/Utils
- library
- Validators
- Rules
- api
- eventdispatcher
- RestApiEventHookExample
- oe-patient-create-update-hooks-example
- tools/ci
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
2,869 files changed
+432621
-56063
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
44 | | - | |
45 | 44 | | |
46 | 45 | | |
47 | 46 | | |
| |||
117 | 116 | | |
118 | 117 | | |
119 | 118 | | |
120 | | - | |
121 | 119 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
3 | 4 | | |
4 | 5 | | |
5 | 6 | | |
| |||
13 | 14 | | |
14 | 15 | | |
15 | 16 | | |
| 17 | + | |
16 | 18 | | |
17 | 19 | | |
18 | 20 | | |
| |||
36 | 38 | | |
37 | 39 | | |
38 | 40 | | |
| 41 | + | |
39 | 42 | | |
40 | 43 | | |
41 | 44 | | |
| |||
52 | 55 | | |
53 | 56 | | |
54 | 57 | | |
55 | | - | |
56 | 58 | | |
57 | 59 | | |
58 | 60 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
| 28 | + | |
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
34 | | - | |
| 33 | + | |
| 34 | + | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
38 | 37 | | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
| 38 | + | |
56 | 39 | | |
57 | 40 | | |
58 | 41 | | |
59 | | - | |
| 42 | + | |
60 | 43 | | |
61 | 44 | | |
62 | 45 | | |
63 | 46 | | |
64 | 47 | | |
65 | 48 | | |
66 | 49 | | |
67 | | - | |
| 50 | + | |
| 51 | + | |
68 | 52 | | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
74 | 61 | | |
75 | 62 | | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | 36 | | |
43 | 37 | | |
44 | 38 | | |
45 | 39 | | |
46 | 40 | | |
47 | | - | |
| 41 | + | |
48 | 42 | | |
49 | | - | |
| 43 | + | |
50 | 44 | | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | | - | |
111 | | - | |
112 | | - | |
113 | | - | |
114 | | - | |
115 | | - | |
116 | | - | |
117 | | - | |
118 | | - | |
119 | | - | |
120 | | - | |
121 | | - | |
122 | | - | |
123 | | - | |
124 | | - | |
125 | | - | |
126 | 45 | | |
127 | 46 | | |
128 | | - | |
129 | | - | |
130 | | - | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | | - | |
| 47 | + | |
0 commit comments