From 5606c93fec3ddc67f764548d8cad3920cc0e3e03 Mon Sep 17 00:00:00 2001 From: KazeemHamzat Date: Thu, 25 Jan 2024 12:46:08 +0000 Subject: [PATCH 01/10] Add Questionnaire & QuestionnaireResponse Add Questionnaire & QuestionnaireResponse --- ...aire-ConsulteeDeclarationForm-Example.json | 287 ++++++++++++++++++ ...Response-ConsulteeDeclaration-Example.json | 188 ++++++++++++ 2 files changed, 475 insertions(+) create mode 100644 Questionnaire/Questionnaire-ConsulteeDeclarationForm-Example.json create mode 100644 QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json diff --git a/Questionnaire/Questionnaire-ConsulteeDeclarationForm-Example.json b/Questionnaire/Questionnaire-ConsulteeDeclarationForm-Example.json new file mode 100644 index 00000000..6634738b --- /dev/null +++ b/Questionnaire/Questionnaire-ConsulteeDeclarationForm-Example.json @@ -0,0 +1,287 @@ +{ + "resourceType": "Questionnaire", + "id": "Questionnaire-ConsulteeDeclarationForm-Example", + "url": "https://fhir.nhs.uk/Questionnaire/Questionnaire-ConsulteeDeclaration-Example", + "version": "0.1.0", + "name": "QuestionnaireConsulteeDeclarationExample", + "title": "Consultee declaration regarding whole genome sequencing", + "status": "draft", + "subjectType": [ + "Patient" + ], + "date": "2024-01-18T09:00:00Z", + "publisher": "NHS England", + "contact": [ + { + "name": "NHS England", + "telecom": [ + { + "system": "email", + "value": "secretariat@hl7.org.uk", + "use": "work", + "rank": 1 + } + ] + }, + { + "name": "NHS Digital", + "telecom": [ + { + "system": "email", + "value": "interoperabilityteam@nhs.net", + "use": "work", + "rank": 2 + } + ] + } + ], + "description": "This questionnaire is to be used to document the consent of a patient Consultee before undergoing Genomic testing and their choice of participation in the National Genomic Research Library programme", + "purpose": "Consultee declaration regarding whole genome sequencing", + "item": [ + { + "item": [ + { + "linkId": "givenName", + "text": "First Name", + "type": "string", + "required": true + }, + { + "linkId": "familyName", + "text": "Last Name", + "type": "string", + "required": true + }, + { + "linkId": "nhs_Number", + "text": "NHS number (or postcode if not not known)", + "type": "string", + "required": true + }, + { + "type": "date", + "linkId": "birthDate", + "text": "Date of Birth", + "required": true + } + ], + "type": "group", + "linkId": "patientDetails", + "text": "Patient Details" + }, + { + "type": "display", + "linkId": "consulteeConsentAwareness", + "text": "Your relative, friend, patient or client has been invited to take part in the National Genomic Research Library. You are being asked to act as a consultee on their behalf." + }, + { + "type": "display", + "linkId": "guidanceForConsultee", + "text": "Your relative, friend, patient or client is considered to be unable to decide for themselves whether they want their data and samples to be used in research. Someone who can’t make this kind of decision for themselves is described as lacking capacity. When we talk about this person, we will refer to ‘the person who lacks capacity’ or ‘the person’." + }, + { + "type": "display", + "linkId": "roleOfConsultee", + "text": "The role of a consultee" + }, + { + "type": "display", + "linkId": "roleOfConsultee1", + "text": "A consultee is someone who will only consider the likely views and interests of the person who lacks capacity. They must set aside their own personal views about participating in research and consider the person they represent. A consultee cannot be part of the person’s NHS clinical team or anyone else acting in a professional or paid capacity (e.g. a person’s solicitor)." + }, + { + "item": [ + { + "type": "display", + "linkId": "typesOfConsultee1", + "text": "• Next of kin (i.e. parent, partner, husband, wife, son or daughter) or friend, family member or carer" + }, + { + "type": "display", + "linkId": "typesOfConsultee2", + "text": "• A person holding Lasting Power of Attorney for Personal welfare registered with the Public Guardian" + }, + { + "type": "display", + "linkId": "typesOfConsultee3", + "text": "• A deputy appointed by the Court of Protection" + } + ], + "type": "group", + "linkId": "typesOfConsultee", + "text": "They must be an adult who is prepared to be consulted on the person’s behalf. For example:" + }, + { + "type": "display", + "linkId": "guidanceOnConsulteeRole", + "text": "The law protects the interests of adults who lack capacity. In England and Wales, it states that a consultee can advise about the person’s likely wishes or feelings. If the person does not want to take part, we will respect their wishes. More information about being a consultee and the National Genomic Research Library can be found at www.genomicsengland.co.uk" + }, + { + "type": "display", + "linkId": "consulteeAgreement", + "text": "The consultee agreement" + }, + { + "item": [ + { + "type": "display", + "linkId": "consulteeResponsibility1", + "text": "• I must only consider the likely views and interests of the person who lacks capacity" + }, + { + "type": "display", + "linkId": "consulteeResponsibility2", + "text": "• I must consider the aims of the research, the practicalities, risks and benefits" + }, + { + "type": "display", + "linkId": "consulteeResponsibility3", + "text": "• I will inform the healthcare team of any decisions the person may have already made about research" + }, + { + "type": "display", + "linkId": "consulteeResponsibility4", + "text": "• I have been made aware and given an opportunity to get independent advice" + }, + { + "type": "display", + "linkId": "consulteeResponsibility5", + "text": "• If I feel that the person wishes to be withdrawn, I will notify a healthcare professional" + }, + { + "type": "display", + "linkId": "consulteeResponsibility6", + "text": "• I might be asked to give advice again in the future, for example if more blood or saliva samples were needed" + }, + { + "type": "display", + "linkId": "consulteeResponsibility7", + "text": "• Hospital staff will tell me if any future changes to the research might affect the person" + }, + { + "type": "display", + "linkId": "consulteeResponsibility8", + "text": "• I can stop being a consultee at any time" + } + ], + "type": "group", + "linkId": "consulteeResponsibility", + "text": "By saying ‘yes’ to be a consultee, I understand that:" + }, + { + "type": "display", + "linkId": "clarificationForConfirmation", + "text": "Please ask any questions before taking the decisions shown on the following page." + }, + { + "item": [ + { + "item": [ + { + "type": "boolean", + "linkId": "choiceConfirmation1", + "prefix": "1.", + "text": "I have been consulted about this person’s participation in the National Genomic Research Library", + "required": true + }, + { + "type": "display", + "linkId": "isChoiceOfConfirmationFalse", + "text": "If your answer to 1 is NO, then please ignore 2 and sign below." + }, + { + "type": "boolean", + "linkId": "choiceConfirmation2", + "prefix": "2.", + "text": "I am willing to accept the role of consultee for this person", + "enableWhen": [ + { + "question": "choiceConfirmation1", + "operator": "!=", + "answerBoolean": true + } + ], + "required": true + }, + { + "type": "boolean", + "linkId": "isRemoteConsentTrue", + "text": "Remote consent, recorded remotely by clinician, no patient signature", + "required": true + }, + { + "item": [ + { + "type": "string", + "linkId": "cosulteeNamecombined", + "text": "Your Name(i.e, the Consultee)", + "required": true + }, + { + "type": "string", + "linkId": "consulteeSignature", + "text": "Signature", + "required": true + }, + { + "type": "dateTime", + "linkId": "dateConsulteeCompletedForm", + "text": "Date", + "required": true + } + ], + "type": "group", + "linkId": "consilteeValidation", + "text": "Consultee Validation", + "enableWhen": [ + { + "question": "isRemoteConsentTrue", + "operator": "!=", + "answerBoolean": true + } + ] + } + ], + "type": "group", + "linkId": "confirmation", + "text": "I confirm that I have read and had the opportunity to discuss information about acting as a consultee for the person lacking capacity. My research choices are indicated below." + } + ], + "type": "group", + "linkId": "confirmationOfDecision", + "text": "Confirmation of decision" + }, + { + "item": [ + { + "item": [ + { + "type": "string", + "linkId": "healthcareProfessionalName", + "text": "Healthcare professional name", + "required": true + }, + { + "linkId": "healthcareProfessionalSignature", + "text": "Signature", + "type": "string", + "required": true + }, + { + "linkId": "datehealthcareProfessionalCompletedForm", + "text": "Date", + "type": "dateTime", + "required": true + } + ], + "type": "group", + "linkId": "healthcareProfessional", + "text": "To be completed by the healthcare professional recording the consultee’s choices." + } + ], + "type": "group", + "linkId": "healthcareProfessionalValidation", + "text": "Healthcare professional use only" + } + ] +} \ No newline at end of file diff --git a/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json b/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json new file mode 100644 index 00000000..08dc009a --- /dev/null +++ b/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json @@ -0,0 +1,188 @@ +{ + "resourceType": "QuestionnaireResponse", + "id": "QuestionnaireResponse-ConsulteeDeclaration-Example", + "questionnaire": "https://fhir.nhs.uk/Questionnaire/Questionnaire-ConsulteeDeclaration-Example", + "status": "completed", + "basedOn": [ + { + "reference": "urn:uuid:a40c7ddc-2897-4e3c-bae6-88500e080229" + } + ], + "subject": { + "identifier": { + "system": "https://fhir.nhs.uk/Id/nhs-number", + "value": "9449307539" + }, + "display": "A Patient" + }, + "authored": "2024-01-25", + "author": { + "type": "PractitionerRole", + "identifier": { + "system": "https://fhir.nhs.uk/Id/sds-role-profile-id", + "value": "999999999999" + } + }, + "source": { + "type": "PractitionerRole", + "identifier": { + "system": "https://fhir.nhs.uk/Id/sds-role-profile-id", + "value": "999999999999" + } + }, + "item": [ + { + "linkId": "patientDetails", + "text": "Patient Details", + "item": [ + { + "linkId": "givenName", + "text": "First Name", + "answer": [ + { + "valueString": "Phoebe" + } + ] + }, + { + "linkId": "familyName", + "text": "Last Name", + "answer": [ + { + "valueString": "Smitham" + } + ] + }, + { + "linkId": "nhs_Number", + "text": "NHS number (or postcode if not not known)", + "answer": [ + { + "valueString": "9449307539" + } + ] + }, + { + "linkId": "birthDate", + "text": "Date of Birth", + "answer": [ + { + "valueDate": "2013-09-27" + } + ] + } + ] + }, + { + "linkId": "confirmationOfDecision", + "text": "confirmation of decision", + "item": [ + { + "linkId": "confirmation", + "text": "I confirm that I have read and had the opportunity to discuss information about acting as a consultee for the person lacking capacity. My researchchoices are indicated below.", + "item": [ + { + "linkId": "choiceConfirmation1", + "text": "1. I have been consulted about this person’s participation in the National Genomic Research Library", + "answer": [ + { + "valueBoolean": true + } + ] + }, + { + "linkId": "choiceConfirmation2", + "text": "2. I am willing to accept the role of consultee for this person", + "answer": [ + { + "valueBoolean": true + } + ] + } + ] + } + ] + }, + { + "linkId": "isRemoteConsentTrue", + "text": "Consent obtained remotely, no patient signature", + "answer": [ + { + "valueBoolean": false + } + ] + }, + { + "linkId": "consulteeValidation", + "text": "Consultee Validation", + "item": [ + { + "linkId": "consulteetNamecombined", + "text": "Your Name(i.e, the Consultee)", + "answer": [ + { + "valueString": "James Goldsmith" + } + ] + }, + { + "linkId": "consulteeSignature", + "text": "Signature", + "answer": [ + { + "valueString": "JamesG" + } + ] + }, + { + "linkId": "dateConsulteeCompletedForm", + "text": "Date", + "answer": [ + { + "valueDateTime": "2024-01-25" + } + ] + } + ] + }, + { + "linkId": "healthcareProfessionalValidation", + "text": "Healthcare professional use only", + "item": [ + { + "linkId": "healthcareProfessional", + "text": "To be completed by the healthcare professional recording the consultee’s choices.", + "item": [ + { + "linkId": "healthcareProfessionalName", + "text": "Healthcare professional name", + "answer": [ + { + "valueString": "Mathew Arnold" + } + ] + }, + { + "linkId": "healthcareProfessionalSignature", + "text": "Signature", + "answer": [ + { + "valueString": "MathewA" + } + ] + }, + { + "linkId": "datehealthcareProfessionalCompletedForm", + "text": "Date", + "answer": [ + { + "valueDateTime": "2024-01-25" + } + ] + } + ] + } + ] + } + ] +} \ No newline at end of file From 67dfade165500d3d6162e1d2808fee56d43b6fe5 Mon Sep 17 00:00:00 2001 From: KazeemHamzat Date: Thu, 25 Jan 2024 16:47:43 +0000 Subject: [PATCH 02/10] Resolve Validation Issues on QResponse Resolve Validation Issues on QResponse --- ...aire-ConsulteeDeclarationForm-Example.json | 12 +- ...Response-ConsulteeDeclaration-Example.json | 372 +++++++++--------- 2 files changed, 192 insertions(+), 192 deletions(-) diff --git a/Questionnaire/Questionnaire-ConsulteeDeclarationForm-Example.json b/Questionnaire/Questionnaire-ConsulteeDeclarationForm-Example.json index 6634738b..f0050c27 100644 --- a/Questionnaire/Questionnaire-ConsulteeDeclarationForm-Example.json +++ b/Questionnaire/Questionnaire-ConsulteeDeclarationForm-Example.json @@ -197,8 +197,8 @@ "enableWhen": [ { "question": "choiceConfirmation1", - "operator": "!=", - "answerBoolean": true + "operator": "=", + "answerBoolean": false } ], "required": true @@ -206,7 +206,7 @@ { "type": "boolean", "linkId": "isRemoteConsentTrue", - "text": "Remote consent, recorded remotely by clinician, no patient signature", + "text": "Consent obtained remotely, no patient signature", "required": true }, { @@ -231,13 +231,13 @@ } ], "type": "group", - "linkId": "consilteeValidation", + "linkId": "consulteeValidation", "text": "Consultee Validation", "enableWhen": [ { "question": "isRemoteConsentTrue", - "operator": "!=", - "answerBoolean": true + "operator": "=", + "answerBoolean": false } ] } diff --git a/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json b/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json index 08dc009a..ae23326a 100644 --- a/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json +++ b/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json @@ -1,188 +1,188 @@ { - "resourceType": "QuestionnaireResponse", - "id": "QuestionnaireResponse-ConsulteeDeclaration-Example", - "questionnaire": "https://fhir.nhs.uk/Questionnaire/Questionnaire-ConsulteeDeclaration-Example", - "status": "completed", - "basedOn": [ - { - "reference": "urn:uuid:a40c7ddc-2897-4e3c-bae6-88500e080229" - } - ], - "subject": { - "identifier": { - "system": "https://fhir.nhs.uk/Id/nhs-number", - "value": "9449307539" - }, - "display": "A Patient" - }, - "authored": "2024-01-25", - "author": { - "type": "PractitionerRole", - "identifier": { - "system": "https://fhir.nhs.uk/Id/sds-role-profile-id", - "value": "999999999999" - } - }, - "source": { - "type": "PractitionerRole", - "identifier": { - "system": "https://fhir.nhs.uk/Id/sds-role-profile-id", - "value": "999999999999" - } - }, - "item": [ - { - "linkId": "patientDetails", - "text": "Patient Details", - "item": [ - { - "linkId": "givenName", - "text": "First Name", - "answer": [ - { - "valueString": "Phoebe" - } - ] - }, - { - "linkId": "familyName", - "text": "Last Name", - "answer": [ - { - "valueString": "Smitham" - } - ] - }, - { - "linkId": "nhs_Number", - "text": "NHS number (or postcode if not not known)", - "answer": [ - { - "valueString": "9449307539" - } - ] - }, - { - "linkId": "birthDate", - "text": "Date of Birth", - "answer": [ - { - "valueDate": "2013-09-27" - } - ] - } - ] - }, - { - "linkId": "confirmationOfDecision", - "text": "confirmation of decision", - "item": [ - { - "linkId": "confirmation", - "text": "I confirm that I have read and had the opportunity to discuss information about acting as a consultee for the person lacking capacity. My researchchoices are indicated below.", - "item": [ - { - "linkId": "choiceConfirmation1", - "text": "1. I have been consulted about this person’s participation in the National Genomic Research Library", - "answer": [ - { - "valueBoolean": true - } - ] - }, - { - "linkId": "choiceConfirmation2", - "text": "2. I am willing to accept the role of consultee for this person", - "answer": [ - { - "valueBoolean": true - } - ] - } - ] - } - ] - }, - { - "linkId": "isRemoteConsentTrue", - "text": "Consent obtained remotely, no patient signature", - "answer": [ - { - "valueBoolean": false - } - ] - }, - { - "linkId": "consulteeValidation", - "text": "Consultee Validation", - "item": [ - { - "linkId": "consulteetNamecombined", - "text": "Your Name(i.e, the Consultee)", - "answer": [ - { - "valueString": "James Goldsmith" - } - ] - }, - { - "linkId": "consulteeSignature", - "text": "Signature", - "answer": [ - { - "valueString": "JamesG" - } - ] - }, - { - "linkId": "dateConsulteeCompletedForm", - "text": "Date", - "answer": [ - { - "valueDateTime": "2024-01-25" - } - ] - } - ] - }, - { - "linkId": "healthcareProfessionalValidation", - "text": "Healthcare professional use only", - "item": [ - { - "linkId": "healthcareProfessional", - "text": "To be completed by the healthcare professional recording the consultee’s choices.", - "item": [ - { - "linkId": "healthcareProfessionalName", - "text": "Healthcare professional name", - "answer": [ - { - "valueString": "Mathew Arnold" - } - ] - }, - { - "linkId": "healthcareProfessionalSignature", - "text": "Signature", - "answer": [ - { - "valueString": "MathewA" - } - ] - }, - { - "linkId": "datehealthcareProfessionalCompletedForm", - "text": "Date", - "answer": [ - { - "valueDateTime": "2024-01-25" - } - ] - } - ] - } - ] - } - ] + "resourceType": "QuestionnaireResponse", + "id": "QuestionnaireResponse-ConsulteeDeclaration-Example", + "questionnaire": "https://fhir.nhs.uk/Questionnaire/Questionnaire-ConsulteeDeclaration-Example", + "status": "completed", + "basedOn": [ + { + "reference": "urn:uuid:a40c7ddc-2897-4e3c-bae6-88500e080229" + } + ], + "subject": { + "identifier": { + "system": "https://fhir.nhs.uk/Id/nhs-number", + "value": "9449307539" + }, + "display": "A Patient" + }, + "authored": "2024-01-25", + "author": { + "type": "PractitionerRole", + "identifier": { + "system": "https://fhir.nhs.uk/Id/sds-role-profile-id", + "value": "999999999999" + } + }, + "source": { + "type": "PractitionerRole", + "identifier": { + "system": "https://fhir.nhs.uk/Id/sds-role-profile-id", + "value": "999999999999" + } + }, + "item": [ + { + "linkId": "patientDetails", + "text": "Patient Details", + "item": [ + { + "linkId": "givenName", + "text": "First Name", + "answer": [ + { + "valueString": "Phoebe" + } + ] + }, + { + "linkId": "familyName", + "text": "Last Name", + "answer": [ + { + "valueString": "Smitham" + } + ] + }, + { + "linkId": "nhs_Number", + "text": "NHS number (or postcode if not not known)", + "answer": [ + { + "valueString": "9449307539" + } + ] + }, + { + "linkId": "birthDate", + "text": "Date of Birth", + "answer": [ + { + "valueDate": "2013-09-27" + } + ] + } + ] + }, + { + "linkId": "confirmationOfDecision", + "text": "Confirmation of decision", + "item": [ + { + "linkId": "confirmation", + "text": "I confirm that I have read and had the opportunity to discuss information about acting as a consultee for the person lacking capacity. My research choices are indicated below.", + "item": [ + { + "linkId": "choiceConfirmation1", + "text": "I have been consulted about this person’s participation in the National Genomic Research Library", + "answer": [ + { + "valueBoolean": true + } + ] + }, + { + "linkId": "choiceConfirmation2", + "text": "I am willing to accept the role of consultee for this person", + "answer": [ + { + "valueBoolean": true + } + ] + } + ] + }, + { + "linkId": "isRemoteConsentTrue", + "text": "Consent obtained remotely, no patient signature", + "answer": [ + { + "valueBoolean": false + } + ] + }, + { + "linkId": "consulteeValidation", + "text": "Consultee Validation", + "item": [ + { + "linkId": "consulteetNamecombined", + "text": "Your Name(i.e, the Consultee)", + "answer": [ + { + "valueString": "James Goldsmith" + } + ] + }, + { + "linkId": "consulteeSignature", + "text": "Signature", + "answer": [ + { + "valueString": "JamesG" + } + ] + }, + { + "linkId": "dateConsulteeCompletedForm", + "text": "Date", + "answer": [ + { + "valueDateTime": "2024-01-25" + } + ] + } + ] + } + ] + }, + { + "linkId": "healthcareProfessionalValidation", + "text": "Healthcare professional use only", + "item": [ + { + "linkId": "healthcareProfessional", + "text": "To be completed by the healthcare professional recording the consultee’s choices.", + "item": [ + { + "linkId": "healthcareProfessionalName", + "text": "Healthcare professional name", + "answer": [ + { + "valueString": "Mathew Arnold" + } + ] + }, + { + "linkId": "healthcareProfessionalSignature", + "text": "Signature", + "answer": [ + { + "valueString": "MathewA" + } + ] + }, + { + "linkId": "datehealthcareProfessionalCompletedForm", + "text": "Date", + "answer": [ + { + "valueDateTime": "2024-01-25" + } + ] + } + ] + } + ] + } + ] } \ No newline at end of file From eacc913e28c2917c7ae182f64ed76c3dd61c1463 Mon Sep 17 00:00:00 2001 From: KazeemHamzat Date: Thu, 25 Jan 2024 17:37:15 +0000 Subject: [PATCH 03/10] Fixing Validation Issues ON QRes Fixing Validation Issues ON QRes --- ...aire-ConsulteeDeclarationForm-Example.json | 2 +- ...Response-ConsulteeDeclaration-Example.json | 69 +++++++++---------- 2 files changed, 33 insertions(+), 38 deletions(-) diff --git a/Questionnaire/Questionnaire-ConsulteeDeclarationForm-Example.json b/Questionnaire/Questionnaire-ConsulteeDeclarationForm-Example.json index f0050c27..2acaf260 100644 --- a/Questionnaire/Questionnaire-ConsulteeDeclarationForm-Example.json +++ b/Questionnaire/Questionnaire-ConsulteeDeclarationForm-Example.json @@ -206,7 +206,7 @@ { "type": "boolean", "linkId": "isRemoteConsentTrue", - "text": "Consent obtained remotely, no patient signature", + "text": "Consent obtained remotely, no consultee signature", "required": true }, { diff --git a/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json b/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json index ae23326a..44de8c27 100644 --- a/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json +++ b/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json @@ -92,52 +92,47 @@ }, { "linkId": "choiceConfirmation2", - "text": "I am willing to accept the role of consultee for this person", - "answer": [ - { - "valueBoolean": true - } - ] - } - ] - }, - { - "linkId": "isRemoteConsentTrue", - "text": "Consent obtained remotely, no patient signature", - "answer": [ - { - "valueBoolean": false - } - ] - }, - { - "linkId": "consulteeValidation", - "text": "Consultee Validation", - "item": [ - { - "linkId": "consulteetNamecombined", - "text": "Your Name(i.e, the Consultee)", - "answer": [ - { - "valueString": "James Goldsmith" - } - ] + "text": "I am willing to accept the role of consultee for this person" }, { - "linkId": "consulteeSignature", - "text": "Signature", + "linkId": "isRemoteConsentTrue", + "text": "Consent obtained remotely, no consultee signature", "answer": [ { - "valueString": "JamesG" + "valueBoolean": false } ] }, { - "linkId": "dateConsulteeCompletedForm", - "text": "Date", - "answer": [ + "linkId": "consulteeValidation", + "text": "Consultee Validation", + "item": [ { - "valueDateTime": "2024-01-25" + "linkId": "consulteetNamecombined", + "text": "Your Name(i.e, the Consultee)", + "answer": [ + { + "valueString": "James Goldsmith" + } + ] + }, + { + "linkId": "consulteeSignature", + "text": "Signature", + "answer": [ + { + "valueString": "JamesG" + } + ] + }, + { + "linkId": "dateConsulteeCompletedForm", + "text": "Date", + "answer": [ + { + "valueDateTime": "2024-01-25" + } + ] } ] } From 6ab43d2c4da96410f86fee503762790898781c79 Mon Sep 17 00:00:00 2001 From: KazeemHamzat Date: Thu, 25 Jan 2024 17:45:25 +0000 Subject: [PATCH 04/10] Fixing Validation Issue on QRes Typo on variable for Consultee name --- .../Questionnaire-ConsulteeDeclarationForm-Example.json | 2 +- .../QuestionnaireResponse-ConsulteeDeclaration-Example.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Questionnaire/Questionnaire-ConsulteeDeclarationForm-Example.json b/Questionnaire/Questionnaire-ConsulteeDeclarationForm-Example.json index 2acaf260..7fb695fb 100644 --- a/Questionnaire/Questionnaire-ConsulteeDeclarationForm-Example.json +++ b/Questionnaire/Questionnaire-ConsulteeDeclarationForm-Example.json @@ -213,7 +213,7 @@ "item": [ { "type": "string", - "linkId": "cosulteeNamecombined", + "linkId": "consulteeNamecombined", "text": "Your Name(i.e, the Consultee)", "required": true }, diff --git a/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json b/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json index 44de8c27..c2ce80e4 100644 --- a/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json +++ b/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json @@ -108,7 +108,7 @@ "text": "Consultee Validation", "item": [ { - "linkId": "consulteetNamecombined", + "linkId": "consulteeNamecombined", "text": "Your Name(i.e, the Consultee)", "answer": [ { From bebbc44371bde5d9a8cc5670f8a7f2b68c9a30b3 Mon Sep 17 00:00:00 2001 From: KazeemHamzat Date: Fri, 26 Jan 2024 09:34:04 +0000 Subject: [PATCH 05/10] Rename Files Rename Files Questionnaire and QuestionnaireResponse --- ...RoD-ConsulteeDeclarationForm-Example.json} | 6 +- ...Response-ConsulteeDeclaration-Example.json | 2 +- ...onse-ConsulteeDeclarationForm-Example.json | 183 ++++++++++++++++++ 3 files changed, 187 insertions(+), 4 deletions(-) rename Questionnaire/{Questionnaire-ConsulteeDeclarationForm-Example.json => Questionnaire-RoD-ConsulteeDeclarationForm-Example.json} (97%) create mode 100644 QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclarationForm-Example.json diff --git a/Questionnaire/Questionnaire-ConsulteeDeclarationForm-Example.json b/Questionnaire/Questionnaire-RoD-ConsulteeDeclarationForm-Example.json similarity index 97% rename from Questionnaire/Questionnaire-ConsulteeDeclarationForm-Example.json rename to Questionnaire/Questionnaire-RoD-ConsulteeDeclarationForm-Example.json index 7fb695fb..85a853df 100644 --- a/Questionnaire/Questionnaire-ConsulteeDeclarationForm-Example.json +++ b/Questionnaire/Questionnaire-RoD-ConsulteeDeclarationForm-Example.json @@ -1,9 +1,9 @@ { "resourceType": "Questionnaire", - "id": "Questionnaire-ConsulteeDeclarationForm-Example", - "url": "https://fhir.nhs.uk/Questionnaire/Questionnaire-ConsulteeDeclaration-Example", + "id": "Questionnaire-RoD-ConsulteeDeclarationForm-Example", + "url": "https://fhir.nhs.uk/Questionnaire/Questionnaire-RoD-ConsulteeDeclarationForm-Example", "version": "0.1.0", - "name": "QuestionnaireConsulteeDeclarationExample", + "name": "QuestionnaireRoDConsulteeDeclarationFormExample", "title": "Consultee declaration regarding whole genome sequencing", "status": "draft", "subjectType": [ diff --git a/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json b/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json index c2ce80e4..64c57335 100644 --- a/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json +++ b/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json @@ -1,6 +1,6 @@ { "resourceType": "QuestionnaireResponse", - "id": "QuestionnaireResponse-ConsulteeDeclaration-Example", + "id": "QuestionnaireResponse-RoD-ConsulteeDeclaration-Example", "questionnaire": "https://fhir.nhs.uk/Questionnaire/Questionnaire-ConsulteeDeclaration-Example", "status": "completed", "basedOn": [ diff --git a/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclarationForm-Example.json b/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclarationForm-Example.json new file mode 100644 index 00000000..95bcd9c0 --- /dev/null +++ b/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclarationForm-Example.json @@ -0,0 +1,183 @@ +{ + "resourceType": "QuestionnaireResponse", + "id": "QuestionnaireResponse-ConsulteeDeclarationForm-Example", + "questionnaire": "https://fhir.nhs.uk/Questionnaire/Questionnaire-RoD-ConsulteeDeclarationForm-Example", + "status": "completed", + "basedOn": [ + { + "reference": "urn:uuid:a40c7ddc-2897-4e3c-bae6-88500e080229" + } + ], + "subject": { + "identifier": { + "system": "https://fhir.nhs.uk/Id/nhs-number", + "value": "9449307539" + }, + "display": "A Patient" + }, + "authored": "2024-01-25", + "author": { + "type": "PractitionerRole", + "identifier": { + "system": "https://fhir.nhs.uk/Id/sds-role-profile-id", + "value": "999999999999" + } + }, + "source": { + "type": "PractitionerRole", + "identifier": { + "system": "https://fhir.nhs.uk/Id/sds-role-profile-id", + "value": "999999999999" + } + }, + "item": [ + { + "linkId": "patientDetails", + "text": "Patient Details", + "item": [ + { + "linkId": "givenName", + "text": "First Name", + "answer": [ + { + "valueString": "Phoebe" + } + ] + }, + { + "linkId": "familyName", + "text": "Last Name", + "answer": [ + { + "valueString": "Smitham" + } + ] + }, + { + "linkId": "nhs_Number", + "text": "NHS number (or postcode if not not known)", + "answer": [ + { + "valueString": "9449307539" + } + ] + }, + { + "linkId": "birthDate", + "text": "Date of Birth", + "answer": [ + { + "valueDate": "2013-09-27" + } + ] + } + ] + }, + { + "linkId": "confirmationOfDecision", + "text": "Confirmation of decision", + "item": [ + { + "linkId": "confirmation", + "text": "I confirm that I have read and had the opportunity to discuss information about acting as a consultee for the person lacking capacity. My research choices are indicated below.", + "item": [ + { + "linkId": "choiceConfirmation1", + "text": "I have been consulted about this person’s participation in the National Genomic Research Library", + "answer": [ + { + "valueBoolean": true + } + ] + }, + { + "linkId": "choiceConfirmation2", + "text": "I am willing to accept the role of consultee for this person" + }, + { + "linkId": "isRemoteConsentTrue", + "text": "Consent obtained remotely, no consultee signature", + "answer": [ + { + "valueBoolean": false + } + ] + }, + { + "linkId": "consulteeValidation", + "text": "Consultee Validation", + "item": [ + { + "linkId": "consulteeNamecombined", + "text": "Your Name(i.e, the Consultee)", + "answer": [ + { + "valueString": "James Goldsmith" + } + ] + }, + { + "linkId": "consulteeSignature", + "text": "Signature", + "answer": [ + { + "valueString": "JamesG" + } + ] + }, + { + "linkId": "dateConsulteeCompletedForm", + "text": "Date", + "answer": [ + { + "valueDateTime": "2024-01-25" + } + ] + } + ] + } + ] + } + ] + }, + { + "linkId": "healthcareProfessionalValidation", + "text": "Healthcare professional use only", + "item": [ + { + "linkId": "healthcareProfessional", + "text": "To be completed by the healthcare professional recording the consultee’s choices.", + "item": [ + { + "linkId": "healthcareProfessionalName", + "text": "Healthcare professional name", + "answer": [ + { + "valueString": "Mathew Arnold" + } + ] + }, + { + "linkId": "healthcareProfessionalSignature", + "text": "Signature", + "answer": [ + { + "valueString": "MathewA" + } + ] + }, + { + "linkId": "datehealthcareProfessionalCompletedForm", + "text": "Date", + "answer": [ + { + "valueDateTime": "2024-01-25" + } + ] + } + ] + } + ] + } + ] +} \ No newline at end of file From cd3d4474186d35c842c5b5600069316050cc562a Mon Sep 17 00:00:00 2001 From: KazeemHamzat Date: Fri, 26 Jan 2024 09:35:34 +0000 Subject: [PATCH 06/10] Remove duplicate QResponse Remove duplicate QResponse --- ...Response-ConsulteeDeclaration-Example.json | 183 ------------------ 1 file changed, 183 deletions(-) delete mode 100644 QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json diff --git a/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json b/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json deleted file mode 100644 index 64c57335..00000000 --- a/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclaration-Example.json +++ /dev/null @@ -1,183 +0,0 @@ -{ - "resourceType": "QuestionnaireResponse", - "id": "QuestionnaireResponse-RoD-ConsulteeDeclaration-Example", - "questionnaire": "https://fhir.nhs.uk/Questionnaire/Questionnaire-ConsulteeDeclaration-Example", - "status": "completed", - "basedOn": [ - { - "reference": "urn:uuid:a40c7ddc-2897-4e3c-bae6-88500e080229" - } - ], - "subject": { - "identifier": { - "system": "https://fhir.nhs.uk/Id/nhs-number", - "value": "9449307539" - }, - "display": "A Patient" - }, - "authored": "2024-01-25", - "author": { - "type": "PractitionerRole", - "identifier": { - "system": "https://fhir.nhs.uk/Id/sds-role-profile-id", - "value": "999999999999" - } - }, - "source": { - "type": "PractitionerRole", - "identifier": { - "system": "https://fhir.nhs.uk/Id/sds-role-profile-id", - "value": "999999999999" - } - }, - "item": [ - { - "linkId": "patientDetails", - "text": "Patient Details", - "item": [ - { - "linkId": "givenName", - "text": "First Name", - "answer": [ - { - "valueString": "Phoebe" - } - ] - }, - { - "linkId": "familyName", - "text": "Last Name", - "answer": [ - { - "valueString": "Smitham" - } - ] - }, - { - "linkId": "nhs_Number", - "text": "NHS number (or postcode if not not known)", - "answer": [ - { - "valueString": "9449307539" - } - ] - }, - { - "linkId": "birthDate", - "text": "Date of Birth", - "answer": [ - { - "valueDate": "2013-09-27" - } - ] - } - ] - }, - { - "linkId": "confirmationOfDecision", - "text": "Confirmation of decision", - "item": [ - { - "linkId": "confirmation", - "text": "I confirm that I have read and had the opportunity to discuss information about acting as a consultee for the person lacking capacity. My research choices are indicated below.", - "item": [ - { - "linkId": "choiceConfirmation1", - "text": "I have been consulted about this person’s participation in the National Genomic Research Library", - "answer": [ - { - "valueBoolean": true - } - ] - }, - { - "linkId": "choiceConfirmation2", - "text": "I am willing to accept the role of consultee for this person" - }, - { - "linkId": "isRemoteConsentTrue", - "text": "Consent obtained remotely, no consultee signature", - "answer": [ - { - "valueBoolean": false - } - ] - }, - { - "linkId": "consulteeValidation", - "text": "Consultee Validation", - "item": [ - { - "linkId": "consulteeNamecombined", - "text": "Your Name(i.e, the Consultee)", - "answer": [ - { - "valueString": "James Goldsmith" - } - ] - }, - { - "linkId": "consulteeSignature", - "text": "Signature", - "answer": [ - { - "valueString": "JamesG" - } - ] - }, - { - "linkId": "dateConsulteeCompletedForm", - "text": "Date", - "answer": [ - { - "valueDateTime": "2024-01-25" - } - ] - } - ] - } - ] - } - ] - }, - { - "linkId": "healthcareProfessionalValidation", - "text": "Healthcare professional use only", - "item": [ - { - "linkId": "healthcareProfessional", - "text": "To be completed by the healthcare professional recording the consultee’s choices.", - "item": [ - { - "linkId": "healthcareProfessionalName", - "text": "Healthcare professional name", - "answer": [ - { - "valueString": "Mathew Arnold" - } - ] - }, - { - "linkId": "healthcareProfessionalSignature", - "text": "Signature", - "answer": [ - { - "valueString": "MathewA" - } - ] - }, - { - "linkId": "datehealthcareProfessionalCompletedForm", - "text": "Date", - "answer": [ - { - "valueDateTime": "2024-01-25" - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file From 8ea4cea69a9b89e976f499822f58168606387c4b Mon Sep 17 00:00:00 2001 From: KazeemHamzat Date: Fri, 26 Jan 2024 09:44:21 +0000 Subject: [PATCH 07/10] Update QuestionnaireResponse-RoD-ConsulteeDeclarationForm-Example.json Update Based on Element --- ...onnaireResponse-RoD-ConsulteeDeclarationForm-Example.json} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename QuestionnaireResponse/{QuestionnaireResponse-ConsulteeDeclarationForm-Example.json => QuestionnaireResponse-RoD-ConsulteeDeclarationForm-Example.json} (96%) diff --git a/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclarationForm-Example.json b/QuestionnaireResponse/QuestionnaireResponse-RoD-ConsulteeDeclarationForm-Example.json similarity index 96% rename from QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclarationForm-Example.json rename to QuestionnaireResponse/QuestionnaireResponse-RoD-ConsulteeDeclarationForm-Example.json index 95bcd9c0..df4875b5 100644 --- a/QuestionnaireResponse/QuestionnaireResponse-ConsulteeDeclarationForm-Example.json +++ b/QuestionnaireResponse/QuestionnaireResponse-RoD-ConsulteeDeclarationForm-Example.json @@ -1,11 +1,11 @@ { "resourceType": "QuestionnaireResponse", - "id": "QuestionnaireResponse-ConsulteeDeclarationForm-Example", + "id": "QuestionnaireResponse-RoD-ConsulteeDeclarationForm-Example", "questionnaire": "https://fhir.nhs.uk/Questionnaire/Questionnaire-RoD-ConsulteeDeclarationForm-Example", "status": "completed", "basedOn": [ { - "reference": "urn:uuid:a40c7ddc-2897-4e3c-bae6-88500e080229" + "reference": "ServiceRequest/ServiceRequest-WGSTestOrderForm-TrioTestingProband-Example" } ], "subject": { From 492bf5f50981480204422ec3877a1821a6de1c54 Mon Sep 17 00:00:00 2001 From: KazeemHamzat Date: Fri, 26 Jan 2024 12:15:47 +0000 Subject: [PATCH 08/10] Change position of Consent Change position of Consent --- ...-RoD-ConsulteeDeclarationForm-Example.json | 80 +++++++++--------- ...-RoD-ConsulteeDeclarationForm-Example.json | 81 ++++++++++--------- 2 files changed, 83 insertions(+), 78 deletions(-) diff --git a/Questionnaire/Questionnaire-RoD-ConsulteeDeclarationForm-Example.json b/Questionnaire/Questionnaire-RoD-ConsulteeDeclarationForm-Example.json index 85a853df..8efc25bf 100644 --- a/Questionnaire/Questionnaire-RoD-ConsulteeDeclarationForm-Example.json +++ b/Questionnaire/Questionnaire-RoD-ConsulteeDeclarationForm-Example.json @@ -24,7 +24,7 @@ ] }, { - "name": "NHS Digital", + "name": "NHS England", "telecom": [ { "system": "email", @@ -202,44 +202,6 @@ } ], "required": true - }, - { - "type": "boolean", - "linkId": "isRemoteConsentTrue", - "text": "Consent obtained remotely, no consultee signature", - "required": true - }, - { - "item": [ - { - "type": "string", - "linkId": "consulteeNamecombined", - "text": "Your Name(i.e, the Consultee)", - "required": true - }, - { - "type": "string", - "linkId": "consulteeSignature", - "text": "Signature", - "required": true - }, - { - "type": "dateTime", - "linkId": "dateConsulteeCompletedForm", - "text": "Date", - "required": true - } - ], - "type": "group", - "linkId": "consulteeValidation", - "text": "Consultee Validation", - "enableWhen": [ - { - "question": "isRemoteConsentTrue", - "operator": "=", - "answerBoolean": false - } - ] } ], "type": "group", @@ -251,6 +213,44 @@ "linkId": "confirmationOfDecision", "text": "Confirmation of decision" }, + { + "type": "boolean", + "linkId": "isRemoteConsentTrue", + "text": "Consent obtained remotely, no consultee signature", + "required": true + }, + { + "item": [ + { + "type": "string", + "linkId": "consulteeNamecombined", + "text": "Your Name(i.e, the Consultee)", + "required": true + }, + { + "type": "string", + "linkId": "consulteeSignature", + "text": "Signature", + "required": true + }, + { + "type": "dateTime", + "linkId": "dateConsulteeCompletedForm", + "text": "Date", + "required": true + } + ], + "type": "group", + "linkId": "consulteeValidation", + "text": "Consultee Validation", + "enableWhen": [ + { + "question": "isRemoteConsentTrue", + "operator": "=", + "answerBoolean": false + } + ] + }, { "item": [ { @@ -284,4 +284,4 @@ "text": "Healthcare professional use only" } ] -} \ No newline at end of file +} diff --git a/QuestionnaireResponse/QuestionnaireResponse-RoD-ConsulteeDeclarationForm-Example.json b/QuestionnaireResponse/QuestionnaireResponse-RoD-ConsulteeDeclarationForm-Example.json index df4875b5..08e88a4d 100644 --- a/QuestionnaireResponse/QuestionnaireResponse-RoD-ConsulteeDeclarationForm-Example.json +++ b/QuestionnaireResponse/QuestionnaireResponse-RoD-ConsulteeDeclarationForm-Example.json @@ -92,49 +92,54 @@ }, { "linkId": "choiceConfirmation2", - "text": "I am willing to accept the role of consultee for this person" - }, - { - "linkId": "isRemoteConsentTrue", - "text": "Consent obtained remotely, no consultee signature", + "text": "I am willing to accept the role of consultee for this person", "answer": [ { - "valueBoolean": false + "valueBoolean": true } ] - }, + } + ] + } + ] + }, + { + "linkId": "isRemoteConsentTrue", + "text": "Consent obtained remotely, no consultee signature", + "answer": [ + { + "valueBoolean": false + } + ] + }, + { + "linkId": "consulteeValidation", + "text": "Consultee Validation", + "item": [ + { + "linkId": "consulteeNamecombined", + "text": "Your Name(i.e, the Consultee)", + "answer": [ { - "linkId": "consulteeValidation", - "text": "Consultee Validation", - "item": [ - { - "linkId": "consulteeNamecombined", - "text": "Your Name(i.e, the Consultee)", - "answer": [ - { - "valueString": "James Goldsmith" - } - ] - }, - { - "linkId": "consulteeSignature", - "text": "Signature", - "answer": [ - { - "valueString": "JamesG" - } - ] - }, - { - "linkId": "dateConsulteeCompletedForm", - "text": "Date", - "answer": [ - { - "valueDateTime": "2024-01-25" - } - ] - } - ] + "valueString": "James Goldsmith" + } + ] + }, + { + "linkId": "consulteeSignature", + "text": "Signature", + "answer": [ + { + "valueString": "JamesG" + } + ] + }, + { + "linkId": "dateConsulteeCompletedForm", + "text": "Date", + "answer": [ + { + "valueDateTime": "2024-01-25" } ] } From 132d913eb0c826c89549a796310d0a11b06518f3 Mon Sep 17 00:00:00 2001 From: KazeemHamzat Date: Fri, 26 Jan 2024 12:25:27 +0000 Subject: [PATCH 09/10] Update Questionnaire-RoD-ConsulteeDeclarationForm-Example.json Choice of Que1 --- .../Questionnaire-RoD-ConsulteeDeclarationForm-Example.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Questionnaire/Questionnaire-RoD-ConsulteeDeclarationForm-Example.json b/Questionnaire/Questionnaire-RoD-ConsulteeDeclarationForm-Example.json index 8efc25bf..de22b53b 100644 --- a/Questionnaire/Questionnaire-RoD-ConsulteeDeclarationForm-Example.json +++ b/Questionnaire/Questionnaire-RoD-ConsulteeDeclarationForm-Example.json @@ -198,7 +198,7 @@ { "question": "choiceConfirmation1", "operator": "=", - "answerBoolean": false + "answerBoolean": true } ], "required": true @@ -284,4 +284,4 @@ "text": "Healthcare professional use only" } ] -} +} \ No newline at end of file From 623fda2bb42b2675594f6ded37d1aa210d269fcd Mon Sep 17 00:00:00 2001 From: KazeemHamzat Date: Fri, 26 Jan 2024 16:32:46 +0000 Subject: [PATCH 10/10] Removed HL7 Contact Removed HL7 Contact --- ...nnaire-RoD-ConsulteeDeclarationForm-Example.json | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/Questionnaire/Questionnaire-RoD-ConsulteeDeclarationForm-Example.json b/Questionnaire/Questionnaire-RoD-ConsulteeDeclarationForm-Example.json index de22b53b..24321db9 100644 --- a/Questionnaire/Questionnaire-RoD-ConsulteeDeclarationForm-Example.json +++ b/Questionnaire/Questionnaire-RoD-ConsulteeDeclarationForm-Example.json @@ -12,17 +12,6 @@ "date": "2024-01-18T09:00:00Z", "publisher": "NHS England", "contact": [ - { - "name": "NHS England", - "telecom": [ - { - "system": "email", - "value": "secretariat@hl7.org.uk", - "use": "work", - "rank": 1 - } - ] - }, { "name": "NHS England", "telecom": [ @@ -30,7 +19,7 @@ "system": "email", "value": "interoperabilityteam@nhs.net", "use": "work", - "rank": 2 + "rank": 1 } ] }