功能添加

1.新增登记项目时的部位选择功能
2.新增时间节点报表
3.新增职业体检意见字段
4.修复删除订单后无法取消应用模板到分组的BUG

PEIS/Entity/EnrollmentFeeItem.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using PEIS.Utils;
 
 namespace PEIS.Entity
@@ -23,6 +24,7 @@ namespace PEIS.Entity
         public Decimal? Price { get; set; }
         public Decimal? SettlePrice { get; set; }
         public String ItemClass { get; set; }
+        public String Part { get; set; }
         public DateTime CreateTime { get; set; }
         public String CreatorCode { get; set; }
         public String Creator { get; set; }

PEIS/Entity/EnrollmentOrgFeeItem.cs

@@ -32,5 +32,6 @@ namespace PEIS.Entity
         public Int64? OID { get; set; }
         public String KeyNo { get; set; }
         public bool IsOccupational { get; set; }
+        public string Part { get; set; }
     }
 }

PEIS/Entity/EnrollmentPatient.cs

@@ -120,6 +120,18 @@ namespace PEIS.Entity
         [RefFlag(true)]
         public Decimal Discount { get; set; }
 
+        [RefFlag(true)]
+        public DateTime? MINC { get; set; }
+
+        [RefFlag(true)]
+        public DateTime? MAXC { get; set; }
+
+        [RefFlag(true)]
+        public DateTime? MINV { get; set; }
+
+        [RefFlag(true)]
+        public DateTime? MAXV { get; set; }
+
         #endregion Other
     }
 }

PEIS/Entity/ExamCareerConclusion.cs

@@ -20,6 +20,10 @@ namespace PEIS.Entity
         /// 职业体检结论(1.目前未见异常 2.复查 3.疑似职业病 4.职业禁忌症 5.其他疾病或异常)
         /// </summary>
         public int OccupationalConclusion { get; set; }
+        /// <summary>
+        /// 职业健康检查处理意见
+        /// </summary>
+        public string OccupationalSuggestion { get; set; }
     }
 
     public class CareerConclusionReportModele : ExamCareerConclusion

PEIS/Event/Args.cs

@@ -51,6 +51,7 @@ namespace PEIS.Event
         public Int64 Eid { get; set; }
         public Int64 Pid { get; set; }
         public int OccupationalConclusion { get; set; }
+        public string OccupationalSuggestion { get; set; }
 
         public Args()
         {

PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs

@@ -33,7 +33,7 @@ namespace PEIS.Model.Enrollment
 
         public List<EnrollmentOrgFeeItem> GetItems(Int64 groupID)
         {
-            return DAOHelp.GetDataBySQL<EnrollmentOrgFeeItem>($"SELECT ID, GroupID, PackId, PackName, FID,FeeItemCode, FeeItemName, Quantity, Unit,Price, SettlePrice, ItemClass, CreateTime, Creator, DeptCode, DeptName, KeyNo, IsOccupational FROM Enrollment_OrgFeeItem WHERE GroupID = {groupID} Order by PackID, ItemClass, DeptCode, FeeItemCode");
+            return DAOHelp.GetDataBySQL<EnrollmentOrgFeeItem>($"SELECT ID, GroupID, PackId, PackName, FID,FeeItemCode, FeeItemName, Quantity, Unit,Price, SettlePrice, ItemClass, CreateTime, Creator, DeptCode, DeptName, KeyNo, IsOccupational, Part FROM Enrollment_OrgFeeItem WHERE GroupID = {groupID} Order by PackID, ItemClass, DeptCode, FeeItemCode");
         }
 
         public void AddPackFeeItem(Int64 packID, Int64 oeID, Int64 groupID, Int64 oID)
@@ -69,7 +69,7 @@ namespace PEIS.Model.Enrollment
             if (groupFeeItem.Count != 0)
             {
                 // 个人收费项目信息
-                DAOHelp.ExecuteSql($"INSERT INTO Enrollment_FeeItem(OEID, GroupID, EID, PackID, PackName, FID, FeeItemCode, FeeItemName, Quantity, Unit, Price, SettlePrice, ItemClass, CreateTime, CreatorCode, Creator, DeptCode, DeptName, Seq, KeyNo) SELECT a.OEID, a.GroupID, a.ID, b.PackID, b.PackName, b.FID, b.FeeItemCode, b.FeeItemName, b.Quantity, b.Unit, b.Price, b.SettlePrice, b.ItemClass, GETDATE(), '{Global.currentUser.Code}', '{Global.currentUser.Name}', b.DeptCode, b.DeptName, b.Seq, b.KeyNo FROM Enrollment_patient a LEFT JOIN dbo.Enrollment_OrgFeeItem b ON a.GroupID = b.GroupID WHERE a.GroupID = { groupID} AND a.OEID = {oeID} AND a.ID NOT IN ( SELECT EID FROM Enrollment_FeeItem )");
+                DAOHelp.ExecuteSql($"INSERT INTO Enrollment_FeeItem(OEID, GroupID, EID, PackID, PackName, FID, FeeItemCode, FeeItemName, Quantity, Unit, Price, SettlePrice, ItemClass, CreateTime, CreatorCode, Creator, DeptCode, DeptName, Seq, KeyNo, Part) SELECT a.OEID, a.GroupID, a.ID, b.PackID, b.PackName, b.FID, b.FeeItemCode, b.FeeItemName, b.Quantity, b.Unit, b.Price, b.SettlePrice, b.ItemClass, GETDATE(), '{Global.currentUser.Code}', '{Global.currentUser.Name}', b.DeptCode, b.DeptName, b.Seq, b.KeyNo, B.Part FROM Enrollment_patient a LEFT JOIN dbo.Enrollment_OrgFeeItem b ON a.GroupID = b.GroupID WHERE a.GroupID = { groupID} AND a.OEID = {oeID} AND a.ID NOT IN ( SELECT EID FROM Enrollment_FeeItem )");
             }
 
             // 更新应用时间

PEIS/Model/Exam/TotalModel.cs

@@ -375,10 +375,10 @@ namespace PEIS.Model
         /// <param name="eid"></param>
         /// <param name="conclusions"></param>
         /// <returns></returns>
-        public List<ExamCareerConclusion> SaveExamCareerConclusion(Int64 eid, int conclusion)
+        public List<ExamCareerConclusion> SaveExamCareerConclusion(Int64 eid, int conclusion, string suggestion)
         {
             DAOHelp.ExecuteSql($@"DELETE Exam_CareerConclusion WHERE eid = {eid}");
-            DAOHelp.Save(new ExamCareerConclusion() { EID = eid, OccupationalConclusion = conclusion });
+            DAOHelp.Save(new ExamCareerConclusion() { EID = eid, OccupationalConclusion = conclusion, OccupationalSuggestion = suggestion });
             return GetExamCareerConclusion(eid);
         }
 

PEIS/Model/StatisticalReportModel.cs

@@ -632,5 +632,27 @@ namespace PEIS.Model
                             order by t.DeptCode;";
             return DAOHelp.GetDataBySQL<EnrollmentFeeItem>(sql);
         }
+
+        // 获取体检时间节点
+        public List<EnrollmentPatient> GetPeopleDateTimeData(DateTime begDate, DateTime endDate, int status, long oEid)
+        {
+            string sql = $@"select ID, Name, CreateTime, SignTime ,B.MINC, B.MAXC, B.MINV, B.MAXV, FinishTime, PrintTime, LastPrintTime
+                            from Enrollment_Patient A with(nolock) 
+                            LEFT JOIN (select EID, MIN(CheckTime) MINC, MAX(CheckTime) MAXC, MIN(VerifyTime) MINV, MAX(VerifyTime) MAXV from Exam_Part with(nolock) group by EID) B on A.id=B.EID 
+                            where CreateTime between '{begDate:yyyy-MM-dd}' and '{endDate:yyyy-MM-dd}' ";
+            if (status == 0)
+            {
+                if (oEid == -1)
+                    sql += $@" AND A.OEID is not null ";
+                else
+                    sql += $@" AND A.OEID = {oEid} ";
+            }
+            else if (status == 1)
+            {
+                sql += $@" AND A.OEID is null ";
+            }
+            sql += $@" order by ID; ";
+            return DAOHelp.GetDataBySQL<EnrollmentPatient>(sql);
+        }
     }
 }

PEIS/PEIS.csproj

@@ -394,6 +394,12 @@
     <Compile Include="View\Enrollment\NewEnrollmentPersonForm.Designer.cs">
       <DependentUpon>NewEnrollmentPersonForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="View\Enrollment\PartOptionForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="View\Enrollment\PartOptionForm.Designer.cs">
+      <DependentUpon>PartOptionForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="View\EReport\ITReportView.cs" />
     <Compile Include="View\EReport\TeamReportForm.cs">
       <SubType>Form</SubType>
@@ -644,6 +650,9 @@
     <EmbeddedResource Include="View\Enrollment\NewEnrollmentPersonForm.resx">
       <DependentUpon>NewEnrollmentPersonForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="View\Enrollment\PartOptionForm.resx">
+      <DependentUpon>PartOptionForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="View\EReport\TeamReportForm.resx">
       <DependentUpon>TeamReportForm.cs</DependentUpon>
     </EmbeddedResource>
@@ -777,6 +786,9 @@
     <None Include="ReportFiles\OrgExcel.frx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="ReportFiles\PeopleDateTimeCount.frx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="ReportFiles\Teacher.frx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

PEIS/Presenter/StatisticalReportPresenter.cs

@@ -61,6 +61,10 @@ namespace PEIS.Presenter
             {
                 View.ShowOrgCostFeeData(new StatisticalReportModel().GetOrgCostFeeData(args.Item.oEid));
             };
+            View.GetPeopleDateTimeData += (send, args) =>
+            {
+                View.ShowPeopleDateTimeData(new StatisticalReportModel().GetPeopleDateTimeData(args.Item.begDate, args.Item.endDate, args.Item.status, args.Item.oEid));
+            };
         }
     }
 }

PEIS/Presenter/TotalPresenter.cs

