Skip to content

Commit

Permalink
fix validation of DV_TEXT with list-open (#335)
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanspiska authored Mar 4, 2022
1 parent 235def4 commit a14ce1a
Show file tree
Hide file tree
Showing 7 changed files with 6,664 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Note: version releases in the 0.x.y range may introduce breaking changes.

- Flat : corrected handling of PARTY_PROXY ( see https://github.com/ehrbase/openEHR_SDK/pull/320)
- Flat : corrected handling of history origin and ISM_TRANSITION (see https://github.com/ehrbase/openEHR_SDK/pull/329)
- Validation: fix validation of DV_TEXT with listopen (see https://github.com/ehrbase/openEHR_SDK/pull/335)
- Walker, Flat, DTO, Validation : enhance performance of path handling (
see https://github.com/ehrbase/openEHR_SDK/pull/325 )

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ public enum CompositionTestDataSimSDTJson implements CompositionTestDataSimSDTJs
"EREACT - Covid status monitoring - FLAT.json",
OperationalTemplateTestData.EREACT_COVID_MANAGEMENT),
NESTED("nested.en.v1", "nested.en.v1.json",OperationalTemplateTestData.NESTED),
RE_SPECT("nested.en.v1", "ReSPECT.json",OperationalTemplateTestData.RE_SPECT),
IPS("International Patient Summary", "ips_flat.json",OperationalTemplateTestData.IPS);

private final String filename;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ public enum OperationalTemplateTestData {
"conformance-ehrbase.de.v0"),
MULTIMEDIA_TEST("MultimediaTest", "multimedia_test.en.v1.opt", "multimedia_test.en.v1"),
NESTED("nested.en.v1", "nested.en.v1.opt", "nested.en.v1"),
RE_SPECT("ReSPECT-3.v0", "ReSPECT-3.v0.opt", "ReSPECT-3.v0"),
IPS("International Patient Summary", "ips.v0.opt", "International Patient Summary"),
SECTION_CARDINALITY("Cardinality test template sections", "section_cardinality.opt", "cardinality_of_section");

Expand Down
50 changes: 50 additions & 0 deletions test-data/src/main/resources/composition/flat/simSDT/ReSPECT.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"ctx/language": "en",
"ctx/territory": "US",
"ctx/composer_name": "Silvia Blake",
"ctx/id_namespace": "HOSPITAL-NS",
"ctx/id_scheme": "HOSPITAL-NS",
"ctx/participation_name": "Dr. Marcus Johnson",
"ctx/participation_function": "requester",
"ctx/participation_mode": "face-to-face communication",
"ctx/participation_id": "199",
"ctx/participation_name:1": "Lara Markham",
"ctx/participation_function:1": "performer",
"ctx/participation_id:1": "198",
"ctx/health_care_facility|name": "Hospital",
"ctx/health_care_facility|id": "9091",
"respect-3/context/status": "Complete and signed",
"respect-3/context/xds_metadata/document_type|code": "D.67",
"respect-3/context/xds_metadata/document_type|value": "D.67 description",
"respect-3/respect_headings/a2._shared_understanding/respect_summary/narrative_summary": "Narrative Summary 37",
"respect-3/respect_headings/a2._shared_understanding/details_of_other_relevant_care_planning_documents_and_where_to_find_them/advance_planning_document:0/description": "Description 19",
"respect-3/respect_headings/a2._shared_understanding/legal_welfare_proxies/legal_welfare_proxy_in_place:0/type": "Type 84",
"respect-3/respect_headings/a2._shared_understanding/legal_welfare_proxies/legal_welfare_proxy_in_place:0/status|code": "at0005",
"respect-3/respect_headings/a3._what_matters_to_me/what_matters_to_me/what_i_most_value": "What I most value 18",
"respect-3/respect_headings/a3._what_matters_to_me/what_matters_to_me/what_i_most_fear_wish_to_avoid": "What I most fear / wish to avoid 55",
"respect-3/respect_headings/a4._clinical_recommendations/recommendation/topic": "Topic 49",
"respect-3/respect_headings/a4._clinical_recommendations/recommendation/clinical_focus": "Prioritise extending life",
"respect-3/respect_headings/a4._clinical_recommendations/recommendation/clinical_guidance_on_interventions": "Clinical guidance on interventions 86",
"respect-3/respect_headings/a4._clinical_recommendations/cpr_decision/cpr_decision|code": "at0022",
"respect-3/respect_headings/a4._clinical_recommendations/cpr_decision/date_of_cpr_decision": "2022-03-03T09:15:53.069272+01:00",
"respect-3/respect_headings/a5._capacity_for_involvement/mental_capacity/decision_plan": "ReSPECT recommendations",
"respect-3/respect_headings/a5._capacity_for_involvement/mental_capacity/does_the_person_have_capacity_to_participate_in_making_recommendations_on_this_plan|code": "at0003",
"respect-3/respect_headings/a5._capacity_for_involvement/mental_capacity/if_no_in_what_way_does_this_person_lack_capacity": "If no, in what way does this person lack capacity? 69",
"respect-3/respect_headings/a6._involvement_in_making_plan/respect_involvement/involvement_in_recommendations/involvement:0|code": "at0004",
"respect-3/respect_headings/a6._involvement_in_making_plan/respect_involvement/involvement_in_recommendations/option_d": "Option D 59",
"respect-3/respect_headings/a7._clinician_signatures/clinician_signature:0/ism_transition/current_state|code": "532",
"respect-3/respect_headings/a7._clinician_signatures/clinician_signature:0/ism_transition/current_state|value": "completed",
"respect-3/respect_headings/a7._clinician_signatures/clinician_signature:0/service_name": "ReSPECT - clinician signature",
"respect-3/respect_headings/a7._clinician_signatures/clinician_signature:0/time": "2022-03-03T09:15:53.069433+01:00",
"respect-3/respect_headings/a8._emergency_contacts/emergency_contacts/care_team/name": "ReSPECT Emergency contacts",
"respect-3/respect_headings/a8._emergency_contacts/emergency_contacts/care_team/participant:0/role_and_relationship:0": "parent",
"respect-3/respect_headings/a8._emergency_contacts/emergency_contacts/care_team/participant:0/member/name:0/use|code": "at0002",
"respect-3/respect_headings/a8._emergency_contacts/emergency_contacts/care_team/participant:0/member/name:0/contact_name": "Contact name 53",
"respect-3/respect_headings/a8._emergency_contacts/emergency_contacts/care_team/participant:0/member/telephone:0/system|code": "at0012",
"respect-3/respect_headings/a8._emergency_contacts/emergency_contacts/care_team/participant:0/member/telephone:0/telephone_number": "Telephone number 79",
"respect-3/respect_headings/a8._emergency_contacts/emergency_contacts/care_team/participant:0/other_details_about_contact": "Other details about contact 33",
"respect-3/respect_headings/a9._review_of_plan/review_of_plan:0/ism_transition/current_state|code": "532",
"respect-3/respect_headings/a9._review_of_plan/review_of_plan:0/ism_transition/current_state|value": "completed",
"respect-3/respect_headings/a9._review_of_plan/review_of_plan:0/service_name": "ReSPECT clinical review",
"respect-3/respect_headings/a9._review_of_plan/review_of_plan:0/time": "2022-03-03T09:15:53.069499+01:00"
}
Loading

0 comments on commit a14ce1a

Please sign in to comment.