ДССУ:КВЕД

erpuno · Feb 15, 2024 · 27e5a53 · 27e5a53
1 parent 7699915
commit 27e5a53
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 60 deletions.
diff --git a/lib/hl7_validation.ex b/lib/hl7_validation.ex
@@ -73,11 +73,11 @@ defmodule HL7.Validation do
       list = Map.get(obj, "concept")
       id = Map.get(obj, "id")
       publisher = Map.get(obj, "publisher")
-      res = :lists.map(fn x ->
+      res = :lists.flatten :lists.map(fn x ->
         code = Map.get(x, "code")
         display = Map.get(x, "display")
         id = Map.get(x, "id")
-        {id,code,display}
+        case id do nil -> [] ; _ -> {id,:erlang.binary_to_atom(code),display} end
        end, list)
       verify = Xema.validate(schema, obj)
       {name,verify,id,publisher,res}

diff --git a/terminology/CodeSystem/CodeSystem-CodeSystem.json b/terminology/CodeSystem/CodeSystem-CodeSystem.json
@@ -1,6 +1,6 @@
 {
   "resourceType" : "CodeSystem",
-  "id" : [ { "ЕСОЗ" : "Класифікатор класифікаторів CodeSystem" } ],
+  "id" : [ { "ЕСОЗ" : "CodeSystem" } ],
   "language" : "en",
   "text" : {
     "status" : "generated",
@@ -105,12 +105,12 @@
   {
     "id" : "ДССУ:КОАТУУ/SETTLEMENT_TYPE",
     "code" : "КОАТУУ",
-    "display" : "Вид населенного пункту згідно номенклатури КОАТУУ"
+    "display" : "Вид населенного пункту КОАТУУ"
   },
   {
     "id" : "ДССУ:КАТОТТГ/SETTLEMENT_TYPE",
     "code" : "КАТОТТГ",
-    "display" : "Вид населенного пункту згідно номенклатури КАТОТТГ"
+    "display" : "Вид населенного пункту КАТОТТГ"
   },
   {
     "id" : "ДССУ:КВЕД",
@@ -149,15 +149,87 @@
     "display" : "Спосіб розповсюдження лікарського засобу",
     "definition" : "FHIR UnitOfPresentation"
   },
+  {
+    "id" : "ЕСОЗ:COUNTRY",
+    "code" : "Country",
+    "display" : "Міжнародні коди країн"
+  },
   {
     "id" : "ЕСОЗ:eHealth/immunization_dosage_units",
     "code" : "DosageUnits",
     "display" : "Одиниці виміру доз для імунізації"
   },
   {
-    "id" : "ЕСОЗ:COUNTRY",
-    "code" : "Country",
-    "display" : "Міжнародні коди країн"
+    "id" : "ЕСОЗ:eHealth/ICPC2/reasons",
+    "code" : "ICPC2UKR",
+    "display" : "Класифікатор первинної медичної допомоги"
+  },
+  {
+    "id" : "ЕСОЗ:eHealth/ICPC2/actions",
+    "code" : "ICPC2UKR-actions",
+    "display" : "Класифікатор дій первинної медичної допомоги"
+  },
+  {
+    "id" : "ЕСОЗ:eHealth/episode_types",
+    "code" : "EpisodeOfCareType",
+    "display" : "Види медичної допомоги"
+  },
+  {
+    "id" : "FHIR:CodeSystem",
+    "code" : "CodeSystem",
+    "display" : "Цей класифікатор ієрархічних словників FHIR сервера",
+    "definition" : "Code systems used in HL7 standards.",
+    "property" : [{ "code" : "status", "valueCode" : "active" },
+                  { "code" : "internalId", "valueCode" : "19880" },
+                  { "code" : "OID", "valueCode" : "2.16.840.1.113883.5.22" }]
+  },
+  {
+    "id" : "FHIR:ActionType",
+    "code" : "ActionType",
+    "display" : "Type of CRUD operation or Event signalling"
+  },
+  {
+    "id" : "FHIR:BundleType",
+    "code" : "BundleType",
+    "display" : "Type of Bundle of FHIR server"
+  },
+  {
+    "id" : "FHIR:Religion2",
+    "code" : "Religion2",
+    "display" : "Type of Religion of FHIR nomenclature"
+  },
+  {
+    "id" : "FHIR:RefferalStatus",
+    "code" : "RefferalStatus",
+    "display" : "Status of Document in CRM"
+  },
+  {
+    "id" : "FHIR:ActionCode",
+    "code" : "ActionCode",
+    "display" : "Type of message in CRM system describing Practitioner action"
+  },
+  {
+    "id" : "FHIR:AdministrativeGender",
+    "code" : "AdministrativeGender",
+    "display" : "Gender or person",
+    "definition" : "The gender of a person used for adminstrative purposes (as opposed to clinical gender)",
+    "property" : [{ "code" : "status", "valueCode" : "active" },
+                  { "code" : "internalId", "valueCode" : "19799" },
+                  { "code" : "OID", "valueCode" : "2.16.840.1.113883.5.1" }]
+  },
+  {
+    "id" : "FHIR:AppointmentStatus",
+    "code" : "AppointmentStatus",
+    "display" : "Type of Patient appointment in history records of scheduled visits"
+  },
+  {
+    "id" : "FHIR:ObservationCategory",
+    "code" : "ObservationCategory",
+    "display" : "ObservationCategory",
+    "definition" : "High level observation categories for the general type of observation being made.\r\n\r\nURL: http://hl7-fhir.github.io/valueset-observation-category.html\r\n\r\nThis is an inline code system http://hl7.org/fhir/observation-category.",
+    "property" : [{ "code" : "status", "valueCode" : "active" },
+                  { "code" : "internalId", "valueCode" : "23733" },
+                  { "code" : "OID", "valueCode" : "2.16.840.1.113883.4.642.1.222" }]
   },
   {
     "code" : "ABCcodes",
@@ -570,23 +642,6 @@
       "valueCode" : "2.16.840.1.113883.5.1119"
     }]
   },
-  {
-    "code" : "AdministrativeGender",
-    "display" : "AdministrativeGender",
-    "definition" : "The gender of a person used for adminstrative purposes (as opposed to clinical gender)",
-    "property" : [{
-      "code" : "status",
-      "valueCode" : "active"
-    },
-    {
-      "code" : "internalId",
-      "valueCode" : "19799"
-    },
-    {
-      "code" : "OID",
-      "valueCode" : "2.16.840.1.113883.5.1"
-    }]
-  },
   {
     "code" : "AHFS",
     "display" : "AHFS Pharmacologic-Therapeutic Classification",
@@ -923,23 +978,6 @@
       "valueCode" : "11064"
     }]
   },
