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
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
18 changes: 9 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"isomorphic-fetch": "^2.2.1",
"lodash": "^4.17.21",
"lowdb": "^1.0.0",
"node-fetch": "^2.6.1",
"node-fetch": "^2.6.7",
"pdfmake": "^0.1.56",
"pem": "^1.14.4",
"react": "^16.8.4",
Expand Down
6 changes: 6 additions & 0 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ export default class App extends Component {
}

ehrLaunch(isContainedQuestionnaire, questionnaire) {
// Temporary indication before full supports for relaunch is implemented
if(!this.appContext.request) {
alert("Supports for relaunch will be added in the near future!");
this.consoleLog("Supports for relaunch will be added in the near future!", "errorClass");
return;
}
const deviceRequest = JSON.parse(this.appContext.request.replace(/\\/g,""));
this.consoleLog("fetching artifacts", "infoClass");
this.setState({
Expand Down
40 changes: 33 additions & 7 deletions src/components/QuestionnaireForm/QuestionnaireForm.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -914,9 +914,33 @@ export default class QuestionnaireForm extends Component {
};
this.addAuthorToResponse(qr, this.getPractitioner());

qr.questionnaire = this.props.qform.id;
qr.questionnaire = `${this.FHIR_PREFIX}${this.fhirVersion}/Questionnaire/${this.props.qform.id}`;
console.log("GetQuestionnaireResponse final QuestionnaireResponse: ", qr);

const request = this.props.deviceRequest;
// add context extension
qr.extension = [];
if(request !== undefined) {
const contextExtensionUrl = "http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/context";
qr.extension.push({
url: contextExtensionUrl,
valueReference: {
reference: `${request.resourceType}/${request.id}`,
type: `${request.resourceType}`
}
})

if(request.insurance !== null && request.insurance.length > 0) {
const coverage = request.insurance[0];
qr.extension.push({
url: contextExtensionUrl,
valueReference: {
reference: `${coverage.reference}`,
type: "Coverage"
}
})
}
}
console.log(this.props.attested);
const aa = searchQuestionnaire(qr, this.props.attested);
console.log(aa);
Expand Down Expand Up @@ -1291,14 +1315,16 @@ export default class QuestionnaireForm extends Component {
if (newItem.item == undefined) {
//find the corresponding linkId in savedItem and replace it
const findSavedParentItem = (parentLinkId, savedItem) => {
if (savedItem.linkId == parentLinkId) {
if (savedItem.linkId === parentLinkId) {
return savedItem;
} else {
const parentIndex = savedItem.item.findIndex(item => item.linkId == parentLinkId);
if (parentIndex != -1) {
return savedItem.item[parentIndex];
} else {
findSavedParentItem(parentLinkId, savedItem.item);
if (savedItem.item) {
const parentIndex = savedItem.item.findIndex(item => item.linkId == parentLinkId);
if (parentIndex != -1) {
return savedItem.item[parentIndex];
} else {
findSavedParentItem(parentLinkId, savedItem.item);
}
}
}
};
Expand Down