fix sending multiple analysis elements for same material group with different <Proov> data
This commit is contained in:
@@ -151,14 +151,21 @@ export const getAnalysisElement = (
|
||||
export const getAnalysisGroup = (
|
||||
analysisGroupOriginalId: string,
|
||||
analysisGroupName: string,
|
||||
specimenOrderNr: number,
|
||||
analysisElement: Tables<{ schema: 'medreport' }, 'analysis_elements'>,
|
||||
) =>
|
||||
`<UuringuGrupp>
|
||||
<UuringuGruppId>${analysisGroupOriginalId}</UuringuGruppId>
|
||||
<UuringuGruppNimi>${analysisGroupName}</UuringuGruppNimi>
|
||||
<Uuring>
|
||||
uuringElementInputs: {
|
||||
analysisElement: Tables<{ schema: 'medreport' }, 'analysis_elements'>,
|
||||
specimenOrderNr: number,
|
||||
}[],
|
||||
) => {
|
||||
const uuringElements = uuringElementInputs.map(({ analysisElement, specimenOrderNr }) =>
|
||||
`<Uuring>
|
||||
${getAnalysisElement(analysisElement.analysis_id_oid, analysisElement.analysis_id_original, analysisElement.tehik_short_loinc, analysisElement.tehik_loinc_name, analysisElement.id, analysisElement.analysis_name_lab)}
|
||||
<ProoviJarjenumber>${specimenOrderNr}</ProoviJarjenumber>
|
||||
</Uuring>
|
||||
</Uuring>`
|
||||
).join('');
|
||||
|
||||
return `<UuringuGrupp>
|
||||
<UuringuGruppId>${analysisGroupOriginalId}</UuringuGruppId>
|
||||
<UuringuGruppNimi>${analysisGroupName}</UuringuGruppNimi>
|
||||
${uuringElements}
|
||||
</UuringuGrupp>`;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user