Merge branch 'master' into 3.13

elexis · Aug 14, 2024 · c02462b · c02462b
2 parents c5c2259 + b48f604
commit c02462b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/build-p2-site.yaml b/.github/workflows/build-p2-site.yaml
@@ -25,6 +25,7 @@ jobs:
         run: docker pull ghcr.io/elexis/docker-build:${{ env.TARGET }}
       - name: build using docker image docker-build:${{ env.TARGET }}
         run: docker run --rm --init -v "$(pwd)":/usr/src/mymaven -v "$(eval echo ~$USER)/m2-${{ env.BRANCH_NAME }}":/root/.m2 -w /usr/src/mymaven ghcr.io/elexis/docker-build:${{ env.TARGET }} mvn -f releng/es.parent/pom.xml clean verify -Delexis.branch=${{ env.BRANCH_NAME }}
+
       - name: upload artifacts
         run: |
           eval $(ssh-agent -s)
@@ -52,4 +53,4 @@ jobs:
           push: true
           pull: true
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/.../es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/CoverageTest.java b/.../es.fhir.rest.core.test/src/info/elexis/server/fhir/rest/core/resources/CoverageTest.java
@@ -117,6 +117,7 @@ public void createUpdateDeleteCoverage() {
 		readCoverage
 				.setPeriod(new Period().setStart(TimeUtil.toDate(newStartDate)).setEnd(TimeUtil.toDate(newEndDate)));
 		readCoverage.setPayor(null); // #TODO Kostenträger
+		readCoverage.setPolicyHolder(new Reference("Patient/zd8d46d1b8d44330501105"));
 		// TODO Versicherungsnummer
 		// TODO Unfallnummer
 		// TODO Unfalldatum
@@ -132,6 +133,7 @@ public void createUpdateDeleteCoverage() {
 				readCoverage.getType().getCoding()).orElse(null));
 		assertEquals("KingOfMyCastle", FhirUtil.getCodeFromCodingList(CodingSystem.ELEXIS_COVERAGE_REASON.getSystem(),
 				readCoverage.getType().getCoding()).orElse(null));
+		assertEquals("Patient/zd8d46d1b8d44330501105", readCoverage.getPolicyHolder().getReference());
 //		assertEquals(
 //				"<div xmlns=\"http://www.w3.org/1999/xhtml\">UVG: KingOfMyCastle - Thats the new narrative(05.08.2024-offen)</div>",
 //				readCoverage.getText().getDivAsString());