diff --git a/input/cql/IMMZConcepts.cql b/input/cql/IMMZConcepts.cql index ee12f78a61..ebd62d8199 100644 --- a/input/cql/IMMZConcepts.cql +++ b/input/cql/IMMZConcepts.cql @@ -48,7 +48,6 @@ valueset "Tetanus and Diphtheria Vaccine": 'http://smart.who.int/ig/smart-immuni valueset "Pertussis Vaccine": 'http://smart.who.int/ig/smart-immunizations/ValueSet/IMMZ.Z.DE12' valueset "Rubella Vaccine": 'http://smart.who.int/ig/smart-immunizations/ValueSet/IMMZ.Z.DE17' valueset "Measles and Rubella Vaccine": 'http://smart.who.int/ig/smart-immunizations/ValueSet/IMMZ.Z.DE32' -valueset "All Rubella Vaccine": 'http://smart.who.int/ig/smart-immunizations/ValueSet/IMMZ.Z.DE17.All' valueset "Mumps Vaccine": 'http://smart.who.int/ig/smart-immunizations/ValueSet/IMMZ.Z.DE11' diff --git a/input/cql/IMMZD2DTRubellaInput.cql b/input/cql/IMMZD2DTRubellaInput.cql index 78d86944a1..b236a292b7 100644 --- a/input/cql/IMMZD2DTRubellaInput.cql +++ b/input/cql/IMMZD2DTRubellaInput.cql @@ -20,7 +20,7 @@ context Patient define "Rubella Doses Administered to Patient": IMMZCom."Doses Administered to Patient" I where - I.vaccineCode in IMMZc."All Rubella Vaccine" + I.vaccineCode in IMMZc."Rubella Vaccine" /* @input: No rubella primary series dose was administered diff --git a/input/cql/IMMZD5DTRubella.cql b/input/cql/IMMZD5DTRubella.cql index ce8307552f..b1116785a3 100644 --- a/input/cql/IMMZD5DTRubella.cql +++ b/input/cql/IMMZD5DTRubella.cql @@ -23,7 +23,7 @@ context Patient @internal: Draft Medication Request for Rubella dose */ define "Draft Medication Request for Rubella dose": - [MedicationRequest: IMMZc."All Rubella Vaccine"] MR where MR.status = 'draft' and MR.intent = 'proposal' + [MedicationRequest: IMMZc."Rubella Vaccine"] MR where MR.status = 'draft' and MR.intent = 'proposal' sort by date from (authoredOn as FHIR.dateTime) desc /* diff --git a/input/fsh/valuesets/IMMZ.Z.DE11.fsh b/input/fsh/valuesets/IMMZ.Z.DE11.fsh index 26bc50cc76..e353618fdc 100644 --- a/input/fsh/valuesets/IMMZ.Z.DE11.fsh +++ b/input/fsh/valuesets/IMMZ.Z.DE11.fsh @@ -6,14 +6,14 @@ Description: "Vaccine terminology codes for Mumps containing vaccines." * ^experimental = false * ^name = "IMMZ_Z_DE11" + * $ICD11#XM1131 "Mumps vaccine" * $ICD11#XM2340 "Mumps, live attenuated" +* $ICD11#XM8TF3 "Measles, combinations with mumps and rubella, live attenuated" +* $ICD11#XM4AJ8 "Measles, combinations with mumps, rubella and varicella, live attenuated" +* $ICD11#XM9439 "Measles, combinations with mumps, live attenuated" +* $ICD11#XM3B09 "Rubella, combinations with mumps, live attenuated" * $LNC#30940-1 "Measles virus+Mumps virus+Rubella virus dose count in combination vaccine" -* $SCT#836498007 "Mumps orthorubulavirus antigen-containing vaccine product" - -// From measles/rubella vaccines -* $ICD11#XM21H2 "Measles, combinations with rubella, live attenuated" -* $ICD11#XM8TF3 "Measles, combinations with mumps and rubella, live attenuated" -* $ICD11#XM4AJ8 "Measles, combinations with mumps, rubella and varicella, live attenuated" \ No newline at end of file +* $SCT#836498007 "Mumps orthorubulavirus antigen-containing vaccine product" \ No newline at end of file diff --git a/input/fsh/valuesets/IMMZ.Z.DE14.fsh b/input/fsh/valuesets/IMMZ.Z.DE14.fsh index f864f5733e..d00fed172f 100644 --- a/input/fsh/valuesets/IMMZ.Z.DE14.fsh +++ b/input/fsh/valuesets/IMMZ.Z.DE14.fsh @@ -20,4 +20,6 @@ Description: "Vaccine terminology codes for polio." * $ICD11#XM79H3 "Poliomyelitis oral, bivalent, live attenuated" * $ICD11#XM0VX8 "Poliomyelitis oral, monovalent live attenuated" * $ICD11#XM0KZ1 "Poliomyelitis oral, trivalent, live attenuated" + * $SCT#1031000221108 "Vaccine product containing Human poliovirus antigen (medicinal product)" +* $SCT#1871740006 "Inactivated whole Human poliovirus antigen only vaccine product" diff --git a/input/fsh/valuesets/IMMZ.Z.DE17.All.fsh b/input/fsh/valuesets/IMMZ.Z.DE17.All.fsh deleted file mode 100644 index 6e5b587b49..0000000000 --- a/input/fsh/valuesets/IMMZ.Z.DE17.All.fsh +++ /dev/null @@ -1,20 +0,0 @@ -ValueSet: IMMZ.Z.DE17.All -Title: "IMMZ.Z.DE.17 All Rubella containing vaccines" -Description: "Vaccine terminology codes for All Rubella containing vaccines." - -* ^status = #active -* ^experimental = false -* ^name = "IMMZ_Z_DE17_All" - -* $ICD11#XM7PP1 "Rubella vaccine" -* $ICD11#XM9PS9 "Rubella, live attenuated" -* $ICD11#XM3B09 "Rubella, combinations with mumps, live attenuated" -* $ICD11#XM9744 "Diphtheria, rubella, tetanus vaccines" - -* $SCT#836388000 "Rubella virus antigen-containing vaccine product" - -* $ICD11#XM21H2 "Measles, combinations with rubella, live attenuated" -* $ICD11#XM8TF3 "Measles, combinations with mumps and rubella, live attenuated" -* $ICD11#XM4AJ8 "Measles, combinations with mumps, rubella and varicella, live attenuated" - -* $LNC#30940-1 "Measles virus+Mumps virus+Rubella virus dose count in combination vaccine" \ No newline at end of file diff --git a/input/fsh/valuesets/IMMZ.Z.DE17.fsh b/input/fsh/valuesets/IMMZ.Z.DE17.fsh index d6ae83b38c..a54ed31d7e 100644 --- a/input/fsh/valuesets/IMMZ.Z.DE17.fsh +++ b/input/fsh/valuesets/IMMZ.Z.DE17.fsh @@ -10,5 +10,9 @@ Description: "Vaccine terminology codes for Rubella containing vaccines." * $ICD11#XM9PS9 "Rubella, live attenuated" * $ICD11#XM3B09 "Rubella, combinations with mumps, live attenuated" * $ICD11#XM9744 "Diphtheria, rubella, tetanus vaccines" +* $ICD11#XM8TF3 "Measles, combinations with mumps and rubella, live attenuated" +* $ICD11#XM21H2 "Measles, combinations with rubella, live attenuated" +* $ICD11#XM4AJ8 "Measles, combinations with mumps, rubella and varicella, live attenuated" +* $LNC#30940-1 "Measles virus+Mumps virus+Rubella virus dose count in combination vaccine" * $SCT#836388000 "Rubella virus antigen-containing vaccine product" \ No newline at end of file diff --git a/input/fsh/valuesets/IMMZ.Z.DE24.fsh b/input/fsh/valuesets/IMMZ.Z.DE24.fsh index e0c10fc155..7376db8bcf 100644 --- a/input/fsh/valuesets/IMMZ.Z.DE24.fsh +++ b/input/fsh/valuesets/IMMZ.Z.DE24.fsh @@ -17,4 +17,8 @@ Description: "Vaccine terminology codes for Diphtheria-tetanus-pertussis contai * $ICD11#XM1G86 "Tetanus toxoid, combinations with diphtheria toxoid vaccines" * $ICD11#XM21E6 "Diphtheria tetanus, acellular pertussis, inactivated polio virus, haemophilus Influenzae type B vaccines" * $ICD11#XM9JP8 "Diphtheria, tetanus, acellular pertussis, inactivated polio virus vaccines" -* $SCT#774618008 "Whole cell Bordetella pertussis and Clostridium tetani toxoid adsorbed and Corynebacterium diphtheriae toxoid antigens only vaccine product" \ No newline at end of file +* $ICD11#XM32Q5 "Tetanus and diphtheria vaccines" +* $ICD11#XM4039 "Vaccines diphtheria with tetanus" + +* $SCT#774618008 "Whole cell Bordetella pertussis and Clostridium tetani toxoid adsorbed and Corynebacterium diphtheriae toxoid antigens only vaccine product" +* $SCT#871875004 "Bordetella pertussis and Clostridium tetani and Corynebacterium diphtheriae antigens only vaccine product" diff --git a/input/fsh/valuesets/IMMZ.Z.DE28.fsh b/input/fsh/valuesets/IMMZ.Z.DE28.fsh index 02f2157f3f..f08c05577e 100644 --- a/input/fsh/valuesets/IMMZ.Z.DE28.fsh +++ b/input/fsh/valuesets/IMMZ.Z.DE28.fsh @@ -6,6 +6,22 @@ Description: "Vaccine terminology codes for Tetanus and diphtheria containing v * ^experimental = false * ^name = "IMMZ_Z_DE28" -* $ICD11#XXM32Q5 "Tetanus and diphtheria vaccines" -* $ICD11#XXM4039 "Vaccines diphtheria with tetanus" -* $ICD11#XXM1G86 "Tetanus toxoid, combinations with diphtheria toxoid vaccines" \ No newline at end of file +* $ICD11#XM32Q5 "Tetanus and diphtheria vaccines" +* $ICD11#XM4039 "Vaccines diphtheria with tetanus" +* $ICD11#XM1G86 "Tetanus toxoid, combinations with diphtheria toxoid vaccines" +* $ICD11#XM31Q8 "Tetanus, diphtheria, acellular pertussis vaccines" +* $ICD11#XM1LX9 "Diphtheria, hemophilus influenzae B, pertussis, poliomyelitis, tetanus vaccines" +* $ICD11#XM84S1 "Diphtheria, hepatitis B, tetanus, acellular pertussis, inactivated polio virus, haemophilus Influenzae type B vaccines" +* $ICD11#XM7JP3 "Diphtheria, hemophilus influenzae B, pertussis, tetanus, hepatitis B vaccines" +* $ICD11#XM5XP9 "Diphtheria, hemophilus influenzae B, pertussis, tetanus-hepatitis B, meningococcus A + C vaccines" +* $ICD11#XM41N3 "Diphtheria, hepatitis B, pertussis, tetanus vaccines" +* $ICD11#XM09Q7 "Diphtheria, pertussis, poliomyelitis, tetanus vaccines" +* $ICD11#XM0LT9 "Diphtheria, pertussis, poliomyelitis, tetanus, hepatitis B vaccines" +* $ICD11#XM21E6 "Diphtheria tetanus, acellular pertussis, inactivated polio virus, haemophilus Influenzae type B vaccines" +* $ICD11#XM9JP8 "Diphtheria, tetanus, acellular pertussis, inactivated polio virus vaccines" +* $ICD11#XM9744 "Diphtheria, rubella, tetanus vaccines" +* $ICD11#XM8AW1 "Diphtheria, poliomyelitis, tetanus vaccines" +* $ICD11#XM3G68 "Diphtheria, hepatitis B, tetanus vaccines" + +* $SCT#774618008 "Whole cell Bordetella pertussis and Clostridium tetani toxoid adsorbed and Corynebacterium diphtheriae toxoid antigens only vaccine product" +* $SCT#871875004 "Bordetella pertussis and Clostridium tetani and Corynebacterium diphtheriae antigens only vaccine product"