port PR #5978 CCDA import merge duplicate fix (#5979)v7_0_0_2
commit4f6a815c191c141d03915aee35ea15952c499192
authorJerry Padgett <sjpadgett@gmail.com>
Mon, 28 Nov 2022 23:17:29 +0000 (28 18:17 -0500)
committerGitHub <noreply@github.com>
Mon, 28 Nov 2022 23:17:29 +0000 (28 18:17 -0500)
tree2f3ac9bca236b9ef8633f08186f1e2d80c551037
parent3fc616e826d2f66ff3670d5c5627ffb7ad556f49
port PR #5978 CCDA import merge duplicate fix (#5979)

* port PR #5978 CCDA import merge duplicate fix
- ensure if unstructured and CDA then combine/merge
- fix deleter to auto close after 2 sec or immediate for encounters.

* - fix careplan report to use passed in encounter id instead of session data.

* - additional attempt to get author for portal using hie_primary

* - ensure newly create users aren't duplicated one day I'll get this right!
interface/forms/care_plan/report.php
interface/modules/zend_modules/module/Carecoordination/src/Carecoordination/Model/CarecoordinationTable.php
interface/modules/zend_modules/module/Carecoordination/src/Carecoordination/Model/EncounterccdadispatchTable.php
interface/patient_file/deleter.php
src/Services/Cda/CdaTemplateImportDispose.php