Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ballot to Master STU2 #72

Merged
merged 84 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
fbbed47
stage 2 changes
chn100 Nov 11, 2024
91ac7f4
Merge branch 'master' into trial
chn100 Nov 12, 2024
6984b6b
organization in diagrams updated
chn100 Nov 13, 2024
3d4fb98
Restoration of Stage 2
chn100 Nov 13, 2024
da415df
changes made to Ballot 1 after split brought back to trial
chn100 Nov 13, 2024
94988d2
Changes from ballot after split
chn100 Nov 14, 2024
f49ac21
value sets status to active
chn100 Nov 14, 2024
a033494
Fixed ignoreWarnings
lmckenzi Nov 14, 2024
ed70e3a
Merge branch 'master' of https://github.com/HL7/FHIR-us-pq-cmc
lmckenzi Nov 14, 2024
25e5f8c
converted section codes to ICH; changed to NCIT codes, converted name…
chn100 Nov 15, 2024
c481706
correction to Alias: $SectionTypes after TSMG meeting
chn100 Nov 15, 2024
7994249
added temp alias
chn100 Nov 15, 2024
2248e96
slice path correction in 32p10
chn100 Nov 15, 2024
dc15abc
corrected text in Index page
chn100 Nov 18, 2024
457db4f
updating coding in examples
chn100 Nov 19, 2024
fc13e1b
Wrong structurally diverse substance code
c-norm Nov 19, 2024
149a1b5
update MID property invariants
c-norm Nov 19, 2024
792e74e
styler for terminology branch
c-norm Nov 19, 2024
3eed1db
tempcode system update
chn100 Nov 20, 2024
37f0a1d
canonicals are kebab-case
c-norm Nov 20, 2024
61c5075
more temp code aliases in example
c-norm Nov 20, 2024
884ffe7
remove section code binding; temp code system set to experimental
chn100 Nov 20, 2024
ffc66fa
remove specification type binding for ICH error
c-norm Nov 20, 2024
be968c1
draft status to active; Product Name Types Terminology code changes; …
chn100 Nov 21, 2024
dd9952d
remove organization identifier type binding
c-norm Nov 22, 2024
d9b4fd3
don't MS every section.entry in 32S3
c-norm Nov 22, 2024
bdf8d37
standardize slicing compositions with 1 section
c-norm Nov 22, 2024
f385cb0
added overage example; added usage patterns to Batch Formula page
chn100 Nov 22, 2024
3f85807
merge changes
chn100 Nov 22, 2024
9f62381
Merge branch 'trial' of https://github.com/HL7/FHIR-us-pq-cmc into trial
chn100 Nov 22, 2024
99f055c
Batch codes turned to codeableConcept.text
chn100 Nov 22, 2024
93f89b6
Merge pull request #53 from HL7/trial
chn100 Nov 22, 2024
c70b662
Merge pull request #54 from HL7/ballot
chn100 Nov 22, 2024
57aa081
hierarchy supplement + temp NCIt removed
c-norm Nov 24, 2024
ceb56bc
Merge branch 'trial' of https://github.com/HL7/FHIR-us-pq-cmc into trial
c-norm Nov 24, 2024
a7f2c44
Merge pull request #55 from HL7/trial
chn100 Nov 25, 2024
f2cca6e
iso3166
chn100 Nov 25, 2024
2bd461a
changed NCItHierarchySupplement name
chn100 Nov 25, 2024
1d34f69
corrected valueSets for NCItHierarchySuppl
chn100 Nov 25, 2024
5f48044
Merge pull request #57 from HL7/trial
chn100 Nov 25, 2024
3df10be
removed PqcmcProductCharacteristic from terminology, examples and dia…
chn100 Nov 27, 2024
6012d81
Merge branch 'master' into trial
chn100 Nov 27, 2024
0a7d827
Merge pull request #58 from HL7/trial
chn100 Nov 27, 2024
8c77b38
Update CochinealSpecification.fsh
chn100 Nov 27, 2024
f4b022c
Update materials1.fsh
chn100 Nov 27, 2024
e2714fb
Update Example1Drug.fsh
chn100 Nov 27, 2024
2b62f53
Update ExampleSpecification.fsh
chn100 Nov 27, 2024
a3dda76
Update ExampleSpecification2.fsh
chn100 Nov 27, 2024
4feb106
Incorporte atll terminology fixes
chn100 Nov 27, 2024
655d786
Fixed example rebuilt. Still warning on JiraSpec
chn100 Nov 27, 2024
6ac5dd0
Merge pull request #59 from HL7/trial
chn100 Nov 27, 2024
3592e74
removed (1 uses) and check of all ingoreWarnings
chn100 Dec 2, 2024
7458f39
Made QA warning suppression more concise
lmckenzi Dec 2, 2024
1ee8b03
Merge pull request #60 from HL7/master
chn100 Dec 2, 2024
1f97431
updated last terminology changes and ignoreWarnings.txt
chn100 Dec 3, 2024
7df1adf
removed hyper link to justiciont
chn100 Dec 3, 2024
f4bb017
post review
chn100 Dec 3, 2024
bbbc5e9
config file changes and ignore warnings from 12/3/24 meeting review
chn100 Dec 4, 2024
4af2e93
Merge pull request #61 from HL7/ballot
chn100 Dec 4, 2024
6f92455
release label
chn100 Dec 4, 2024
b19c427
Merge pull request #62 from HL7/ballot
chn100 Dec 4, 2024
f64f91f
labels and ingore warnings
chn100 Dec 5, 2024
58edbae
added terminology borken link to ignore file
chn100 Dec 5, 2024
31a0550
Merge pull request #63 from HL7/ballot
chn100 Dec 5, 2024
8ed7b8e
Merge branch 'master' into terminology
chn100 Dec 10, 2024
15cbb43
Merge pull request #65 from HL7/terminology
chn100 Dec 10, 2024
b442b9c
Revert "STU1 with terminology changes - final publication version"
chn100 Dec 10, 2024
7ff2a63
Merge pull request #66 from HL7/revert-65-terminology
chn100 Dec 10, 2024
799f607
Updated ingoreWarnings and config. Pre-publicaiton with IG Publisher …
chn100 Dec 10, 2024
5eb0716
Merge branch 'master' into jira-spec
chn100 Dec 10, 2024
5cfc86a
Merge pull request #67 from HL7/jira-spec
chn100 Dec 10, 2024
fcc5dc8
Update publication-request.json
chn100 Dec 10, 2024
5adb00c
Update ignoreWarnings.txt
chn100 Dec 10, 2024
79117f3
Merge pull request #68 from HL7/stu-1-dec-10-24
chn100 Dec 10, 2024
487ddaf
Update DrugSubstanceResources.fsh
chn100 Dec 10, 2024
9ad7706
Update DrugProductResources.fsh
chn100 Dec 10, 2024
374ce7b
Update DrugProductResources.fsh
chn100 Dec 10, 2024
58cf95d
Update DrugSubstanceResources.fsh
chn100 Dec 10, 2024
5395fca
remove stage2 content
chn100 Dec 10, 2024
d4ddf9d
Merge branch 'master' into stu-1-dec-10-2024
chn100 Dec 10, 2024
7791aed
Merge pull request #70 from HL7/stu-1-dec-10-2024
chn100 Dec 10, 2024
0ed6257
dropped exception for vocab version
chn100 Dec 11, 2024
e57d5c5
Merge branch 'master' into ballot
chn100 Dec 11, 2024
e790aca
commit all stage 2
chn100 Dec 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
508 changes: 32 additions & 476 deletions input-cache/txcache/iso3166.cache

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion input-cache/workgroups.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
<workgroup key="dev" webcode="healthcaredevices" name="Devices" listserv="[email protected]/"/>
<workgroup key="ec" webcode="ec" name="Emergency Care" listserv="[email protected]/"/>
<workgroup key="ehr" webcode="ehr" name="Electronic Health Record" listserv="[email protected]/"/>
<workgroup key="director" name="FHIR Director"/>
<workgroup key="ex" webcode="ec" name="Executive Committee" listserv="[email protected]/"/>
<workgroup key="director" name="FHIR Director" listserv="[email protected]"/>
<workgroup key="fgb" name="FHIR Governance Board" deprecated="true"/>
<workgroup key="fhir-i" webcode="fiwg" name="FHIR Infrastructure" listserv="[email protected]/"/>
<workgroup key="fmg" webcode="fhirmg" name="FHIR Mgmt Group" listserv="[email protected]/"/>
Expand Down
1 change: 0 additions & 1 deletion input/fsh/CommonOrganization.fsh
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
RuleSet: DUNSandFEINumber
* identifier 1..* MS
* identifier.type 0..1 MS
* identifier.type from PqcmcOrgIdentifierTypeTerminology (required)
* identifier.system 1..1 MS
* identifier.value 1..1 MS
* identifier ^slicing.discriminator.type = #value
Expand Down
324 changes: 277 additions & 47 deletions input/fsh/DrugProductResources.fsh

