From 68d24e678a5f958272ef1bf512762368615b7248 Mon Sep 17 00:00:00 2001
From: sunwen <sunwen@eq9hj.com>
Date: Tue, 10 Sep 2024 14:19:28 +0800
Subject: [PATCH] Add accession number and studyuid in patient data.

---
 src/Data/PatientData.cpp             | 20 ++++++++++++++++++++
 src/Data/PatientData.h               |  6 ++++++
 src/DataReader/PatientDataReader.cpp | 16 ++++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/src/Data/PatientData.cpp b/src/Data/PatientData.cpp
index bbaea03..e63224e 100644
--- a/src/Data/PatientData.cpp
+++ b/src/Data/PatientData.cpp
@@ -25,6 +25,26 @@ std::string PatientData::getPatientName() const
     return mPatientName;
 }
 
+void PatientData::setAccessionNumber(const std::string &aAccessionNumber)
+{
+    mAccessionNumber = aAccessionNumber;
+}
+
+std::string PatientData::getAccessionNumber() const
+{
+    return mAccessionNumber;
+}
+
+void PatientData::setStudyUID(const std::string &aPatientStudyUID)
+{
+    mStudyUID = aPatientStudyUID;
+}
+
+std::string PatientData::getStudyUID() const
+{
+    return mStudyUID;
+}
+
 void PatientData::setReferringPhysicianName(const std::string& aReferringPhysicianName)
 {
     mReferringPhysicianName = aReferringPhysicianName;
diff --git a/src/Data/PatientData.h b/src/Data/PatientData.h
index d11e36d..772aa5d 100644
--- a/src/Data/PatientData.h
+++ b/src/Data/PatientData.h
@@ -11,6 +11,8 @@ public:
     PatientData();
     std::string getPatientID() const;
     std::string getPatientName() const;
+    std::string getAccessionNumber() const;
+    std::string getStudyUID() const;
     std::string getReferringPhysicianName() const;
     std::string getInstituationName() const;
     std::string getInstituationAddress() const;
@@ -23,6 +25,8 @@ public:
 private:
     void setPatientID(const std::string& aPatientID);
     void setPatientName(const std::string& aPatientName);
+    void setAccessionNumber(const std::string& aAccessionNumber);
+    void setStudyUID(const std::string& aPatientStudyUID);
     void setReferringPhysicianName(const std::string& aReferringPhysicianName);
     void setInstituationName(const std::string& aInstituationName);
     void setInstituationAddress(const std::string& aInstituationAddress);
@@ -35,6 +39,8 @@ private:
 private:
     std::string mPatientID;
     std::string mPatientName;
+    std::string mAccessionNumber;
+    std::string mStudyUID;
     std::string mReferringPhysicianName;
     std::string mInstituationName;
     std::string mInstituationAddress;
diff --git a/src/DataReader/PatientDataReader.cpp b/src/DataReader/PatientDataReader.cpp
index 9d84446..e44b76e 100644
--- a/src/DataReader/PatientDataReader.cpp
+++ b/src/DataReader/PatientDataReader.cpp
@@ -65,6 +65,12 @@ PatientData PatientDataReader::getPatientDataFromKIT(const std::string& aFilePat
     //PatientName
     result.setPatientName(getPatientStringData(patMat,"PatientName"));
 
+    //AccessionNumber
+    result.setAccessionNumber(getPatientStringData(patMat,"AccessionNumber"));
+
+    //StudyUID
+    result.setStudyUID(getPatientStringData(patMat,"StudyUID"));
+
     //PatientSex
     result.setPatientSex(getPatientStringData(patMat,"PatientSex"));
 
@@ -139,6 +145,16 @@ PatientData PatientDataReader::getPatientDataFromHJ(const std::string& aFilePath
     {
         result.setLaterality(patientObj.at("Laterality").get<std::string>());
     }
+
+    if(patientObj.contains("AccessionNumber"))
+    {
+        result.setAccessionNumber(patientObj.at("AccessionNumber").get<std::string>());
+    }
+
+    if(patientObj.contains("StudyUID"))
+    {
+        result.setStudyUID(patientObj.at("StudyUID").get<std::string>());
+    }
     delete[] patientCString;
     stream.close();
     return  result;