Skip to content

Commit 2ac3d2d

Browse files
author
Gjermund Stensrud
committed
Update xsd files to v56.0.1
1 parent da6b3b7 commit 2ac3d2d

12 files changed

Lines changed: 614 additions & 529 deletions

File tree

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "6.0.201"
3+
"version": "6.0.404"
44
}
55
}

‎readme.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Det er to måter å kjøre programmet:
1313
## Bygge koden
1414
1. Både Gui og ConsoleApp publiseres med
1515
```
16-
dotnet publish -c Release -r win-x64 -p:PublishSingleFile=true
16+
dotnet publish -c Release -r win-x64 --no-self-contained -p:PublishSingleFile=true
1717
```
1818
2. Legg deretter output fra begge i hver sin `.zip`-fil. Bruk gjerne samme filnavn som i forrige release
1919

‎src/Dhhr.KppParser.ConsoleApp/Dhhr.KppParser.ConsoleApp.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net6.0</TargetFramework>
6-
<AssemblyVersion>1.5.1.*</AssemblyVersion>
6+
<AssemblyVersion>1.6.0.*</AssemblyVersion>
77
<Deterministic>false</Deterministic>
88
<PublishSingleFile Condition="'$(Configuration)' == 'Release'">true</PublishSingleFile>
99
<RuntimeIdentifier>win-x64</RuntimeIdentifier>

‎src/Dhhr.KppParser.Gui/Dhhr.KppParser.Gui.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
55
<TargetFramework>net6.0-windows</TargetFramework>
6-
<AssemblyVersion>1.5.1.*</AssemblyVersion>
6+
<AssemblyVersion>1.6.0.*</AssemblyVersion>
77
<Deterministic>false</Deterministic>
88
<UseWindowsForms>true</UseWindowsForms>
99
<PublishSingleFile Condition="'$(Configuration)' == 'Release'">true</PublishSingleFile>

‎src/Dhhr.KppParser.Gui/appsettings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"leverandor": "HDIR",
33
"navnEpj": "KppParser",
4-
"versjonEpj": "1.5.1",
4+
"versjonEpj": "1.6.0",
55
"hdirQa": "121017",
66
"hdirProd": "94378"
77
}

‎src/Dhhr.KppParser.Service.Tests/Dhhr.KppParser.Service.Tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="FluentAssertions" Version="6.6.0" />
27-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
28-
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
29-
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
26+
<PackageReference Include="FluentAssertions" Version="6.8.0" />
27+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
28+
<PackageReference Include="MSTest.TestAdapter" Version="3.0.0" />
29+
<PackageReference Include="MSTest.TestFramework" Version="3.0.0" />
3030
</ItemGroup>
3131

3232
<ItemGroup>

‎src/Dhhr.KppParser.Service.Tests/Resources/Expectations/TestMelding.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<Melding xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" versjon="54.0.1" meldingstype="B" fraDatoPeriode="2019-01-01" uttakDato="2019-03-25" leverandor="ukjent leverandør" navnEPJ="ukjent epj" versjonEPJ="ukjent epj versjon" versjonUt="KppService_ShouldSetMetadata_WhenParsingKpp" lopenr="201903251624117690" tilDatoPeriode="2019-12-31" lokalident="ba00a4ca-b05e-4e01-9d7b-90578f46bf0f" xmlns="http://www.npr.no/xmlstds/55_0_1_kpp">
2+
<Melding xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" versjon="56.0.1" meldingstype="B" fraDatoPeriode="2019-01-01" uttakDato="2019-03-25" leverandor="ukjent leverandør" navnEPJ="ukjent epj" versjonEPJ="ukjent epj versjon" versjonUt="KppService_ShouldSetMetadata_WhenParsingKpp" lopenr="201903251624117690" tilDatoPeriode="2019-12-31" lokalident="ba00a4ca-b05e-4e01-9d7b-90578f46bf0f" xmlns="http://www.npr.no/xmlstds/56_0_1_kpp">
33
<Institusjon institusjonID="900000000">
44
<Objektholder pasientNr="-1">
55
<!-- ordinary -->