Large diffs are not rendered by default.

162 changes: 162 additions & 0 deletions input/fsh/DrugSubstanceResources.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,134 @@ RuleSet: CountryOfOrigin

//*Stage 2 --------------------------------------------------------------------------------------------------------------*/

Profile: DrugSubstanceCharacterisation
Parent: SubstanceDefinition
Id: pqcmc-drug-substance-characterisation
Title: "Drug Substance"
Description: "Drug Substance (Active Ingredient) nomenclature and characterisation."
* . obeys cmc-when-unii-required
* . obeys cmc-name-isbt
* obeys cmc-substance-characterisation-content-required
* identifier 0..1 MS
* identifier ^short = "optional user designated identifier"
* classification 1..1 MS
* classification from SubstanceClassification
* classification ^short = "Substance Type"
* classification ^definition = """A controlled vocabulary as provided by the prEN ISO 11238 - Health informatics identification of medicinal products - Structures and controlled vocabularies for drug substances to group drug substances at a relatively high level acording to the Substance and the Substance Preparation Model.
[Source: Adapted from 'Logical model of the classification and identification of pharmaceutical and medicinal Products', HL7]
"""
* manufacturer 0..1 MS
* insert PQReference(manufacturer)
* manufacturer only Reference(CodedOrganization)
* supplier 0..1 MS
* insert PQReference(supplier)
* supplier only Reference(CodedOrganization)
* insert SubstanceCharacterization
* insert UniiAndUniProtCodes(1)
* insert ShortSetSubstanceNames

