@openhealth/oht-custom-parser-lib 0.2.24 → 0.2.25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { DataImportFileUpload } from '../types/oht.types';
|
|
2
|
-
declare function postDataImportFileUploadToCore(dataImportFileUpload: DataImportFileUpload, rejectedStatus: string | undefined, rejectReason: string | undefined, isReportParsedCorrectly: boolean, filename: string, ohtCoreApiKey: string): Promise<DataImportFileUpload | null>;
|
|
1
|
+
import { DataImportFileUpload, UnknownMeasurementsBulk } from '../types/oht.types';
|
|
2
|
+
declare function postDataImportFileUploadToCore(dataImportFileUpload: DataImportFileUpload, unknownMeasurements: UnknownMeasurementsBulk, rejectedStatus: string | undefined, rejectReason: string | undefined, isReportParsedCorrectly: boolean, filename: string, ohtCoreApiKey: string): Promise<DataImportFileUpload | null>;
|
|
3
3
|
export { postDataImportFileUploadToCore };
|
|
@@ -18,7 +18,7 @@ const dataUtils_1 = require("../util-ts/dataUtils");
|
|
|
18
18
|
const apiUtils_1 = require("../util-ts/apiUtils");
|
|
19
19
|
dotenv_1.default.config({ path: `.env.local` });
|
|
20
20
|
const OHT_CORE_URL = process.env.OHT_CORE_URL;
|
|
21
|
-
async function postDataImportFileUploadToCore(dataImportFileUpload, rejectedStatus, rejectReason, isReportParsedCorrectly, filename, ohtCoreApiKey) {
|
|
21
|
+
async function postDataImportFileUploadToCore(dataImportFileUpload, unknownMeasurements, rejectedStatus, rejectReason, isReportParsedCorrectly, filename, ohtCoreApiKey) {
|
|
22
22
|
let status = isReportParsedCorrectly
|
|
23
23
|
? oht_types_1.DataImportFileUploadStatus.PROCESSED
|
|
24
24
|
: oht_types_1.DataImportFileUploadStatus.FOR_REVIEW;
|
|
@@ -61,6 +61,23 @@ async function postDataImportFileUploadToCore(dataImportFileUpload, rejectedStat
|
|
|
61
61
|
},
|
|
62
62
|
}, ohtCoreApiKey);
|
|
63
63
|
logger.info({ response: initialResponse.data }, `Resp: PATCH status: ${patchStatus} ${ohtCoreFileUploadUrl}, filename: ${filename}`);
|
|
64
|
+
// Send unknown measurements if they exist
|
|
65
|
+
if (unknownMeasurements.unmappedlabkeys.length > 0) {
|
|
66
|
+
try {
|
|
67
|
+
await (0, dataUtils_1.updatePartnerCustomParserUnmappedLabKeys)(dataImportFileUpload.partnerId, unknownMeasurements, ohtCoreApiKey);
|
|
68
|
+
logger.info({
|
|
69
|
+
partnerId: dataImportFileUpload.partnerId,
|
|
70
|
+
unknownMeasurements: unknownMeasurements.unmappedlabkeys
|
|
71
|
+
}, `Successfully sent unknown measurements to server, filename: ${filename}`);
|
|
72
|
+
}
|
|
73
|
+
catch (error) {
|
|
74
|
+
logger.error({
|
|
75
|
+
error: (0, apiUtils_1.parseErrorObj)(error),
|
|
76
|
+
partnerId: dataImportFileUpload.partnerId,
|
|
77
|
+
unknownMeasurements: unknownMeasurements.unmappedlabkeys
|
|
78
|
+
}, `Failed to send unknown measurements to server, filename: ${filename}`);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
64
81
|
if (isReportParsedCorrectly && rejectedStatus === undefined) {
|
|
65
82
|
if (dataImportFileUpload?.labOrderId?.length > 0) {
|
|
66
83
|
// deprecate any previous fileUpload with same labOrderId and update current to READY
|
|
@@ -68,25 +85,6 @@ async function postDataImportFileUploadToCore(dataImportFileUpload, rejectedStat
|
|
|
68
85
|
return null;
|
|
69
86
|
}
|
|
70
87
|
else {
|
|
71
|
-
// Send unknown measurements if they exist
|
|
72
|
-
if (dataImportFileUpload.unknownMeasurements.length > 0) {
|
|
73
|
-
try {
|
|
74
|
-
await (0, dataUtils_1.updatePartnerCustomParserUnmappedLabKeys)(dataImportFileUpload.partnerId, {
|
|
75
|
-
unmappedlabkeys: dataImportFileUpload.unknownMeasurements
|
|
76
|
-
}, ohtCoreApiKey);
|
|
77
|
-
logger.info({
|
|
78
|
-
partnerId: dataImportFileUpload.partnerId,
|
|
79
|
-
unknownMeasurements: dataImportFileUpload.unknownMeasurements
|
|
80
|
-
}, `Successfully sent unknown measurements to server, filename: ${filename}`);
|
|
81
|
-
}
|
|
82
|
-
catch (error) {
|
|
83
|
-
logger.error({
|
|
84
|
-
error: (0, apiUtils_1.parseErrorObj)(error),
|
|
85
|
-
partnerId: dataImportFileUpload.partnerId,
|
|
86
|
-
unknownMeasurements: dataImportFileUpload.unknownMeasurements
|
|
87
|
-
}, `Failed to send unknown measurements to server, filename: ${filename}`);
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
88
|
return await (0, auxiliaryFunctions_service_1.postFileUploadSetStatus)({
|
|
91
89
|
status: oht_types_1.DataImportFileUploadStatus.READY,
|
|
92
90
|
digitalization: { status: 'DONE', lastUpdated: dayjs_1.default.utc() },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reportCreator.service.js","sourceRoot":"","sources":["../../service/reportCreator.service.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"reportCreator.service.js","sourceRoot":"","sources":["../../service/reportCreator.service.ts"],"names":[],"mappings":"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"}
|