@@ -89,7 +89,7 @@ namespace PEIS.Presenter
             };
             View.SaveExamCareerConclusion += (send, args) =>
             {
-                View.ShowExamCareerConclusion(new TotalModel().SaveExamCareerConclusion(args.ID, args.OccupationalConclusion));
+                View.ShowExamCareerConclusion(new TotalModel().SaveExamCareerConclusion(args.ID, args.OccupationalConclusion, args.OccupationalSuggestion));
             };
         }
     }

PEIS/ReportFiles/CAPReport.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="05/23/2023 15:50:00" ReportInfo.Modified="09/03/2025 15:17:51" ReportInfo.CreatorVersion="2022.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="05/23/2023 15:50:00" ReportInfo.Modified="10/15/2025 14:16:03" ReportInfo.CreatorVersion="2022.1.0.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -612,9 +612,9 @@ namespace FastReport
     </ReportTitleBand>
     <PageHeaderBand Name="PageHeader10" Top="41.8" Width="718.2" Height="9.45"/>
     <DataBand Name="CareerConclusion" Top="55.25" Width="718.2" Height="727.65">
-      <TextObject Name="Text641" Top="28.35" Width="718.2" Height="179.55" Border.Lines="All" Font="微软雅黑, 12pt, style=Bold"/>
+      <TextObject Name="Text641" Top="170.1" Width="718.2" Height="179.55" Border.Lines="All" Font="微软雅黑, 12pt, style=Bold"/>
-      <TextObject Name="Text529" Width="718.2" Height="28.35" Border.Lines="All" Text="职业健康检查结论：" VertAlign="Center" Font="微软雅黑, 12pt, style=Bold"/>
+      <TextObject Name="Text529" Top="141.75" Width="718.2" Height="28.35" Border.Lines="All" Text="职业健康检查结论：" VertAlign="Center" Font="微软雅黑, 12pt, style=Bold"/>
-      <TextObject Name="Text531" Top="207.9" Width="718.2" Height="28.35" Border.Lines="All" Text="职业健康检查处理意见：" VertAlign="Center" Font="微软雅黑, 12pt, style=Bold"/>
+      <TextObject Name="Text531" Top="349.65" Width="718.2" Height="28.35" Border.Lines="All" Text="职业健康检查处理意见：" VertAlign="Center" Font="微软雅黑, 12pt, style=Bold"/>
       <TextObject Name="Text533" Top="415.8" Width="718.2" Height="311.85" Border.Lines="All" Padding="0, 0, 0, 0" Font="微软雅黑, 12pt"/>
       <TextObject Name="Text534" Top="434.7" Width="122.85" Height="18.9" Text="主检医师签字：" Padding="0, 0, 0, 0" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 12pt"/>
       <TextObject Name="Text535" Left="103.95" Top="434.7" Width="122.85" Height="18.9" Text="朗玉" Padding="0, 0, 0, 0" VertAlign="Center" Font="微软雅黑, 12pt"/>
@@ -626,17 +626,19 @@ namespace FastReport
       <TextObject Name="Text542" Top="576.45" Width="708.75" Height="113.4" Text="感谢你的信任和配合并完成本次医学检查，职业健康监护是职业性疾病二级预防‘早发现、早诊断、早治疗’的重要手段。依照《职业健康监护技术规范》GBZ188-2014的相关检查要求针对您所接触的职业危害因素所检项目，我们对您的职业健康情况进行检查。在此提请您注意的是①本报告改动无效②报告结论只针对本次检查有效③本报告不得作为劳动关系、职业史和职业危害接触史证明④若检出职业性相关异常情况请按照处理意见要求进行处理。" Font="微软雅黑, 12pt"/>
       <TextObject Name="Text543" Top="699.3" Width="652.05" Height="28.35" Text="注意：您只需要阅读体检结论及建议。" Font="微软雅黑, 12pt"/>
       <TextObject Name="Text544" Left="444.15" Top="481.95" Width="179.55" Height="18.9" Text="[FinishDate]" Padding="0, 0, 0, 0" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 12pt"/>
-      <TextObject Name="Text547" Top="236.25" Width="718.2" Height="179.55" Border.Lines="Left, Right" CanGrow="true" Text="[Suggestion]" Padding="2, 0, 0, 0" Font="微软雅黑, 12pt"/>
+      <TextObject Name="Text547" Top="378" Width="718.2" Height="37.8" Border.Lines="Left, Right" CanGrow="true" Text="[OccupationalSuggestion]" Padding="2, 0, 0, 0" Font="微软雅黑, 12pt"/>
-      <CheckBoxObject Name="CheckBox7" Left="226.8" Top="37.8" Width="28.35" Height="28.35" Border.Lines="All" Checked="false" DataColumn="CC.Conclusion_1"/>
+      <CheckBoxObject Name="CheckBox7" Left="226.8" Top="189" Width="28.35" Height="28.35" Border.Lines="All" Checked="false" DataColumn="CC.Conclusion_1"/>
-      <TextObject Name="Text642" Left="66.15" Top="37.8" Width="160.65" Height="28.35" Border.Lines="All" Text="1、目前未见异常" Padding="0, 0, 0, 0" VertAlign="Center" Font="微软雅黑, 12pt"/>
+      <TextObject Name="Text642" Left="66.15" Top="189" Width="160.65" Height="28.35" Border.Lines="All" Text="1、目前未见异常" Padding="0, 0, 0, 0" VertAlign="Center" Font="微软雅黑, 12pt"/>
-      <CheckBoxObject Name="CheckBox8" Left="226.8" Top="66.15" Width="28.35" Height="28.35" Border.Lines="All" Checked="false" DataColumn="CC.Conclusion_2"/>
+      <CheckBoxObject Name="CheckBox8" Left="226.8" Top="217.35" Width="28.35" Height="28.35" Border.Lines="All" Checked="false" DataColumn="CC.Conclusion_2"/>
-      <TextObject Name="Text643" Left="66.15" Top="66.15" Width="160.65" Height="28.35" Border.Lines="All" Text="2、复查" Padding="0, 0, 0, 0" VertAlign="Center" Font="微软雅黑, 12pt"/>
+      <TextObject Name="Text643" Left="66.15" Top="217.35" Width="160.65" Height="28.35" Border.Lines="All" Text="2、复查" Padding="0, 0, 0, 0" VertAlign="Center" Font="微软雅黑, 12pt"/>
-      <CheckBoxObject Name="CheckBox9" Left="226.8" Top="94.5" Width="28.35" Height="28.35" Border.Lines="All" Checked="false" DataColumn="CC.Conclusion_3"/>
+      <CheckBoxObject Name="CheckBox9" Left="226.8" Top="245.7" Width="28.35" Height="28.35" Border.Lines="All" Checked="false" DataColumn="CC.Conclusion_3"/>
-      <TextObject Name="Text644" Left="66.15" Top="94.5" Width="160.65" Height="28.35" Border.Lines="All" Text="3、疑似职业病" Padding="0, 0, 0, 0" VertAlign="Center" Font="微软雅黑, 12pt"/>
+      <TextObject Name="Text644" Left="66.15" Top="245.7" Width="160.65" Height="28.35" Border.Lines="All" Text="3、疑似职业病" Padding="0, 0, 0, 0" VertAlign="Center" Font="微软雅黑, 12pt"/>
-      <CheckBoxObject Name="CheckBox10" Left="226.8" Top="122.85" Width="28.35" Height="28.35" Border.Lines="All" Checked="false" DataColumn="CC.Conclusion_4"/>
+      <CheckBoxObject Name="CheckBox10" Left="226.8" Top="274.05" Width="28.35" Height="28.35" Border.Lines="All" Checked="false" DataColumn="CC.Conclusion_4"/>
-      <TextObject Name="Text645" Left="66.15" Top="122.85" Width="160.65" Height="28.35" Border.Lines="All" Text="4、职业禁忌症" Padding="0, 0, 0, 0" VertAlign="Center" Font="微软雅黑, 12pt"/>
+      <TextObject Name="Text645" Left="66.15" Top="274.05" Width="160.65" Height="28.35" Border.Lines="All" Text="4、职业禁忌症" Padding="0, 0, 0, 0" VertAlign="Center" Font="微软雅黑, 12pt"/>
-      <CheckBoxObject Name="CheckBox11" Left="226.8" Top="151.2" Width="28.35" Height="28.35" Border.Lines="All" Checked="false" DataColumn="CC.Conclusion_5"/>
+      <CheckBoxObject Name="CheckBox11" Left="226.8" Top="302.4" Width="28.35" Height="28.35" Border.Lines="All" Checked="false" DataColumn="CC.Conclusion_5"/>
-      <TextObject Name="Text646" Left="66.15" Top="151.2" Width="160.65" Height="28.35" Border.Lines="All" Text="5、其他疾病或异常" Padding="0, 0, 0, 0" VertAlign="Center" Font="微软雅黑, 12pt"/>
+      <TextObject Name="Text646" Left="66.15" Top="302.4" Width="160.65" Height="28.35" Border.Lines="All" Text="5、其他疾病或异常" Padding="0, 0, 0, 0" VertAlign="Center" Font="微软雅黑, 12pt"/>
+      <TextObject Name="Text651" Width="718.2" Height="28.35" Border.Lines="All" Text="体检结论与健康建议：" VertAlign="Center" Font="微软雅黑, 12pt, style=Bold"/>
+      <TextObject Name="Text652" Top="28.35" Width="718.2" Height="113.4" Border.Lines="Left, Right" CanGrow="true" Text="[Suggestion]" Padding="2, 0, 0, 0" Font="微软雅黑, 12pt"/>
     </DataBand>
     <PageFooterBand Name="PageFooter9" Top="786.9" Width="718.2" Height="37.8">
       <TextObject Name="Text545" Width="718.2" Height="37.8" Dock="Fill" Text="第[Page#]页，共[TotalPages#]页" VertAlign="Center" Font="微软雅黑, 8pt, style=Bold"/>

PEIS/ReportFiles/PeopleDateTimeCount.frx