‎src/Dhhr.KppParser.Service/Models/NPR(kpp).cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ namespace Dhhr.KppParser.Service.Models {
2020
[System.SerializableAttribute()]
2121
[System.Diagnostics.DebuggerStepThroughAttribute()]
2222
[System.ComponentModel.DesignerCategoryAttribute("code")]
23-
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.npr.no/xmlstds/55_0_1_kpp")]
24-
[System.Xml.Serialization.XmlRootAttribute(Namespace="http://www.npr.no/xmlstds/55_0_1_kpp", IsNullable=false)]
23+
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.npr.no/xmlstds/56_0_1_kpp")]
24+
[System.Xml.Serialization.XmlRootAttribute(Namespace="http://www.npr.no/xmlstds/56_0_1_kpp", IsNullable=false)]
2525
public partial class Melding {
2626

2727
private Institusjon[] institusjonField;
@@ -49,7 +49,7 @@ public partial class Melding {
4949
private string lokalidentField;
5050

5151
public Melding() {
52-
this.versjonField = "55.0.1";
52+
this.versjonField = "56.0.1";
5353
}
5454

5555
/// <remarks/>
@@ -190,8 +190,8 @@ public string lokalident {
190190
[System.SerializableAttribute()]
191191
[System.Diagnostics.DebuggerStepThroughAttribute()]
192192
[System.ComponentModel.DesignerCategoryAttribute("code")]
193-
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.npr.no/xmlstds/55_0_1_kpp")]
194-
[System.Xml.Serialization.XmlRootAttribute(Namespace="http://www.npr.no/xmlstds/55_0_1_kpp", IsNullable=false)]
193+
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.npr.no/xmlstds/56_0_1_kpp")]
194+
[System.Xml.Serialization.XmlRootAttribute(Namespace="http://www.npr.no/xmlstds/56_0_1_kpp", IsNullable=false)]
195195
public partial class Institusjon {
196196

197197
private Objektholder[] objektholderField;
@@ -239,8 +239,8 @@ public string foretakID {
239239
[System.SerializableAttribute()]
240240
[System.Diagnostics.DebuggerStepThroughAttribute()]
241241
[System.ComponentModel.DesignerCategoryAttribute("code")]
242-
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.npr.no/xmlstds/55_0_1_kpp")]
243-
[System.Xml.Serialization.XmlRootAttribute(Namespace="http://www.npr.no/xmlstds/55_0_1_kpp", IsNullable=false)]
242+
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.npr.no/xmlstds/56_0_1_kpp")]
243+
[System.Xml.Serialization.XmlRootAttribute(Namespace="http://www.npr.no/xmlstds/56_0_1_kpp", IsNullable=false)]
244244
public partial class Objektholder {
245245

246246
private EpisodeKPP[] episodeKPPField;
@@ -275,8 +275,8 @@ public string pasientNr {
275275
[System.SerializableAttribute()]
276276
[System.Diagnostics.DebuggerStepThroughAttribute()]
277277
[System.ComponentModel.DesignerCategoryAttribute("code")]
278-
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.npr.no/xmlstds/55_0_1_kpp")]
279-
[System.Xml.Serialization.XmlRootAttribute(Namespace="http://www.npr.no/xmlstds/55_0_1_kpp", IsNullable=false)]
278+
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.npr.no/xmlstds/56_0_1_kpp")]
279+
[System.Xml.Serialization.XmlRootAttribute(Namespace="http://www.npr.no/xmlstds/56_0_1_kpp", IsNullable=false)]
280280
public partial class EpisodeKPP {
281281

282282
private TjenesteKPP[] tjenesteKPPField;
@@ -350,8 +350,8 @@ public bool totalSpecified {
350350
[System.SerializableAttribute()]
351351
[System.Diagnostics.DebuggerStepThroughAttribute()]
352352
[System.ComponentModel.DesignerCategoryAttribute("code")]
353-
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.npr.no/xmlstds/55_0_1_kpp")]
354-
[System.Xml.Serialization.XmlRootAttribute(Namespace="http://www.npr.no/xmlstds/55_0_1_kpp", IsNullable=false)]
353+
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="http://www.npr.no/xmlstds/56_0_1_kpp")]
354+
[System.Xml.Serialization.XmlRootAttribute(Namespace="http://www.npr.no/xmlstds/56_0_1_kpp", IsNullable=false)]
355355
public partial class TjenesteKPP {
356356

357357
private string kostnadKodeField;

‎src/Dhhr.KppParser.Service/Models/RefDocContent.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace Dhhr.KppParser.Service.Models
44
{
55
public partial class RefDocContent
66
{
7-
[XmlElement(Namespace = "http://www.npr.no/xmlstds/55_0_1_kpp", ElementName = "Melding")]
7+
[XmlElement(Namespace = "http://www.npr.no/xmlstds/56_0_1_kpp", ElementName = "Melding")]
88
public Melding Melding { get; set; }
99
}
1010
}

‎src/Dhhr.KppParser.Service/Resources/NPR(kpp).xsd‎

Lines changed: 114 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,126 @@
11
<?xml version="1.0" encoding="ISO-8859-1"?>
2-
<!-- Generated on 2020-10-12 18:37:44 at NPR -->
2+
<!-- Generated on 2021-11-11 10:11:01 at NPR -->
33
<!-- Avdeling helseregistres meldinger -->
44
<!-- Modul kpp -->
55
<!-- Skjema for Innrapportering av data om kostnad per pasient -->
66
<!-- XML-Schema level supported is specified by W3C -->
77
<!-- http://www.w3.org/2001/XMLSchema -->
8-
<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema.xsd" xmlns:kith="http://www.kith.no/xmlstds" xmlns:nprx="http://www.npr.no/xmlstds/55_0_1" xmlns:npr="http://www.npr.no/xmlstds/55_0_1_kpp" targetNamespace="http://www.npr.no/xmlstds/55_0_1_kpp" version="55.0.1.27" elementFormDefault="qualified" attributeFormDefault="unqualified">
9-
<import namespace="http://www.npr.no/xmlstds/55_0_1" schemaLocation="NPR.xsd"/>
10-
<include schemaLocation="NPR(kpp)_CodingSchemes.xsd"/>
11-
<!-- LEVEL 1 -->
12-
<!-- Class: Melding -->
13-
<element name="Melding">
14-
<annotation>
15-
<documentation>
16-
Opplysninger som leverandører av helsetjenester i kommuner, helsevirksomheter eller helsepersonell etter bestemmelser i lov eller i medhold av lov i gitte situasjoner er pliktig til å rapportere.
8+
<schema
9+
xmlns="http://www.w3.org/2001/XMLSchema"
10+
xmlns:xsd="http://www.w3.org/2001/XMLSchema.xsd"
11+
xmlns:kith="http://www.kith.no/xmlstds"
12+
xmlns:nprx="http://www.npr.no/xmlstds/56_0_1"
13+
xmlns:npr = "http://www.npr.no/xmlstds/56_0_1_kpp"
14+
targetNamespace = "http://www.npr.no/xmlstds/56_0_1_kpp"
15+
version = "56.0.1.5"
16+
elementFormDefault = "qualified"
17+
attributeFormDefault="unqualified">
18+
<import namespace="http://www.npr.no/xmlstds/56_0_1" schemaLocation="NPR.xsd"/>
19+
20+
<include schemaLocation="NPR(kpp)_CodingSchemes.xsd"/>
21+
22+
23+
<!-- LEVEL 1 -->
24+
25+
<!-- Class: Melding -->
26+
<element name = "Melding">
27+
<annotation>
28+
<documentation>
29+
Opplysninger som leverandører av helsetjenester i kommuner, helsevirksomheter eller helsepersonell etter bestemmelser i lov eller i medhold av lov i gitte situasjoner er pliktig til å rapportere.
1730
</documentation>
18-
</annotation>
19-
<complexType>
20-
<sequence>
21-
<element ref="npr:Institusjon" minOccurs="1" maxOccurs="unbounded"/>
22-
</sequence>
23-
<attribute name="versjon" type="string" use="required" fixed="55.0.1"/>
24-
<attribute name="meldingstype" type="npr:meldingstype" use="required"/>
25-
<attribute name="fraDatoPeriode" type="date" use="required"/>
26-
<attribute name="uttakDato" type="date" use="required"/>
27-
<attribute name="leverandor" type="string" use="required"/>
28-
<attribute name="navnEPJ" type="string" use="required"/>
29-
<attribute name="versjonEPJ" type="string" use="required"/>
30-
<attribute name="versjonUt" type="string" use="required"/>
31-
<attribute name="lopenr" type="integer" use="required"/>
32-
<attribute name="tilDatoPeriode" type="date" use="required"/>
33-
<attribute name="lokalident" type="string" use="optional"/>
34-
</complexType>
35-
<unique name="InstitusjonP_ID">
36-
<selector xpath="npr:Institusjon"/>
37-
<field xpath="@institusjonID"/>
38-
</unique>
39-
</element>
40-
<!-- LEVEL 2 -->
41-
<!-- Class: Helseinstitusjon -->
42-
<element name="Institusjon">
43-
<annotation>
44-
<documentation>
45-
Institusjon som hører under lov om spesialisthelsetjenesten.
31+
</annotation>
32+
<complexType >
33+
<sequence>
34+
<element ref = "npr:Institusjon" minOccurs = "1" maxOccurs = "unbounded" />
35+
</sequence>
36+
<attribute name = "versjon" type = "string" use = "required" fixed = "56.0.1" />
37+
<attribute name = "meldingstype" type = "npr:meldingstype" use = "required" />
38+
<attribute name = "fraDatoPeriode" type = "date" use = "required" />
39+
<attribute name = "uttakDato" type = "date" use = "required" />
40+
<attribute name = "leverandor" type = "string" use = "required" />
41+
<attribute name = "navnEPJ" type = "string" use = "required" />
42+
<attribute name = "versjonEPJ" type = "string" use = "required" />
43+
<attribute name = "versjonUt" type = "string" use = "required" />
44+
<attribute name = "lopenr" type = "integer" use = "required" />
45+
<attribute name = "tilDatoPeriode" type = "date" use = "required" />
46+
<attribute name = "lokalident" type = "string" use = "optional" />
47+
</complexType>
48+
<unique name= "InstitusjonP_ID">
49+
<selector xpath = "npr:Institusjon"/>
50+
<field xpath = "@institusjonID"/>
51+
</unique>
52+
</element>
53+
54+
55+
<!-- LEVEL 2 -->
56+
57+
<!-- Class: Helseinstitusjon -->
58+
<element name = "Institusjon">
59+
<annotation>
60+
<documentation>
61+
Institusjon som hører under lov om spesialisthelsetjenesten.
4662
</documentation>
47-
</annotation>
48-
<complexType>
49-
<sequence>
50-
<element ref="npr:Objektholder" minOccurs="1" maxOccurs="unbounded"/>
51-
</sequence>
52-
<attribute name="institusjonID" type="string" use="required"/>
53-
<attribute name="foretakID" type="string" use="optional"/>
54-
</complexType>
55-
<unique name="ObjektholderP_ID">
56-
<selector xpath="npr:Objektholder"/>
57-
<field xpath="@pasientNr"/>
58-
</unique>
59-
</element>
60-
<!-- LEVEL 3 -->
61-
<!-- Class: Objektholder -->
62-
<element name="Objektholder">
63-
<annotation>
64-
<documentation>
65-
Er en container som holder objekter fra lavere nivå. Hver av objektene på lavere nivå skal identifiseres ved hjelp av GUID eller annen unik identifikasjon slik at alle objekter kan identifiseres på tvers av meldinger.
63+
</annotation>
64+
<complexType >
65+
<sequence>
66+
<element ref = "npr:Objektholder" minOccurs = "1" maxOccurs = "unbounded" />
67+
</sequence>
68+
<attribute name = "institusjonID" type = "string" use = "required" />
69+
<attribute name = "foretakID" type = "string" use = "optional" />
70+
</complexType>
71+
<unique name= "ObjektholderP_ID">
72+
<selector xpath = "npr:Objektholder"/>
73+
<field xpath = "@pasientNr"/>
74+
</unique>
75+
</element>
76+
77+
78+
<!-- LEVEL 3 -->
79+
80+
<!-- Class: Objektholder -->
81+
<element name = "Objektholder">
82+
<annotation>
83+
<documentation>
84+
Er en container som holder objekter fra lavere nivå. Hver av objektene på lavere nivå skal identifiseres ved hjelp av GUID eller annen unik identifikasjon slik at alle objekter kan identifiseres på tvers av meldinger.
6685
</documentation>
67-
</annotation>
68-
<complexType>
69-
<sequence>
70-
<element ref="npr:EpisodeKPP" minOccurs="0" maxOccurs="unbounded"/>
71-
</sequence>
72-
<attribute name="pasientGUID" type="nprx:guid" use="prohibited"/>
73-
<attribute name="pasientNr" type="string" use="required"/>
74-
</complexType>
75-
</element>
76-
<!-- LEVEL 4 -->
77-
<!-- Class: Episode KPP -->
78-
<element name="EpisodeKPP">
79-
<annotation>
80-
<documentation>
86+
</annotation>
87+
<complexType >
88+
<sequence>
89+
<element ref = "npr:EpisodeKPP" minOccurs = "0" maxOccurs = "unbounded" />
90+
</sequence>
91+
<attribute name = "pasientGUID" type = "nprx:guid" use = "prohibited" />
92+
<attribute name = "pasientNr" type = "string" use = "required" />
93+
</complexType>
94+
</element>
95+
96+
97+
<!-- LEVEL 4 -->
98+
99+
<!-- Class: Episode KPP -->
100+
<element name = "EpisodeKPP">
101+
<annotation>
102+
<documentation>
81103
Kostnader knyttet til Episode
82104
</documentation>
83-
</annotation>
84-
<complexType>
85-
<sequence>
86-
<element ref="npr:TjenesteKPP" minOccurs="0" maxOccurs="unbounded"/>
87-
</sequence>
88-
<attribute name="episodeID" type="string" use="required"/>
89-
<attribute name="drg" type="string" use="optional"/>
90-
<attribute name="total" type="decimal" use="optional"/>
91-
</complexType>
92-
</element>
93-
<!-- LEVEL 5 -->
94-
<!-- Class: Tjeneste KPP -->
95-
<element name="TjenesteKPP">
96-
<complexType>
97-
<attribute name="kostnadKode" type="npr:kPP___Kostnad_per_pasient" use="required"/>
98-
<attribute name="kostnad" type="decimal" use="required"/>
99-
</complexType>
100-
</element>
105+
</annotation>
106+
<complexType >
107+
<sequence>
108+
<element ref = "npr:TjenesteKPP" minOccurs = "0" maxOccurs = "unbounded" />
109+
</sequence>
110+
<attribute name = "episodeID" type = "string" use = "required" />
111+
<attribute name = "drg" type = "string" use = "optional" />
112+
<attribute name = "total" type = "decimal" use = "optional" />
113+
</complexType>
114+
</element>
115+
116+
117+
<!-- LEVEL 5 -->
118+
119+
<!-- Class: Tjeneste KPP -->
120+
<element name = "TjenesteKPP">
121+
<complexType >
122+
<attribute name = "kostnadKode" type = "npr:kPP___Kostnad_per_pasient" use = "required" />
123+
<attribute name = "kostnad" type = "decimal" use = "required" />
124+
</complexType>
125+
</element>
101126
</schema>

0 commit comments

Comments
 (0)