1 files changed, 6 insertions, 10 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttributeProviderPlugin.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttributeProviderPlugin.java
index 2328391ec..8af35673f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttributeProviderPlugin.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttributeProviderPlugin.java
@@ -180,23 +180,19 @@ public class EHvdAttributeProviderPlugin extends AttributeProvider {
 
 			PersonalAttribute acquiredAttribute = null;
 
-			if (collection.get("IsHealthcareProfessional").equals("false")) {
+			if (collection.get("IsHealthcareProfessional").equals("false") || !collection.get("Type").equals("Medical doctor")) {
 				// the citizen is no HCP
 				acquiredAttribute = new PersonalAttribute("isHealthCareProfessional", false, new ArrayList<String>(), "NotAvailable");
 			} else {
 				// go on and parse the data
 				IsHealthCareProfessionalType result = new IsHealthCareProfessionalType();
-				result.setNameOfOrganisation(collection.get("NameOfOrganisation"));
 
-				if (collection.get("Type").equals("Medical doctor"))
-					result.setHCPType("D");
-				else
-					result.setHCPType("?");
+				// TODO: we do not have any list of possible values yet. Fix as soon as we get some.
+//				if (collection.get("Type").equals("Medical doctor"))
+					result.setTypeOfHCP("physician");
 
-				if (collection.get("Specialization").contains("Arzt für Allgemeinmedizin"))
-					result.setSpecialisation("GP");
-				else
-					result.setSpecialisation("??");
+				result.setNameOfOrganisation(collection.get("NameOfOrganisation"));
+				result.setTypeOfOrganisation("Unknown");
 
 				result.setAQAA(4);