diff options
Diffstat (limited to 'src/main')
3 files changed, 25 insertions, 5 deletions
diff --git a/src/main/java/dev/dnpm/oshelper/atc/AtcCode.java b/src/main/java/dev/dnpm/oshelper/atc/AtcCode.java index 7beabbd..61685d6 100644 --- a/src/main/java/dev/dnpm/oshelper/atc/AtcCode.java +++ b/src/main/java/dev/dnpm/oshelper/atc/AtcCode.java @@ -31,18 +31,22 @@ public class AtcCode implements AgentCode { private final String code; private final String name; + private final String synonyms; private final String version; public AtcCode(String code, String name) { - this.code = code; - this.name = name; - this.version = null; + this(code, name, null); } public AtcCode(String code, String name, String version) { + this(code, name, version, ""); + } + + public AtcCode(String code, String name, String version, String synonyms) { this.code = code; this.name = name; + this.synonyms = synonyms; this.version = version; } @@ -54,6 +58,10 @@ public class AtcCode implements AgentCode { return name; } + public String getSynonyms() { + return this.synonyms; + } + public CodeSystem getSystem() { return CodeSystem.ATC; } diff --git a/src/main/java/dev/dnpm/oshelper/atc/UnregisteredCode.java b/src/main/java/dev/dnpm/oshelper/atc/UnregisteredCode.java index 14be757..8c7df54 100644 --- a/src/main/java/dev/dnpm/oshelper/atc/UnregisteredCode.java +++ b/src/main/java/dev/dnpm/oshelper/atc/UnregisteredCode.java @@ -32,9 +32,16 @@ public class UnregisteredCode implements AgentCode { private final String code; private final String name; + private final String synonyms; + public UnregisteredCode(String code, String name) { + this(code, name, ""); + } + + public UnregisteredCode(String code, String name, String synonyms) { this.code = code; this.name = name; + this.synonyms = synonyms; } public String getCode() { @@ -45,6 +52,10 @@ public class UnregisteredCode implements AgentCode { return name; } + public String getSynonyms() { + return synonyms; + } + public CodeSystem getSystem() { return CodeSystem.UNREGISTERED; } diff --git a/src/main/java/dev/dnpm/oshelper/atc/services/OnkostarAgentCodeService.java b/src/main/java/dev/dnpm/oshelper/atc/services/OnkostarAgentCodeService.java index 2fe6713..306563d 100644 --- a/src/main/java/dev/dnpm/oshelper/atc/services/OnkostarAgentCodeService.java +++ b/src/main/java/dev/dnpm/oshelper/atc/services/OnkostarAgentCodeService.java @@ -51,7 +51,7 @@ public class OnkostarAgentCodeService implements AgentCodeService { */ @Override public List<AgentCode> findAgentCodes(final String query, final int size) { - var sql = "SELECT code, shortdesc\n" + + var sql = "SELECT code, shortdesc, synonyms\n" + " FROM property_catalogue\n" + " JOIN property_catalogue_version ON (property_catalogue_version.datacatalog_id = property_catalogue.id)\n" + " JOIN property_catalogue_version_entry p ON (p.property_version_id = property_catalogue_version.id)\n" + @@ -68,10 +68,11 @@ public class OnkostarAgentCodeService implements AgentCodeService { (resultSet, i) -> { var code = resultSet.getString("code"); var shortdesc = resultSet.getString("shortdesc"); + var synonyms = resultSet.getString("synonyms"); if (AtcCode.isAtcCode(code)) { return new AtcCode(code, shortdesc); } - return new UnregisteredCode(code, shortdesc); + return new UnregisteredCode(code, shortdesc, synonyms); } ); } |