Skip to content

Commit 71cdc9f

Browse files
Alex-NitaAlex-Nita
committed
Fixed test data from ehr extract mapper.
1 parent cc146ea commit 71cdc9f

File tree

2 files changed

+346
-322
lines changed

2 files changed

+346
-322
lines changed

‎service/src/test/resources/ehr/request/fhir/output/expected-xml-with-observations-inside-report.xml‎

Lines changed: 157 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -39,133 +39,167 @@
3939
</AgentOrgSDS>
4040
</author>
4141
<responsibleParty typeCode="RESP">
42-
<agentDirectory classCode="AGNT">
43-
<part typeCode="PART">
44-
<Agent classCode="AGNT">
45-
<id root="test-id-3"/>
46-
<code nullFlavor="UNK">
47-
<originalText>Unknown</originalText>
48-
</code>
49-
<agentPerson classCode="PSN" determinerCode="INSTANCE">
50-
<name>
51-
<family>TEMPLE SOWERBY MEDICAL PRACTICE</family>
52-
</name>
53-
</agentPerson>
54-
</Agent>
55-
</part>
56-
</agentDirectory>
57-
</responsibleParty>
58-
<component typeCode="COMP">
59-
<ehrComposition classCode="COMPOSITION" moodCode="EVN">
60-
<id root="test-id-3" />
61-
<code code="109341000000100" displayName="GP to GP communication transaction" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"/>
62-
<statusCode code="COMPLETE" />
63-
<effectiveTime>
64-
<center value="20030221115000"/>
65-
</effectiveTime>
66-
<availabilityTime value="20030221115000"/>
67-
<author typeCode="AUT" contextControlCode="OP">
68-
<time value="20030221115000" />
69-
<agentRef classCode="AGNT">
70-
<id nullFlavor="UNK" />
71-
</agentRef>
72-
</author>
73-
<Participant2 typeCode="PRF" contextControlCode="OP">
74-
<agentRef classCode="AGNT">
75-
<id nullFlavor="UNK"/>
76-
</agentRef>
77-
</Participant2>
78-
<component typeCode="COMP">
79-
<CompoundStatement classCode="CLUSTER" moodCode="EVN">
80-
<id root="test-id-3"/>
81-
<code code="16488004" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="laboratory reporting">
82-
<originalText>Filed Report</originalText>
83-
</code>
84-
<statusCode code="COMPLETE"/>
85-
<effectiveTime>
86-
<center nullFlavor="NI"/>
87-
</effectiveTime>
88-
<availabilityTime value="20030221115000"/>
89-
<component typeCode="COMP" contextConductionInd="true">
90-
<NarrativeStatement classCode="OBS" moodCode="EVN">
91-
<id root="test-id-3"/>
92-
<text mediaType="text/x-h7uk-pmip">CommentType:LABORATORY RESULT COMMENT(E141)
93-
CommentDate:20030221115000
42+
<agentDirectory classCode="AGNT">
43+
<part typeCode="PART">
44+
<Agent classCode="AGNT">
45+
<id root="test-id-3"/>
46+
<code nullFlavor="UNK">
47+
<originalText>Unknown</originalText>
48+
</code>
49+
<agentPerson classCode="PSN" determinerCode="INSTANCE">
50+
<name>
51+
<family>TEMPLE SOWERBY MEDICAL PRACTICE</family>
52+
</name>
53+
</agentPerson>
54+
</Agent>
55+
</part>
56+
</agentDirectory>
57+
</responsibleParty>
58+
<component typeCode="COMP">
59+
<ehrComposition classCode="COMPOSITION" moodCode="EVN">
60+
<id root="test-id-3" />
61+
<code code="109341000000100" displayName="GP to GP communication transaction" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"/>
62+
<statusCode code="COMPLETE" />
63+
<effectiveTime>
64+
<center value="20030221115000"/>
65+
</effectiveTime>
66+
<availabilityTime value="20030221115000"/>
67+
<author typeCode="AUT" contextControlCode="OP">
68+
<time value="20030221115000" />
69+
<agentRef classCode="AGNT">
70+
<id nullFlavor="UNK" />
71+
</agentRef>
72+
</author>
73+
<Participant2 typeCode="PRF" contextControlCode="OP">
74+
<agentRef classCode="AGNT">
75+
<id nullFlavor="UNK"/>
76+
</agentRef>
77+
</Participant2>
78+
<component typeCode="COMP">
79+
<CompoundStatement classCode="CLUSTER" moodCode="EVN">
80+
<id root="test-id-3"/>
81+
<code code="16488004" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="laboratory reporting">
82+
<originalText>Filed Report</originalText>
83+
</code>
84+
<statusCode code="COMPLETE"/>
85+
<effectiveTime>
86+
<center nullFlavor="NI"/>
87+
</effectiveTime>
88+
<availabilityTime value="20030221115000"/>
89+
<component typeCode="COMP" contextConductionInd="true">
90+
<NarrativeStatement classCode="OBS" moodCode="EVN">
91+
<id root="test-id-3"/>
92+
<text mediaType="text/x-h7uk-pmip">CommentType:LABORATORY RESULT COMMENT(E141)
93+
CommentDate:20030221115000
9494

