From 791b0e805710202374cf959c2e57e97098c1fcc6 Mon Sep 17 00:00:00 2001 From: Ryan May <112563297+ryma2fhir@users.noreply.github.com> Date: Wed, 14 Aug 2024 15:25:47 +0100 Subject: [PATCH 1/8] Update common.js.ts --- src/common.js.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/common.js.ts b/src/common.js.ts index e310563..bee1ef1 100644 --- a/src/common.js.ts +++ b/src/common.js.ts @@ -303,10 +303,14 @@ function raiseError(issue: OperationOutcomeIssue) : boolean { // ignore ods codesystems if (issue.diagnostics.includes('https://digital.nhs.uk/services/organisation-data-service/CodeSystem/ODS')) return false + + // ignore QuestionnaireResponse error https://github.com/hapifhir/hapi-fhir/issues/1184 + if (issue.diagnostics.includes('No response answer found for required item')) return false; } if (issue.location !== undefined && issue.location.length>0) { if (issue.location[0].includes('StructureMap.group')) return false; } + } return true; } From 03b05f3afb5817393376ea1be30cf73e01581e21 Mon Sep 17 00:00:00 2001 From: Ryan May <112563297+ryma2fhir@users.noreply.github.com> Date: Thu, 15 Aug 2024 12:44:25 +0100 Subject: [PATCH 2/8] Update common.js.ts --- src/common.js.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/common.js.ts b/src/common.js.ts index bee1ef1..935b6f8 100644 --- a/src/common.js.ts +++ b/src/common.js.ts @@ -312,6 +312,7 @@ function raiseError(issue: OperationOutcomeIssue) : boolean { } } + System.out.println("Issue: "+issue+"\nDignostics: "+issue.diagnostics); return true; } From ae12bac75f5446d68253837d9f2f95c6c386f4ab Mon Sep 17 00:00:00 2001 From: Ryan May <112563297+ryma2fhir@users.noreply.github.com> Date: Thu, 15 Aug 2024 12:58:41 +0100 Subject: [PATCH 3/8] Update common.js.ts --- src/common.js.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common.js.ts b/src/common.js.ts index 935b6f8..aa286f3 100644 --- a/src/common.js.ts +++ b/src/common.js.ts @@ -305,7 +305,7 @@ function raiseError(issue: OperationOutcomeIssue) : boolean { if (issue.diagnostics.includes('https://digital.nhs.uk/services/organisation-data-service/CodeSystem/ODS')) return false // ignore QuestionnaireResponse error https://github.com/hapifhir/hapi-fhir/issues/1184 - if (issue.diagnostics.includes('No response answer found for required item')) return false; + if (issue.diagnostics.includes('answer')) return false; } if (issue.location !== undefined && issue.location.length>0) { if (issue.location[0].includes('StructureMap.group')) return false; From c6dbe6c1c49325b6b30d5ed1ac7b25175bd9acd9 Mon Sep 17 00:00:00 2001 From: Ryan May <112563297+ryma2fhir@users.noreply.github.com> Date: Thu, 15 Aug 2024 15:25:30 +0100 Subject: [PATCH 4/8] Update common.js.ts --- src/common.js.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common.js.ts b/src/common.js.ts index aa286f3..56beae5 100644 --- a/src/common.js.ts +++ b/src/common.js.ts @@ -305,7 +305,7 @@ function raiseError(issue: OperationOutcomeIssue) : boolean { if (issue.diagnostics.includes('https://digital.nhs.uk/services/organisation-data-service/CodeSystem/ODS')) return false // ignore QuestionnaireResponse error https://github.com/hapifhir/hapi-fhir/issues/1184 - if (issue.diagnostics.includes('answer')) return false; + if (issue.includes('answer')) return false; } if (issue.location !== undefined && issue.location.length>0) { if (issue.location[0].includes('StructureMap.group')) return false; From 54ceef59d83283923b274143fd102f5c699ac386 Mon Sep 17 00:00:00 2001 From: Ryan May <112563297+ryma2fhir@users.noreply.github.com> Date: Thu, 15 Aug 2024 15:35:03 +0100 Subject: [PATCH 5/8] Update common.js.ts --- src/common.js.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common.js.ts b/src/common.js.ts index 56beae5..8cd652a 100644 --- a/src/common.js.ts +++ b/src/common.js.ts @@ -304,15 +304,15 @@ function raiseError(issue: OperationOutcomeIssue) : boolean { // ignore ods codesystems if (issue.diagnostics.includes('https://digital.nhs.uk/services/organisation-data-service/CodeSystem/ODS')) return false - // ignore QuestionnaireResponse error https://github.com/hapifhir/hapi-fhir/issues/1184 - if (issue.includes('answer')) return false; + } if (issue.location !== undefined && issue.location.length>0) { if (issue.location[0].includes('StructureMap.group')) return false; + // ignore QuestionnaireResponse error https://github.com/hapifhir/hapi-fhir/issues/1184 + if (issue.includes('answer')) return false; } } - System.out.println("Issue: "+issue+"\nDignostics: "+issue.diagnostics); return true; } From 277f6c0ac711064b1482697299292675ccfa20e7 Mon Sep 17 00:00:00 2001 From: Ryan May <112563297+ryma2fhir@users.noreply.github.com> Date: Thu, 15 Aug 2024 15:40:20 +0100 Subject: [PATCH 6/8] Update common.js.ts --- src/common.js.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common.js.ts b/src/common.js.ts index 8cd652a..c4e31a3 100644 --- a/src/common.js.ts +++ b/src/common.js.ts @@ -309,7 +309,7 @@ function raiseError(issue: OperationOutcomeIssue) : boolean { if (issue.location !== undefined && issue.location.length>0) { if (issue.location[0].includes('StructureMap.group')) return false; // ignore QuestionnaireResponse error https://github.com/hapifhir/hapi-fhir/issues/1184 - if (issue.includes('answer')) return false; + if (issue.diagnostics.includes('answer')) return false; } } From 64a9f47b495d58fa71100b7375ad6c2862bc5a80 Mon Sep 17 00:00:00 2001 From: Ryan May <112563297+ryma2fhir@users.noreply.github.com> Date: Fri, 16 Aug 2024 07:51:46 +0100 Subject: [PATCH 7/8] Update common.js.ts --- src/common.js.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/common.js.ts b/src/common.js.ts index c4e31a3..1ec8875 100644 --- a/src/common.js.ts +++ b/src/common.js.ts @@ -313,6 +313,8 @@ function raiseError(issue: OperationOutcomeIssue) : boolean { } } + console.log(issue) + console.log(issue.diagnsotics) return true; } From 04872f78c2bfc0058fbe4ac358667609749b9888 Mon Sep 17 00:00:00 2001 From: Ryan May <112563297+ryma2fhir@users.noreply.github.com> Date: Fri, 16 Aug 2024 11:22:44 +0100 Subject: [PATCH 8/8] Update common.js.ts --- src/common.js.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/common.js.ts b/src/common.js.ts index 1ec8875..77b413c 100644 --- a/src/common.js.ts +++ b/src/common.js.ts @@ -279,6 +279,9 @@ function raiseWarning(issue: OperationOutcomeIssue, failOnWarning:boolean): bool //Fragment codesystems can't be checked if (issue.diagnostics.includes('Unknown code in fragment CodeSystem')) return false; + + // ignore QuestionnaireResponse error https://github.com/hapifhir/hapi-fhir/issues/1184 + if (issue.diagnostics.includes('answer')) return false; } // if error not handled above, return error if FailOnWarning is true