Skip to content

Commit

Permalink
#444: fix hl7v3 translation for deceasedInd=false
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian Ohr committed Mar 12, 2024
1 parent 05d0500 commit cd3e9cf
Show file tree
Hide file tree
Showing 5 changed files with 325 additions and 319 deletions.
2 changes: 1 addition & 1 deletion ...ovy/org/openehealth/ipf/commons/ihe/hl7v3/translation/PixFeedRequest3to2Translator.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ class PixFeedRequest3to2Translator implements Hl7TranslatorV3toV2 {
grp.PID[30].value = 'Y'
grp.PID[29][1].value = person.deceasedTime?.@value?.text() ?: ''
} else if (person.deceasedInd?.@value == 'false') {
grp.PID[24].value = 'N'
grp.PID[30].value = 'N'
}

// Segment PV1
Expand Down
2 changes: 1 addition & 1 deletion commons/ihe/hl7v3/src/test/resources/translation/pixfeed/v2/PIX_FEED_REG_Maximal_Request.hl7
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
MSH|^~\&|1.2.840.114350.1.13.99998.8734^1.2.840.114350.1.13.99998.8734^ISO|unknown|1.2.840.114350.1.13.99999.4567^1.2.840.114350.1.13.99999.4567^ISO|unknown|20091112115139||ADT^A01|345@21acf7be-007c-41e6-b176-d0969794983b|P^T|2.3.1EVN|A01|20091112115139PID|||PIX10515W3^^^HIMSS2005&1.3.6.1.4.1.21367.2005.1.1&ISO~PIX10515W4^^^&1.2.3.4.5.1000&ISO~PIX10515W5^^^domain2||WASHINGTON^MARY^ROSE^II^Dr.^^L~^ANNE^^^^^L~DEAN^^^^^^B||19771208|F||1004-1~1004-2|100 JORIE BLVD 5^^CHICAGO^IL^60523^US~1 SECOND ADDRESS^^CHICAGO^IL^60555||012-0001^PRN^PH~012-0003^PRN^CP~012-0004^PRN^[email protected]^NET^Internet|012-0002^WPN^PH|eng|M|1022|100-09-123456^^^&1.2.3&ISO|100-09-1234|||2178-2~2178-3|Chicago|||USPV1||O
MSH|^~\&|1.2.840.114350.1.13.99998.8734^1.2.840.114350.1.13.99998.8734^ISO|unknown|1.2.840.114350.1.13.99999.4567^1.2.840.114350.1.13.99999.4567^ISO|unknown|20091112115139||ADT^A01|345@21acf7be-007c-41e6-b176-d0969794983b|P^T|2.3.1EVN|A01|20091112115139PID|||PIX10515W3^^^HIMSS2005&1.3.6.1.4.1.21367.2005.1.1&ISO~PIX10515W4^^^&1.2.3.4.5.1000&ISO~PIX10515W5^^^domain2||WASHINGTON^MARY^ROSE^II^Dr.^^L~^ANNE^^^^^L~DEAN^^^^^^B||19771208|F||1004-1~1004-2|100 JORIE BLVD 5^^CHICAGO^IL^60523^US~1 SECOND ADDRESS^^CHICAGO^IL^60555||012-0001^PRN^PH~012-0003^PRN^CP~012-0004^PRN^[email protected]^NET^Internet|012-0002^WPN^PH|eng|M|1022|100-09-123456^^^&1.2.3&ISO|100-09-1234|||2178-2~2178-3|Chicago|||US||||NPV1||O
Expand Down
116 changes: 58 additions & 58 deletions ...ns/ihe/hl7v3/src/test/resources/translation/pixfeed/v3/PIX_FEED_MERGE_Maximal_Request.xml
View file
Original file line number Diff line number Diff line change
@@ -1,61 +1,61 @@
<PRPA_IN201304UV02 ITSVersion="XML_1.0" xmlns:urn="urn:hl7-org:v3" xmlns="urn:hl7-org:v3">
<id root="52918b99-dc72-4d17-8714-f39b9b6f16e8" extension="123"/>
<creationTime value="20091112115139"/>
<interactionId root="2.16.840.1.113883.1.6" extension="PRPA_IN201304UV02"/>
<processingCode code="P"/>
<processingModeCode code="T"/>
<acceptAckCode code="AL"/>
<receiver typeCode="RCV">
<device classCode="DEV" determinerCode="INSTANCE">
<id root="1.2.840.114350.1.13.99999.4567"/>
<asAgent classCode="AGNT">
<representedOrganization determinerCode="INSTANCE" classCode="ORG">
<id root="1.2.840.114350.1.13.99999.1234"/>
</representedOrganization>
</asAgent>
</device>
</receiver>
<sender typeCode="SND">
<device classCode="DEV" determinerCode="INSTANCE">
<id root="1.2.840.114350.1.13.99998.8734"/>
<asAgent classCode="AGNT">
<representedOrganization determinerCode="INSTANCE" classCode="ORG">
<id root="1.2.840.114350.1.13.99998"/>
</representedOrganization>
</asAgent>
</device>
</sender>
<controlActProcess classCode="CACT" moodCode="EVN">
<code code="PRPA_TE201304UV02" codeSystem="2.16.840.1.113883.1.6"/>
<subject typeCode="SUBJ">
<registrationEvent classCode="REG" moodCode="EVN">
<id nullFlavor="NA"/>
<statusCode code="active"/>
<subject1 typeCode="SBJ">
<patient classCode="PAT">
<id extension="120-01" root="1.2.3.4.5.1000"/>
<statusCode code="active"/>
<patientPerson classCode="PSN" determinerCode="INSTANCE">
<name>Unknown</name>
</patientPerson>
</patient>
</subject1>
<custodian typeCode="CST">
<assignedEntity classCode="ASSIGNED">
<id root="52918b99-dc72-4d17-8714-f39b9b6f16e8" extension="123"/>
<creationTime value="20091112115139"/>
<interactionId root="2.16.840.1.113883.1.6" extension="PRPA_IN201304UV02"/>
<processingCode code="P"/>
<processingModeCode code="T"/>
<acceptAckCode code="AL"/>
<receiver typeCode="RCV">
<device classCode="DEV" determinerCode="INSTANCE">
<id root="1.2.840.114350.1.13.99999.4567"/>
<asAgent classCode="AGNT">
<representedOrganization determinerCode="INSTANCE" classCode="ORG">
<id root="1.2.840.114350.1.13.99999.1234"/>
</representedOrganization>
</asAgent>
</device>
</receiver>
<sender typeCode="SND">
<device classCode="DEV" determinerCode="INSTANCE">
<id root="1.2.840.114350.1.13.99998.8734"/>
</assignedEntity>
</custodian>
<replacementOf typeCode="RPLC">
<priorRegistration classCode="REG" moodCode="EVN">
<statusCode code="obsolete"/>
<subject1 typeCode="SBJ">
<priorRegisteredRole classCode="PAT">
<id root="1.2.3.4.666" extension="120-02" assigningAuthorityName="domain1"/>
</priorRegisteredRole>
</subject1>
</priorRegistration>
</replacementOf>
</registrationEvent>
</subject>
</controlActProcess>
<asAgent classCode="AGNT">
<representedOrganization determinerCode="INSTANCE" classCode="ORG">
<id root="1.2.840.114350.1.13.99998"/>
</representedOrganization>
</asAgent>
</device>
</sender>
<controlActProcess classCode="CACT" moodCode="EVN">
<code code="PRPA_TE201304UV02" codeSystem="2.16.840.1.113883.1.6"/>
<subject typeCode="SUBJ">
<registrationEvent classCode="REG" moodCode="EVN">
<id nullFlavor="NA"/>
<statusCode code="active"/>
<subject1 typeCode="SBJ">
<patient classCode="PAT">
<id extension="120-01" root="1.2.3.4.5.1000"/>
<statusCode code="active"/>
<patientPerson classCode="PSN" determinerCode="INSTANCE">
<name>Unknown</name>
</patientPerson>
</patient>
</subject1>
<custodian typeCode="CST">
<assignedEntity classCode="ASSIGNED">
<id root="1.2.840.114350.1.13.99998.8734"/>
</assignedEntity>
</custodian>
<replacementOf typeCode="RPLC">
<priorRegistration classCode="REG" moodCode="EVN">
<statusCode code="obsolete"/>
<subject1 typeCode="SBJ">
<priorRegisteredRole classCode="PAT">
<id root="1.2.3.4.666" extension="120-02" assigningAuthorityName="domain1"/>
</priorRegisteredRole>
</subject1>
</priorRegistration>
</replacementOf>
</registrationEvent>
</subject>
</controlActProcess>
</PRPA_IN201304UV02>
Loading

0 comments on commit cd3e9cf

Please sign in to comment.