Skip to content
This repository was archived by the owner on Jul 31, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
4f6432b
add endpoint for next question
yuliumitre Oct 4, 2021
8c4651a
add item to questionnaire
yuliumitre Oct 7, 2021
8fef814
merge from master
yuliumitre Oct 7, 2021
a17a1cc
Update gradle to newest version
KeeyanGhoreshi Oct 14, 2021
608741c
fix merge issue
yuliumitre Oct 18, 2021
eb61b07
Working version of next-question (assuming there is only one parent q…
RobertScalfani Oct 22, 2021
d94c7cf
next-question tree can now have infiinite depth of questions and answ…
RobertScalfani Oct 22, 2021
c170068
Changed the questionnaire tree to use a static map to track multuple …
RobertScalfani Oct 25, 2021
763ec63
Removed children display in response JSON for question items
RobertScalfani Oct 25, 2021
c033a5e
Made it so that sending a response with no answer items will reset th…
RobertScalfani Oct 25, 2021
3f169c5
Retrieve the Questions file from the FileStore.
plarocque4 Oct 25, 2021
b75b6e8
Merge branch 'master' of https://github.com/HL7-DaVinci/CRD into adFo…
yuliumitre Oct 25, 2021
85a93c0
Fix Java 8 build error.
plarocque4 Oct 25, 2021
c2049d1
Cleanup.
RobertScalfani Oct 28, 2021
abf5ff2
merge git pull
RobertScalfani Oct 28, 2021
bade0a0
Added funcionality for an adaptive questionnaire to return multiple q…
RobertScalfani Nov 1, 2021
d9d4041
Added multiple questions to be sent based on current next-question. U…
RobertScalfani Nov 10, 2021
79b23b8
Updated CDS-Library resource call for adform.
RobertScalfani Nov 30, 2021
19c0c19
Updated adform tree to rerun with each request so that any input can …
RobertScalfani Dec 1, 2021
321c407
Cleanup, added TODO comments with missing functionality.
RobertScalfani Dec 1, 2021
fa760d4
Commented out leaf node code
RobertScalfani Dec 1, 2021
fe21db8
Added support for string-based answers, added leaf node functionality…
RobertScalfani Dec 1, 2021
6d5de01
Fixed an issue where duplicate questions would be sent with the final…
RobertScalfani Dec 1, 2021
9041344
Update gradle to newest version
KeeyanGhoreshi Dec 2, 2021
ea089d2
Merge pull request #250 from HL7-DaVinci/update-gradle
yuliumitre Dec 2, 2021
2aa86d1
Cleaned up code by removing extranseous file, comments, updated quest…
RobertScalfani Dec 10, 2021
c030137
Removed hard-coded home oxygen file names
RobertScalfani Dec 10, 2021
bb0db2e
Merge pull request #256 from HL7-DaVinci/cql-and-question-pages
RobertScalfani Dec 14, 2021
9ccbfb2
Preemptive prior auth (#255)
plarocque4 Dec 22, 2021
4cb84bc
Update build.gradle
smalho01 Jan 12, 2022
d2386de
Delete CdsAbstract.java
smalho01 Jan 12, 2022
e40cdd9
Delete CdsServiceRems.java
smalho01 Jan 12, 2022
72e1315
Delete OrderSelectServiceRems.java
smalho01 Jan 12, 2022
b297315
revert accidental merges from mcode space
smalho01 Jan 12, 2022
4a9e3ea
Merge branch 'dockerDev' of https://github.com/HL7-DaVinci/CRD into d…
smalho01 Jan 12, 2022
2e08689
Delete dockerRunner.sh
smalho01 Jan 12, 2022
8890d41
Merge branch 'master' into dockerDev
smalho01 Jan 12, 2022
57bbca2
Merge branch 'dockerDev' of https://github.com/HL7-DaVinci/CRD into d…
smalho01 Jan 12, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions dockerRunner.sh

This file was deleted.

2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
8 changes: 4 additions & 4 deletions operations/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply plugin: 'maven'
apply plugin: 'maven-publish'

dependencies {
compile project(':resources')
compile 'ca.uhn.hapi.fhir:hapi-fhir-base:5.3.0'
compile 'ca.uhn.hapi.fhir:hapi-fhir-structures-r4:5.3.0'
implementation project(':resources')
implementation 'ca.uhn.hapi.fhir:hapi-fhir-base:5.3.0'
implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-r4:5.3.0'
}
26 changes: 13 additions & 13 deletions resources/build.gradle
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
apply plugin: 'maven'
apply plugin: 'maven-publish'

dependencies {
compile group: 'com.helger', name: 'ph-schematron', version: '4.1.0'
compile 'com.googlecode.json-simple:json-simple:1.1.1'
implementation group: 'com.helger', name: 'ph-schematron', version: '4.1.0'
implementation 'com.googlecode.json-simple:json-simple:1.1.1'

compile 'ca.uhn.hapi.fhir:hapi-fhir-base:5.3.0'
compile 'ca.uhn.hapi.fhir:hapi-fhir-structures-r4:5.3.0'
compile group: 'ca.uhn.hapi.fhir', name: 'hapi-fhir-validation-resources-r4', version: '5.3.0'
compile 'ca.uhn.hapi.fhir:hapi-fhir-validation:5.3.0'
implementation 'ca.uhn.hapi.fhir:hapi-fhir-base:5.3.0'
implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-r4:5.3.0'
implementation group: 'ca.uhn.hapi.fhir', name: 'hapi-fhir-validation-resources-r4', version: '5.3.0'
implementation 'ca.uhn.hapi.fhir:hapi-fhir-validation:5.3.0'

compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.12.1'
compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.12.1'
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.12.1'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.12.1'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.12.1'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.12.1'

compile group: 'javax.validation', name: 'validation-api', version: '2.0.1.Final'
compile group: 'org.springframework', name: 'spring-context', version: '5.0.8.RELEASE'
implementation group: 'javax.validation', name: 'validation-api', version: '2.0.1.Final'
implementation group: 'org.springframework', name: 'spring-context', version: '5.0.8.RELEASE'

compile('ca.uhn.hapi.fhir:hapi-fhir-jpaserver-base:3.6.0'){
implementation('ca.uhn.hapi.fhir:hapi-fhir-jpaserver-base:3.6.0'){
exclude group: 'org.thymeleaf'
}
}
14 changes: 10 additions & 4 deletions resources/src/main/java/org/cdshooks/Action.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public Action(FhirComponentsT fhirComponents) {
private TypeEnum type = null;
private String description = null;
private IBaseResource resource = null;
private String resourceId = null;

private FhirComponentsT fhirComponents;

Expand All @@ -26,17 +27,22 @@ public void setType(TypeEnum type) {
this.type = type;
}

public String getDescription() {
return description;
}
public String getDescription() { return description; }

public void setDescription(String description) {
this.description = description;
}

public IBaseResource getResource() { return resource; }

public void setResource(IBaseResource resource) { this.resource = resource; }
public void setResource(IBaseResource resource) {
this.resource = resource;
setResourceId(resource.fhirType() + "/" + resource.getIdElement().getIdPart());
}

public String getResourceId() { return resourceId; }

public void setResourceId(String resourceId) { this.resourceId = resourceId; }

public FhirComponentsT getFhirComponents() {
return this.fhirComponents;
Expand Down
2 changes: 2 additions & 0 deletions resources/src/main/java/org/cdshooks/ActionSerializer.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ public void serialize(
new ObjectMapper().readValue(jsonStrNew, HashMap.class);
jgen.writeObjectField("resource", map);

jgen.writeStringField("resourceId", value.getResourceId());

jgen.writeEndObject();
}
}
48 changes: 47 additions & 1 deletion resources/src/main/java/org/cdshooks/Card.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,24 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;

public class Card {
private String uuid = null;
private String summary = null;

private String detail = null;
private IndicatorEnum indicator = null;
private Source source = null;
private List<Suggestion> suggestions = null;
private SelectionBehaviorEnum selectionBehavior = null;
private List<Link> links = null;

public Card() { this.uuid = UUID.randomUUID().toString(); }

public String getUuid() { return uuid; }

private void setUuid(String uuid) { this.uuid = uuid; }

public String getSummary() {
return summary;
}
Expand Down Expand Up @@ -68,6 +76,10 @@ public void setSuggestions(List<Suggestion> suggestions) {
this.suggestions = suggestions;
}

public SelectionBehaviorEnum getSelectionBehavior() { return selectionBehavior; }

public void setSelectionBehavior(SelectionBehaviorEnum selectionBehavior) { this.selectionBehavior = selectionBehavior; }

/**
* Add a link.
* @param linksItem The link.
Expand Down Expand Up @@ -129,4 +141,38 @@ public String toString() {
return String.valueOf(value);
}
}

public enum SelectionBehaviorEnum {
ANY("any"),
AT_MOST_ONE("at-most-one");

private String value;

SelectionBehaviorEnum(String value) { this.value = value; }

/**
* Create the enum value from a string. Needed because the values have illegal java chars.
* @param value One of the enum values.
* @return selectionBehaviorEnum
*/
@JsonCreator
public static SelectionBehaviorEnum fromValue(String value) throws IOException {
for (SelectionBehaviorEnum selectionBehaviorEnum : SelectionBehaviorEnum.values()) {
if (selectionBehaviorEnum.toString().equals(value)) {
return selectionBehaviorEnum;
}
}
return null;
}

@JsonValue
public String getValue() {
return value;
}

@Override
public String toString() {
return String.valueOf(value);
}
}
}
34 changes: 34 additions & 0 deletions resources/src/main/java/org/cdshooks/CoverageRequirements.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package org.cdshooks;

import java.util.UUID;

public class CoverageRequirements {
private boolean applies;
private String summary;
Expand All @@ -12,10 +14,14 @@ public class CoverageRequirements {
private String questionnairePARequestUri;
private String questionnairePlanOfCareUri;
private String questionnaireDispenseUri;
private String questionnaireAdditionalUri;
private String requestId;
private boolean priorAuthRequired;
private boolean documentationRequired;

private boolean priorAuthApproved;
private String priorAuthId;

public boolean getApplies() { return applies; }

public CoverageRequirements setApplies(boolean applies) {
Expand Down Expand Up @@ -137,4 +143,32 @@ public CoverageRequirements setDocumentationRequired(boolean documentationRequir
this.documentationRequired = documentationRequired;
return this;
}

public boolean isPriorAuthApproved() { return priorAuthApproved; }

public CoverageRequirements setPriorAuthApproved(boolean priorAuthApproved) {
this.priorAuthApproved = priorAuthApproved;
return this;
}

public String getPriorAuthId() { return priorAuthId; }

public CoverageRequirements setPriorAuthId(String priorAuthId) {
this.priorAuthId = priorAuthId;
return this;
}

public CoverageRequirements generatePriorAuthId() {
// Generate a random UUID as the ID. This is the same method that Prior Auth (PAS) uses.
this.priorAuthId = UUID.randomUUID().toString();
return this;
}

public String getQuestionnaireAdditionalUri() {
return questionnaireAdditionalUri;
}

public void setQuestionnaireAdditionalUri(String questionnaireAdditionalUri) {
this.questionnaireAdditionalUri = questionnaireAdditionalUri;
}
}
12 changes: 6 additions & 6 deletions resources/src/main/java/org/cdshooks/Suggestion.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@
public class Suggestion {
private String label = null;

private UUID uuid = null;
private String uuid = null;

private List<Action> actions = null;

private boolean isRecommended = false;
private boolean isRecommended = true;

public Suggestion() { this.uuid = UUID.randomUUID().toString(); }

public String getLabel() {
return label;
Expand All @@ -21,11 +23,9 @@ public void setLabel(String label) {
this.label = label;
}

public UUID getUuid() {
return uuid;
}
public String getUuid() { return uuid; }

public void setUuid(UUID uuid) {
public void setUuid(String uuid) {
this.uuid = uuid;
}

Expand Down
Loading