From b13478931339e99adf5bf49ab107639134dce323 Mon Sep 17 00:00:00 2001 From: Amos B Date: Wed, 29 May 2024 18:24:28 +0300 Subject: [PATCH 1/2] upsated invariants file --- ILCore/input/fsh/Invariants.fsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ILCore/input/fsh/Invariants.fsh b/ILCore/input/fsh/Invariants.fsh index 17f01d0..9d6bab4 100644 --- a/ILCore/input/fsh/Invariants.fsh +++ b/ILCore/input/fsh/Invariants.fsh @@ -141,7 +141,7 @@ Invariant: idf-num Description: "7 or 8 digit prisoner number" Severity: #error Expression: -"matches('^\\d{7,8}$')" +"matches('^[0-9]{7,8}$')" // TEMP //////////////////////// Invariant: us-core-6 From 260c22aeb6ffc5f303f188d8941cf53e71116a94 Mon Sep 17 00:00:00 2001 From: Amos B Date: Thu, 30 May 2024 14:25:19 +0300 Subject: [PATCH 2/2] corrections and additions --- .gitignore | 1 + ILCore/input/fsh/Aliases-fsh.fsh | 1 + .../Extension-movement-sequenceNumber.fsh | 4 ++-- ILCore/input/fsh/Profiles/IL-Core-Patient.fsh | 14 +++++++++++- .../fsh/Profiles/IL-Core-PractitionerRole.fsh | 4 ++-- .../input/fsh/Profiles/IL-Core-Specimen.fsh | 4 ++-- .../ValueSet-il-core-medication-code.fsh | 2 +- .../fsh/ValueSets/ValueSet-israel-hmo.fsh | 6 ++--- .../_Examples/MedicationDispense-exmaple.fsh | 21 ++++++++++++++++++ .../fsh/_Examples/RelatedPerson-example.fsh | 22 +++++++++++++++++++ .../CodeSystem-moh-medication-code .fsh | 13 ----------- 11 files changed, 68 insertions(+), 24 deletions(-) create mode 100644 ILCore/input/fsh/_Examples/MedicationDispense-exmaple.fsh create mode 100644 ILCore/input/fsh/_Examples/RelatedPerson-example.fsh delete mode 100644 ILCore/input/fsh/codeSystems/CodeSystem-moh-medication-code .fsh diff --git a/.gitignore b/.gitignore index 5d3980c..419540e 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ ILCore/_updatePublisher.sh ILCore/_gencontinuous.bat ILCore/_updatePublisher.sh ILCore/_updatePublisher.bat +Files to add later on diff --git a/ILCore/input/fsh/Aliases-fsh.fsh b/ILCore/input/fsh/Aliases-fsh.fsh index fa33468..a0fa162 100644 --- a/ILCore/input/fsh/Aliases-fsh.fsh +++ b/ILCore/input/fsh/Aliases-fsh.fsh @@ -67,6 +67,7 @@ Alias: $ILVitalSigns = http://fhir.health.gov.il/StructureDefin // IDs & licenses Alias: $il-id = http://fhir.health.gov.il/identifier/il-national-id +Alias: $visa-num = http://fhir.health.gov.il/identifier/il-visa-num Alias: $pna-id = http://fhir.health.gov.il/identifier/pna-national-id Alias: $idf-sn = http://fhir.health.gov.il/identifier/idf-service-number Alias: $prisoner-id = http://fhir.health.gov.il/identifier/il-prisoner-number diff --git a/ILCore/input/fsh/Extensions/Extension-movement-sequenceNumber.fsh b/ILCore/input/fsh/Extensions/Extension-movement-sequenceNumber.fsh index e505140..2f7b81e 100644 --- a/ILCore/input/fsh/Extensions/Extension-movement-sequenceNumber.fsh +++ b/ILCore/input/fsh/Extensions/Extension-movement-sequenceNumber.fsh @@ -9,5 +9,5 @@ Description: "Extension: Movement Sequence-Number" * ^status = #draft * ^context.type = #element * ^context.expression = "Encounter.hospitalization" -* value[x] only positiveInt -* valuePositiveInt 1..1 +* value[x] only string +* valueString 1..1 \ No newline at end of file diff --git a/ILCore/input/fsh/Profiles/IL-Core-Patient.fsh b/ILCore/input/fsh/Profiles/IL-Core-Patient.fsh index 3764083..98ef0c4 100644 --- a/ILCore/input/fsh/Profiles/IL-Core-Patient.fsh +++ b/ILCore/input/fsh/Profiles/IL-Core-Patient.fsh @@ -55,7 +55,8 @@ Description: "Israel Core Proposed constraints and extensions on the Patient Res ppn 0..* and // idf-sn 0..1 and prisoner-id 0..1 and - enc 0..* + enc 0..* and + visa-num 0..* // ppn-no-system 0..* * identifier[il-id] ^short = "Israeli National Identifier" @@ -128,6 +129,17 @@ Description: "Israel Core Proposed constraints and extensions on the Patient Res * identifier[enc].value ^example.label = "Valid Example" * identifier[enc].assigner only Reference(ILCoreOrganization) +* identifier[visa-num] ^short = "Israeli Temporary Visa number" +* identifier[visa-num] ^definition = "Israeli Temporary Visa number" +* identifier[visa-num] ^mustSupport = true +* identifier[visa-num].value 1..1 MS +* identifier[visa-num].value ^short = "An Israeli Visa Number" +* identifier[visa-num].system 1..1 MS +* identifier[visa-num].system = $visa-num (exactly) +* identifier[visa-num].value ^example.valueString = "000000018" +* identifier[visa-num].value ^example.label = "Valid Example" +* identifier[visa-num].assigner only Reference(ILCoreOrganization) + //address * address only ILCoreAddress * address 0..* diff --git a/ILCore/input/fsh/Profiles/IL-Core-PractitionerRole.fsh b/ILCore/input/fsh/Profiles/IL-Core-PractitionerRole.fsh index 7ab5c27..395115d 100644 --- a/ILCore/input/fsh/Profiles/IL-Core-PractitionerRole.fsh +++ b/ILCore/input/fsh/Profiles/IL-Core-PractitionerRole.fsh @@ -16,9 +16,9 @@ Description: "Israel Core proposed constraints and extensions on the Practitione * . ^definition = "Israel Core proposed constraints and extensions on the practitionerrole resource profile." * . ^isModifier = false * ^extension[+].url = "http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status" -* ^extension[=].valueCode = #trial-use +* ^extension[=].valueCode = #draft * ^extension[+].url = "http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm" -* ^extension[=].valueInteger = 1 +* ^extension[=].valueInteger = 0 * practitioner only Reference(ILCorePractitioner) diff --git a/ILCore/input/fsh/Profiles/IL-Core-Specimen.fsh b/ILCore/input/fsh/Profiles/IL-Core-Specimen.fsh index eae427a..eeffc2d 100644 --- a/ILCore/input/fsh/Profiles/IL-Core-Specimen.fsh +++ b/ILCore/input/fsh/Profiles/IL-Core-Specimen.fsh @@ -16,9 +16,9 @@ Description: "Israel Core proposed constraints and extensions on the Specimen Re * . ^definition = "Israel Core proposed constraints and extensions on the Specimen resource profile." * . ^isModifier = false * ^extension[+].url = "http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status" -* ^extension[=].valueCode = #draft +* ^extension[=].valueCode = #trail-use * ^extension[+].url = "http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm" -* ^extension[=].valueInteger = 0 +* ^extension[=].valueInteger = 1 * extension contains diff --git a/ILCore/input/fsh/ValueSets/ValueSet-il-core-medication-code.fsh b/ILCore/input/fsh/ValueSets/ValueSet-il-core-medication-code.fsh index dacbc8a..1f6a0fb 100644 --- a/ILCore/input/fsh/ValueSets/ValueSet-il-core-medication-code.fsh +++ b/ILCore/input/fsh/ValueSets/ValueSet-il-core-medication-code.fsh @@ -8,7 +8,7 @@ Description: "Codes for medications according to ILCore catalogue" * ^version = "0.14.2" * ^experimental = false -* include codes from system $moh-medication-code +// * include codes from system $moh-medication-code * include codes from system $sct * include codes from system $atc * include codes from system http://www.nlm.nih.gov/research/umls/rxnorm diff --git a/ILCore/input/fsh/ValueSets/ValueSet-israel-hmo.fsh b/ILCore/input/fsh/ValueSets/ValueSet-israel-hmo.fsh index 3a1baba..b24c84b 100644 --- a/ILCore/input/fsh/ValueSets/ValueSet-israel-hmo.fsh +++ b/ILCore/input/fsh/ValueSets/ValueSet-israel-hmo.fsh @@ -26,9 +26,9 @@ Description: "A code classifying Health Management Organizations" * $payer#104 ^designation.value = "מאוחדת" * $payer#401 "צה\"ל" * $payer#402 "משרד הבטחון" -* $payer#104 ^designation.language = #he -* $payer#104 ^designation.use = $sct#900000000000013009 "Synonym" -* $payer#104 ^designation.value = "משהב\"ט" +* $payer#402 ^designation.language = #he +* $payer#402 ^designation.use = $sct#900000000000013009 "Synonym" +* $payer#402 ^designation.value = "משהב\"ט" * $payer#480 "רשות פלסטינאית" * $payer#480 ^designation.language = #he * $payer#480 ^designation.use = $sct#900000000000013009 "Synonym" diff --git a/ILCore/input/fsh/_Examples/MedicationDispense-exmaple.fsh b/ILCore/input/fsh/_Examples/MedicationDispense-exmaple.fsh new file mode 100644 index 0000000..2914993 --- /dev/null +++ b/ILCore/input/fsh/_Examples/MedicationDispense-exmaple.fsh @@ -0,0 +1,21 @@ +Instance: medication-dispense +InstanceOf: ILCoreMedicationDispense +Title: "Example ILCore MedicationDispense" +Description: "An example instance of the ILCore MedicationDispense profile." + +* status = #completed +* category = $il-core-medication-category#community-hmo "Community Care/HMO" +* medicationReference = Reference(paracetamol) +* subject = Reference(patient-israeli-with-statistical-area) +* performer.actor = Reference(practitioner-md) +* authorizingPrescription = Reference(metamizole-for-gangreenous-tonsolitis) +* type = http://terminology.hl7.org/CodeSystem/v3-ActCode#RFP "Refill - Part Fill" +* quantity = 10 'tablet' +* whenHandedOver = "2024-05-21T14:30:00Z" +* dosageInstruction[0].sequence = 1 +* dosageInstruction[0].text = "Take one tablet daily" +* dosageInstruction[0].timing.repeat.frequency = 1 +* dosageInstruction[0].timing.repeat.period = 1 +* dosageInstruction[0].timing.repeat.periodUnit = #d +* dosageInstruction[0].doseAndRate[0].doseQuantity = 1 'tablet' +* extension[recorded].valueDateTime = "2024-05-21T14:00:00Z" diff --git a/ILCore/input/fsh/_Examples/RelatedPerson-example.fsh b/ILCore/input/fsh/_Examples/RelatedPerson-example.fsh new file mode 100644 index 0000000..cde08b9 --- /dev/null +++ b/ILCore/input/fsh/_Examples/RelatedPerson-example.fsh @@ -0,0 +1,22 @@ +Instance: example-related-person +InstanceOf: ILCoreRelatedPerson +Title: "Example ILCore RelatedPerson" +Description: "An example instance of the ILCore RelatedPerson profile." + +* extension[parentName].extension[given].valueString = "John Doe Sr." +* identifier[il-id].system = $il-id +* identifier[il-id].value = "000000018" +* active = true +* patient = Reference(patient-with-hebrew-date) +* relationship[0].coding[0] = $v3-RoleCode#GUARD "Guardian" +* name[0].family = "Doe" +* name[0].given[0] = "John" +* name[0].use = #official +* telecom[0].system = #phone +* telecom[0].value = "+1-555-555-5555" +* telecom[0].use = #mobile +* address[0].line[0] = "123 Main St" +* address[0].city = "Somewhere" +* address[0].state = "CA" +* address[0].postalCode = "90210" +* address[0].country = "USA" diff --git a/ILCore/input/fsh/codeSystems/CodeSystem-moh-medication-code .fsh b/ILCore/input/fsh/codeSystems/CodeSystem-moh-medication-code .fsh deleted file mode 100644 index f75bec4..0000000 --- a/ILCore/input/fsh/codeSystems/CodeSystem-moh-medication-code .fsh +++ /dev/null @@ -1,13 +0,0 @@ -CodeSystem: MoHMedicationCode -Id: moh-medication-code -Title: "MoH Medication Codes" -Description: "Codes for medications according to MoH catalogue" - - -* ^status = #draft -* ^url = $moh-medication-code -* ^content = #not-present -* ^version = "0.14.2" -* ^caseSensitive = false -* ^experimental = false -* ^publisher = "Israeli Ministry of Health"