diff --git a/frontend/src/app/components/medical-sources-connected/medical-sources-connected.component.ts b/frontend/src/app/components/medical-sources-connected/medical-sources-connected.component.ts index 8822a9d1..7337d698 100644 --- a/frontend/src/app/components/medical-sources-connected/medical-sources-connected.component.ts +++ b/frontend/src/app/components/medical-sources-connected/medical-sources-connected.component.ts @@ -124,8 +124,9 @@ export class MedicalSourcesConnectedComponent implements OnInit { //nextGen uses fhirUser instead of profile. payload.patient = decodedIdToken["patient"] || decodedIdToken["profile"] || decodedIdToken["fhirUser"] - if(payload.patient){ - payload.patient = payload.patient.replace(/^(Patient\/)/,'') + if(payload.patient && payload.patient.includes("Patient/")){ + //remove the "Patient/" or "https://example.com/fhir/Patient/" prefix if it exists + payload.patient = payload.patient.split("Patient/")[1] } } diff --git a/frontend/src/assets/sources/beach-physicians-medical-group.png b/frontend/src/assets/sources/beach-physicians-medical-group.png index 09a2e2ff..b786c917 100644 Binary files a/frontend/src/assets/sources/beach-physicians-medical-group.png and b/frontend/src/assets/sources/beach-physicians-medical-group.png differ diff --git a/frontend/src/assets/sources/boonslick-medical-group-inc.jpg b/frontend/src/assets/sources/boonslick-medical-group-inc.jpg index 9d065efe..4dbd30d8 100644 Binary files a/frontend/src/assets/sources/boonslick-medical-group-inc.jpg and b/frontend/src/assets/sources/boonslick-medical-group-inc.jpg differ diff --git a/frontend/src/assets/sources/california-coast-physicians.png b/frontend/src/assets/sources/california-coast-physicians.png index 5a64322d..cd926a46 100644 Binary files a/frontend/src/assets/sources/california-coast-physicians.png and b/frontend/src/assets/sources/california-coast-physicians.png differ diff --git a/frontend/src/assets/sources/caribou-medical-center.png b/frontend/src/assets/sources/caribou-medical-center.png index 4363983a..c3ed1f10 100644 Binary files a/frontend/src/assets/sources/caribou-medical-center.png and b/frontend/src/assets/sources/caribou-medical-center.png differ diff --git a/frontend/src/assets/sources/central-medical-group.png b/frontend/src/assets/sources/central-medical-group.png index b9c43f45..4bcdb50a 100644 Binary files a/frontend/src/assets/sources/central-medical-group.png and b/frontend/src/assets/sources/central-medical-group.png differ diff --git a/frontend/src/assets/sources/chi-st-vincent.png b/frontend/src/assets/sources/chi-st-vincent.png index a95d9dcf..09c328ce 100644 Binary files a/frontend/src/assets/sources/chi-st-vincent.png and b/frontend/src/assets/sources/chi-st-vincent.png differ diff --git a/frontend/src/assets/sources/childrens-eye-care-and-surgery-of-ga.jpg b/frontend/src/assets/sources/childrens-eye-care-and-surgery-of-ga.jpg index b0be13ab..23497b57 100644 Binary files a/frontend/src/assets/sources/childrens-eye-care-and-surgery-of-ga.jpg and b/frontend/src/assets/sources/childrens-eye-care-and-surgery-of-ga.jpg differ diff --git a/frontend/src/assets/sources/clinix-healthcare.png b/frontend/src/assets/sources/clinix-healthcare.png index 5906a17e..3270e0bf 100644 Binary files a/frontend/src/assets/sources/clinix-healthcare.png and b/frontend/src/assets/sources/clinix-healthcare.png differ diff --git a/frontend/src/assets/sources/cogdell-memorial-hospital.png b/frontend/src/assets/sources/cogdell-memorial-hospital.png index 1a25e9f8..2173798f 100644 Binary files a/frontend/src/assets/sources/cogdell-memorial-hospital.png and b/frontend/src/assets/sources/cogdell-memorial-hospital.png differ diff --git a/frontend/src/assets/sources/dayton-nephrology.png b/frontend/src/assets/sources/dayton-nephrology.png index 6eec56c6..ac9a4862 100644 Binary files a/frontend/src/assets/sources/dayton-nephrology.png and b/frontend/src/assets/sources/dayton-nephrology.png differ diff --git a/frontend/src/assets/sources/dickson-medical-associates-pc.png b/frontend/src/assets/sources/dickson-medical-associates-pc.png index 36b4253e..b88067a2 100644 Binary files a/frontend/src/assets/sources/dickson-medical-associates-pc.png and b/frontend/src/assets/sources/dickson-medical-associates-pc.png differ diff --git a/frontend/src/assets/sources/eclinicalworks.png b/frontend/src/assets/sources/eclinicalworks.png new file mode 100644 index 00000000..50af0086 Binary files /dev/null and b/frontend/src/assets/sources/eclinicalworks.png differ diff --git a/frontend/src/assets/sources/h-charles-harris-md-pa.png b/frontend/src/assets/sources/h-charles-harris-md-pa.png index 401aa376..989b47c3 100644 Binary files a/frontend/src/assets/sources/h-charles-harris-md-pa.png and b/frontend/src/assets/sources/h-charles-harris-md-pa.png differ diff --git a/go.mod b/go.mod index c2dce3b3..1f12aa4b 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/dave/jennifer v1.6.1 github.com/dominikbraun/graph v0.15.0 github.com/dop251/goja v0.0.0-20230605162241-28ee0ee714f3 - github.com/fastenhealth/fasten-sources v0.2.3 + github.com/fastenhealth/fasten-sources v0.2.5 github.com/fastenhealth/gofhir-models v0.0.5 github.com/gin-gonic/gin v1.9.0 github.com/glebarez/sqlite v1.5.0 diff --git a/go.sum b/go.sum index 18d11242..643f031c 100644 --- a/go.sum +++ b/go.sum @@ -191,8 +191,8 @@ github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M= github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= -github.com/fastenhealth/fasten-sources v0.2.3 h1:a40yp/cim0PUf6DFH3WgMW4a6J7cgUDycdQqur1dq0c= -github.com/fastenhealth/fasten-sources v0.2.3/go.mod h1:B7pVQcwLuL+rgjSHwlu3p0CySyHN262BkfbYMKVKXTk= +github.com/fastenhealth/fasten-sources v0.2.5 h1:CIXq9gg611dEn/uIfj6G3iPyG7x0+xgHtEQaFEIZPQQ= +github.com/fastenhealth/fasten-sources v0.2.5/go.mod h1:B7pVQcwLuL+rgjSHwlu3p0CySyHN262BkfbYMKVKXTk= github.com/fastenhealth/gofhir-models v0.0.5 h1:wU2Dz+/h9MzZCTRgkQzeq5l0EFuMI6C5xgCbKislFpg= github.com/fastenhealth/gofhir-models v0.0.5/go.mod h1:xB8ikGxu3bUq2b1JYV+CZpHqBaLXpOizFR0eFBCunis= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=