95-
Status: unknown</text>
96-
<statusCode code="COMPLETE"/>
97-
<availabilityTime value="20030221115000"/>
98-
</NarrativeStatement>
99-
</component><component typeCode="COMP" contextConductionInd="true">
100-
<NarrativeStatement classCode="OBS" moodCode="EVN">
101-
<id root="test-id-3"/>
102-
<text mediaType="text/x-h7uk-pmip">CommentType:AGGREGATE COMMENT SET
103-
CommentDate:20030221115000
95+
Status: unknown</text>
96+
<statusCode code="COMPLETE"/>
97+
<availabilityTime value="20030221115000"/>
98+
</NarrativeStatement>
99+
</component><component typeCode="COMP" contextConductionInd="true">
100+
<NarrativeStatement classCode="OBS" moodCode="EVN">
101+
<id root="test-id-3"/>
102+
<text mediaType="text/x-h7uk-pmip">CommentType:AGGREGATE COMMENT SET
103+
CommentDate:20030221115000
104104

105-
Filing Date: 2010-01-13</text>
106-
<statusCode code="COMPLETE"/>
107-
<availabilityTime value="20030221115000"/>
108-
</NarrativeStatement>
109-
</component><component typeCode="COMP" contextConductionInd="true">
110-
<NarrativeStatement classCode="OBS" moodCode="EVN">
111-
<id root="test-id-3"/>
112-
<text mediaType="text/x-h7uk-pmip">CommentType:USER COMMENT
113-
CommentDate:20030221115000
105+
Filing Date: 2010-01-13</text>
106+
<statusCode code="COMPLETE"/>
107+
<availabilityTime value="20030221115000"/>
108+
</NarrativeStatement>
109+
</component><component typeCode="COMP" contextConductionInd="true">
110+
<NarrativeStatement classCode="OBS" moodCode="EVN">
111+
<id root="test-id-3"/>
112+
<text mediaType="text/x-h7uk-pmip">CommentType:USER COMMENT
113+
CommentDate:20030221115000
114114

