Exchange FamilyStudy with StudyFamily

NIH-NCPI · Aug 6, 2024 · 964ff8a · 964ff8a
1 parent 85ba390
commit 964ff8a
Show file tree

Hide file tree

Showing 24 changed files with 317 additions and 317 deletions.
diff --git a/fsh-generated/fsh-index.json b/fsh-generated/fsh-index.json
@@ -144,7 +144,7 @@
     "endLine": 65
   },
   {
-    "outputFile": "Group-cbtn-family-study.json",
+    "outputFile": "Group-cbtn-study-family.json",
     "fshName": "FM-00C8Y7DG",
     "fshType": "Instance",
     "fshFile": "examples/family.fsh",
@@ -423,14 +423,6 @@
     "startLine": 110,
     "endLine": 116
   },
-  {
-    "outputFile": "StructureDefinition-SharedDataModelFamilyStudy.json",
-    "fshName": "CdmFamilyStudy",
-    "fshType": "Logical",
-    "fshFile": "modules/family.fsh",
-    "startLine": 13,
-    "endLine": 22
-  },
   {
     "outputFile": "StructureDefinition-SharedDataModelPerson.json",
     "fshName": "CdmPerson",
@@ -471,6 +463,14 @@
     "startLine": 138,
     "endLine": 168
   },
+  {
+    "outputFile": "StructureDefinition-SharedDataModelStudyFamily.json",
+    "fshName": "CdmStudyFamily",
+    "fshType": "Logical",
+    "fshFile": "modules/family.fsh",
+    "startLine": 13,
+    "endLine": 22
+  },
   {
     "outputFile": "StructureDefinition-SharedDataModelStudyParticipant.json",
     "fshName": "CdmStudyParticipant",
@@ -527,22 +527,6 @@
     "startLine": 127,
     "endLine": 133
   },
-  {
-    "outputFile": "StructureDefinition-family-study-focus.json",
-    "fshName": "FamilyStudyFocus",
-    "fshType": "Extension",
-    "fshFile": "modules/family.fsh",
-    "startLine": 81,
-    "endLine": 86
-  },
-  {
-    "outputFile": "StructureDefinition-family-study.json",
-    "fshName": "FamilyStudy",
-    "fshType": "Extension",
-    "fshFile": "modules/family.fsh",
-    "startLine": 118,
-    "endLine": 125
-  },
   {
     "outputFile": "StructureDefinition-family-type.json",
     "fshName": "FamilyType",
@@ -583,14 +567,6 @@
     "startLine": 135,
     "endLine": 148
   },
-  {
-    "outputFile": "StructureDefinition-ncpi-family-study.json",
-    "fshName": "NcpiFamilyStudy",
-    "fshType": "Profile",
-    "fshFile": "modules/family.fsh",
-    "startLine": 88,
-    "endLine": 106
-  },
   {
     "outputFile": "StructureDefinition-ncpi-participant.json",
     "fshName": "NcpiParticipant",
@@ -631,6 +607,14 @@
     "startLine": 60,
     "endLine": 86
   },
+  {
+    "outputFile": "StructureDefinition-ncpi-study-family.json",
+    "fshName": "NcpiStudyFamily",
+    "fshType": "Profile",
+    "fshFile": "modules/family.fsh",
+    "startLine": 88,
+    "endLine": 106
+  },
   {
     "outputFile": "StructureDefinition-research-age-at-last-vital-status.json",
     "fshName": "AgeAtLastVitalStatus",
@@ -727,6 +711,22 @@
     "startLine": 2,
     "endLine": 9
   },
