Skip to content

Commit b53d885

Browse files
Alex-NitaAlex-Nita
committed
Reverted test test files with filing comments associated with specimens
1 parent b7a998d commit b53d885

File tree

2 files changed

+69
-136
lines changed

2 files changed

+69
-136
lines changed

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

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -129,49 +129,16 @@ This is some random free text</text>
129129
<specimen typeCode="SPC">
130130
<specimenRole classCode="SPEC">
131131
<id root="test-id-3"/>
132-
<id root="2.16.840.1.113883.2.1.4.5.2" extension="DUMMY"/>
132+
<id root="2.16.840.1.113883.2.1.4.5.2" extension="G,03.0999008.K"/>
133133
<effectiveTime>
134-
<center value="20030221115000"/>
134+
<center value="20030109000000"/>
135135
</effectiveTime>
136136
<specimenSpecimenMaterial determinerCode="INSTANCE" classCode="MAT">
137-
<desc>UNKNOWN</desc>
137+
<desc>Blood</desc>
138138
</specimenSpecimenMaterial>
139139
</specimenRole>
140140
</specimen>
141141
<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">
175142
<NarrativeStatement classCode="OBS" moodCode="EVN">
176143
<id root="test-id-3"/>
177144
<text mediaType="text/x-h7uk-pmip">CommentType:LAB SPECIMEN COMMENT(E271)

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