* relationship 0..* MS
* ^short = "Reference to Drug Substance Impurity"
//* relationship obeys cmc-substance-relationship not needed since this resource is for illustraion.
* substanceDefinition[x] 1..1 MS
* insert PQReference(substanceDefinition[x])
* substanceDefinition[x] only Reference(ImpuritySubstance)

Profile: ImpuritySubstance
Parent: SubstanceDefinition
Id: pqcmc-drug-product-substance-impurity
Title: "Drug Substance Impurity"
Description: "Any component of the drug substance that is not the chemical entity for procduct composition."
* obeys cmc-impurity-unii-required
* identifier 0..1 MS
* identifier ^short = "optional user designated identifier"
* classification 1..* MS
* classification from PqcmcImpurityClassificationTerminology (required)
* classification ^short = "Impurity Classification"
* classification ^definition = """A categorization of impurities based on its origin. [Source: SME Defined]
Examples: Degradation Product, Inorganic, Process Related/Process, Product Related, Leachables.
"""
* insert SubstanceCharacterization
* structure 0..1 MS
//* structure obeys cmc-representation-or-document
* structure.technique MS
* structure.technique ^short = "Impurity Substance Characterisation Technique"
* structure.technique ^definition = """The technique used to elucidate the structure or characterisation of the drug substance. [Source: SME Defined] Examples: x-ray, HPLC, NMR, peptide mapping, ligand binding assay.
"""
* structure.technique only CodeableConceptTextOnly
* structure
* representation MS
* ^short = "Impurity Structure Graphic | Impurity Structure Data File"
* ^slicing.discriminator.type = #value
* ^slicing.rules = #closed
* ^slicing.discriminator.path = "type"
* ^slicing.ordered = false
* type 1..1 MS
* type from PqcmcRepresentationTypes (required)
* representation contains
graphic 0..1 and
structureFile 0..* and
structureString 0..*
* representation[graphic]
* ^short = "A graphical, displayable depiction of the structure (e.g. an SVG, PNG)"
* type 1..1 MS
* ^short = "Graphic"
* type = $NCIT#C54273
* document 1..1
* ^short = "Impurity Structure Graphic"
* ^definition = """
A pictorial representation of the structure of the impurity substance.
[Source: SME Defined] Note: Refer to the 'Acceptable File Formats for
use in eCTD' Example: This is the representation of the molecule CH3OH,
or the sequence SHLVEALALVAGERG.
"""
* insert PQReference(document)
* document only Reference(GraphicReference)
* representation[structureFile]
* ^short = "machine-readable representation -- attached file"
* type 1..1 MS
* ^short = "Structure File"
* type = $NCIT#C103240
* document 1..1 MS
* ^short = "Impurity Chemical Structure Data (files, e.g. .SDF, .CIF)"
* insert PQReference(document)
* document only Reference(StructureReference)
* representation[structureString]
* ^short = "machine-readable representation -- plain text"
* type 1..1 MS
* ^short = "Structure Textual"
* type = $NCIT#C45253
* format 1..1 MS
* ^short = "Drug Substance Impurity Method Type"
* format from PqcmcChemicalStructureDataFileTypeTerminology (required)
* representation 1..1 MS
* ^short = "Impurity Chemical Structure Data (short, plain text representations, e.g. SMILES)"
* ^definition = """
A machine-readable representation of the structure of the chemical. [Source: SME Defined]
Examples: SMILES, INCHI
"""
// * representation[structureData]
// * ^short = "machine-readable representation -- may be plain text (e.g. SMILES) or an attached file (e.g. SDF)"
// * format 0..1 MS
// * format ^short = "Drug Substance Impurity Method Type"
// * format.text 0..1 MS
// * type 1..1 MS
// * text 1..1 MS
// * text = "Structure"
// * representation 0..1 MS
// * representation ^short = "Impurity Chemical Structure Data (short, plain text representations, e.g. SMILES)"
// * representation ^definition = """A machine-readable representation of the structure of the chemical. [Source: SME Defined]
// Examples: Structured Data File (SDF), MOLFILE, InChI file (small molecule), PDB, mmCIF (large molecules), HELM.
// """
// * document 0..1 MS
// * document ^short = "Impurity Chemical Structure Data (large files, e.g. SDF, CIF)"
// * document only Reference(StructureReference)