+  {
+    "outputFile": "StructureDefinition-study-family-focus.json",
+    "fshName": "StudyFamilyFocus",
+    "fshType": "Extension",
+    "fshFile": "modules/family.fsh",
+    "startLine": 81,
+    "endLine": 86
+  },
+  {
+    "outputFile": "StructureDefinition-study-family.json",
+    "fshName": "StudyFamily",
+    "fshType": "Extension",
+    "fshFile": "modules/family.fsh",
+    "startLine": 118,
+    "endLine": 125
+  },
   {
     "outputFile": "ValueSet-collection-type-vs.json",
     "fshName": "CollectionTypeVS",

diff --git a/fsh-generated/fsh-index.txt b/fsh-generated/fsh-index.txt
@@ -17,7 +17,7 @@ Consent-kf-gsr-allowed-access.json                                kf-gsr-allowed
 Consent-kf-registered-allowed-access.json                         kf-registered-allowed-access                        Instance    examples/ResearchStudy-CBTN.fsh      193 - 204
 Group-cbtn-family-role-mother.json                                cbtn-family-role-mother                             Instance    examples/family.fsh                  30 - 39
 Group-cbtn-family-role-son.json                                   cbtn-family-role-son                                Instance    examples/family.fsh                  56 - 65
-Group-cbtn-family-study.json                                      FM-00C8Y7DG                                         Instance    examples/family.fsh                  13 - 28
+Group-cbtn-study-family.json                                      FM-00C8Y7DG                                         Instance    examples/family.fsh                  13 - 28
 Group-cmg-research-study-bhcmg-consent-group-hmb-npu.json         cmg-research-study-bhcmg-consent-group-hmb-npu      Instance    examples/ResearchStudy-BH-CMG.fsh    89 - 100
 Group-cmg-research-study-bhcmg-consent-group-irb-hmb-npu.json     cmg-research-study-bhcmg-consent-group-irb-hmb-npu  Instance    examples/ResearchStudy-BH-CMG.fsh    135 - 146
 Group-kf-research-study-cbtn-participants.json                    kf-research-study-cbtn-participants                 Instance    examples/ResearchStudy-CBTN.fsh      92 - 103
@@ -52,32 +52,30 @@ ResearchSubject-emerge-example-participantstudy.json              emerge-example
 ResearchSubject-pcgc-example-participantstudy.json                pcgc-example-participantstudy                       Instance    examples/participant.fsh             208 - 216
 StructureDefinition-SharedDataModelFamilyRelationship.json        CdmFamilyRelationship                               Logical     modules/family.fsh                   153 - 159
 StructureDefinition-SharedDataModelFamilyRole.json                CdmFamilyRole                                       Logical     modules/family.fsh                   110 - 116
-StructureDefinition-SharedDataModelFamilyStudy.json               CdmFamilyStudy                                      Logical     modules/family.fsh                   13 - 22
 StructureDefinition-SharedDataModelPerson.json                    CdmPerson                                           Logical     modules/participant.fsh              93 - 98
 StructureDefinition-SharedDataModelResearchCollection.json        CdmResearchCollection                               Logical     modules/research-collection.fsh      39 - 48
 StructureDefinition-SharedDataModelResearchDataAccessPolicy.json  CdmResearchDataAccessPolicy                         Logical     modules/research-accesss-policy.fsh  113 - 120
 StructureDefinition-SharedDataModelResearchParticipant.json       CdmResearchParticipant                              Logical     modules/participant.fsh              3 - 16
 StructureDefinition-SharedDataModelResearchStudy.json             CdmResearchStudy                                    Logical     modules/research-study.fsh           138 - 168
+StructureDefinition-SharedDataModelStudyFamily.json               CdmStudyFamily                                      Logical     modules/family.fsh                   13 - 22
 StructureDefinition-SharedDataModelStudyParticipant.json          CdmStudyParticipant                                 Logical     modules/participant.fsh              116 - 122
 StructureDefinition-access-policy-description.json                AccessPolicyDescription                             Extension   modules/research-accesss-policy.fsh  83 - 90
 StructureDefinition-access-policy.json                            AccessPolicy                                        Extension   modules/participant.fsh              124 - 131
 StructureDefinition-access-type.json                              AccessType                                          Extension   modules/research-accesss-policy.fsh  75 - 81
 StructureDefinition-consanguinity.json                            Consanguinity                                       Extension   modules/family.fsh                   73 - 79
 StructureDefinition-description.json                              Description                                         Extension   modules/family.fsh                   56 - 61
 StructureDefinition-family-role.json                              FamilyRole                                          Extension   modules/family.fsh                   127 - 133
-StructureDefinition-family-study-focus.json                       FamilyStudyFocus                                    Extension   modules/family.fsh                   81 - 86
-StructureDefinition-family-study.json                             FamilyStudy                                         Extension   modules/family.fsh                   118 - 125
 StructureDefinition-family-type.json                              FamilyType                                          Extension   modules/family.fsh                   48 - 54
 StructureDefinition-label-extension.json                          Label                                               Extension   extensions/Label.fsh                 1 - 13
 StructureDefinition-ncpi-Study-Participant.json                   NcpiStudyParticipant                                Profile     modules/participant.fsh              133 - 145
 StructureDefinition-ncpi-family-relationship.json                 NcpiFamilyRelationship                              Profile     modules/family.fsh                   161 - 175
 StructureDefinition-ncpi-family-role.json                         NcpiFamilyRole                                      Profile     modules/family.fsh                   135 - 148
-StructureDefinition-ncpi-family-study.json                        NcpiFamilyStudy                                     Profile     modules/family.fsh                   88 - 106
 StructureDefinition-ncpi-participant.json                         NcpiParticipant                                     Profile     modules/participant.fsh              62 - 87
 StructureDefinition-ncpi-person.json                              NcpiPerson                                          Profile     modules/participant.fsh              101 - 112
 StructureDefinition-ncpi-research-access-policy.json              NcpiResearchAccessPolicy                            Profile     modules/research-accesss-policy.fsh  92 - 110
 StructureDefinition-ncpi-research-collection.json                 NcpiResearchCollection                              Profile     modules/research-collection.fsh      20 - 37
 StructureDefinition-ncpi-research-study.json                      NcpiResearchStudy                                   Profile     modules/research-study.fsh           60 - 86
+StructureDefinition-ncpi-study-family.json                        NcpiStudyFamily                                     Profile     modules/family.fsh                   88 - 106
 StructureDefinition-research-age-at-last-vital-status.json        AgeAtLastVitalStatus                                Extension   modules/participant.fsh              53 - 60
 StructureDefinition-research-date-of-birth-method.json            ResearchDateOfBirthMethod                           Extension   modules/participant.fsh              45 - 51
 StructureDefinition-research-disease-use-limitation.json          ResearchDiseaseUseLimitation                        Extension   modules/research-accesss-policy.fsh  67 - 73
@@ -90,6 +88,8 @@ StructureDefinition-research-study-result.json                    ResearchStudyR
 StructureDefinition-research-study-subject-consent.json           ResearchStudySubjectConsent                         Extension   modules/research-study-subject.fsh   1 - 5
 StructureDefinition-research-study-subject.json                   ResearchStudySubject                                Profile     modules/research-study-subject.fsh   7 - 15
 StructureDefinition-research-web-Link.json                        ResearchWebLink                                     Extension   extensions/ResearchWebLink.fsh       2 - 9
+StructureDefinition-study-family-focus.json                       StudyFamilyFocus                                    Extension   modules/family.fsh                   81 - 86
+StructureDefinition-study-family.json                             StudyFamily                                         Extension   modules/family.fsh                   118 - 125
 ValueSet-collection-type-vs.json                                  CollectionTypeVS                                    ValueSet    modules/research-collection.fsh      13 - 18
 ValueSet-consanguinity-assertion-vs.json                          ConsanguinityAssertionVS                            ValueSet    modules/family.fsh                   63 - 71
 ValueSet-mesh-terms.json                                          MeshTerms                                           ValueSet    modules/research-accesss-policy.fsh  54 - 60

diff --git a/fsh-generated/includes/fsh-link-references.md b/fsh-generated/includes/fsh-link-references.md
@@ -27,17 +27,13 @@
 [cbtn-example-participantstudy]: ResearchSubject-cbtn-example-participantstudy.html
 [emerge-example-participantstudy]: ResearchSubject-emerge-example-participantstudy.html
 [pcgc-example-participantstudy]: ResearchSubject-pcgc-example-participantstudy.html
-[cbtn-family-study]: Group-cbtn-family-study.html
+[cbtn-study-family]: Group-cbtn-study-family.html
 [PT-KZG2CZ95]: Patient-PT-KZG2CZ95.html
 [cbtn-example-person]: Person-cbtn-example-person.html
 [6812345]: Patient-6812345.html
 [emerge-example-person]: Person-emerge-example-person.html
 [PT-005B7CZ4]: Patient-PT-005B7CZ4.html
 [pcgc-example-person]: Person-pcgc-example-person.html
-[Description]: StructureDefinition-description.html
-[FamilyRole]: StructureDefinition-family-role.html
-[FamilyStudyFocus]: StructureDefinition-family-study-focus.html
-[FamilyStudy]: StructureDefinition-family-study.html
 [FamilyType]: StructureDefinition-family-type.html
 [NcpiFamilyTypesVS]: ValueSet-ncpi-family-types-vs.html
 [kf-gsr-allowed-access]: Consent-kf-gsr-allowed-access.html
@@ -51,7 +47,6 @@
 [SD-BHJXBDQK]: ResearchStudy-SD-BHJXBDQK.html
 [SD-PREASA7S]: ResearchStudy-SD-PREASA7S.html
 [phv00407460.v2]: ResearchStudy-phv00407460.v2.html
-[NcpiFamilyStudy]: StructureDefinition-ncpi-family-study.html
 [NcpiFamilyTypes]: CodeSystem-ncpi-family-types.html
 [Ncpi]: CodeSystem-ncpi.html
 [NcpiParticipant]: StructureDefinition-ncpi-participant.html
@@ -60,6 +55,7 @@
 [NcpiResearchCollection]: StructureDefinition-ncpi-research-collection.html
 [NcpiResearchStudy]: StructureDefinition-ncpi-research-study.html
 [ResearchStudyGroup]: StructureDefinition-research-study-group.html
+[NcpiStudyFamily]: StructureDefinition-ncpi-study-family.html
 [NcpiStudyParticipant]: StructureDefinition-ncpi-Study-Participant.html
 [cmg-research-study-bhcmg-consent-group-hmb-npu]: Group-cmg-research-study-bhcmg-consent-group-hmb-npu.html
 [cmg-research-study-subject-cmg-hmb-npu]: ResearchStudy-cmg-research-study-subject-cmg-hmb-npu.html
@@ -85,14 +81,18 @@
 [NcpiFamilyRelationship]: StructureDefinition-ncpi-family-relationship.html
 [NcpiFamilyRole]: StructureDefinition-ncpi-family-role.html
 [CdmFamilyRole]: StructureDefinition-SharedDataModelFamilyRole.html
-[CdmFamilyStudy]: StructureDefinition-SharedDataModelFamilyStudy.html
-[CdmFamilyRelationship]: StructureDefinition-SharedDataModelFamilyRelationship.html
 [CdmResearchCollection]: StructureDefinition-SharedDataModelResearchCollection.html
 [CdmResearchDataAccessPolicy]: StructureDefinition-SharedDataModelResearchDataAccessPolicy.html
 [CdmStudyParticipant]: StructureDefinition-SharedDataModelStudyParticipant.html
 [CdmResearchParticipant]: StructureDefinition-SharedDataModelResearchParticipant.html
 [CdmPerson]: StructureDefinition-SharedDataModelPerson.html
 [CdmResearchStudy]: StructureDefinition-SharedDataModelResearchStudy.html
+[CdmStudyFamily]: StructureDefinition-SharedDataModelStudyFamily.html
+[CdmFamilyRelationship]: StructureDefinition-SharedDataModelFamilyRelationship.html
+[Description]: StructureDefinition-description.html
+[FamilyRole]: StructureDefinition-family-role.html
+[StudyFamilyFocus]: StructureDefinition-study-family-focus.html
+[StudyFamily]: StructureDefinition-study-family.html
 [StudyNameTypeVS]: ValueSet-study-name-type-vs.html
 [StudyNameType]: CodeSystem-study-name-type.html
 [StudyPersonnelRoleVS]: ValueSet-study-personnel-role-vs.html

diff --git a/fsh-generated/resources/Group-cbtn-family-role-mother.json b/fsh-generated/resources/Group-cbtn-family-role-mother.json
@@ -15,9 +15,9 @@
   ],
   "extension": [
     {
-      "url": "https://nih-ncpi.github.io/ncpi-fhir-ig-2/StructureDefinition/family-study",
+      "url": "https://nih-ncpi.github.io/ncpi-fhir-ig-2/StructureDefinition/study-family",
       "valueReference": {
-        "reference": "Group/cbtn-family-study"
+        "reference": "Group/cbtn-study-family"
       }
     },
     {

diff --git a/fsh-generated/resources/Group-cbtn-family-role-son.json b/fsh-generated/resources/Group-cbtn-family-role-son.json
@@ -15,9 +15,9 @@
   ],
   "extension": [
     {
-      "url": "https://nih-ncpi.github.io/ncpi-fhir-ig-2/StructureDefinition/family-study",
+      "url": "https://nih-ncpi.github.io/ncpi-fhir-ig-2/StructureDefinition/study-family",
       "valueReference": {
-        "reference": "Group/cbtn-family-study"
+        "reference": "Group/cbtn-study-family"
       }
     },
     {

diff --git a/...ed/resources/Group-cbtn-family-study.json → ...ed/resources/Group-cbtn-study-family.json b/...ed/resources/Group-cbtn-family-study.json → ...ed/resources/Group-cbtn-study-family.json
@@ -1,9 +1,9 @@
 {
   "resourceType": "Group",
-  "id": "cbtn-family-study",
+  "id": "cbtn-study-family",
   "meta": {
     "profile": [
-      "https://nih-ncpi.github.io/ncpi-fhir-ig-2/StructureDefinition/ncpi-family-study"
+      "https://nih-ncpi.github.io/ncpi-fhir-ig-2/StructureDefinition/ncpi-study-family"
     ]
   },
   "identifier": [
@@ -26,7 +26,7 @@
       }
     },
     {
-      "url": "https://nih-ncpi.github.io/ncpi-fhir-ig-2/StructureDefinition/family-study-focus",
+      "url": "https://nih-ncpi.github.io/ncpi-fhir-ig-2/StructureDefinition/study-family-focus",
       "valueCodeableConcept": {
         "coding": [
           {