Lines changed: 66 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,28 @@ Status: unknown</text>
124124
<specimen typeCode="SPC">
125125
<specimenRole classCode="SPEC">
126126
<id root="test-id-3"/>
127-
<id root="2.16.840.1.113883.2.1.4.5.2" extension="DUMMY"/>
127+
<id root="2.16.840.1.113883.2.1.4.5.2" extension="G,03.0999008.K"/>
128128
<effectiveTime>
129-
<center value="20030221115000"/>
129+
<center value="20030109000000"/>
130130
</effectiveTime>
131131
<specimenSpecimenMaterial determinerCode="INSTANCE" classCode="MAT">
132-
<desc>UNKNOWN</desc>
132+
<desc>Blood</desc>
133133
</specimenSpecimenMaterial>
134134
</specimenRole>
135135
</specimen>
136136
<component typeCode="COMP" contextConductionInd="true">
137+
<NarrativeStatement classCode="OBS" moodCode="EVN">
138+
<id root="test-id-3"/>
139+
<text mediaType="text/x-h7uk-pmip">CommentType:LAB SPECIMEN COMMENT(E271)
140+
CommentDate:20030109000000
141+
142+
Received Date: 2003-01-09 13:54
143+
</text>
144+
<statusCode code="COMPLETE"/>
145+
<availabilityTime value="20030221115000"/>
146+
</NarrativeStatement>
147+
</component>
148+
<component typeCode="COMP" contextConductionInd="true">
137149
<NarrativeStatement classCode="OBS" moodCode="EVN">
138150
<id root="test-id-3"/>
139151
<text mediaType="text/x-h7uk-pmip">CommentType:AGGREGATE COMMENT SET
@@ -146,110 +158,64 @@ EMPTY REPORT</text>
146158
</component>
147159
</CompoundStatement>
148160
</component>
149-
<component typeCode="COMP" contextConductionInd="true">
150-
<CompoundStatement classCode="CLUSTER" moodCode="EVN">
151-
<id root="test-id-3"/>
152-
<code code="123038009" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="specimen (specimen)"/>
153-
<statusCode code="COMPLETE"/>
161+
</CompoundStatement>
162+
</component>
163+
</ehrComposition>
164+
</component>
165+
<component typeCode="COMP">
166+
<ehrComposition classCode="COMPOSITION" moodCode="EVN">
167+
<id root="test-id-3" />
168+
<code code="109341000000100" displayName="GP to GP communication transaction" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"/>
169+
<statusCode code="COMPLETE" />
154170
<effectiveTime>
155-
<center nullFlavor="NI"/>
171+
<center value="20100113"/>
156172
</effectiveTime>
157-
<availabilityTime value="20030221115000"/>
158-
<specimen typeCode="SPC">
159-
<specimenRole classCode="SPEC">
160-
<id root="test-id-3"/>
161-
<id root="2.16.840.1.113883.2.1.4.5.2" extension="G,03.0999008.K"/>
162-
<effectiveTime>
163-
<center value="20030109000000"/>
164-
</effectiveTime>
165-
<specimenSpecimenMaterial determinerCode="INSTANCE" classCode="MAT">
166-
<desc>Blood</desc>
167-
</specimenSpecimenMaterial>
168-
</specimenRole>
169-
</specimen>
170-
<component typeCode="COMP" contextConductionInd="true">
171-
<NarrativeStatement classCode="OBS" moodCode="EVN">
172-
<id root="test-id-3"/>
173-
<text mediaType="text/x-h7uk-pmip">CommentType:LAB SPECIMEN COMMENT(E271)
174-
CommentDate:20030109000000
175-
176-
Received Date: 2003-01-09 13:54
177-
</text>
178-
<statusCode code="COMPLETE"/>
179-
<availabilityTime value="20030221115000"/>
180-
</NarrativeStatement>
181-
</component>
182-
<component typeCode="COMP" contextConductionInd="true">
183-
<NarrativeStatement classCode="OBS" moodCode="EVN">
173+
<availabilityTime value="20100113"/>
174+
<author typeCode="AUT" contextControlCode="OP">
175+
<time value="20100113" />
176+
<agentRef classCode="AGNT">
177+
<id root="test-id-3" />
178+
</agentRef>
179+
</author>
180+
<Participant2 typeCode="PRF" contextControlCode="OP">
181+
<agentRef classCode="AGNT">
184182
<id root="test-id-3"/>
185-
<text mediaType="text/x-h7uk-pmip">CommentType:AGGREGATE COMMENT SET
186-
CommentDate:UNK
187-
188-
EMPTY REPORT</text>
189-
<statusCode code="COMPLETE"/>
190-
<availabilityTime nullFlavor="UNK"/>
191-
</NarrativeStatement>
192-
</component>
193-
</CompoundStatement>
194-
</component>
195-
</CompoundStatement>
196-
</component>
197-
</ehrComposition>
198-
</component>
199-
<component typeCode="COMP">
200-
<ehrComposition classCode="COMPOSITION" moodCode="EVN">
201-
<id root="test-id-3" />
202-
<code code="109341000000100" displayName="GP to GP communication transaction" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"/>
203-
<statusCode code="COMPLETE" />
204-
<effectiveTime>
205-
<center value="20100113"/>
206-
</effectiveTime>
207-
<availabilityTime value="20100113"/>
208-
<author typeCode="AUT" contextControlCode="OP">
209-
<time value="20100113" />
210-
<agentRef classCode="AGNT">
211-
<id root="test-id-3" />
212-
</agentRef>
213-
</author>
214-
<Participant2 typeCode="PRF" contextControlCode="OP">
215-
<agentRef classCode="AGNT">
216-
<id root="test-id-3"/>
217-
</agentRef>
218-
</Participant2>
219-
<component typeCode="COMP" >
220-
<NarrativeStatement classCode="OBS" moodCode="EVN">
221-
<id root="test-id-3" />
222-
<text>This is some random free text</text>
223-
<statusCode code="COMPLETE" />
224-
<availabilityTime value="20100113" />
225-
<Participant typeCode="PRF" contextControlCode="OP">
226-
<agentRef classCode="AGNT">
227-
<id root="test-id-3"/>
228-
</agentRef>
229-
</Participant>
230-
</NarrativeStatement>
231-
</component>
232-
</ehrComposition>
233-
</component>
234-
<component typeCode="COMP">
235-
<ehrComposition classCode="COMPOSITION" moodCode="EVN">
236-
<id root="test-id-3" />
237-
<code code="196401000000100" displayName="Non-consultation data" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"/>
238-
<statusCode code="COMPLETE" />
239-
<effectiveTime>
240-
<center nullFlavor="UNK"/>
241-
</effectiveTime>
242-
<availabilityTime nullFlavor="UNK"/>
243-
<author typeCode="AUT" contextControlCode="OP">
244-
<time nullFlavor="UNK" />
245-
<agentRef classCode="AGNT">
183+
</agentRef>
184+
</Participant2>
185+
<component typeCode="COMP" >
186+
<NarrativeStatement classCode="OBS" moodCode="EVN">
246187
<id root="test-id-3" />
247-
</agentRef>
248-
</author>
249-
<Participant2 typeCode="PRF" contextControlCode="OP">
188+
<text>This is some random free text</text>
189+
<statusCode code="COMPLETE" />
190+
<availabilityTime value="20100113" />
191+
<Participant typeCode="PRF" contextControlCode="OP">
250192
<agentRef classCode="AGNT">
251193
<id root="test-id-3"/>
252194
</agentRef>
195+
</Participant>
196+
</NarrativeStatement>
197+
</component>
198+
</ehrComposition>
199+
</component>
200+
<component typeCode="COMP">
201+
<ehrComposition classCode="COMPOSITION" moodCode="EVN">
202+
<id root="test-id-3" />
203+
<code code="196401000000100" displayName="Non-consultation data" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"/>
204+
<statusCode code="COMPLETE" />
205+
<effectiveTime>
206+
<center nullFlavor="UNK"/>
207+
</effectiveTime>
208+
<availabilityTime nullFlavor="UNK"/>
209+
<author typeCode="AUT" contextControlCode="OP">
210+
<time nullFlavor="UNK" />
211+
<agentRef classCode="AGNT">
212+
<id root="test-id-3" />
213+
</agentRef>
214+
</author>
215+
<Participant2 typeCode="PRF" contextControlCode="OP">
216+
<agentRef classCode="AGNT">
217+
<id root="test-id-3"/>
218+
</agentRef>
253219
</Participant2>
254220
<component typeCode="COMP" >
255221
<ObservationStatement classCode="OBS" moodCode="EVN">

0 commit comments

Comments
 (0)