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

Elements and Common Refactoring Fixed #46

Merged
merged 10 commits into from
Aug 12, 2024

Conversation

pmanko
Copy link
Member

@pmanko pmanko commented Aug 9, 2024

No description provided.

@pmanko pmanko changed the title Squashing to examine changes Elements and Common Refactoring Fixed Aug 9, 2024
@pmanko pmanko marked this pull request as draft August 9, 2024 23:59

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will combine(HIE.patientGroups.code), ':') not work? I'm concerned about flatten.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah it should work - i need to take a look why it was giving me a nested list given the definition of the functions

Copy link
Collaborator

@ibacher ibacher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! Couple of small things.

Comment on lines 274 to 284
define function ExtractMedicationCode(choice Choice<FHIR.CodeableConcept, FHIR.Reference>):
case
when choice is FHIR.CodeableConcept then
choice as FHIR.CodeableConcept
when choice is FHIR.Reference then
First([Medication] M
where M.id = Last(Split(choice.reference, '/'))
return M.code as FHIR.CodeableConcept)
else
Message(null as FHIR.CodeableConcept, true, '1', 'Error', 'Cannot compute a medication code') // TODO: I'm sure that this is supported somehow?
end
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this element uses both spaces and tabs, which means the indentations renders inconsistently.

@@ -7,7 +7,7 @@ Usage: #definition
* meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-publishablelibrary"
* meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-library"
* meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
* url = "http://smart.who.int/hivIndicator/Library/HIVIndicatorElements"
* url = "http://smart.who.int/HIVIndicator/Library/HIVIndicatorElements"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be /hiv/HIVIndicator (or just /hiv/Library)?

@@ -1,5 +1,5 @@
/*
@DecisionID: HIV.B9.DT
@DecisionID: HIV.B9.DT Logic
Copy link
Collaborator

@ibacher ibacher Aug 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Logic" is the name of the library, but not the DecisionID (reviewing the SOP it should be @DecisionID: HIV.B9.DT.HIV Re-testing Recommendations

Suggested change
@DecisionID: HIV.B9.DT Logic
@DecisionID: HIV.B9.DT.HIV Re-testing Recommendations

Copy link
Collaborator

@ibacher ibacher Aug 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could put:

Library: HIV.B9.DT Logic

At the start for consistency?

@pmanko pmanko marked this pull request as ready for review August 12, 2024 23:16
@pmanko pmanko merged commit fefed6a into develop Aug 12, 2024
1 check passed
pmanko added a commit that referenced this pull request Aug 18, 2024
* Updated elements names (#36)

* Small fix to generated element comments

* WSG-90 HIV Indicators Update

Updated Common logic as well

* Updated naming and fixed some errors (#40)

* HIVB9DT (#42)

* WSG 97 indicators HIV.IND.28-35 (#41)

* Wsg 99 fixed (#45)

* IND 44

* IND 45

* Refactoring and updates to IND44 and IND45

* Updated Config file

* indicators 37-39

* Fixed IG Builder translation issues

* Elements and Common Refactoring Fixed (#46)

* Removed erroring include FHIRCommon

* Fixed EncounterElements

* Elements fixes

* Indicator fixes

* Validation fixes

* Review fixes

* Wsg 101 indicators 46 55 (#50)

* indicators 46-47

* HIVIND 46 - 52 updated

* indicators 46-55

* Implement B9 DT and B2 DT (#47)

* Start decision table logic for HIVB9DT; format HIVB7DTLogic

* Two HIV B decision tables

* Update HIVB2DTLogic.cql

* Fix sushi error

* WSG-102 Profile Authoring (#52)

* Profiling

* Previous work

* Fixed generation

* Unintended change removed

* Indicators 46-61 (#51)

* 62-63

* ind 63

* Updated FSH

---------

Co-authored-by: Patric Prado <pprado@caa.columbia.edu>
Co-authored-by: Ian <52504170+ibacher@users.noreply.github.com>
Co-authored-by: Mutesasira Moses <mozzymutesa@gmail.com>
@pmanko pmanko deleted the major-elements-refactoring-fixed branch August 18, 2024 19:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants