Recoding
/
PEIS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、总检检查科室照片显示，2、模板修改

Browse Source
mzzyy
lsm 10 months ago
parent f5da844624
commit 3286338155
4 changed files with 72 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      PEIS/Model/ReportModel.cs
  2. 27
      PEIS/ReportFiles/Guide.frx
  3. 94
      PEIS/ReportFiles/PReport.frx
  4. 3
      PEIS/View/Exam/TotalForm.cs

2
PEIS/Model/ReportModel.cs
Unescape View File

@ -186,7 +186,7 @@ namespace PEIS.Model
// pacs原始报告
public List<Report> GetPacsPhoto(Int64 Eid)
{
var pacs = DAOHelp.GetDataBySQL<Report>($"select ReportImage from Report where EID = { Eid } AND ReportImage IS NOT NULL");
var pacs = DAOHelp.GetDataBySQL<Report>($"select ReportImage from Report where EID = { Eid } AND ReportImage IS NOT NULL ORDER BY Class");
var heart = DAOHelp.GetDataBySQL<Report>($"select ReportData AS ReportImage from Report_GSEXD where PatientNo = {Eid}");
if (heart.Count == 0)

27
PEIS/ReportFiles/Guide.frx
Unescape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="06/08/2023 15:44:02" ReportInfo.Modified="09/22/2024 15:52:54" ReportInfo.CreatorVersion="2022.1.0.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="06/08/2023 15:44:02" ReportInfo.Modified="09/24/2024 09:24:43" ReportInfo.CreatorVersion="2022.1.0.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@ -154,7 +154,7 @@ namespace FastReport
</TableObject>
<BarcodeObject Name="Barcode1" Left="9.45" Top="9.45" Width="143.75" Height="56.7" AutoSize="false" Expression="[ExamID]" Text="" Barcode="Code128" Barcode.AutoEncode="true"/>
</ReportTitleBand>
<DataBand Name="FeeItems" Top="438.21" Width="718.2" Height="81.27" CanGrow="true" CanShrink="true">
<DataBand Name="FeeItems" Top="438.88" Width="718.2" Height="81.27" CanGrow="true" CanShrink="true">
<TableObject Name="Table2" Width="718.2" Height="81.27">
<TableColumn Name="Column11" Width="143.64"/>
<TableColumn Name="Column12" Width="143.64"/>
@ -178,9 +178,26 @@ namespace FastReport
</TableRow>
</TableObject>
</DataBand>
<PageFooterBand Name="PageFooter1" Top="521.48" Width="718.2" Height="37.8" Border.Lines="Top">
<TextObject Name="Text7" Width="160.65" Height="28.35" Text="第[Page#]页，共[TotalPages#]页" Font="微软雅黑, 10pt"/>
<TextObject Name="Text8" Left="500.85" Width="217.35" Height="28.35" Text="打印时间：[Date]" Font="微软雅黑, 10pt"/>
<PageFooterBand Name="PageFooter1" Top="522.81" Width="718.2" Height="85.05">
<TextObject Name="Text7" Top="56.7" Width="160.65" Height="28.35" Text="第[Page#]页，共[TotalPages#]页" Font="微软雅黑, 10pt"/>
<TextObject Name="Text8" Left="500.85" Top="56.7" Width="217.35" Height="28.35" Text="打印时间：[Date]" Font="微软雅黑, 10pt"/>
<TextObject Name="Text16" Width="37.8" Height="18.9" CanBreak="false" Text="身高" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
<TextObject Name="Text17" Left="37.8" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
<TextObject Name="Text18" Left="103.95" Width="37.8" Height="18.9" CanBreak="false" Text="体重" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
<TextObject Name="Text19" Left="141.75" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
<TextObject Name="Text20" Left="207.9" Width="37.8" Height="18.9" CanBreak="false" Text="血压" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
<TextObject Name="Text21" Left="245.7" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
<TextObject Name="Text22" Left="311.85" Width="37.8" Height="18.9" CanBreak="false" Text="心率" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
<TextObject Name="Text23" Left="349.65" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
<TextObject Name="Text24" Left="415.8" Width="37.8" Height="18.9" CanBreak="false" Text="视力" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
<TextObject Name="Text25" Left="453.6" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
<TextObject Name="Text28" Left="519.75" Width="37.8" Height="18.9" CanBreak="false" Text="听力" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
<TextObject Name="Text29" Left="557.55" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
<TextObject Name="Text26" Top="28.35" Width="47.25" Height="18.9" CanBreak="false" Text="现病史" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
<TextObject Name="Text27" Left="47.25" Top="28.35" Width="283.5" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
<TextObject Name="Text30" Left="349.65" Top="28.35" Width="47.25" Height="18.9" CanBreak="false" Text="既往史" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
<TextObject Name="Text31" Left="396.9" Top="28.35" Width="283.5" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
<LineObject Name="Line1" Top="56.7" Width="718.2" Border.Width="4"/>
</PageFooterBand>
</ReportPage>
</Report>

94
PEIS/ReportFiles/PReport.frx
View File

File diff suppressed because one or more lines are too long

3
PEIS/View/Exam/TotalForm.cs
Unescape View File

@ -860,10 +860,9 @@ 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();
ShowPacsRptList(pacsReportList);

Write Preview
Loading…
Cancel
Save