@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Report ScriptLanguage="CSharp" ReportInfo.Created="06/27/2023 14:18:39" ReportInfo.Modified="09/19/2025 09:33:04" ReportInfo.CreatorVersion="2022.1.0.0">
+  <ScriptText>using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Data;
+using FastReport;
+using FastReport.Data;
+using FastReport.Dialog;
+using FastReport.Barcode;
+using FastReport.Table;
+using FastReport.Utils;
+
+namespace FastReport
+{
+  public class ReportScript
+  {
+    public double totalSum = 0;
+    public double totalHisSum = 0;
+    
+    private void OrderCount_AfterData(object sender, EventArgs e)
+    {
+//      DataSourceBase rowData = Report.GetDataSource(&quot;P&quot;);
+////      Cell37.Text = rowData[&quot;CreateTime&quot;] == null ? &quot;&quot; : rowData[&quot;CreateTime&quot;].ToString().Substring(0,16);
+////      Cell46.Text = rowData[&quot;ChargeTime&quot;] == null ? &quot;&quot; : rowData[&quot;ChargeTime&quot;].ToString().Substring(0,16);
+////      Cell48.Text = rowData[&quot;CostTime&quot;] == null ? &quot;&quot; : rowData[&quot;CostTime&quot;].ToString().Substring(0,16);
+//      
+//      
+//      totalSum += Convert.ToDouble(rowData[&quot;Sum&quot;].ToString());
+//      totalHisSum += Convert.ToDouble(rowData[&quot;Fee&quot;].ToString());
+//      Cell50.Text = totalSum.ToString();
+//      Cell51.Text = totalHisSum.ToString();
+//      
+//      int total = rowData.CurrentRowNo + 1;     
+//      Cell49.Text = &quot;-总计-  &quot; + total.ToString() +&quot;笔订单&quot;;
+    }       
+
+    private void Cell43_AfterData(object sender, EventArgs e)
+    {
+      if (Cell43.Text != null &amp;&amp; Cell43.Text.Length &gt; 0 &amp;&amp; Cell43.Text.Substring(0,1).Equals(&quot;、&quot;)) {
+        Cell43.Text = Cell43.Text.Substring(1);
+      }
+    }
+  }
+}
+</ScriptText>
+  <Dictionary>
+    <Parameter Name="HospitalName" DataType="System.String"/>
+    <Parameter Name="DateBetween" DataType="System.String"/>
+    <Parameter Name="Type" DataType="System.String"/>
+  </Dictionary>
+  <ReportPage Name="Page1" Landscape="true" PaperWidth="297" PaperHeight="210" RawPaperSize="9" Watermark.Font="宋体, 60pt">
+    <PageHeaderBand Name="PageHeader1" Width="1047.06" Height="75.6" PrintOn="FirstPage">
+      <TextObject Name="Text1" Width="1047.06" Height="56.7" Text="体检时间节点统计表" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 26pt, style=Bold"/>
+      <TextObject Name="Text2" Top="56.7" Width="66.15" Height="18.9" Text="统计单位:" HorzAlign="Right" VertAlign="Center" Font="微软雅黑, 9pt"/>
+      <TextObject Name="Text3" Left="66.15" Top="56.7" Width="179.55" Height="18.9" CanBreak="false" Text="[HospitalName]" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
+      <TextObject Name="Text4" Left="245.7" Top="56.7" Width="66.15" Height="18.9" Text="统计日期:" HorzAlign="Right" VertAlign="Center" Font="微软雅黑, 9pt"/>
+      <TextObject Name="Text5" Left="311.85" Top="56.7" Width="226.8" Height="18.9" CanBreak="false" Text="[DateBetween]" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
+    </PageHeaderBand>
+    <DataBand Name="PeopleDateTimeCount" Top="121.4" Width="1047.06" Height="45.36" CanGrow="true" CanShrink="true" KeepTogether="true" KeepDetail="true">
+      <TableObject Name="Table2" Width="1037.73" Height="45.36">
+        <TableColumn Name="Column15" Width="60.48"/>
+        <TableColumn Name="Column16" Width="51.15"/>
+        <TableColumn Name="Column17" Width="132.3"/>
+        <TableColumn Name="Column18" Width="132.3"/>
+        <TableColumn Name="Column20" Width="132.3"/>
+        <TableColumn Name="Column22" Width="132.3"/>
+        <TableColumn Name="Column23" Width="132.3"/>
+        <TableColumn Name="Column24" Width="132.3"/>
+        <TableColumn Name="Column29" Width="132.3"/>
+        <TableRow Name="Row2" MinHeight="28.35" Height="45.36" AutoSize="true">
+          <TableCell Name="ExamDate" Border.Lines="All" Text="[P.ID]" Format="Date" Format.Format="d" VertAlign="Center" Font="微软雅黑, 8pt"/>
+          <TableCell Name="Cell36" Border.Lines="All" Text="[P.Name]" VertAlign="Center" Font="微软雅黑, 8pt"/>
+          <TableCell Name="Cell37" Border.Lines="All" Text="[P.CreateTime]" VertAlign="Center" Font="微软雅黑, 8pt"/>
+          <TableCell Name="Cell38" Border.Lines="All" Text="[P.SignTime]" VertAlign="Center" Font="微软雅黑, 8pt"/>
+          <TableCell Name="Cell40" Border.Lines="All" Text="[P.MAXC]" VertAlign="Center" Font="微软雅黑, 8pt"/>
+          <TableCell Name="Cell42" Border.Lines="All" Text="[P.MAXV]" VertAlign="Center" Font="微软雅黑, 8pt"/>
+          <TableCell Name="Cell43" Border.Lines="All" AfterDataEvent="Cell43_AfterData" Text="[P.FinishTime]" VertAlign="Center" Font="微软雅黑, 8pt"/>
+          <TableCell Name="Cell44" Border.Lines="All" Text="[P.PrintTime]" VertAlign="Center" Font="微软雅黑, 8pt"/>
+          <TableCell Name="Cell49" Border.Lines="All" Text="[P.LastPrintTime]" VertAlign="Center" Font="微软雅黑, 8pt"/>
+        </TableRow>
+      </TableObject>
+      <DataHeaderBand Name="DataHeader1" Top="79.6" Width="1047.06" Height="37.8" CanGrow="true" CanShrink="true" KeepWithData="true">
+        <TableObject Name="Table1" Width="1037.72" Height="37.8">
+          <TableColumn Name="Column1" Width="60.48"/>
+          <TableColumn Name="Column2" Width="51.14"/>
+          <TableColumn Name="Column6" Width="132.3"/>
+          <TableColumn Name="Column7" Width="132.3"/>
+          <TableColumn Name="Column9" Width="132.3"/>
+          <TableColumn Name="Column11" Width="132.3"/>
+          <TableColumn Name="Column12" Width="132.3"/>
+          <TableColumn Name="Column27" Width="132.3"/>
+          <TableColumn Name="Column28" Width="132.3"/>
+          <TableRow Name="Row1" MinHeight="37.8" Height="37.8" AutoSize="true">
+            <TableCell Name="Cell1" Border.Lines="All" Text="体检号" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt, style=Bold"/>
+            <TableCell Name="Cell2" Border.Lines="All" Text="姓名" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt, style=Bold"/>
+            <TableCell Name="Cell26" Border.Lines="All" Text="登记时间" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt, style=Bold"/>
+            <TableCell Name="Cell27" Border.Lines="All" Text="签到时间" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt, style=Bold"/>
+            <TableCell Name="Cell29" Border.Lines="All" Text="最晚检查时间" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt, style=Bold"/>
+            <TableCell Name="Cell31" Border.Lines="All" Text="最晚分检审核" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt, style=Bold"/>
+            <TableCell Name="Cell32" Border.Lines="All" Text="总检时间" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt, style=Bold"/>
+            <TableCell Name="Cell47" Border.Lines="All" Text="首次打印时间" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt, style=Bold"/>
+            <TableCell Name="Cell48" Border.Lines="All" Text="最晚补打时间" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt, style=Bold"/>
+          </TableRow>
+        </TableObject>
+      </DataHeaderBand>
+    </DataBand>
+  </ReportPage>
+</Report>

PEIS/Utils/DAOHelp.cs

@@ -243,7 +243,7 @@ namespace PEIS.Utils
                                     sqltext = sqltext + " " + item.Name + "= '" + columnValue.Replace("'", "''") + "',";
                                 }
                             }
-                            else if (item.PropertyType == typeof(Boolean))
+                            else if (item.PropertyType == typeof(Boolean) || item.PropertyType == typeof(Boolean?))
                             {
                                 String value = columnValue.Equals("True") ? "1" : "0";
                                 sqltext = sqltext + " " + item.Name + "= " + value + ",";

PEIS/Utils/ReportHelper.cs

@@ -444,6 +444,7 @@ namespace PEIS.Utils
             rpt.SetParameterValue("Conclusion", Conclusion);
             rpt.SetParameterValue("Suggestion", Suggestion);
 
+            string occupationalSuggestion = string.Empty;
             List<CareerConclusionReportModele> lstCareerConclusions = new List<CareerConclusionReportModele>();
             CareerConclusionReportModele careerConclusion = new CareerConclusionReportModele();
             if (examCareerConclusions != null && examCareerConclusions.Any())
@@ -458,8 +459,10 @@ namespace PEIS.Utils
                     careerConclusion.Conclusion_4 = true;
                 else if (examCareerConclusions.First().OccupationalConclusion == 5)
                     careerConclusion.Conclusion_5 = true;
+                occupationalSuggestion = examCareerConclusions.First().OccupationalSuggestion;
             }
             lstCareerConclusions.Add(careerConclusion);
+            rpt.SetParameterValue("OccupationalSuggestion", occupationalSuggestion);
 
             // 收费列表
             SetDataSource(ref rpt, lstEFeeItems, "F", "FeeItems");
@@ -499,7 +502,9 @@ namespace PEIS.Utils
 
             rpt.Load(filePath);
             var lstEFeeItems = new ReportModel().GetEFeeItem(eid);
-            var lstConclusions = new ReportModel().GetExamConclusions(eid).Where(w => !w.IsOccupational).ToList();
+            //2025年10月10日 李嘉文 应德宏中医院李昕蔓要求,健康体检的结论要包含职业体检结论,这里不再做过滤
+            //var lstConclusions = new ReportModel().GetExamConclusions(eid).Where(w => !w.IsOccupational).ToList();
+            var lstConclusions = new ReportModel().GetExamConclusions(eid).ToList();
             var lstGeneral = new ReportModel().GetGeneralResult(eid);
             var lstLis = new ReportModel().GetLisResult(eid);
             var lstPacs = new ReportModel().GetPacsResult(eid);

PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs

@@ -143,12 +143,15 @@
             this.TpGroupFeeItem = new DevExpress.XtraTab.XtraTabPage();
             this.panel5 = new System.Windows.Forms.Panel();
             this.DgcGroupFeeItem = new DevExpress.XtraGrid.GridControl();
+            this.GFeeItmeMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.GroupPartOption = new System.Windows.Forms.ToolStripMenuItem();
             this.DgvGroupFeeItem = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn75 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemMemoEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
             this.gridColumn74 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn76 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn77 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn106 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn79 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn78 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn80 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -277,6 +280,7 @@
             this.gridColumn115 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn116 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn117 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn107 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn161 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn163 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.splitter7 = new System.Windows.Forms.Splitter();
@@ -284,6 +288,8 @@
             this.tabControl2 = new System.Windows.Forms.TabControl();
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.DgcPack2 = new DevExpress.XtraGrid.GridControl();
+            this.EFeeItemMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.EnrollmentPartOption = new System.Windows.Forms.ToolStripMenuItem();
             this.DgvPack2 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn126 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn127 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -347,6 +353,7 @@
             this.gridColumn90 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn108 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn91 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn42 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn93 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn94 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn95 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -354,6 +361,8 @@
             this.gridColumn105 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn104 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn92 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn40 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.PatientSearch = new System.Windows.Forms.TextBox();
             this.gridColumn109 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.新建NToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -385,9 +394,6 @@
             this.gridView5 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridView7 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridView8 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn40 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn42 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit21)).BeginInit();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.DgcOrg)).BeginInit();
@@ -424,6 +430,7 @@
             this.TpGroupFeeItem.SuspendLayout();
             this.panel5.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.DgcGroupFeeItem)).BeginInit();
+            this.GFeeItmeMenu.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.DgvGroupFeeItem)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit1)).BeginInit();
             this.panel9.SuspendLayout();
@@ -468,6 +475,7 @@
             this.tabControl2.SuspendLayout();
             this.tabPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.DgcPack2)).BeginInit();
+            this.EFeeItemMenu.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.DgvPack2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
             this.tabPage2.SuspendLayout();
@@ -1978,6 +1986,7 @@
             // 
             // DgcGroupFeeItem
             // 
+            this.DgcGroupFeeItem.ContextMenuStrip = this.GFeeItmeMenu;
             this.DgcGroupFeeItem.Dock = System.Windows.Forms.DockStyle.Fill;
             this.DgcGroupFeeItem.Location = new System.Drawing.Point(0, 5);
             this.DgcGroupFeeItem.MainView = this.DgvGroupFeeItem;
@@ -1989,6 +1998,20 @@
             this.DgcGroupFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.DgvGroupFeeItem});
             // 
+            // GFeeItmeMenu
+            // 
+            this.GFeeItmeMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.GroupPartOption});
+            this.GFeeItmeMenu.Name = "contextMenuStrip2";
+            this.GFeeItmeMenu.Size = new System.Drawing.Size(125, 26);
+            // 
+            // GroupPartOption
+            // 
+            this.GroupPartOption.Image = global::PEIS.Properties.Resources.个人信息__1_;
+            this.GroupPartOption.Name = "GroupPartOption";
+            this.GroupPartOption.Size = new System.Drawing.Size(124, 22);
+            this.GroupPartOption.Text = "选择部位";
+            // 
             // DgvGroupFeeItem
             // 
             this.DgvGroupFeeItem.Appearance.FooterPanel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -2004,6 +2027,7 @@
             this.gridColumn74,
             this.gridColumn76,
             this.gridColumn77,
+            this.gridColumn106,
             this.gridColumn79,
             this.gridColumn78,
             this.gridColumn80,
@@ -2105,6 +2129,21 @@
             this.gridColumn77.VisibleIndex = 3;
             this.gridColumn77.Width = 200;
             // 
+            // gridColumn106
+            // 
+            this.gridColumn106.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.gridColumn106.AppearanceCell.Options.UseFont = true;
+            this.gridColumn106.Caption = "部位";
+            this.gridColumn106.FieldName = "Part";
+            this.gridColumn106.Name = "gridColumn106";
+            this.gridColumn106.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn106.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn106.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn106.OptionsColumn.ReadOnly = true;
+            this.gridColumn106.OptionsFilter.AllowAutoFilter = false;
+            this.gridColumn106.Visible = true;
+            this.gridColumn106.VisibleIndex = 4;
+            // 
             // gridColumn79
             // 
             this.gridColumn79.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
@@ -2126,7 +2165,7 @@
             this.gridColumn79.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
             new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "Price", "￥{0:0.##}")});
             this.gridColumn79.Visible = true;
-            this.gridColumn79.VisibleIndex = 4;
+            this.gridColumn79.VisibleIndex = 5;
             this.gridColumn79.Width = 63;
             // 
             // gridColumn78
@@ -2142,7 +2181,7 @@
             this.gridColumn78.OptionsColumn.ReadOnly = true;
             this.gridColumn78.OptionsFilter.AllowFilter = false;
             this.gridColumn78.Visible = true;
-            this.gridColumn78.VisibleIndex = 5;
+            this.gridColumn78.VisibleIndex = 6;
             this.gridColumn78.Width = 63;
             // 
             // gridColumn80
@@ -2160,7 +2199,7 @@
             this.gridColumn80.OptionsColumn.ReadOnly = true;
             this.gridColumn80.OptionsFilter.AllowFilter = false;
             this.gridColumn80.Visible = true;
-            this.gridColumn80.VisibleIndex = 6;
+            this.gridColumn80.VisibleIndex = 7;
             this.gridColumn80.Width = 70;
             // 
             // gridColumn81
@@ -2175,7 +2214,7 @@
             this.gridColumn81.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
             this.gridColumn81.OptionsColumn.ReadOnly = true;
             this.gridColumn81.Visible = true;
-            this.gridColumn81.VisibleIndex = 7;
+            this.gridColumn81.VisibleIndex = 8;
             this.gridColumn81.Width = 40;
             // 
             // splitter4
@@ -3869,6 +3908,7 @@
             // 
             // DgcEnrollmentFeeItem
             // 
+            this.DgcEnrollmentFeeItem.ContextMenuStrip = this.EFeeItemMenu;
             this.DgcEnrollmentFeeItem.Dock = System.Windows.Forms.DockStyle.Fill;
             this.DgcEnrollmentFeeItem.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.DgcEnrollmentFeeItem.Location = new System.Drawing.Point(0, 0);
@@ -3895,6 +3935,7 @@
             this.gridColumn115,
             this.gridColumn116,
             this.gridColumn117,
+            this.gridColumn107,
             this.gridColumn161,
             this.gridColumn163});
             this.DgvEnrollmentFeeItem.GridControl = this.DgcEnrollmentFeeItem;
@@ -4057,6 +4098,21 @@
             this.gridColumn117.VisibleIndex = 7;
             this.gridColumn117.Width = 48;
             // 
+            // gridColumn107
+            // 
+            this.gridColumn107.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.gridColumn107.AppearanceCell.Options.UseFont = true;
+            this.gridColumn107.Caption = "部位";
+            this.gridColumn107.FieldName = "Part";
+            this.gridColumn107.Name = "gridColumn107";
+            this.gridColumn107.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn107.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn107.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn107.OptionsColumn.ReadOnly = true;
+            this.gridColumn107.OptionsFilter.AllowAutoFilter = false;
+            this.gridColumn107.Visible = true;
+            this.gridColumn107.VisibleIndex = 8;
+            // 
             // gridColumn161
             // 
             this.gridColumn161.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
@@ -4072,7 +4128,7 @@
             this.gridColumn161.OptionsColumn.ReadOnly = true;
             this.gridColumn161.OptionsFilter.AllowFilter = false;
             this.gridColumn161.Visible = true;
-            this.gridColumn161.VisibleIndex = 8;
+            this.gridColumn161.VisibleIndex = 9;
             // 
             // gridColumn163
             // 
@@ -4148,6 +4204,20 @@
             this.DgvPack2,
             this.gridView4});
             // 
+            // EFeeItemMenu
+            // 
+            this.EFeeItemMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.EnrollmentPartOption});
+            this.EFeeItemMenu.Name = "EFeeItemMenu";
+            this.EFeeItemMenu.Size = new System.Drawing.Size(125, 26);
+            // 
+            // EnrollmentPartOption
+            // 
+            this.EnrollmentPartOption.Image = global::PEIS.Properties.Resources.个人信息__1_;
+            this.EnrollmentPartOption.Name = "EnrollmentPartOption";
+            this.EnrollmentPartOption.Size = new System.Drawing.Size(124, 22);
+            this.EnrollmentPartOption.Text = "选择部位";
+            // 
             // DgvPack2
             // 
             this.DgvPack2.Appearance.FooterPanel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -4954,6 +5024,20 @@
             this.gridColumn91.Visible = true;
             this.gridColumn91.VisibleIndex = 4;
             // 
+            // gridColumn42
+            // 
+            this.gridColumn42.Caption = "备注";
+            this.gridColumn42.FieldName = "Description";
+            this.gridColumn42.Name = "gridColumn42";
+            this.gridColumn42.OptionsColumn.AllowEdit = false;
+            this.gridColumn42.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn42.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn42.OptionsColumn.AllowMove = false;
+            this.gridColumn42.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn42.OptionsColumn.ReadOnly = true;
+            this.gridColumn42.Visible = true;
+            this.gridColumn42.VisibleIndex = 7;
+            // 
             // gridColumn93
             // 
             this.gridColumn93.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
@@ -5092,6 +5176,18 @@
             this.gridColumn92.Visible = true;
             this.gridColumn92.VisibleIndex = 10;
             // 
+            // gridColumn39
+            // 
+            this.gridColumn39.Name = "gridColumn39";
+            this.gridColumn39.Visible = true;
+            this.gridColumn39.VisibleIndex = 13;
+            // 
+            // gridColumn40
+            // 
+            this.gridColumn40.Name = "gridColumn40";
+            this.gridColumn40.Visible = true;
+            this.gridColumn40.VisibleIndex = 14;
+            // 
             // PatientSearch
             // 
             this.PatientSearch.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@@ -5311,32 +5407,6 @@
             // 
             this.gridView8.Name = "gridView8";
             // 
