diff --git a/input/fsh/examples.fsh b/input/fsh/examples.fsh index 48a28e156..0685af6ef 100644 --- a/input/fsh/examples.fsh +++ b/input/fsh/examples.fsh @@ -1025,7 +1025,7 @@ Title: "Service Request - Referred to PMTCT" Description: "Represents a service request for the patient's referral to PMTCT." * status = #completed * intent = #order -* code = $SCT#3457005 +* code = $LNC#LP173238-9 * code.text = "Patient referral" * subject = Reference(GeneralPatientExample) * encounter = Reference(GeneralEncounterExample) @@ -1464,8 +1464,8 @@ Description: "This is used to record the patient's cervical cancer screening typ Instance: CervicalCancerScreeningMethodExample InstanceOf: CervicalCancerScreeningMethod Usage: #example -Title: "Observation - Cervical Cancer Screening Method" -Description: "This is used to record the patient's cervical cancer screening method." +Title: "Observation - Cervical Cancer Screening HPV Method" +Description: "This is used to record the patient's cervical cancer screening method as HPV." * status = #final * category = $OBSERVATION_CATEGORY#exam * code = $SCT#171149006 @@ -1475,6 +1475,7 @@ Description: "This is used to record the patient's cervical cancer screening met * encounter = Reference(GeneralEncounterExample) * performer = Reference(CurrentServiceProviderExample) * effectiveDateTime = "2024-01-25" +* basedOn = Reference(CervicalCancerScreeningServiceRequestForHPVExample) Instance: CervicalCancerHPVPositiveScreeningResultExample InstanceOf: CervicalCancerScreeningResult @@ -1491,7 +1492,7 @@ Description: "Indicates that the patient has a positive screening for HPV." * performer = Reference(CurrentServiceProviderExample) * effectiveDateTime = "2024-01-25" * derivedFrom = Reference(CervicalCancerScreeningDoneExample) -* basedOn = Reference(CervicalCancerCarePlanFullExample) +* basedOn = Reference(CervicalCancerCarePlanHPVWithTreatmentRequestExample) Instance: CervicalCancerVIAPositiveScreeningResultExample InstanceOf: CervicalCancerScreeningResult @@ -1508,7 +1509,7 @@ Description: "Indicates that the patient has a positive screening for VIA." * performer = Reference(CurrentServiceProviderExample) * effectiveDateTime = "2024-01-25" * derivedFrom = Reference(CervicalCancerScreeningDoneExample) -* basedOn = Reference(CervicalCancerCarePlanFullExample) +* basedOn = Reference(CervicalCancerCarePlanVIAWithTreatmentRequestExample) Instance: CervicalCancerHPVNegtiveScreeningResultExample InstanceOf: CervicalCancerScreeningResult @@ -1896,8 +1897,8 @@ Description: "Used to record the OI medication (Fluconazole) that will be prescr * code = $LNC#18924-1 * code.text = "Fluconazole" -Instance: ReferralWithinFacilitytExample -InstanceOf: ReferralInServiceRequest +Instance: ReferralWithinFacilityExample +InstanceOf: HIVReferralInServiceRequest Usage: #example Title: "Service Request - Incoming Referral From Within Facility - (Existing ART Client)" Description: "Used to capture a pateint's referral information." @@ -1914,7 +1915,7 @@ Description: "Used to capture a pateint's referral information." * reasonCode = $LNC#LA6517-2 Instance: ReferralFromOutsideFacilitytExample -InstanceOf: ReferralInServiceRequest +InstanceOf: HIVReferralInServiceRequest Usage: #example Title: "Service Request - Incoming Referral From Outside Facility - (New ART Client)" Description: "Used to capture a pateint's referral information." @@ -2216,7 +2217,7 @@ Description: "Records the health related activities for patients associated with * type.coding[ART] = $LNC#LP66375-4 * patient = Reference(GeneralPatientExample) * managingOrganization = Reference(CurrentServiceProviderExample) -* referralRequest[Incoming] = Reference(ReferralWithinFacilitytExample) +* referralRequest[Incoming] = Reference(ReferralWithinFacilityExample) Instance: HIVEpisodeOfCareReferralFromOutsideFacilityExample InstanceOf: EthEpisodeOfCare @@ -3761,4 +3762,176 @@ Description: "Adds the prescribed medication of INH to the medication history fo * subject = Reference(GeneralPatientExample) * context = Reference(GeneralEncounterExample) * effectivePeriod.start = "2009-11-24" -* reasonReference = Reference(TBProphylaxisTypeINHObservationExample) \ No newline at end of file +* reasonReference = Reference(TBProphylaxisTypeINHObservationExample) + +Instance: CervicalCancerScreeningServiceRequestForHPVExample +InstanceOf: CervicalCancerScreeningServiceRequest +Usage: #example +Title: "Service Request - Cervical Cancer Screening HPV Method" +Description: "Represents the service request for the HPV method of cervical cancer screening." +* status = #active +* intent = #order +* code = $CERVICAL_CANCER_SCREENING_METHOD#hpv-dna-test +* subject = Reference(GeneralPatientExample) +* encounter = Reference(GeneralEncounterExample) +* authoredOn = "2024-01-25" + +Instance: CervicalCancerDiagnosticReportForHPVExample +InstanceOf: CervicalCancerDiagnosticReport +Usage: #example +Title: "Diagnostic Report - Tested Positive for Cervical Cancer (HPV)" +Description: "Indicates that the patient tested HPV positive for cervical cancer." +* status = #final +* category = $LNC#11502-2 +* code = $LNC#72135-7 +* subject = Reference(GeneralPatientExample) +* encounter = Reference(GeneralEncounterExample) +* result = Reference(CervicalCancerHPVPositiveScreeningResultExample) +* issued = "2024-01-25T11:45:33+11:00" +* basedOn = Reference(CervicalCancerScreeningServiceRequestForHPVExample) +* performer = Reference(CurrentServiceProviderExample) + +Instance: CervicalCancerTreatmentServiceRequestForHPVExample +InstanceOf: CervicalCancerTreatmentServiceRequest +Usage: #example +Title: "Service Request - Request for Cryotherapy as Treatment for Cervical Cancer (HPV Positive)" +Description: "Indicates that a request was made for cryotherapy as the targeted treatment for the HPV positive patient" +* status = #active +* intent = #order +* code = $PRECANCEROUS_TREAT#cryotherapy +* subject = Reference(GeneralPatientExample) +* encounter = Reference(GeneralEncounterExample) +* authoredOn = "2024-01-25" +* reasonReference = Reference(CervicalCancerDiagnosticReportForHPVExample) + +Instance: CervicalCancerTreatmentReceivedForHPVExample +InstanceOf: CervicalCancerTreatmentReceived +Usage: #example +Title: "Observation - Received Cryotherapy Treatment For the HPV+ Diagnosis" +Description: "Indicates that the patient received cryotherapy as treatment after being diagnosed psoitive for cervical cancer (using HPV as the method)." +* status = #final +* category = $OBSERVATION_CATEGORY#therapy +* code = $LNC#LA13405-8 +* code.text = "Treatment received" +* subject = Reference(GeneralPatientExample) +* encounter = Reference(GeneralEncounterExample) +* effectiveDateTime = "2023-12-11" +* performer = Reference(CurrentServiceProviderExample) +* valueDateTime = "2023-12-11" +* basedOn = Reference(CervicalCancerScreeningServiceRequestForHPVExample) + +Instance: CervicalCancerCarePlanHPVExample +InstanceOf: CervicalCancerCarePlan +Usage: #example +Title: "Care Plan - Request for Cervical Cancer Screening (HPV Method)" +Description: "Indicates the activity associated with the request for cervical cancer screening using HPV as the method of screening." +* status = #active +* intent = #order +* created = "2024-03-20" +* category[+] = $LNC#LP173209-0 +* category[=].text = "Cervical cancer" +* subject = Reference(GeneralPatientExample) +* encounter = Reference(GeneralEncounterExample) +* activity[+].reference = Reference(CervicalCancerScreeningServiceRequestForHPVExample) + +Instance: CervicalCancerCarePlanHPVWithTreatmentRequestExample +InstanceOf: CervicalCancerCarePlan +Usage: #example +Title: "Care Plan - Request for Cervical Cancer Screening (HPV Method) - Incl. the Service Request For Cryotherapy Treatment" +Description: "Indicates the activities associated with the requests for cervical cancer screening (using HPV as the method) and cryotherapy as the received treatment." +* status = #active +* intent = #order +* created = "2024-03-20" +* category[+] = $LNC#LP173209-0 +* category[=].text = "Cervical cancer" +* subject = Reference(GeneralPatientExample) +* encounter = Reference(GeneralEncounterExample) +* activity[+].reference = Reference(CervicalCancerScreeningServiceRequestForHPVExample) +* activity[=].reference = Reference(CervicalCancerTreatmentServiceRequestForHPVExample) +* activity[=].outcomeReference = Reference(CervicalCancerTreatmentReceivedForHPVExample) + +Instance: CervicalCancerScreeningServiceRequestForVIAExample +InstanceOf: CervicalCancerScreeningServiceRequest +Usage: #example +Title: "Service Request - Cervical Cancer Screening VIA Method" +Description: "Represents the service request for the VIA method of cervical cancer screening." +* status = #active +* intent = #order +* code = $CERVICAL_CANCER_SCREENING_METHOD#via-test +* subject = Reference(GeneralPatientExample) +* encounter = Reference(GeneralEncounterExample) +* authoredOn = "2024-01-25" + +Instance: CervicalCancerDiagnosticReportForVIAExample +InstanceOf: CervicalCancerDiagnosticReport +Usage: #example +Title: "Diagnostic Report - Tested Positive for Cervical Cancer (VIA)" +Description: "Indicates that the patient tested VIA positive for cervical cancer." +* status = #final +* category = $LNC#11502-2 +* code = $LNC#72135-7 +* subject = Reference(GeneralPatientExample) +* encounter = Reference(GeneralEncounterExample) +* result = Reference(CervicalCancerVIAPositiveScreeningResultExample) +* issued = "2024-01-25T11:45:33+11:00" +* basedOn = Reference(CervicalCancerScreeningServiceRequestForVIAExample) +* performer = Reference(CurrentServiceProviderExample) + +Instance: CervicalCancerTreatmentServiceRequestForVIAExample +InstanceOf: CervicalCancerTreatmentServiceRequest +Usage: #example +Title: "Service Request - Request for Cryotherapy as Treatment for Cervical Cancer (VIA Positive)" +Description: "Indicates that a request was made for cryotherapy as the targeted treatment for the VIA positive patient" +* status = #active +* intent = #order +* code = $PRECANCEROUS_TREAT#cryotherapy +* subject = Reference(GeneralPatientExample) +* encounter = Reference(GeneralEncounterExample) +* authoredOn = "2024-01-25" +* reasonReference = Reference(CervicalCancerDiagnosticReportForVIAExample) + +Instance: CervicalCancerTreatmentReceivedForVIAExample +InstanceOf: CervicalCancerTreatmentReceived +Usage: #example +Title: "Observation - Received Cryotherapy Treatment For the VIA+ Diagnosis" +Description: "Indicates that the patient received cryotherapy as treatment after being diagnosed psoitive for cervical cancer (using VIA as the method)." +* status = #final +* category = $OBSERVATION_CATEGORY#therapy +* code = $LNC#LA13405-8 +* code.text = "Treatment received" +* subject = Reference(GeneralPatientExample) +* encounter = Reference(GeneralEncounterExample) +* effectiveDateTime = "2023-12-11" +* performer = Reference(CurrentServiceProviderExample) +* valueDateTime = "2023-12-11" +* basedOn = Reference(CervicalCancerScreeningServiceRequestForVIAExample) + +Instance: CervicalCancerCarePlanVIAExample +InstanceOf: CervicalCancerCarePlan +Usage: #example +Title: "Care Plan - Request for Cervical Cancer Screening (VIA Method)" +Description: "Indicates the activity associated with the request for cervical cancer screening using VIA as the method of screening." +* status = #active +* intent = #order +* created = "2024-03-20" +* category[+] = $LNC#LP173209-0 +* category[=].text = "Cervical cancer" +* subject = Reference(GeneralPatientExample) +* encounter = Reference(GeneralEncounterExample) +* activity[+].reference = Reference(CervicalCancerScreeningServiceRequestForVIAExample) + +Instance: CervicalCancerCarePlanVIAWithTreatmentRequestExample +InstanceOf: CervicalCancerCarePlan +Usage: #example +Title: "Care Plan - Request for Cervical Cancer Screening (VIA Method) - Incl. the Service Request For Cryotherapy Treatment" +Description: "Indicates the activities associated with the requests for cervical cancer screening (using VIA as the method) and cryotherapy as the received treatment." +* status = #active +* intent = #order +* created = "2024-03-20" +* category[+] = $LNC#LP173209-0 +* category[=].text = "Cervical cancer" +* subject = Reference(GeneralPatientExample) +* encounter = Reference(GeneralEncounterExample) +* activity[+].reference = Reference(CervicalCancerScreeningServiceRequestForVIAExample) +* activity[=].reference = Reference(CervicalCancerTreatmentServiceRequestForVIAExample) +* activity[=].outcomeReference = Reference(CervicalCancerTreatmentReceivedForVIAExample) \ No newline at end of file diff --git a/input/fsh/profiles.fsh b/input/fsh/profiles.fsh index 60a52ae2c..55e823550 100644 --- a/input/fsh/profiles.fsh +++ b/input/fsh/profiles.fsh @@ -346,7 +346,7 @@ Title: "Service Request - Cervical Cancer Screening Method" Description: "Represents the service request for the method of cervical cancer screening." * code from CervicalCancerScreeningMethodValueSet (required) * category 1..1 -* category = $LNC#LP114948-5 +* category = $LNC#LP94892-4 * authoredOn 1..1 Profile: CervicalCancerDiagnosticReport @@ -366,7 +366,7 @@ Title: "Service Request - Cervical Cancer Treatment" Description: "Represents the service request for the cervical cancer treatment." * code from CervicalCancerTreatmentReceivedValueSet (required) * category 1..1 -* category = $LNC#LP114959-2 +* category = $LNC#89429-5 * authoredOn 1..1 * reasonReference 1..1 * reasonReference only Reference(CervicalCancerDiagnosticReport) @@ -377,7 +377,7 @@ Id: cervical-cancer-treatment-received-observation Title: "Observation - Cervical Cancer Treatment Received" Description: "This is used to record the date the patient received cervical cancer treatment." * category 1..1 -* category = $OBSERVATION_CATEGORY#exam +* category = $OBSERVATION_CATEGORY#therapy * code = $LNC#LA13405-8 * value[x] only dateTime * valueDateTime 1..1 @@ -535,6 +535,8 @@ Parent: GenericServiceRequest Id: tb-screening-service-request Title: "Service Request - TB Screening" Description: "Service request used to examine the specimen taken during TB screening." +* category 1..1 +* category = $LNC#LP94892-4 * code from TBScreeningDiagnosticTestTypeValueSet (required) * reasonReference 1..1 * reasonReference only Reference(TBScreeningResultObservation) @@ -640,6 +642,8 @@ Title: "Service Request - PCR HIV Test" Description: "Represents the service request for PCR HIV testing." * code = $LNC#9836-8 * authoredOn 1..1 +* category 1..1 +* category = $LNC#LP94892-4 Profile: ConfirmedHIVPositive Parent: GenericObservation @@ -939,7 +943,7 @@ Parent: GenericServiceRequest Id: referred-for-pmtct-service-request Title: "Service Request - Patient Referral to PMTCT" Description: "Represents a service request for the patient's referral to PMTCT." -* code = $SCT#3457005 +* code = $LNC#LP173238-9 * authoredOn 1..1 * insert Slice(orderDetail, reasons why this should be supported, value, coding, open, Slicing the items based on the linkId value, false) * orderDetail contains @@ -1497,13 +1501,14 @@ Description: "This is used to record the type for the ARV regimen change categor Profile: ReferralOutServiceRequest Parent: GenericServiceRequest -Id: refferal-out-service-request +Id: referral-out-service-request Title: "Service Request - Request for Referral" Description: "Service request used to make a request for a referral." * intent = #order * code = $LNC#LP173238-9 * locationReference 1..* * authoredOn 1..1 +* reasonReference 1..* Profile: ARVMedicationAdministration Parent: MedicationAdministration @@ -1546,7 +1551,7 @@ Description: "Used to record the OI medication that will be prescribed to the pa * code from OpportunisticInfectionsTreatmentValueSet (required) * code.text 1..1 -Profile: ReferralInServiceRequest +Profile: HIVReferralInServiceRequest Parent: GenericServiceRequest Id: referral-in-service-request Title: "Service Request - Incoming Referral Information" @@ -1790,7 +1795,7 @@ Description: "Records the health related activities for patients associated with * referralRequest[Incoming] ^definition = "reason(s) why this should be supported." -* referralRequest[Incoming] only Reference(ReferralInServiceRequest) +* referralRequest[Incoming] only Reference(HIVReferralInServiceRequest) * referralRequest[Outgoing] ^definition = "reason(s) why this should be supported." diff --git a/input/fsh/terminology.fsh b/input/fsh/terminology.fsh index 242671179..73930718d 100644 --- a/input/fsh/terminology.fsh +++ b/input/fsh/terminology.fsh @@ -223,7 +223,7 @@ Description: "A list of codes describing the precancerous lesion treatment recei * #leep "LEEP" * #referred-for-leep "Referred for LEEP" * #referred-for-suspicious-cancer-evaluation "Referred for Suspicious cancer evaluation" -//* #other "Other" +* #other "Other" ValueSet: CervicalCancerTreatmentReceivedValueSet Id: cervical-cancer-treatment-received-value-set