From 32863381550bed3f02405df94276d179d23073df Mon Sep 17 00:00:00 2001 From: lsm Date: Tue, 24 Sep 2024 11:33:06 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=80=BB=E6=A3=80=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E7=A7=91=E5=AE=A4=E7=85=A7=E7=89=87=E6=98=BE=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?2=E3=80=81=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PEIS/Model/ReportModel.cs | 2 +- PEIS/ReportFiles/Guide.frx | 27 +++++++++-- PEIS/ReportFiles/PReport.frx | 94 ++++++++++++++++++------------------ PEIS/View/Exam/TotalForm.cs | 5 +- 4 files changed, 72 insertions(+), 56 deletions(-) diff --git a/PEIS/Model/ReportModel.cs b/PEIS/Model/ReportModel.cs index 0da30c6..cd06ee9 100644 --- a/PEIS/Model/ReportModel.cs +++ b/PEIS/Model/ReportModel.cs @@ -186,7 +186,7 @@ namespace PEIS.Model // pacs原始报告 public List GetPacsPhoto(Int64 Eid) { - var pacs = DAOHelp.GetDataBySQL($"select ReportImage from Report where EID = { Eid } AND ReportImage IS NOT NULL"); + var pacs = DAOHelp.GetDataBySQL($"select ReportImage from Report where EID = { Eid } AND ReportImage IS NOT NULL ORDER BY Class"); var heart = DAOHelp.GetDataBySQL($"select ReportData AS ReportImage from Report_GSEXD where PatientNo = {Eid}"); if (heart.Count == 0) diff --git a/PEIS/ReportFiles/Guide.frx b/PEIS/ReportFiles/Guide.frx index af91b1b..91c140b 100644 --- a/PEIS/ReportFiles/Guide.frx +++ b/PEIS/ReportFiles/Guide.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -154,7 +154,7 @@ namespace FastReport - + @@ -178,9 +178,26 @@ namespace FastReport - - - + + + + + + + + + + + + + + + + + + + + diff --git a/PEIS/ReportFiles/PReport.frx b/PEIS/ReportFiles/PReport.frx index f936f78..9e6bbaa 100644 --- a/PEIS/ReportFiles/PReport.frx +++ b/PEIS/ReportFiles/PReport.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -164,30 +164,30 @@ namespace FastReport - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - + @@ -201,12 +201,12 @@ namespace FastReport - + - + @@ -228,7 +228,7 @@ namespace FastReport - + @@ -242,7 +242,7 @@ namespace FastReport - + @@ -260,7 +260,7 @@ namespace FastReport - + @@ -312,7 +312,7 @@ namespace FastReport - + @@ -344,7 +344,7 @@ namespace FastReport - + @@ -367,7 +367,7 @@ namespace FastReport - + @@ -381,7 +381,7 @@ namespace FastReport - + @@ -402,7 +402,7 @@ namespace FastReport - + @@ -412,10 +412,10 @@ namespace FastReport - + - + @@ -432,7 +432,7 @@ namespace FastReport - + @@ -441,7 +441,7 @@ namespace FastReport - + @@ -464,7 +464,7 @@ namespace FastReport - + @@ -479,7 +479,7 @@ namespace FastReport - + @@ -502,7 +502,7 @@ namespace FastReport - + @@ -514,7 +514,7 @@ namespace FastReport - + @@ -523,16 +523,16 @@ namespace FastReport - + - - - + + + - + @@ -550,7 +550,7 @@ namespace FastReport - + @@ -564,10 +564,10 @@ namespace FastReport - - + + - + diff --git a/PEIS/View/Exam/TotalForm.cs b/PEIS/View/Exam/TotalForm.cs index 9924384..46d502b 100644 --- a/PEIS/View/Exam/TotalForm.cs +++ b/PEIS/View/Exam/TotalForm.cs @@ -860,12 +860,11 @@ namespace PEIS.View.Exam b.Positive, b.InTime, b.SpcimenName - FROM Enrollment_FeeItem a - LEFT JOIN Report b ON a.EID = b.EID AND a.ID= b.ReportNo + LEFT JOIN Report b ON a.EID = b.EID AND (a.ID= b.ReportNo or a.OldId = b.ReportNo) WHERE - a.ItemClass = '检查' AND a.eid = {eid}").ToList(); + a.ItemClass = '检查' AND a.eid = {eid}").ToList(); ShowPacsRptList(pacsReportList); return pacsReportList; }