// impurities might be unknown and not have Unii's
* insert UniiAndUniProtCodes(0)
* insert ShortSetSubstanceNames
* insert CompanyName

//Rulesets---------------------------------------------------------------------------------------------------------------*/
RuleSet: SubstanceCharacterization
* characterization MS
Expand Down Expand Up @@ -594,6 +722,40 @@ Example: This is the representation of the instrumental output for the molecule
* ^definition = """Impurity Analytical Instrument Data File: The transport format for data exchange. [Source: SME Defined]
Example: JCAMP, ADX, ADF."""

Profile: DrugProductIngredient
Parent: Ingredient
Id: pqcmc-dp-ingredient
Title: "Drug Product Batch Formula Ingredient"
Description: "The amount details about the drug product ingredients in the batch. Use for Batch Formula."

* identifier 0..1 MS
* substance.code 1..1 MS
* substance.code ^short = "Ingredient Substance"
* insert PQCodeableReference(substance.code)
* substance.code only CodeableReference(pqcmc-routine-drug-substance or pqcmc-excipient)
* substance
* strength 2..2 MS
* ^slicing.discriminator.type = #value
* ^slicing.rules = #closed
* ^slicing.discriminator.path = "concentration.code"
* ^slicing.ordered = false
* strength contains
perBatch 1..1 MS and
percent 1..1 MS
* strength[perBatch]
* ^short = "Ingredient Total per Batch"
* ^definition = "the total amount of thi ingredient present in the batch"
* concentration[x] 1..1 MS
* concentration[x] only Quantity
* concentrationQuantity.code 1..1 MS
* concentrationQuantity.code from PqcmcNonPercentageUnits (required)
* strength[percent]
* ^short = "Ingredient percent of Total Batch"
* concentration[x] 1..1 MS
* concentration[x] only Quantity
* concentrationQuantity.code 1..1 MS
* concentrationQuantity.code from PqcmcPercentageUnits (required)


RuleSet: GraphicAndStructureRepresentations(graphicsCardinality, structureFileCardinality,structureStringCardinality)
* structure
Expand Down
142 changes: 142 additions & 0 deletions input/fsh/HierarchySupplement.fsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
RuleSet: child(parent,child)
* {parent}
* ^property[+].code = #child
* ^property[=].valueCode = {child}