115-
This is some random free text</text>
116-
<statusCode code="COMPLETE"/>
117-
<availabilityTime value="20030221115000"/>
118-
</NarrativeStatement>
119-
</component>
120-
<component typeCode="COMP" contextConductionInd="true">
121-
<CompoundStatement classCode="CLUSTER" moodCode="EVN">
122-
<id root="test-id-3"/>
123-
<code code="123038009" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="specimen (specimen)"/>
124-
<statusCode code="COMPLETE"/>
125-
<effectiveTime>
126-
<center nullFlavor="NI"/>
127-
</effectiveTime>
128-
<availabilityTime value="20030221115000"/>
129-
<specimen typeCode="SPC">
130-
<specimenRole classCode="SPEC">
131-
<id root="test-id-3"/>
132-
<id root="2.16.840.1.113883.2.1.4.5.2" extension="G,03.0999008.K"/>
133-
<effectiveTime>
134-
<center value="20030109000000"/>
135-
</effectiveTime>
136-
<specimenSpecimenMaterial determinerCode="INSTANCE" classCode="MAT">
137-
<desc>Blood</desc>
138-
</specimenSpecimenMaterial>
139-
</specimenRole>
140-
</specimen>
141-
<component typeCode="COMP" contextConductionInd="true">
142-
<NarrativeStatement classCode="OBS" moodCode="EVN">
143-
<id root="test-id-3"/>
144-
<text mediaType="text/x-h7uk-pmip">CommentType:LAB SPECIMEN COMMENT(E271)
145-
CommentDate:20030109000000
115+
This is some random free text</text>
116+
<statusCode code="COMPLETE"/>
117+
<availabilityTime value="20030221115000"/>
118+
</NarrativeStatement>
119+
</component>
120+
<component typeCode="COMP" contextConductionInd="true">
121+
<CompoundStatement classCode="CLUSTER" moodCode="EVN">
122+
<id root="test-id-3"/>
123+
<code code="123038009" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="specimen (specimen)"/>
124+
<statusCode code="COMPLETE"/>
125+
<effectiveTime>
126+
<center nullFlavor="NI"/>
127+
</effectiveTime>
128+
<availabilityTime value="20030221115000"/>
129+
<specimen typeCode="SPC">
130+
<specimenRole classCode="SPEC">
131+
<id root="test-id-3"/>
132+
<id root="2.16.840.1.113883.2.1.4.5.2" extension="DUMMY"/>
133+
<effectiveTime>
134+
<center value="20030221115000"/>
135+
</effectiveTime>
136+
<specimenSpecimenMaterial determinerCode="INSTANCE" classCode="MAT">
137+
<desc>UNKNOWN</desc>
138+
</specimenSpecimenMaterial>
139+
</specimenRole>
140+
</specimen>
141+
<component typeCode="COMP" contextConductionInd="true">
142+
<ObservationStatement classCode="OBS" moodCode="EVN">
143+
<id root="test-id-3"/>
144+
<code nullFlavor="UNK"><originalText>Mocked code</originalText></code>
145+
<statusCode code="COMPLETE"/>
146+
<effectiveTime>
147+
<center nullFlavor="UNK"/>
148+
</effectiveTime>
149+
<availabilityTime nullFlavor="UNK"/>
150+
</ObservationStatement>
151+
</component>
152+
</CompoundStatement>
153+
</component><component typeCode="COMP" contextConductionInd="true">
154+
<CompoundStatement classCode="CLUSTER" moodCode="EVN">
155+
<id root="test-id-3"/>
156+
<code code="123038009" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="specimen (specimen)"/>
157+
<statusCode code="COMPLETE"/>
158+
<effectiveTime>
159+
<center nullFlavor="NI"/>
160+
</effectiveTime>
161+
<availabilityTime value="20030221115000"/>
162+
<specimen typeCode="SPC">
163+
<specimenRole classCode="SPEC">
164+
<id root="test-id-3"/>
165+
<id root="2.16.840.1.113883.2.1.4.5.2" extension="G,03.0999008.K"/>
166+
<effectiveTime>
167+
<center value="20030109000000"/>
168+
</effectiveTime>
169+
<specimenSpecimenMaterial determinerCode="INSTANCE" classCode="MAT">
170+
<desc>Blood</desc>
171+
</specimenSpecimenMaterial>
172+
</specimenRole>
173+
</specimen>
174+
<component typeCode="COMP" contextConductionInd="true">
175+
<NarrativeStatement classCode="OBS" moodCode="EVN">
176+
<id root="test-id-3"/>
177+
<text mediaType="text/x-h7uk-pmip">CommentType:LAB SPECIMEN COMMENT(E271)
178+
CommentDate:20030109000000
146179

147-
Received Date: 2003-01-09 13:54
148-
</text>
149-
<statusCode code="COMPLETE"/>
150-
<availabilityTime value="20030221115000"/>
151-
</NarrativeStatement>
152-
</component><component typeCode="COMP" contextConductionInd="true">
153-
<ObservationStatement classCode="OBS" moodCode="EVN">
154-
<id root="test-id-3"/>
155-
<code nullFlavor="UNK"><originalText>Mocked code</originalText></code>
156-
<statusCode code="COMPLETE"/>
157-
<effectiveTime>
158-
<center nullFlavor="UNK"/>
159-
</effectiveTime>
160-
<availabilityTime nullFlavor="UNK"/>
161-
</ObservationStatement>
162-
</component>
163-
</CompoundStatement>
164-
</component>
165-
</CompoundStatement>
166-
</component>
167-
</ehrComposition>
168-
</component>
180+
Received Date: 2003-01-09 13:54
181+
</text>
182+
<statusCode code="COMPLETE"/>
183+
<availabilityTime value="20030221115000"/>
184+
</NarrativeStatement>
185+
</component>
186+
<component typeCode="COMP" contextConductionInd="true">
187+
<ObservationStatement classCode="OBS" moodCode="EVN">
188+
<id root="test-id-3"/>
189+
<code nullFlavor="UNK"><originalText>Mocked code</originalText></code>
190+
<statusCode code="COMPLETE"/>
191+
<effectiveTime>
192+
<center nullFlavor="UNK"/>
193+
</effectiveTime>
194+
<availabilityTime nullFlavor="UNK"/>
195+
</ObservationStatement>
196+
</component>
197+
</CompoundStatement>
198+
</component>
199+
</CompoundStatement>
200+
</component>
201+
</ehrComposition>
202+
</component>
169203
</ehrFolder>
170204
</component>
171205
<inFulfillmentOf typeCode="FLFS">

0 commit comments

Comments
 (0)