-            // gridColumn39
-            // 
-            this.gridColumn39.Name = "gridColumn39";
-            this.gridColumn39.Visible = true;
-            this.gridColumn39.VisibleIndex = 13;
-            // 
-            // gridColumn40
-            // 
-            this.gridColumn40.Name = "gridColumn40";
-            this.gridColumn40.Visible = true;
-            this.gridColumn40.VisibleIndex = 14;
-            // 
-            // gridColumn42
-            // 
-            this.gridColumn42.Caption = "备注";
-            this.gridColumn42.FieldName = "Description";
-            this.gridColumn42.Name = "gridColumn42";
-            this.gridColumn42.OptionsColumn.AllowEdit = false;
-            this.gridColumn42.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn42.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn42.OptionsColumn.AllowMove = false;
-            this.gridColumn42.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn42.OptionsColumn.ReadOnly = true;
-            this.gridColumn42.Visible = true;
-            this.gridColumn42.VisibleIndex = 7;
-            // 
             // EnrollmentOrgForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
@@ -5388,6 +5458,7 @@
             this.TpGroupFeeItem.ResumeLayout(false);
             this.panel5.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.DgcGroupFeeItem)).EndInit();
+            this.GFeeItmeMenu.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.DgvGroupFeeItem)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit1)).EndInit();
             this.panel9.ResumeLayout(false);
@@ -5433,6 +5504,7 @@
             this.tabControl2.ResumeLayout(false);
             this.tabPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.DgcPack2)).EndInit();
+            this.EFeeItemMenu.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.DgvPack2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
             this.tabPage2.ResumeLayout(false);
@@ -5815,5 +5887,11 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn42;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn39;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn40;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn106;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn107;
+        private System.Windows.Forms.ContextMenuStrip GFeeItmeMenu;
+        private System.Windows.Forms.ToolStripMenuItem GroupPartOption;
+        private System.Windows.Forms.ContextMenuStrip EFeeItemMenu;
+        private System.Windows.Forms.ToolStripMenuItem EnrollmentPartOption;
     }
 }

PEIS/View/Enrollment/EnrollmentOrgForm.cs

@@ -3,6 +3,7 @@ using DevExpress.XtraGrid.Views.Grid.ViewInfo;
 using DevExpress.XtraPrinting.Native;
 using FastReport;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using PEIS.Base;
 using PEIS.Entity;
 using PEIS.Event;
@@ -194,6 +195,61 @@ namespace PEIS.View.Enrollment
             #endregion
 
             DgvGroup.CellValueChanged += DgvGroup_CellValueChanged;
+
+            //分组项目选择部位
+            GroupPartOption.Click += GroupPartOption_Click;
+            //人员项目选择部位
+            EnrollmentPartOption.Click += EnrollmentPartOption_Click;
+        }
+
+        private void EnrollmentPartOption_Click(object sender, EventArgs e)
+        {
+            if (DgvEnrollmentFeeItem.GetSelectedRows().Count() == 0) return;
+            EnrollmentFeeItem item = DgvEnrollmentFeeItem.GetRow(DgvEnrollmentFeeItem.GetSelectedRows()[0]) as EnrollmentFeeItem;
+
+            string jsonString = DAOHelp.GetDataBySQL($@"select * from [vi_HisFeeItem] where FeeItemCode='{item.FeeItemCode}' and KeyNo='{item.KeyNo}'; ").Rows[0]["BodyParts"]?.ToString();
+
+            if (string.IsNullOrEmpty(jsonString)) return;
+
+            List<string> parts = new List<string>();
+            JArray array = JArray.Parse(jsonString);
+            foreach (JObject data in array)
+            {
+                parts.Add((string)data["Name"]);
+            }
+
+            PartOptionForm po = new PartOptionForm(item.FeeItemName, parts);
+            if (po.ShowDialog() == DialogResult.OK)
+            {
+                item.Part = PartOptionForm.PartResult;
+                item.Update();
+                DgcEnrollmentFeeItem.RefreshDataSource();
+            }
+        }
+
+        private void GroupPartOption_Click(object sender, EventArgs e)
+        {
+            if (DgvGroupFeeItem.GetSelectedRows().Count() == 0) return;
+            EnrollmentOrgFeeItem item = DgvGroupFeeItem.GetRow(DgvGroupFeeItem.GetSelectedRows()[0]) as EnrollmentOrgFeeItem;
+
+            string jsonString = DAOHelp.GetDataBySQL($@"select * from [vi_HisFeeItem] where FeeItemCode='{item.FeeItemCode}' and KeyNo='{item.KeyNo}'; ").Rows[0]["BodyParts"]?.ToString();
+
+            if (string.IsNullOrEmpty(jsonString)) return;
+
+            List<string> parts = new List<string>();
+            JArray array = JArray.Parse(jsonString);
+            foreach (JObject data in array)
+            {
+                parts.Add((string)data["Name"]);
+            }
+
+            PartOptionForm po = new PartOptionForm(item.FeeItemName, parts);
+            if (po.ShowDialog() == DialogResult.OK)
+            {
+                item.Part = PartOptionForm.PartResult;
+                item.Update();
+                DgcGroupFeeItem.RefreshDataSource();
+            }
         }
 
         /// <summary>
@@ -566,7 +622,7 @@ namespace PEIS.View.Enrollment
             Int64 _groupId = Convert.ToInt64(DgvGroup2.GetRowCellValue(DgvGroup2.GetSelectedRows()[0], "ID").ToString());
             String _oename = DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "Name").ToString();
 
-            List<EnrollmentCheckCost> _checkCost = DAOHelp.GetDataBySQL<EnrollmentCheckCost>($@"select a.* from Enrollment_CheckCost a left join Enrollment_Patient b on a.EID = b.ID and a.OEID = b.OEID where b.OEID = {_oeid} and b.GroupId = {_groupId}");
+            List<EnrollmentCheckCost> _checkCost = DAOHelp.GetDataBySQL<EnrollmentCheckCost>($@"select a.* from Enrollment_CheckCost a left join Enrollment_Patient b on a.EID = b.ID and a.OEID = b.OEID where b.OEID = {_oeid} and b.GroupId = {_groupId} and a.DeleteTime is null ");
             if (_checkCost.Count > 0)
             {
                 Global.Msg("info", "该团体分组成员已生成订单，无法撤销分组成员的模版应用！");

PEIS/View/Enrollment/EnrollmentOrgForm.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="menuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>510, 16</value>
+    <value>299, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="TsmiOrgUpdate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -132,7 +132,7 @@
 </value>
   </data>
   <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1597, 17</value>
+    <value>897, 17</value>
   </metadata>
   <data name="ImportBtn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -141,8 +141,11 @@
         azgI0NwCEBi1hCQwDC2hRWEHAzQtrkcBzQAAtlLL7bkHJToAAAAASUVORK5CYII=
 </value>
   </data>
+  <metadata name="GFeeItmeMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="PersonCostFastMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1023, 19</value>
+    <value>588, 17</value>
   </metadata>
   <data name="PFastCharge.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -211,7 +214,7 @@
 </value>
   </data>
   <metadata name="TeamCostFastMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>713, 17</value>
+    <value>419, 17</value>
   </metadata>
   <data name="TFastCharge.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -279,8 +282,11 @@
         xgAAAABJRU5ErkJggg==
 </value>
   </data>
+  <metadata name="EFeeItemMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>159, 17</value>
+  </metadata>
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1914, 17</value>
+    <value>1062, 17</value>
   </metadata>
   <data name="TsmiCheckOrg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -432,7 +438,7 @@
 </value>
   </data>
   <metadata name="InfoFastMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1358, 18</value>
+    <value>764, 17</value>
   </metadata>
   <data name="FastCamera.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

PEIS/View/Enrollment/EnrollmentPersonForm.Designer.cs

@@ -30,8 +30,8 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnrollmentPersonForm));
-            DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule();
+            DevExpress.XtraGrid.GridFormatRule gridFormatRule2 = new DevExpress.XtraGrid.GridFormatRule();
-            DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
+            DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression2 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
             this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn118 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn123 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -175,6 +175,8 @@
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.splitContainer2 = new System.Windows.Forms.SplitContainer();
             this.DgcEFeeItem = new DevExpress.XtraGrid.GridControl();
+            this.FeeFastMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.PartOption = new System.Windows.Forms.ToolStripMenuItem();
             this.DgvEFeeItem = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -184,6 +186,7 @@
             this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.PackAndFeeItem = new System.Windows.Forms.TabControl();
             this.ExamComboTab = new System.Windows.Forms.TabPage();
@@ -272,6 +275,7 @@
             this.splitContainer2.Panel2.SuspendLayout();
             this.splitContainer2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.DgcEFeeItem)).BeginInit();
+            this.FeeFastMenu.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.DgvEFeeItem)).BeginInit();
             this.PackAndFeeItem.SuspendLayout();
             this.ExamComboTab.SuspendLayout();
@@ -1786,7 +1790,7 @@
             // 
             this.splitContainer1.Panel2.Controls.Add(this.DgcCheckCost);
             this.splitContainer1.Size = new System.Drawing.Size(1201, 541);
-            this.splitContainer1.SplitterDistance = 293;
+            this.splitContainer1.SplitterDistance = 280;
             this.splitContainer1.SplitterWidth = 3;
             this.splitContainer1.TabIndex = 29;
             // 
@@ -1807,24 +1811,40 @@
             // 
             this.splitContainer2.Panel2.BackColor = System.Drawing.Color.White;
             this.splitContainer2.Panel2.Controls.Add(this.PackAndFeeItem);
-            this.splitContainer2.Size = new System.Drawing.Size(1201, 293);
+            this.splitContainer2.Size = new System.Drawing.Size(1201, 280);
             this.splitContainer2.SplitterDistance = 547;
             this.splitContainer2.SplitterWidth = 3;
             this.splitContainer2.TabIndex = 0;
             // 
             // DgcEFeeItem
             // 
