diff --git a/PEIS/Model/ReportModel.cs b/PEIS/Model/ReportModel.cs
index ade1521..d60e6ce 100644
--- a/PEIS/Model/ReportModel.cs
+++ b/PEIS/Model/ReportModel.cs
@@ -187,7 +187,7 @@ namespace PEIS.Model
         public List<Report> GetPacsPhoto(Int64 Eid)
         {
             var pacs =  DAOHelp.GetDataBySQL<Report>($"select ReportImage from Report where EID = { Eid } AND ReportImage IS NOT NULL");
-            var heart = DAOHelp.GetDataBySQL<Report>($"select ReportData AS ReportImage from Report_GSEXD where PatientNo = {Eid}");
+            var heart = DAOHelp.GetDataBySQL<Report>($"select ReportData AS ReportImage from Report_GSEXD where PatientNo = {Eid} AND ReportData IS NOT NULL");
 
             if (heart.Count == 0)
             {
diff --git a/PEIS/Utils/ReportHelper.cs b/PEIS/Utils/ReportHelper.cs
index aa193c5..cc4877c 100644
--- a/PEIS/Utils/ReportHelper.cs
+++ b/PEIS/Utils/ReportHelper.cs
@@ -244,7 +244,7 @@ namespace PEIS.Utils
             rpt.SetParameterValue("HospitalName", Global._hospital.Name);
             rpt.SetParameterValue("DeptName", patient.DeptName);
 
-            if(patient.Photo == null)
+            if(string.IsNullOrEmpty(patient.Photo))
             {
                 rpt.SetParameterValue("Avatar", patient.Photo);
             }