1、编辑/修改备注，导检单同步显示备注

PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs

@@ -50,8 +50,8 @@ namespace PEIS.Model.Enrollment
         {
             // 个人登记信息
             DAOHelp.ExecuteSql($"Insert into Enrollment_Patient " +
-                                    $"(Name, Sex, Nation, Age, AgeClass, CardType, CardNo, Tel1, Tel2, Contactor1,Contactor2,Address1, Address2, Marriage, Education, Occupation, Company, ExamDate, Type, PID, OID, OEID, OrgName, GroupID, GroupName, CreateTime, CreatorCode, Creator)" +
+                                    $"(Name, Sex, Nation, Age, AgeClass, CardType, CardNo, Tel1, Tel2, Contactor1,Contactor2,Address1, Address2, Marriage, Education, Occupation, Company, ExamDate, Type, PID, OID, OEID, OrgName, GroupID, GroupName, Description, CreateTime, CreatorCode, Creator)" +
-                                    $" SELECT a.Name, a.Sex, a.Nation, DATEDIFF(YEAR, a.Birthday, GETDATE()) + CASE WHEN DATEDIFF(DAY,DATEADD(YEAR,DATEDIFF(YEAR, a.Birthday,GETDATE()), a.Birthday),GETDATE()) < 0 THEN -1 ELSE 0 END, '岁', CardType, CardNo, a.Tel1, a.Tel2, a.Contactor1, a.Contactor2, Address1, Address2, a.Marriage, Education, Occupation, Company, c.ExamDate, d.Type, a.ID, c.OID, c.ID, c.Name, d.ID, d.Name, GETDATE(), '{Global.currentUser.Code}', '{Global.currentUser.Name}'  " +
+                                    $" SELECT a.Name, a.Sex, a.Nation, DATEDIFF(YEAR, a.Birthday, GETDATE()) + CASE WHEN DATEDIFF(DAY,DATEADD(YEAR,DATEDIFF(YEAR, a.Birthday,GETDATE()), a.Birthday),GETDATE()) < 0 THEN -1 ELSE 0 END, '岁', CardType, CardNo, a.Tel1, a.Tel2, a.Contactor1, a.Contactor2, Address1, Address2, a.Marriage, Education, Occupation, Company, c.ExamDate, d.Type, a.ID, c.OID, c.ID, c.Name, d.ID, d.Name, a.Description, GETDATE(), '{Global.currentUser.Code}', '{Global.currentUser.Name}'  " +
                                     $"FROM dbo.Base_Patient a " +
                                     $"LEFT JOIN dbo.Enrollment_OrgPatient b ON a.ID = b.PID " +
                                     $"LEFT JOIN dbo.Enrollment_Org c ON b.OID = c.ID " +

PEIS/Model/Enrollment/EnrollmentPatientModel.cs

@@ -59,7 +59,7 @@ namespace PEIS.Model.Enrollment
                             SpellCode = '{item.SpellCode}'        
                             WHERE ID = {item.ID}";
 
-            var baseStr = $@"update base_patient set name =  '{item.Name}',  Sex = '{item.Sex}', Birthday = '{item.Birthday}', CardType = '{item.CardType}',  CardNo = '{item.CardNo}', SpellCode = '{item.SpellCode}', Marriage = '{item.Marriage}' where ID = {item.PID}";
+            var baseStr = $@"update base_patient set name =  '{item.Name}',  Sex = '{item.Sex}', Birthday = '{item.Birthday}', CardType = '{item.CardType}',  CardNo = '{item.CardNo}', SpellCode = '{item.SpellCode}', Marriage = '{item.Marriage}', Description = '{item.Description}' where ID = {item.PID}";
             DAOHelp.ExecuteSql(baseStr, false);
 
             return DAOHelp.ExecuteSql(sql, false) > 0;

PEIS/ReportFiles/Guide.frx

@@ -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/04/2024 15:48:30" ReportInfo.CreatorVersion="2022.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="06/08/2023 15:44:02" ReportInfo.Modified="09/04/2024 16:48:39" ReportInfo.CreatorVersion="2022.1.0.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -74,6 +74,7 @@ namespace FastReport
     <Parameter Name="HospitalName" DataType="System.String"/>
     <Parameter Name="CardNo" DataType="System.String"/>
     <Parameter Name="Nation" DataType="System.String"/>
+    <Parameter Name="Remark" DataType="System.String"/>
   </Dictionary>
   <ReportPage Name="Page1" RawPaperSize="9" Watermark.Font="宋体, 60pt">
     <ReportTitleBand Name="ReportTitle1" Width="718.2" Height="398.41">
@@ -141,7 +142,7 @@ namespace FastReport
         </TableRow>
         <TableRow Name="Row7" Height="28.35">
           <TableCell Name="Cell57" Border.Lines="All" Text="备注" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
-          <TableCell Name="Cell58" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt" ColSpan="9"/>
+          <TableCell Name="Cell58" Border.Lines="All" Text="[Remark]" VertAlign="Center" Font="微软雅黑, 10pt" ColSpan="9"/>
           <TableCell Name="Cell59" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
           <TableCell Name="Cell60" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
           <TableCell Name="Cell61" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>

PEIS/Utils/ReportHelper.cs

@@ -532,6 +532,7 @@ namespace PEIS.Utils
                 rpt.SetParameterValue("Nation", regInfo.Nation);
                 rpt.SetParameterValue("CardNo", regInfo.CardNo);
                 rpt.SetParameterValue("HospitalName", Global._hospital?.Name);
+                rpt.SetParameterValue("Remark", regInfo.Description);
 
                 if (string.IsNullOrEmpty(regInfo.Photo))
                 {