+            this.DgcEFeeItem.ContextMenuStrip = this.FeeFastMenu;
             this.DgcEFeeItem.Dock = System.Windows.Forms.DockStyle.Fill;
             this.DgcEFeeItem.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.DgcEFeeItem.Location = new System.Drawing.Point(0, 0);
             this.DgcEFeeItem.MainView = this.DgvEFeeItem;
             this.DgcEFeeItem.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.DgcEFeeItem.Name = "DgcEFeeItem";
-            this.DgcEFeeItem.Size = new System.Drawing.Size(543, 289);
+            this.DgcEFeeItem.Size = new System.Drawing.Size(543, 276);
             this.DgcEFeeItem.TabIndex = 2;
             this.DgcEFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.DgvEFeeItem});
             // 
+            // FeeFastMenu
+            // 
+            this.FeeFastMenu.ImageScalingSize = new System.Drawing.Size(20, 20);
+            this.FeeFastMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.PartOption});
+            this.FeeFastMenu.Name = "FeeFastMenu";
+            this.FeeFastMenu.Size = new System.Drawing.Size(129, 30);
+            // 
+            // PartOption
+            // 
+            this.PartOption.Image = global::PEIS.Properties.Resources.个人信息__1_;
+            this.PartOption.Name = "PartOption";
+            this.PartOption.Size = new System.Drawing.Size(128, 26);
+            this.PartOption.Text = "选择部位";
+            // 
             // DgvEFeeItem
             // 
             this.DgvEFeeItem.Appearance.FooterPanel.Font = new System.Drawing.Font("微软雅黑", 10.8F);
@@ -1842,6 +1862,7 @@
             this.gridColumn29,
             this.gridColumn30,
             this.gridColumn31,
+            this.gridColumn54,
             this.gridColumn32});
             this.DgvEFeeItem.GridControl = this.DgcEFeeItem;
             this.DgvEFeeItem.Name = "DgvEFeeItem";
@@ -1996,9 +2017,24 @@
             this.gridColumn31.OptionsColumn.ReadOnly = true;
             this.gridColumn31.OptionsFilter.AllowFilter = false;
             this.gridColumn31.Visible = true;
-            this.gridColumn31.VisibleIndex = 7;
+            this.gridColumn31.VisibleIndex = 8;
             this.gridColumn31.Width = 48;
             // 
+            // gridColumn54
+            // 
+            this.gridColumn54.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.gridColumn54.AppearanceCell.Options.UseFont = true;
+            this.gridColumn54.Caption = "部位";
+            this.gridColumn54.FieldName = "Part";
+            this.gridColumn54.Name = "gridColumn54";
+            this.gridColumn54.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn54.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn54.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn54.OptionsColumn.ReadOnly = true;
+            this.gridColumn54.OptionsFilter.AllowAutoFilter = false;
+            this.gridColumn54.Visible = true;
+            this.gridColumn54.VisibleIndex = 7;
+            // 
             // gridColumn32
             // 
             this.gridColumn32.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
@@ -2014,7 +2050,7 @@
             this.gridColumn32.OptionsColumn.ReadOnly = true;
             this.gridColumn32.OptionsFilter.AllowFilter = false;
             this.gridColumn32.Visible = true;
-            this.gridColumn32.VisibleIndex = 8;
+            this.gridColumn32.VisibleIndex = 9;
             // 
             // PackAndFeeItem
             // 
@@ -2026,7 +2062,7 @@
             this.PackAndFeeItem.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.PackAndFeeItem.Name = "PackAndFeeItem";
             this.PackAndFeeItem.SelectedIndex = 0;
-            this.PackAndFeeItem.Size = new System.Drawing.Size(647, 289);
+            this.PackAndFeeItem.Size = new System.Drawing.Size(647, 276);
             this.PackAndFeeItem.TabIndex = 1;
             // 
             // ExamComboTab
@@ -2037,7 +2073,7 @@
             this.ExamComboTab.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.ExamComboTab.Name = "ExamComboTab";
             this.ExamComboTab.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3);
-            this.ExamComboTab.Size = new System.Drawing.Size(639, 259);
+            this.ExamComboTab.Size = new System.Drawing.Size(639, 246);
             this.ExamComboTab.TabIndex = 1;
             this.ExamComboTab.Text = "体检套餐";
             // 
@@ -2049,7 +2085,7 @@
             this.DgcPack.Name = "DgcPack";
             this.DgcPack.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit2});
-            this.DgcPack.Size = new System.Drawing.Size(635, 253);
+            this.DgcPack.Size = new System.Drawing.Size(635, 240);
             this.DgcPack.TabIndex = 122;
             this.DgcPack.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.DgvPack,
@@ -2213,7 +2249,7 @@
             this.FeeItemTab.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.FeeItemTab.Name = "FeeItemTab";
             this.FeeItemTab.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3);
-            this.FeeItemTab.Size = new System.Drawing.Size(637, 255);
+            this.FeeItemTab.Size = new System.Drawing.Size(637, 242);
             this.FeeItemTab.TabIndex = 0;
             this.FeeItemTab.Text = "收费项目";
             // 
@@ -2225,7 +2261,7 @@
             this.DgcFeeItem.Name = "DgcFeeItem";
             this.DgcFeeItem.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit1});
-            this.DgcFeeItem.Size = new System.Drawing.Size(633, 226);
+            this.DgcFeeItem.Size = new System.Drawing.Size(633, 213);
             this.DgcFeeItem.TabIndex = 124;
             this.DgcFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.DgvFeeItem,
@@ -2408,7 +2444,7 @@
             this.CopyItemTab.Location = new System.Drawing.Point(4, 26);
             this.CopyItemTab.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.CopyItemTab.Name = "CopyItemTab";
-            this.CopyItemTab.Size = new System.Drawing.Size(637, 255);
+            this.CopyItemTab.Size = new System.Drawing.Size(639, 246);
             this.CopyItemTab.TabIndex = 2;
             this.CopyItemTab.Text = "从体检者复制项目";
             this.CopyItemTab.UseVisualStyleBackColor = true;
@@ -2421,7 +2457,7 @@
             this.DgcCopyItem.MainView = this.DgvCopyItem;
             this.DgcCopyItem.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.DgcCopyItem.Name = "DgcCopyItem";
-            this.DgcCopyItem.Size = new System.Drawing.Size(497, 227);
+            this.DgcCopyItem.Size = new System.Drawing.Size(499, 218);
             this.DgcCopyItem.TabIndex = 32;
             this.DgcCopyItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.DgvCopyItem});
@@ -2598,7 +2634,7 @@
             this.panel2.Dock = System.Windows.Forms.DockStyle.Left;
             this.panel2.Location = new System.Drawing.Point(0, 28);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(140, 227);
+            this.panel2.Size = new System.Drawing.Size(140, 218);
             this.panel2.TabIndex = 31;
             // 
             // NameSearch2
@@ -2620,7 +2656,7 @@
             this.DgcRegItem2.MainView = this.DgvRegItem2;
             this.DgcRegItem2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.DgcRegItem2.Name = "DgcRegItem2";
-            this.DgcRegItem2.Size = new System.Drawing.Size(140, 227);
+            this.DgcRegItem2.Size = new System.Drawing.Size(140, 218);
             this.DgcRegItem2.TabIndex = 29;
             this.DgcRegItem2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.DgvRegItem2});
@@ -2684,7 +2720,7 @@
             this.CopyMenu.Location = new System.Drawing.Point(0, 0);
             this.CopyMenu.Name = "CopyMenu";
             this.CopyMenu.Padding = new System.Windows.Forms.Padding(2, 2, 0, 2);
-            this.CopyMenu.Size = new System.Drawing.Size(637, 28);
+            this.CopyMenu.Size = new System.Drawing.Size(639, 28);
             this.CopyMenu.TabIndex = 24;
             this.CopyMenu.Text = "menuStrip1";
             // 
@@ -2704,7 +2740,7 @@
             this.DgcCheckCost.Name = "DgcCheckCost";
             this.DgcCheckCost.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemMemoEdit3});
-            this.DgcCheckCost.Size = new System.Drawing.Size(1197, 241);
+            this.DgcCheckCost.Size = new System.Drawing.Size(1197, 254);
             this.DgcCheckCost.TabIndex = 145;
             this.DgcCheckCost.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.DgvCheckCost});
@@ -2737,15 +2773,15 @@
             this.gridColumn53,
             this.gridColumn52});
             this.DgvCheckCost.FixedLineWidth = 1;
-            gridFormatRule1.ApplyToRow = true;
+            gridFormatRule2.ApplyToRow = true;
-            gridFormatRule1.Column = this.gridColumn52;
+            gridFormatRule2.Column = this.gridColumn52;
-            gridFormatRule1.Name = "Format0";
+            gridFormatRule2.Name = "Format0";
-            formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Gray;
+            formatConditionRuleExpression2.Appearance.ForeColor = System.Drawing.Color.Gray;
-            formatConditionRuleExpression1.Appearance.Options.UseForeColor = true;
+            formatConditionRuleExpression2.Appearance.Options.UseForeColor = true;
-            formatConditionRuleExpression1.Expression = "[CancelTime] Is Not Null";
+            formatConditionRuleExpression2.Expression = "[CancelTime] Is Not Null";
-            formatConditionRuleExpression1.PredefinedName = "Strikeout Text";
+            formatConditionRuleExpression2.PredefinedName = "Strikeout Text";
-            gridFormatRule1.Rule = formatConditionRuleExpression1;
+            gridFormatRule2.Rule = formatConditionRuleExpression2;
-            this.DgvCheckCost.FormatRules.Add(gridFormatRule1);
+            this.DgvCheckCost.FormatRules.Add(gridFormatRule2);
             this.DgvCheckCost.GridControl = this.DgcCheckCost;
             this.DgvCheckCost.IndicatorWidth = 40;
             this.DgvCheckCost.Name = "DgvCheckCost";
@@ -2840,6 +2876,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
             this.splitContainer2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.DgcEFeeItem)).EndInit();
+            this.FeeFastMenu.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.DgvEFeeItem)).EndInit();
             this.PackAndFeeItem.ResumeLayout(false);
             this.ExamComboTab.ResumeLayout(false);
@@ -3075,5 +3112,8 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn47;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn48;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn49;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
+        private System.Windows.Forms.ContextMenuStrip FeeFastMenu;
+        private System.Windows.Forms.ToolStripMenuItem PartOption;
     }
 }

