Got the reader to read both srt/sct codes

QIICR · Mar 3, 2020 · 3301704 · 3301704
1 parent 626b52f
commit 3301704
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/include/dcmqi/TID1500Reader.h b/include/dcmqi/TID1500Reader.h
@@ -14,7 +14,7 @@
 #include "dcmtk/dcmsr/codes/dcm.h"
 #include "dcmtk/dcmsr/codes/ncit.h"
 #include "dcmtk/dcmsr/codes/sct.h"
-#include "dcmtk/dcmsr/codes/sct.h"
+#include "dcmtk/dcmsr/codes/srt.h"
 #include "dcmtk/dcmsr/codes/umls.h"
 #include <dcmtk/dcmsr/dsruidtn.h>
 

diff --git a/libsrc/TID1500Reader.cpp b/libsrc/TID1500Reader.cpp
@@ -84,8 +84,8 @@ Json::Value TID1500Reader::getMeasurements() {
         mIt!=string2code.end();++mIt){
     knownConcepts.push_back(mIt->second);
   }
-  knownConcepts.push_back(CODE_SCT_MeasurementMethod);
-  knownConcepts.push_back(CODE_SCT_FindingSite);
+  knownConcepts.push_back(CODE_SRT_MeasurementMethod);
+  knownConcepts.push_back(CODE_SRT_FindingSite);
 
   std::vector<DSRCodedEntryValue> algorithmIdentificationConcepts;
   algorithmIdentificationConcepts.push_back(CODE_DCM_AlgorithmName);
@@ -145,8 +145,8 @@ Json::Value TID1500Reader::getMeasurements() {
               Json::Value laterality = Json::nullValue;
               if(node->getConceptName() == CODE_SCT_FindingSite)
                 laterality = getContentItem(CODE_SCT_Laterality, cursor);
-              else if(node->getConceptName() == CODE_SCT_FindingSite)
-                laterality = getContentItem(CODE_SCT_Laterality, cursor);
+              else if(node->getConceptName() == CODE_SRT_FindingSite)
+                laterality = getContentItem(CODE_SRT_Laterality, cursor);
               if(laterality!=Json::nullValue)
                 measurementGroup["Laterality"] = laterality;
             }
@@ -279,9 +279,9 @@ Json::Value TID1500Reader::getSingleMeasurement(const DSRNumTreeNode &numNode,
           if (node->getConceptName() == CODE_DCM_Derivation) {
             singleMeasurement["derivationModifier"] = DSRCodedEntryValue2CodeSequence(OFstatic_cast(
             const DSRCodeTreeNode *, node)->getValue());
-          } else if (node->getConceptName() == CODE_SCT_FindingSite || node->getConceptName() == CODE_SCT_FindingSite) {
+          } else if (node->getConceptName() == CODE_SCT_FindingSite || node->getConceptName() == CODE_SRT_FindingSite) {
             std::cerr << "Warning: For now, FindingSite modifier is interpreted only at the MeasurementGroup level." << OFendl;
-          } else if (node->getConceptName() == CODE_SCT_MeasurementMethod || node->getConceptName() == CODE_SCT_MeasurementMethod) {
+          } else if (node->getConceptName() == CODE_SCT_MeasurementMethod || node->getConceptName() == CODE_SRT_MeasurementMethod) {
             std::cerr << "Warning: For now, Measurement Method modifier is interpreted only at the MeasurementGroup level." << OFendl;
           } else if (node->getValueType() == VT_Code) {
             // Otherwise, assume that modifier corresponds to row 6.