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

1、导出名单增加备注信息

Browse Source
dhzzyy
lsm 7 months ago
parent 6ae6e1efa2
commit f0ef865cb9
2 changed files with 18 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      PEIS/Model/Enrollment/EnrollmentOrgModel.cs
  2. 28
      PEIS/ReportFiles/OrgExcel.frx

3
PEIS/Model/Enrollment/EnrollmentOrgModel.cs
Unescape View File

@ -113,7 +113,8 @@ namespace PEIS.Model.Enrollment
a.Tel1, a.Tel1,
c.DeptName, c.DeptName,
a.SignTime, a.SignTime,
(SELECT SUM(Fee) FROM Enrollment_CheckCost WHERE a.ID = EID AND a.OEID = OEID AND DeleteTime IS NULL) AS Fee (SELECT SUM(Fee) FROM Enrollment_CheckCost WHERE a.ID = EID AND a.OEID = OEID AND DeleteTime IS NULL) AS Fee,
a.Description
FROM FROM
Enrollment_Patient a Enrollment_Patient a
LEFT JOIN Base_Patient b ON a.PID = b.ID LEFT JOIN Base_Patient b ON a.PID = b.ID

28
PEIS/ReportFiles/OrgExcel.frx
Unescape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="06/26/2023 17:47:58" ReportInfo.Modified="09/12/2024 15:31:07" ReportInfo.CreatorVersion="2022.1.0.0"> <Report ScriptLanguage="CSharp" ReportInfo.Created="06/26/2023 17:47:58" ReportInfo.Modified="10/21/2024 09:58:59" ReportInfo.CreatorVersion="2022.1.0.0">
<ScriptText>using System; <ScriptText>using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
@ -22,7 +22,7 @@ namespace FastReport
private void PeopleCount_AfterData(object sender, EventArgs e) private void PeopleCount_AfterData(object sender, EventArgs e)
{ {
DataSourceBase rowData = Report.GetDataSource(&quot;O&quot;); DataSourceBase rowData = Report.GetDataSource(&quot;O&quot;);
Cell86.Text = rowData[&quot;SignTime&quot;] == null ? &quot;&quot; : Convert.ToDateTime(rowData[&quot;SignTime&quot;]).ToString(&quot;yyyy-MM-dd&quot;); Cell87.Text = rowData[&quot;SignTime&quot;] == null ? &quot;&quot; : Convert.ToDateTime(rowData[&quot;SignTime&quot;]).ToString(&quot;yyyy-MM-dd&quot;);
} }
} }
} }
@ -46,11 +46,12 @@ namespace FastReport
<TableColumn Name="Column60" Width="36.95"/> <TableColumn Name="Column60" Width="36.95"/>
<TableColumn Name="Column61" Width="36.96"/> <TableColumn Name="Column61" Width="36.96"/>
<TableColumn Name="Column62" Width="46.41"/> <TableColumn Name="Column62" Width="46.41"/>
<TableColumn Name="Column63" Width="169.25"/> <TableColumn Name="Column63" Width="103.1"/>
<TableColumn Name="Column64" Width="65.31"/> <TableColumn Name="Column64" Width="74.76"/>
<TableColumn Name="Column65" Width="74.77"/> <TableColumn Name="Column65" Width="65.32"/>
<TableColumn Name="Column66" Width="73.71"/> <TableColumn Name="Column66" Width="73.71"/>
<TableColumn Name="Column67"/> <TableColumn Name="Column67"/>
<TableColumn Name="Column70"/>
<TableRow Name="Row8" Height="37.8"> <TableRow Name="Row8" Height="37.8">
<TableCell Name="Cell77" Border.Lines="All" Text="[Row#]" Padding="0, 0, 0, 0" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/> <TableCell Name="Cell77" Border.Lines="All" Text="[Row#]" Padding="0, 0, 0, 0" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TableCell Name="Cell78" Border.Lines="All" Text="[O.ID]" Padding="0, 0, 0, 0" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/> <TableCell Name="Cell78" Border.Lines="All" Text="[O.ID]" Padding="0, 0, 0, 0" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
@ -61,8 +62,9 @@ namespace FastReport
<TableCell Name="Cell83" Border.Lines="All" Text="[O.CardNo]" VertAlign="Center" Font="微软雅黑, 10pt"/> <TableCell Name="Cell83" Border.Lines="All" Text="[O.CardNo]" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TableCell Name="Cell84" Border.Lines="All" Text="[O.Tel1]" VertAlign="Center" Font="微软雅黑, 10pt"/> <TableCell Name="Cell84" Border.Lines="All" Text="[O.Tel1]" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TableCell Name="Cell85" Border.Lines="All" Text="[O.DeptName]" VertAlign="Center" Font="微软雅黑, 10pt"/> <TableCell Name="Cell85" Border.Lines="All" Text="[O.DeptName]" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TableCell Name="Cell86" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/> <TableCell Name="Cell86" Border.Lines="All" Text="[O.Description]" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TableCell Name="Cell87" Border.Lines="All" Text="[O.Fee]" VertAlign="Center" Font="微软雅黑, 10pt"/> <TableCell Name="Cell87" Border.Lines="All" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TableCell Name="Cell90" Border.Lines="All" Text="[O.Fee]" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
</TableRow> </TableRow>
</TableObject> </TableObject>
<DataHeaderBand Name="DataHeader1" Top="58.7" Width="718.2" Height="37.8"> <DataHeaderBand Name="DataHeader1" Top="58.7" Width="718.2" Height="37.8">
@ -73,11 +75,12 @@ namespace FastReport
<TableColumn Name="Column4" Width="36.95"/> <TableColumn Name="Column4" Width="36.95"/>
<TableColumn Name="Column5" Width="36.96"/> <TableColumn Name="Column5" Width="36.96"/>
<TableColumn Name="Column6" Width="46.41"/> <TableColumn Name="Column6" Width="46.41"/>
<TableColumn Name="Column7" Width="169.25"/> <TableColumn Name="Column7" Width="103.1"/>
<TableColumn Name="Column8" Width="65.31"/> <TableColumn Name="Column8" Width="74.76"/>
<TableColumn Name="Column9" Width="74.77"/> <TableColumn Name="Column9" Width="65.32"/>
<TableColumn Name="Column45" Width="73.71"/> <TableColumn Name="Column45" Width="73.71"/>
<TableColumn Name="Column56"/> <TableColumn Name="Column56"/>
<TableColumn Name="Column69"/>
<TableRow Name="Row1" Height="37.8"> <TableRow Name="Row1" Height="37.8">
<TableCell Name="Cell1" Border.Lines="All" Text="序号" Padding="0, 0, 0, 0" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/> <TableCell Name="Cell1" Border.Lines="All" Text="序号" Padding="0, 0, 0, 0" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TableCell Name="Cell2" Border.Lines="All" Text="体检号" Padding="0, 0, 0, 0" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/> <TableCell Name="Cell2" Border.Lines="All" Text="体检号" Padding="0, 0, 0, 0" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
@ -88,8 +91,9 @@ namespace FastReport
<TableCell Name="Cell7" Border.Lines="All" Text="证件号" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/> <TableCell Name="Cell7" Border.Lines="All" Text="证件号" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TableCell Name="Cell8" Border.Lines="All" Text="联系方式" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/> <TableCell Name="Cell8" Border.Lines="All" Text="联系方式" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TableCell Name="Cell9" Border.Lines="All" Text="部门" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/> <TableCell Name="Cell9" Border.Lines="All" Text="部门" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TableCell Name="Cell65" Border.Lines="All" Text="体检日期" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/> <TableCell Name="Cell65" Border.Lines="All" Text="备注" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TableCell Name="Cell76" Border.Lines="All" Text="体检费用" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/> <TableCell Name="Cell76" Border.Lines="All" Text="体检日期" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TableCell Name="Cell89" Border.Lines="All" Text="体检费用" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
</TableRow> </TableRow>
</TableObject> </TableObject>
</DataHeaderBand> </DataHeaderBand>

Write Preview
Loading…
Cancel
Save