PEIS/View/Enrollment/EnrollmentPersonForm.cs

@@ -15,6 +15,7 @@ using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
 using System.Net;
+using Newtonsoft.Json.Linq;
 
 namespace PEIS.View.Enrollment
 {
@@ -119,6 +120,9 @@ namespace PEIS.View.Enrollment
             // 移除收费项目
             DgvEFeeItem.DoubleClick += DgvEFeeItem_DoubleClick;
 
+            //选择部位
+            PartOption.Click += PartOption_Click;
+
             // 改变体检项目行颜色
             DgvEFeeItem.RowStyle += DgvEFeeItem_RowStyle;
             // 改变订单行颜色
@@ -142,6 +146,7 @@ namespace PEIS.View.Enrollment
             DgvFeeItem.MouseDown += DgvFeeItem_MouseDown;
             DgvEFeeItem.MouseDown += DgvEFeeItem_MouseDown;
             #endregion
+
         }
 
         private void DgvEFeeItem_MouseDown(object sender, MouseEventArgs e)
@@ -159,6 +164,31 @@ namespace PEIS.View.Enrollment
             pInfo = DgvPack.CalcHitInfo(e.X, e.Y);
         }
 
+        private void PartOption_Click(object sender, EventArgs e)
+        {
+            if (DgvEFeeItem.GetSelectedRows().Count() == 0) return;
+            EnrollmentFeeItem item = DgvEFeeItem.GetRow(DgvEFeeItem.GetSelectedRows()[0]) as EnrollmentFeeItem;
+
+            string jsonString = DAOHelp.GetDataBySQL($@"select * from [vi_HisFeeItem] where FeeItemCode='{item.FeeItemCode}' and KeyNo='{item.KeyNo}'; ").Rows[0]["BodyParts"]?.ToString();
+
+            if (string.IsNullOrEmpty(jsonString)) return;
+
+            List<string> parts = new List<string>();
+            JArray array = JArray.Parse(jsonString);
+            foreach (JObject data in array)
+            {
+                parts.Add((string)data["Name"]);
+            }
+
+            PartOptionForm po = new PartOptionForm(item.FeeItemName, parts);
+            if (po.ShowDialog() == DialogResult.OK)
+            {
+                item.Part = PartOptionForm.PartResult;
+                item.Update();
+                DgcEFeeItem.RefreshDataSource();
+            }
+        }
+
         private void DgvEFeeItem_RowStyle(object sender, RowStyleEventArgs e)
         {
             if (DgvEFeeItem.RowCount == 0) return;

PEIS/View/Enrollment/EnrollmentPersonForm.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="RegMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1724, 14</value>
+    <value>925, 13</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="TsmiRegRefresh.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -134,7 +134,7 @@
 </value>
   </data>
   <metadata name="DateFastMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>182, 9</value>
+    <value>19, 18</value>
   </metadata>
   <data name="FastLastWeek.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -176,7 +176,7 @@
 </value>
   </data>
   <metadata name="CostFastMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>522, 8</value>
+    <value>335, 18</value>
   </metadata>
   <data name="FastCharge.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -358,7 +358,7 @@
 </value>
   </data>
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>816, 8</value>
+    <value>483, 18</value>
   </metadata>
   <data name="TsmiRegAdd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -387,7 +387,7 @@
 </value>
   </data>
   <metadata name="ProjectMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1094, 4</value>
+    <value>621, 16</value>
   </metadata>
   <data name="TsmiPojectCreateOrder.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -495,8 +495,11 @@
         AElFTkSuQmCC
 </value>
   </data>
+  <metadata name="FeeFastMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>152, 18</value>
+  </metadata>
   <metadata name="CopyMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1417, 8</value>
+    <value>762, 13</value>
   </metadata>
   <data name="TsmiCopyFeeItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -508,6 +511,6 @@
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>58</value>
+    <value>54</value>
   </metadata>
 </root>

PEIS/View/Enrollment/PartOptionForm.Designer.cs

@@ -0,0 +1,86 @@
+
+namespace PEIS.View.Enrollment
+{
+    partial class PartOptionForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.CheckPanel = new System.Windows.Forms.Panel();
+            this.OKButton = new System.Windows.Forms.Button();
+            this.CancelButton = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // CheckPanel
+            // 
+            this.CheckPanel.AutoScroll = true;
+            this.CheckPanel.Location = new System.Drawing.Point(13, 13);
+            this.CheckPanel.Name = "CheckPanel";
+            this.CheckPanel.Size = new System.Drawing.Size(239, 148);
+            this.CheckPanel.TabIndex = 0;
+            // 
+            // OKButton
+            // 
+            this.OKButton.Location = new System.Drawing.Point(13, 167);
+            this.OKButton.Name = "OKButton";
+            this.OKButton.Size = new System.Drawing.Size(110, 30);
+            this.OKButton.TabIndex = 1;
+            this.OKButton.Text = "确定";
+            this.OKButton.UseVisualStyleBackColor = true;
+            // 
+            // CancelButton
+            // 
+            this.CancelButton.Location = new System.Drawing.Point(142, 167);
+            this.CancelButton.Name = "CancelButton";
+            this.CancelButton.Size = new System.Drawing.Size(110, 30);
+            this.CancelButton.TabIndex = 2;
+            this.CancelButton.Text = "取消";
+            this.CancelButton.UseVisualStyleBackColor = true;
+            // 
+            // PartOptionForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(264, 203);
+            this.Controls.Add(this.CancelButton);
+            this.Controls.Add(this.OKButton);
+            this.Controls.Add(this.CheckPanel);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "PartOptionForm";
+            this.Text = "PartOptionForm";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Panel CheckPanel;
+        private System.Windows.Forms.Button OKButton;
+        private System.Windows.Forms.Button CancelButton;
+    }
+}

PEIS/View/Enrollment/PartOptionForm.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace PEIS.View.Enrollment
+{
+    public partial class PartOptionForm : Form
+    {
+
+        public static string PartResult;
+
+        public PartOptionForm(string feeItemName, List<string> parts)
+        {
+            InitializeComponent();
+
+            Text = feeItemName;
+            StartPosition = FormStartPosition.Manual;
+            Location = Control.MousePosition;
+
+            OKButton.Click += OKButton_Click;
+            CancelButton.Click += CancelButton_Click;
+
+            PartResult = null;
+
+            for (int i = 0; i < parts.Count; i++)
+            {
+                CheckBox checkBox = new CheckBox
+                {
+                    Text = parts[i],
+                    AutoSize = true,
+                    Location = new Point(10, i * 25 + 10)
+                };
+                CheckPanel.Controls.Add(checkBox);
+            }
+        }
+
+        private void OKButton_Click(object sender, EventArgs e)
+        {
+            foreach (var control in CheckPanel.Controls)
+            {
+                if (control is CheckBox)
+                {
+                    var checkbox = control as CheckBox;
+                    if (checkbox.Checked)
+                    {
+                        PartResult += checkbox.Text + ",";
+                    }
+                }
+            }
+            PartResult = PartResult?.TrimEnd(',');
+
+            DialogResult = DialogResult.OK;
+        }
+
+        private void CancelButton_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.Cancel;
+        }
+    }
+}

PEIS/View/Enrollment/PartOptionForm.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

PEIS/View/Exam/TotalForm.Designer.cs

@@ -244,6 +244,8 @@
             this.gridView6 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridView7 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridView8 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.OccupationalGroupBox = new System.Windows.Forms.GroupBox();
+            this.OccupationalText = new System.Windows.Forms.TextBox();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerBase)).BeginInit();
             this.splitContainerBase.Panel1.SuspendLayout();
             this.splitContainerBase.Panel2.SuspendLayout();
@@ -341,6 +343,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.gridView6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView8)).BeginInit();
+            this.OccupationalGroupBox.SuspendLayout();
             this.SuspendLayout();
             // 
             // splitContainerBase
@@ -1181,7 +1184,7 @@
             this.repositoryItemMemoEdit2,
             this.CmbSearchConclusion,
             this.repositoryItemCheckEdit1});
-            this.DgcExamConclusion.Size = new System.Drawing.Size(442, 391);
+            this.DgcExamConclusion.Size = new System.Drawing.Size(442, 280);
             this.DgcExamConclusion.TabIndex = 5;
             this.DgcExamConclusion.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.DgvExamConclusion,
@@ -1351,10 +1354,11 @@
             this.panelOccupational.Controls.Add(this.OccupationalConclusion_3);
             this.panelOccupational.Controls.Add(this.OccupationalConclusion_2);
             this.panelOccupational.Controls.Add(this.OccupationalConclusion_1);
+            this.panelOccupational.Controls.Add(this.OccupationalGroupBox);
             this.panelOccupational.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panelOccupational.Location = new System.Drawing.Point(0, 391);
+            this.panelOccupational.Location = new System.Drawing.Point(0, 280);
             this.panelOccupational.Name = "panelOccupational";
-            this.panelOccupational.Size = new System.Drawing.Size(442, 36);
+            this.panelOccupational.Size = new System.Drawing.Size(442, 147);
             this.panelOccupational.TabIndex = 6;
             this.panelOccupational.Visible = false;
             // 
@@ -1365,7 +1369,7 @@
             this.OccupationalConclusion_5.Location = new System.Drawing.Point(356, 0);
             this.OccupationalConclusion_5.Name = "OccupationalConclusion_5";
             this.OccupationalConclusion_5.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);
-            this.OccupationalConclusion_5.Size = new System.Drawing.Size(119, 36);
+            this.OccupationalConclusion_5.Size = new System.Drawing.Size(119, 38);
             this.OccupationalConclusion_5.TabIndex = 4;
             this.OccupationalConclusion_5.TabStop = true;
             this.OccupationalConclusion_5.Text = "其他疾病或异常";
@@ -1378,7 +1382,7 @@
             this.OccupationalConclusion_4.Location = new System.Drawing.Point(261, 0);
             this.OccupationalConclusion_4.Name = "OccupationalConclusion_4";
             this.OccupationalConclusion_4.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);