-  {
-    "code" : "CodeSystem",
-    "display" : "CodeSystem",
-    "definition" : "Code systems used in HL7 standards.",
-    "property" : [{
-      "code" : "status",
-      "valueCode" : "active"
-    },
-    {
-      "code" : "internalId",
-      "valueCode" : "19880"
-    },
-    {
-      "code" : "OID",
-      "valueCode" : "2.16.840.1.113883.5.22"
-    }]
-  },
   {
     "code" : "CodeSystemType",
     "display" : "HL7 Code System Type",
@@ -3339,23 +3377,6 @@
       "valueCode" : "2.16.840.1.113883.5.1008"
     }]
   },
-  {
-    "code" : "ObservationCategory",
-    "display" : "ObservationCategory",
-    "definition" : "High level observation categories for the general type of observation being made.\r\n\r\nURL: http://hl7-fhir.github.io/valueset-observation-category.html\r\n\r\nThis is an inline code system http://hl7.org/fhir/observation-category.",
-    "property" : [{
-      "code" : "status",
-      "valueCode" : "active"
-    },
-    {
-      "code" : "internalId",
-      "valueCode" : "23733"
-    },
-    {
-      "code" : "OID",
-      "valueCode" : "2.16.840.1.113883.4.642.1.222"
-    }]
-  },
   {
     "code" : "ObservationInterpretation",
     "display" : "ObservationInterpretation",

diff --git a/terminology/КВЕД/CodeSystem-КВЕД.json b/terminology/КВЕД/CodeSystem-КВЕД.json
@@ -1,6 +1,6 @@
 {
   "resourceType" : "CodeSystem",
-  "id" : [ { "УКРСТАТ" : "КВЕД" } ],
+  "id" : [ { "ДССУ" : "КВЕД" } ],
   "url" : "http://terminology.erp.uno/CodeSystem/УКРСТАТ:КВЕД",
   "identifier" : [{
     "system" : "urn:ietf:rfc:3986",