CodeSystem: NCItHierarchySupplement
Id: cmc-hierarchy-supplement
Title: "PQ-CMC-FDA NCIt Hieararchy Supplement"
Description: """Provides hierarchical relationships for value sets as a CodeSystem supplement to the NCI Thesaurus (NCIt) """
* ^experimental = false
* ^status = #draft
* ^publisher = "NCI Thesaurus (NCIt)"
* ^copyright = "PQ-CMC-FDA Temporary Codes are either in the NCI Thesaurus (NCIt) or are in the process of being included in NCIt. When all codes are in NCIt, they will migrate to the HL7 Terminology (THO). License Note Unless otherwise indicated, all text within NCI products is free of copyright and may be reused without our permission. Credit the National Cancer Institute as the source. For more licensing information see: [https://www.cancer.gov/policies/copyright-reuse](https://www.cancer.gov/policies/copyright-reuse)"
* ^supplements = Canonical(http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl)
* ^content = #supplement
* ^property[+].code = #child
* ^hierarchyMeaning = #is-a
// uri MUST be in quotes or it won't work
* ^property[=].uri = "http://hl7.org/fhir/concept-properties#child"
* ^property[=].description = "Defines which codes are children"
* ^property[=].type = #code
// * #C60819
* insert child(#C60819,#C204845)
* insert child(#C60819,#C205001)
* insert child(#C60819,#C81183)
* insert child(#C60819,#C205003)
* insert child(#C60819,#C205007)
* insert child(#C60819,#C205015)
* insert child(#C60819,#C205018)
* insert child(#C60819,#C205020)
* insert child(#C60819,#C205028)
* insert child(#C60819,#C62352)
* insert child(#C60819,#C171277)
* insert child(#C60819,#C205038)
* insert child(#C60819,#C64858)
* insert child(#C60819,#C205006)
//* #C134249
// * #C134250
* insert child(#C134250,#C205004)
* insert child(#C134250,#C205019)
* insert child(#C134250,#C134115)
* insert child(#C134250,#C205050)
// * #C133961
// * #C205026
* insert child(#C205026,#C138990)
* insert child(#C205026,#C139027)
* insert child(#C205026,#C134262)
* insert child(#C205026,#C134261)
// * #C138993
// * #C134252
// * #C134253
// * #C205012
// * #C193381
* insert child(#C193381,#C205024)
// * #C134255
// * #C134256
// * #C205027
// * #C134257
// * #C134260
// * #C134263
// * #C133974
// * #C133975
// * #C134264
// * #C63394
// * #C103201
// * #C205029
// * #C60821
// * #C64832
// * #C25483
* insert child(#C25483,#C205022)
* insert child(#C25483,#C205017)
* insert child(#C25483,#C205209)
* insert child(#C25483,#C205053)
* insert child(#C25483,#C205021)
* insert child(#C25483,#C205016)
* insert child(#C25483,#C205206)
* insert child(#C25483,#C205045)
* insert child(#C25483,#C205036)
* insert child(#C25483,#C205011)
* insert child(#C25483,#C205010)
* insert child(#C25483,#C205009)
* insert child(#C25483,#C205037)
* insert child(#C25483,#C205025)
* insert child(#C25483,#C205034)
* insert child(#C25483,#C205033)
* insert child(#C25483,#C205035)
* insert child(#C25483,#C205005)
* insert child(#C25483,#C205044)
* insert child(#C25483,#C205043)
* insert child(#C25483,#C205042)
// * #C134266
// * #C205049
// * #C133979
// * #C134267
// * #C134269
// * #C205030
// * #C134270
// * #C133983
// * #C134272
// * #C133985
// * #C205032
// * #C134276
// * #C134277
// * #C134278
// * #C134113
// * #C134114
// * #C200004
// * #C205023
// * #C205041
// * #C18951
* insert child(#C18951,#C16643)
* insert child(#C18951,#C205054)
* insert child(#C18951,#C205031)
* insert child(#C18951,#C205002)
* insert child(#C18951,#C205008)
// * #C205000
// * #C205013
// * #C74723
// * #C204971
* insert child(#C204971,#C205039)
* insert child(#C204971,#C205040)
* insert child(#C204971,#C205052)
* insert child(#C204971,#C205047)
* insert child(#C204971,#C205048)
* insert child(#C204971,#C205051)
* insert child(#C204971,#C205014)
* insert child(#C204971,#C204890)
* insert child(#C204971,#C134254)
* insert child(#C204971,#C134002)

// Different value set that still requires hierarchies
// Should this be its own supplement?

// * #C45299 "Gas"
// * #C45298 "Liquid"
* insert child(#C45298,#C154598) // "Liquid" -> "Solution"
// * #C149895 "Semi-solid"
// * #C45300 "Solid"
* insert child(#C45300,#C154433) // "Solid" -> "Capsule"
* insert child(#C45300,#C154605) // "Solid" -> "Tablet"


Loading
Loading