-            this.OccupationalConclusion_4.Size = new System.Drawing.Size(95, 36);
+            this.OccupationalConclusion_4.Size = new System.Drawing.Size(95, 38);
             this.OccupationalConclusion_4.TabIndex = 3;
             this.OccupationalConclusion_4.TabStop = true;
             this.OccupationalConclusion_4.Text = "职业禁忌症";
@@ -1391,7 +1395,7 @@
             this.OccupationalConclusion_3.Location = new System.Drawing.Point(166, 0);
             this.OccupationalConclusion_3.Name = "OccupationalConclusion_3";
             this.OccupationalConclusion_3.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);
-            this.OccupationalConclusion_3.Size = new System.Drawing.Size(95, 36);
+            this.OccupationalConclusion_3.Size = new System.Drawing.Size(95, 38);
             this.OccupationalConclusion_3.TabIndex = 2;
             this.OccupationalConclusion_3.TabStop = true;
             this.OccupationalConclusion_3.Text = "疑似职业病";
@@ -1404,7 +1408,7 @@
             this.OccupationalConclusion_2.Location = new System.Drawing.Point(107, 0);
             this.OccupationalConclusion_2.Name = "OccupationalConclusion_2";
             this.OccupationalConclusion_2.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);
-            this.OccupationalConclusion_2.Size = new System.Drawing.Size(59, 36);
+            this.OccupationalConclusion_2.Size = new System.Drawing.Size(59, 38);
             this.OccupationalConclusion_2.TabIndex = 1;
             this.OccupationalConclusion_2.TabStop = true;
             this.OccupationalConclusion_2.Text = "复查";
@@ -1418,7 +1422,7 @@
             this.OccupationalConclusion_1.Location = new System.Drawing.Point(0, 0);
             this.OccupationalConclusion_1.Name = "OccupationalConclusion_1";
             this.OccupationalConclusion_1.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);
-            this.OccupationalConclusion_1.Size = new System.Drawing.Size(107, 36);
+            this.OccupationalConclusion_1.Size = new System.Drawing.Size(107, 38);
             this.OccupationalConclusion_1.TabIndex = 0;
             this.OccupationalConclusion_1.TabStop = true;
             this.OccupationalConclusion_1.Text = "目前未见异常";
@@ -2988,6 +2992,27 @@
             // 
             this.gridView8.Name = "gridView8";
             // 
+            // OccupationalGroupBox
+            // 
+            this.OccupationalGroupBox.Controls.Add(this.OccupationalText);
+            this.OccupationalGroupBox.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.OccupationalGroupBox.Location = new System.Drawing.Point(0, 38);
+            this.OccupationalGroupBox.Name = "OccupationalGroupBox";
+            this.OccupationalGroupBox.Size = new System.Drawing.Size(442, 109);
+            this.OccupationalGroupBox.TabIndex = 5;
+            this.OccupationalGroupBox.TabStop = false;
+            this.OccupationalGroupBox.Text = "职业健康检查处理意见";
+            // 
+            // OccupationalText
+            // 
+            this.OccupationalText.AcceptsReturn = true;
+            this.OccupationalText.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.OccupationalText.Location = new System.Drawing.Point(3, 18);
+            this.OccupationalText.Multiline = true;
+            this.OccupationalText.Name = "OccupationalText";
+            this.OccupationalText.Size = new System.Drawing.Size(436, 88);
+            this.OccupationalText.TabIndex = 0;
+            // 
             // TotalForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
@@ -3104,6 +3129,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.gridView6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView8)).EndInit();
+            this.OccupationalGroupBox.ResumeLayout(false);
+            this.OccupationalGroupBox.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -3324,5 +3351,7 @@
         private System.Windows.Forms.RadioButton OccupationalConclusion_4;
         private System.Windows.Forms.RadioButton OccupationalConclusion_3;
         private System.Windows.Forms.RadioButton OccupationalConclusion_2;
+        private System.Windows.Forms.GroupBox OccupationalGroupBox;
+        private System.Windows.Forms.TextBox OccupationalText;
     }
 }

PEIS/View/Exam/TotalForm.cs

@@ -624,6 +624,8 @@ namespace PEIS.View.Exam
             {
                 var item = items.First();
                 foreach (var item2 in panelOccupational.Controls)
+                {
+                    if (item2 is RadioButton)
                     {
                         var radioButton = item2 as RadioButton;
                         if (radioButton.Name.EndsWith(item.OccupationalConclusion.ToString()))
@@ -632,6 +634,13 @@ namespace PEIS.View.Exam
                             Invoke(new Action(() => radioButton.Checked = false));
                     }
                 }
+                OccupationalText.Text = item.OccupationalSuggestion;
+            }
+            else
+            {
+                OccupationalConclusion_1.Checked = true;
+                OccupationalText.Text = string.Empty;
+            }
         }
 
         /// <summary>
@@ -921,6 +930,7 @@ namespace PEIS.View.Exam
                         {
                             ID = _patient.ID,
                             OccupationalConclusion = int.Parse(rb.Name.Split('_')[1]),
+                            OccupationalSuggestion = OccupationalText.Text,
                         });
                         break;
                     }

PEIS/View/statistics/IStatisticalReportView.cs

@@ -52,5 +52,9 @@ namespace PEIS.View.Statistics
         // 团体费用统计
         event EventHandler<Args<dynamic>> GetOrgCostFeeData;
         void ShowOrgCostFeeData(List<EnrollmentFeeItem> items);
+
+        // 体检时间节点
+        event EventHandler<Args<dynamic>> GetPeopleDateTimeData;
+        void ShowPeopleDateTimeData(List<EnrollmentPatient> items);
     }
 }

PEIS/View/statistics/StatisticalReportForm.Designer.cs

@@ -259,7 +259,7 @@
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(56, 17);
             this.label4.TabIndex = 8;
-            this.label4.Text = "执行科室";
+            this.label4.Text = "统计类别";
             // 
             // label3
             // 

PEIS/View/statistics/StatisticalReportForm.cs

@@ -28,6 +28,7 @@ namespace PEIS.View.Statistics
         public List<EnrollmentFeeItem> _orgCostFeeData = new List<EnrollmentFeeItem>();
         public List<EnrollmentCheckCost> _checkCost = new List<EnrollmentCheckCost>();
         public List<TwoCancer> _twoCancerData = new List<TwoCancer>();
+        private List<EnrollmentPatient> _peopleDateTimeData = new List<EnrollmentPatient>();
         public EnrollmentOrg _org = new EnrollmentOrg();
 
         public StatisticalReportForm()
@@ -48,7 +49,7 @@ namespace PEIS.View.Statistics
             // 控制团体选择的显示
             TeamRadio.CheckedChanged += (object sender, EventArgs e) =>
             {
-                if (TeamRadio.Checked && _parentNode == "CostCount")
+                if (TeamRadio.Checked)
                 {
                     OrgTextEdit.Enabled = true;
                 }
@@ -93,7 +94,7 @@ namespace PEIS.View.Statistics
                         break;
                     case "费用明细统计表":
                         _parentNode = "CostCount";
-                        OrgTextEdit.Enabled = TeamRadio.Checked;
+                        OrgTextEdit.Enabled = TeamRadio.Checked = true;
                         RefreshBtn_Click(sender, e);
                         HandleReport();
                         break;
@@ -116,6 +117,15 @@ namespace PEIS.View.Statistics
                         RefreshBtn_Click(sender, e);
                         HandleReport();
                         break;
+                    case "体检时间节点统计":
+                        _parentNode = "PeopleDateTimeCount";
+                        DeptComboBox.Enabled = false;
+                        PersonRadio.Enabled = true;
+                        AllRadio.Enabled = true;
+                        OrgTextEdit.Enabled = TeamRadio.Checked = true;
+                        RefreshBtn_Click(sender, e);
+                        HandleReport();
+                        break;
                 }
             }
             else
@@ -191,6 +201,9 @@ namespace PEIS.View.Statistics
                 case "OrgCostFeeCount":
                     OnGetOrgCostFeeData();
                     break;
+                case "PeopleDateTimeCount":
+                    OnGetPeopleDateTimeData();
+                    break;
                 default:
                     Global.Msg("info", "请选择统计表!");
                     break;
@@ -235,6 +248,9 @@ namespace PEIS.View.Statistics
                         sReport.SetParameterValue("OrgName", _org != null && _org.ID != -1 ? _org.Name : "");
                         sReport.RegisterData(_orgCostFeeData, "p");
                         break;
+                    case "PeopleDateTimeCount":
+                        sReport.RegisterData(_peopleDateTimeData, "p");
+                        break;
                 }
 
                 DataBand dataBand = sReport.Report.FindObject(_parentNode) as DataBand;
@@ -276,7 +292,10 @@ namespace PEIS.View.Statistics
                 new StatisticalTree() { Id = 12, ParentId = 12, Name = "两癌筛查统计",},
 
                 // 团体总费用统计
-                new StatisticalTree() { Id = 13, ParentId = 13, Name = "团体费用统计" }
+                new StatisticalTree() { Id = 13, ParentId = 13, Name = "团体费用统计" },
+
+                // 体检时间节点统计
+                new StatisticalTree() { Id = 14, ParentId = 14, Name = "体检时间节点统计" }
             };
 
             ImageList imageList = new ImageList();
@@ -451,6 +470,25 @@ namespace PEIS.View.Statistics
             HandleReport();
         }
 
+
+        // 体检时间节点
+        public event EventHandler<Args<dynamic>> GetPeopleDateTimeData;
+        protected virtual void OnGetPeopleDateTimeData()
+        {
+            dynamic paramsData = new ExpandoObject();
+            paramsData.begDate = BegDate.Value;
+            paramsData.endDate = EndDate.Value;
+            paramsData.status = TeamRadio.Checked ? 0 : PersonRadio.Checked ? 1 : 2;
+            paramsData.oEid = _org == null || !TeamRadio.Checked ? -1 : _org.ID;
+
+            GetPeopleDateTimeData?.Invoke(this, new Args<dynamic> { Item = paramsData });
+        }
+        public void ShowPeopleDateTimeData(List<EnrollmentPatient> items)
+        {
+            Invoke(new Action(() => _peopleDateTimeData = items));
+            HandleReport();
+        }
+
         #endregion
 
         #region 树形菜单