V430

.github/workflows/schema.yml

@@ -29,7 +29,7 @@ jobs:
           cd pyxb_build
           python setup.py bdist_wheel
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ukrdc_schema_wheel
           path: pyxb_build/dist/*.whl
@@ -66,7 +66,7 @@ jobs:
           ./build.sh
           python setup.py bdist_wheel
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ukrdc_xsdata_wheel
           path: xsdata_build/dist/*.whl
@@ -86,7 +86,7 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/')
 
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
 
       - name: Release
         uses: softprops/action-gh-release@v1

codes/code_lists/ukrr_observations.csv

@@ -1,61 +1,147 @@
 UKRR,QBLA1,Serum Creatinine,result
+UKRR,QBLA2,Date of serum creatinine,result
 UKRR,QBLA3,Serum Urea,result
 UKRR,QBLA4,Serum Bicarbonate,result
+UKRR,QBLA5,Date of bicarbonate,result
 UKRR,QBLA6,Serum Sodium,result
+UKRR,QBLA7,Date of sodium,result
 UKRR,QBLA9,Serum Potassium,result
+UKRR,QBLAA,Date of potassium,result
 UKRR,QBLAB,Lab Calculated eGFR,result
 UKRR,QBLAC,Serum Uric Acid (Urate),result
+UKRR,QBLAD,Date of serum uric acid (urate),result
+UKRR,QBLAJ,Date of serum urea,result
 UKRR,QBLAL,Unit Calculated eGFR,result
+UKRR,QBLAP,Glomerular filtration rate (GFR) predicted by creatinine based formula (CKD-EPI) WITHOUT ethnicity,result
+UKRR,QBLAQ,Date of CKD-EPI eGFR,result
+UKRR,QBLAR,Glomerular filtration rate (GFR) predicted by creatinine based formula (MDRD) WITHOUT ethnicity,result
+UKRR,QBLAS,Date of MDRD eGFR,result
 UKRR,QBLB1,Serum Phosphate,result
+UKRR,QBLB2,Date of serum phosphate,result
 UKRR,QBLB3,Serum Calcium,result
+UKRR,QBLBB,Date of serum calcium,result
 UKRR,QBLB4,Corrected Serum Calcium,result
+UKRR,QBLBC,Date of corrected/adjusted serum calcium,result
 UKRR,QBLB5,Serum Alkaline Phosphatase,result
+UKRR,QBLB6,Date of Serum alkaline phosphatase,result
 UKRR,QBLB7,Serum Albumin,result
+UKRR,QBLB8,Date of albumin,result
 UKRR,QBLB9,Serum Parathyroid Hormone (PTH),result
+UKRR,QBLBA,Date of PTH,result
 UKRR,QBLC1,Urine Protein:Creatinine Ratio,result
+UKRR,QBLC2,Date of urine protein:creatinine ratio2,result
 UKRR,QBLC3,Urine Albumin:Creatinine Ratio,result
+UKRR,QBLC4,Date of urine albumin:creatinine ratio,result
 UKRR,QBLD1,Total Serium Cholesterol,result
+UKRR,QBLD2,Date of serum cholesterol,result
 UKRR,QBLD3,Serum HDL Cholesterol,result
+UKRR,QBLDB,Date of serum HDL cholesterol,result
 UKRR,QBLD4,Serum LDL Cholesterol,result
+UKRR,QBLDC,Date of serum LDL cholesterol,result
 UKRR,QBLD5,Serum Triglycerides,result
+UKRR,QBLDF,Date of serum triglycerides,result
 UKRR,QBLD6,CRP,result
+UKRR,QBLD7,Date of CRP,result
 UKRR,QBLD8,Hba1c %,result
 UKRR,QBLDA,Hba1c,result
+UKRR,QBLD9,Date of HbA1c,result
 UKRR,QBLE1,Haemoglobin,result
 UKRR,QBLE3,MCH,result
 UKRR,QBLE4,Platelets,result
+UKRR,QBLE9,Date of platelets,result
 UKRR,QBLE5,WBC (from full blood count),result
+UKRR,QBLEA,Date of WBC,result
 UKRR,QBLEB,Haemloglobin,result
+UKRR,QBLE2,Date of haemoglobin,result
 UKRR,QBLF1,Serum Ferritin,result
+UKRR,QBLF2,Date of serum ferritin,result
 UKRR,QBLF3,Transferrin Saturation,result
+UKRR,QBLF4,Date of transferrin saturation,result
 UKRR,QBLF5,Percentage of Hypochromic Cells,result
+UKRR,QBLF6,Date of hypochromic red cells,result
 UKRR,QBLF7,Serum B12,result
+UKRR,QBLF8,Date of serum B12,result
 UKRR,QBLF9,Serum Folate,result
+UKRR,QBLFA,Date of serum folate,result
 UKRR,QBLFB,Red Cell Folate,result
+UKRR,QBLFC,Date of red cell folate,result
 UKRR,QBLFD,Serum Aluminium,result
 UKRR,QBLFF,Tacrolimus Blood Concentration Level,result
+UKRR,QBLFG,Date of tacrolimus blood concentration level,result
 UKRR,QBLFH,Sirolimus Blood Concentration Level,result
+UKRR,QBLFJ,Date of sirolimus blood concentration level,result
 UKRR,QBLFK,Ciclosporin Blood Concentration Level,result
+UKRR,QBLFL,Date of ciclosporin blood concentration level,result
 UKRR,QBLFM,Mycophenolate Blood Concentration Level,result
+UKRR,QBLFN,Date of mycophenolate blood concentration level,result
 UKRR,QBLG1,Weight,observation
+UKRR,QBLG2,Date of weight,observation
 UKRR,QBLG3,Systolic BP,observation
 UKRR,QBLG4,Diastolic BP,observation
+UKRR,QBLG5,Date of Blood Pressure,observation
+UKRR,QBLG6,Post dialysis systolic blood pressure,observation
+UKRR,QBLG7,Post dialysis diastolic blood pressure,observation
+UKRR,QBLG8,Date of post dialysis blood pressure,observation
 UKRR,QBLG9,Urea Reduction Ratio,result
+UKRR,QBLGA,Date of urea reduction ratio,result
 UKRR,QBLGG,Kt/V,result
+UKRR,QBLGH,Date of Kt/V,result
 UKRR,QBLGB,Height,observation
+UKRR,QBLGC,Date of Height,observation
+UKRR,QBLKS,Body weight measured post dialysis,observation
+UKRR,QBLKT,Date of body weight measured post dialysis,observation
+UKRR,QBLKU,Symptoms of peritonitis,observation
+UKRR,QBLKV,Date of peritonitis symptoms,observation
+UKRR,QBLGN,COVID-19 antigen PCR,result
+UKRR,QBLGP,Date of COVID-19 antigen PCR,result
+UKRR,QBLGS,COVID-19 IgG antibody status,result
+UKRR,QBLGT,Date of COVID-19 IgG antibody status,result
+UKRR,QBLGU,PSA - prostate specific antigen,result
+UKRR,QBLGV,Date of PSA test,result
+UKRR,QBLH1,BK Virus status,result
+UKRR,QBLH2,Date of BK Virus status,result
 UKRR,QBLHA,HBV Antibody Status,result
+UKRR,QBLHB,Date of test HBV surface antibody,result
 UKRR,QBLHC,HBV Surface Antigen Status,result
+UKRR,QBLHD,Date of test HBV surface antigen,result
 UKRR,QBLHE,HCV Antibody Status,result
+UKRR,QBLHF,Date of test HCV surface antibody,result
 UKRR,QBLHG,CMV Antibody Status,result
 UKRR,QBLHK,CMV PCR Copies/ML,result
 UKRR,QBLHM,HIV Antigen Status,result
+UKRR,QBLHL,Date HIV screening test,result
 UKRR,QBLHN,Varicella,result
 UKRR,QBLHR,EBV Status,result
 UKRR,QBLHS,EBV Log Count,result
+UKRR,QBLHU,Date of urine volume in 24 hours,result
 UKRR,QBLHV,Urine Volume in 24 Hours,observation
 UKRR,QBLHX,Urinary Creatinine Extraction,result
+UKRR,QBLHY,Date of urine creatinine concentration,result
+UKRR,QBLKE,Serum creatinine - post dialysis,result
+UKRR,QBLKF,Date of post dialysis creatinine,result
+UKRR,QBLKG,Serum urea - post dialysis,result
+UKRR,QBLKH,Date of post dialysis urea,result
+UKRR,QBLKL,Serum potassium - post dialysis,result
+UKRR,QBLKM,Date of post dialysis potassium,result
+UKRR,QBLKN,Serum sodium - post dialysis,result
+UKRR,QBLKP,Date of post dialysis sodium,result
+UKRR,QBLKQ,Serum bicarbonate  - post dialysis,result
+UKRR,QBLKR,Date of post dialysis bicarbonate,result
 UKRR,QBLPA,PTH ULN,result
 UKRR,QBLPB,PTH / PTHH ULN Ratio,result
 UKRR,QBLPC,ALT,result
+UKRR,QBLJB,Date of ALT,result
+UKRR,QBLJJ,Reticulocyte haemoglobin (CHr),result
+UKRR,QBLJK,Date of reticulocyte haemoglobin,result
+UKRR,QBLJL,Proteinuria dipstick test,result
+UKRR,QBLJM,Date of Proteinuria dipstick test,result
+UKRR,QBLJN,PD fluid WCC count,result
+UKRR,QBLJP,Date of PD fluid WCC count,result
+UKRR,QBLJQ,PD fluid culture organism grown text,result
+UKRR,QBLJR,Date of PD fluid culture test,result
+UKRR,QBLJS,Urine protein concentration,result
+UKRR,QBLJT,Date of urinary protein concentration,result
+UKRR,QBLJX,Blood culture organism grown text **,result
+UKRR,QBLJY,Date of blood culture test,result
 UKRR,QBLPD,ANC,result
 UKRR,QBLPE,ALC,result

schema/ukrdc/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 4.3.0 - ???
+### Changed
+- Make Treatment/AdmitReason mandatory
+- Make Treatment/HealthCareFacility mandatory
+- Make Medication/FromTime mandatory
+- Increase Max Length of SendingFacility
+- Add "IND" to InterpretationCodes
+- 111 (COVID 19) has been added to the EDTA_COD code list.
+- Modify PRD and COD Types - remove the enumeration so any SNOMED code can be submitted
+
 ## 4.2.0 - 2024-02-26
 ### Changed
 - Restricted Treatment/VisitDescription to 255 characters
@@ -35,7 +45,9 @@
 - Amended Treatment to remove items not in V5.
 - Added V5 Treatment Modality Codes.
 
-
+## 3.5.0 - 2023-09-15
+### Changed
+- Add 101 (First Seen) to the RR7 Treatment List
 
 ### 3.4.5 - 2023-06-14
 ### Changed

schema/ukrdc/Encounters/Treatment.xsd

@@ -39,13 +39,13 @@
                     <xs:documentation>Responsible Clinician as a National Clinicial code where possible or other local code if not.</xs:documentation>
                 </xs:annotation>
             </xs:element>
-            <xs:element name="HealthCareFacility" type="Location" minOccurs="0">
+            <xs:element name="HealthCareFacility" type="Location" minOccurs="1">
                 <xs:annotation>
                     <!-- <xs:appinfo>UKRRv4,UKRRv5,PKB,RADAR</xs:appinfo> -->
                     <xs:documentation>Treatment Centre (TXT20)</xs:documentation>
                 </xs:annotation>
             </xs:element>
-            <xs:element name="AdmitReason" type="CF_RR7_TREATMENT" minOccurs="0">
+            <xs:element name="AdmitReason" type="CF_RR7_TREATMENT" minOccurs="1">
                 <xs:annotation>
                     <!-- <xs:appinfo>UKRRv4,UKRRv5,PKB,RADAR</xs:appinfo> -->
                     <xs:documentation>Modality</xs:documentation>

schema/ukrdc/LabOrders/LabOrder.xsd

@@ -306,6 +306,11 @@
                                 <xs:documentation>Unknown</xs:documentation>
                             </xs:annotation>
                         </xs:enumeration>
+                        <xs:enumeration value="IND">
+                            <xs:annotation>
+                                <xs:documentation>Indeterminate</xs:documentation>
+                            </xs:annotation>
+                        </xs:enumeration>
                     </xs:restriction>
                 </xs:simpleType>
             </xs:element>

schema/ukrdc/Medications/Medication.xsd

@@ -5,6 +5,7 @@
     <xs:include schemaLocation="../Types/DrugProduct.xsd"/>
     <xs:include schemaLocation="../Types/Location.xsd"/>
     <xs:include schemaLocation="../Types/CommonMetadata.xsd"/>
+    <xs:include schemaLocation="../Types/Route.xsd"/>
 
     <xs:complexType name="Medication">
         <xs:annotation>
@@ -24,7 +25,7 @@
                     </xs:restriction>
                 </xs:simpleType>
             </xs:element>
-            <xs:element name="FromTime" type="xs:dateTime">
+            <xs:element name="FromTime" type="xs:dateTime" minOccurs="1">
                 <xs:annotation>
                     <!-- <xs:appinfo>medication.fromtime</xs:appinfo> -->
                     <!-- <xs:appinfo>UKRRv4,UKRRv5,PKB,RADAR,INSApp</xs:appinfo> -->
@@ -44,37 +45,11 @@
                     <xs:documentation>Where the Medicine was Prescribed</xs:documentation>
                 </xs:annotation>
             </xs:element>
-            <xs:element name="Route" minOccurs="0">
+            <xs:element name="Route" type="Route" minOccurs="0">
                 <xs:annotation>
                     <!-- <xs:appinfo>UKRRv4,UKRRv5,PKB,RADAR,INSApp</xs:appinfo> -->
                     <xs:documentation>Medication Route</xs:documentation>
                 </xs:annotation>
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element name="CodingStandard" minOccurs="0">
-                            <xs:simpleType>
-                                <xs:restriction base="xs:string">
-                                    <xs:enumeration value="SNOMED"/>
-                                    <xs:enumeration value="RR22"/>
-                                </xs:restriction>
-                            </xs:simpleType>
-                        </xs:element>
-                        <xs:element name="Code" minOccurs="0">
-                            <xs:simpleType>
-                                <xs:restriction base="xs:string">
-                                    <xs:maxLength value="18"/>
-                                </xs:restriction>
-                            </xs:simpleType>
-                        </xs:element>
-                        <xs:element name="Description" minOccurs="0">
-                            <xs:simpleType>
-                                <xs:restriction base="xs:string">
-                                    <xs:maxLength value="100"/>
-                                </xs:restriction>
-                            </xs:simpleType>
-                        </xs:element>
-                    </xs:sequence>
-                </xs:complexType>
             </xs:element>
             <xs:element name="DrugProduct" type="DrugProduct"/>
             <xs:element name="Frequency" minOccurs="0">