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

德宏州中医院分支系统部署更新到德宏州妇幼医院,出现的问题排查解决

Browse Source
dhzzyy
zdnpc 1 month ago
parent 0ad09ff056
commit 2cd5e574b1
17 changed files with 166 additions and 167 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      PEIS/App.config
  2. 3
      PEIS/Event/Args.cs
  3. 3
      PEIS/Model/Enrollment/EnrollentOrgGroupModel.cs
  4. 10
      PEIS/Model/Enrollment/EnrollmentOrgModel.cs
  5. 32
      PEIS/Model/Enrollment/EnrollmentPatientModel.cs
  6. 4
      PEIS/Model/Exam/PartModel.cs
  7. 6
      PEIS/Presenter/EnrollmentOrgPresenter.cs
  8. 6
      PEIS/Presenter/EnrollmentPersonPresenter.cs
  9. 46
      PEIS/ReportFiles/Guide.frx
  10. 4
      PEIS/View/Base/OrgForm.cs
  11. 35
      PEIS/View/Enrollment/EnrollmentOrgForm.cs
  12. 25
      PEIS/View/Enrollment/EnrollmentPersonForm.cs
  13. 14
      PEIS/View/Enrollment/NewEnrollmentPersonForm.cs
  14. 62
      PEIS/View/Exam/PartForm.Designer.cs
  15. 25
      PEIS/View/Exam/PartForm.cs
  16. 52
      PEIS/View/Exam/TotalForm.Designer.cs
  17. 2
      PEIS/View/Exam/TotalForm.cs

4
PEIS/App.config
Unescape View File

@ -21,13 +21,13 @@
<!-- 德宏州中医院 peisdb-->
<!--<add name="ConnString" connectionString="10C598E364BCAFCF71617738597417B368D095FA1A37D76CC4755C411E5B6E792E0D4950863434F9B242AA9F134426A27810AC34D6EDC4F6ABFC4BE6027BB990824DB7092BFDA15709314FEBC2C3C9E312752DFBDF33BC1BF3C0FC84EAA83A4F"/>-->
<!-- 192.168.12.188 -->
<!--<add name="ConnString" connectionString="10C598E364BCAFCFDC6960B18CB026C75BD46245729DFD1D3D78E221B3E0300765B697A8C044694AA8A0575480464D83E79206ED689FE4A1CE0C479D02BC880B7FDEDDC464EE6B74BDB082FD5B1B9EFC"/>-->
<add name="ConnString" connectionString="10C598E364BCAFCFDC6960B18CB026C75BD46245729DFD1D3D78E221B3E0300765B697A8C044694AA8A0575480464D83E79206ED689FE4A1CE0C479D02BC880B7FDEDDC464EE6B74BDB082FD5B1B9EFC"/>
<!-- 盈江妇幼YJFY -->
<!--<add name="ConnString" connectionString="10C598E364BCAFCF5A016EA6C7463FAC7D75379F63924F4F82C1749BDA88D9414EC0303E1ECC3E76895E07FCFC13332D1D79643A2AD3AA60507FD3EAF9A41761B30F4FDE900F983F1FE6ED6F0245E5BF8BFCFC5F0A2C03E4"/>-->
<!-- 芒市妇幼MSFY -->
<!-- <add name="ConnString" connectionString="10C598E364BCAFCFDC6960B18CB026C71974C5748654F280FDC48E754851202242B4E7B1AA07112A874114ABFCB682AC3D64541EBBF807FEB54E514CC3815F4A0521AC62245D6E0B29E34ADCAE07492C51045002E903C53C8DC45FF6FC4A547A"/> -->
<!-- 德宏州妇幼-->
<add name="ConnString" connectionString="10C598E364BCAFCFDC6960B18CB026C763905B6860F9682000563332FCAB5C73858C4F5055412BEEA4250C4B7F818B1131EA88AF653A3B4CEF4C8709AEC4870673F567CE7499A1B68594877CCF22BD0DBB127636E607D7B6"/>
<!--<add name="ConnString" connectionString="10C598E364BCAFCFDC6960B18CB026C763905B6860F9682000563332FCAB5C73858C4F5055412BEEA4250C4B7F818B1131EA88AF653A3B4CEF4C8709AEC4870673F567CE7499A1B68594877CCF22BD0DBB127636E607D7B6"/>-->
</connectionStrings>
<entityFramework>
<providers>

3
PEIS/Event/Args.cs
Unescape View File

@ -27,6 +27,7 @@ namespace PEIS.Event
{
public Int64 ID { get; set; }
public Int64 BaseOID { get; set; }
// EID
public Int64 EnrollmentID { get; set; }
public Int64 EnrollmentOID { get; set; }
public Int64 GroupID { get; set; }
@ -41,12 +42,14 @@ namespace PEIS.Event
public DateTime EndTime { get; set; }
public Decimal Discount { get; set; }
public Decimal Fee { get; set; }
public Int64 OEID { get; set; }
/// <summary>
/// 科室分检保存
/// </summary>
public ExamPart Part { get; set; }
public String DeptCode { get; set; }
public Int64 Eid{ get; set; }
public Int64 Pid { get; set; }
public Args()
{

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

@ -45,7 +45,7 @@ namespace PEIS.Model.Enrollment
return;
}
if (item.Type.Contains("职业"))
if (item.Type != null && item.Type.Contains("职业"))
{
DAOHelp.ExecuteSql($@"UPDATE ENROLLMENT_ORGGROUP SET Name= '{item.Name}',Sex= '{item.Sex}', Marriage= '{item.Marriage}', AgeMin= {item.AgeMin}, AgeMax= {item.AgeMax}, Type= '{item.Type}',
JobStatus = '{item.JobStatus}', HazardFactors = '{item.HazardFactors}' WHERE ID= {item.ID}", false);
@ -55,7 +55,6 @@ namespace PEIS.Model.Enrollment
DAOHelp.ExecuteSql($@"UPDATE ENROLLMENT_ORGGROUP SET Name= '{item.Name}',Sex= '{item.Sex}', Marriage= '{item.Marriage}', AgeMin= {item.AgeMin}, AgeMax= {item.AgeMax}, Type= '{item.Type}',
JobStatus = null, JobTypes = null, HazardFactors = null WHERE ID= {item.ID}", false);
}
}
}
}

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

@ -86,8 +86,8 @@ namespace PEIS.Model.Enrollment
}
}
public bool RecallDept(Int64 EId) // 撤回发送科室
// 撤回发送科室
public bool RecallDept(Int64 EId, String Name, long OEID)
{
var checkCost = $@"UPDATE Enrollment_CheckCost SET SendTime = null, SenderCode = null, Sender = null WHERE EID = {EId} AND SendTime is not null AND DeleteTime is null AND WeChatCostTime is null";
var enrollmentPatient = $@"UPDATE Enrollment_Patient SET SignTime = null, SignerCode = null, Signer = null WHERE ID = {EId} AND SignTime is not null";
@ -99,11 +99,7 @@ namespace PEIS.Model.Enrollment
if (cResult > 0 && eResult > 0 && fResult > 0)
{
var enPatients = DAOHelp.GetDataBySQL<EnrollmentPatient>($@"select Name, OEID from Enrollment_Patient where Id = {EId}");
if (enPatients != null && enPatients.Count > 0)
{
new Entity.Log($@"撤回发送到科室：体检号={EId},体检者={enPatients[0].Name},OEID={enPatients[0].OEID}", "3").Save();
}
new Entity.Log($@"撤回发送到科室：体检号={EId},姓名={Name},OEID={OEID}", "3").Save();
return true;
}

32
PEIS/Model/Enrollment/EnrollmentPatientModel.cs
Unescape View File

@ -139,11 +139,8 @@ namespace PEIS.Model.Enrollment
}
// 取消登记
public bool CancelRegInfo(Int64 EId)
public bool CancelRegInfo(Int64 EId, String Name, Int64 Pid, Int64 OEID, Int64 GroupID)
{
List<EnrollmentPatient> _patients = DAOHelp.GetDataBySQL<EnrollmentPatient>($@"Select * From Enrollment_Patient where ID = {EId}");
if (_patients == null || _patients.Count == 0) return false;
// 删除项目信息
var feeItem = $@"DELETE FROM Enrollment_FeeItem WHERE EID = {EId}";
// 删除体检号
@ -158,15 +155,15 @@ namespace PEIS.Model.Enrollment
string _logStr = "删除体检者：";
if (fResult > 0 && eResult > 0)
{
EnrollmentPatient orgPatient = _patients[0];
if (orgPatient.OEID != null)
//EnrollmentPatient orgPatient = _patients[0];
if (OEID != 0)
{
// 剔除分组
var enrollmentOrgPatient = $@"delete from Enrollment_OrgPatient where GroupID = {orgPatient.GroupID} and PID = {orgPatient.PID} and OID = {orgPatient.OEID}";
var enrollmentOrgPatient = $@"delete from Enrollment_OrgPatient where GroupID = {GroupID} and PID = {Pid} and OID = {OEID}";
var oResulr = DAOHelp.ExecuteSql(enrollmentOrgPatient, false);
_logStr = "删除团体成员：";
}
new Entity.Log($@"{_logStr}PID={orgPatient.PID},EID={orgPatient.ID},Name={orgPatient.Name}", "3").Save();
new Entity.Log($@"{_logStr}PID={Pid},体检号={EId},姓名={Name}", "3").Save();
return true;
}
return false;
@ -185,7 +182,7 @@ namespace PEIS.Model.Enrollment
var costs = DAOHelp.GetDataBySQL<EnrollmentCheckCost>($"Select a.Id, a.EID, a.OEID, b.Name From Enrollment_CheckCost a left join Enrollment_Patient b on a.Eid = b.Id WHERE a.Id = {id}");
if (costs != null && costs.Count > 0)
{
new Entity.Log($@"删除体检订单：体检号={costs[0].EID},体检者={costs[0].Name},订单号={costs[0].ID},OEID={costs[0].OEID}", "3").Save();
new Entity.Log($@"删除体检订单：体检号={costs[0].EID},姓名={costs[0].Name},订单号={costs[0].ID},OEID={costs[0].OEID}", "3").Save();
}
return true;
}
@ -193,16 +190,12 @@ namespace PEIS.Model.Enrollment
}
// 取消记账
public bool CancelCharge(Int64 id)
public bool CancelCharge(Int64 id, Int64 EID, String Name, Int64 OEID)
{
var sql = $@"UPDATE Enrollment_CheckCost SET ChargeTime = null, ChargerCode = null, Charger = null WHERE ID = {id}";
if (DAOHelp.ExecuteSql(sql, false) > 0)
{
var costs = DAOHelp.GetDataBySQL<EnrollmentCheckCost>($"Select a.Id, a.EID, a.OEID, b.Name From Enrollment_CheckCost a left join Enrollment_Patient b on a.Eid = b.Id WHERE a.Id = {id}");
if (costs != null && costs.Count > 0)
{
new Entity.Log($@"体检订单取消记账：体检号={costs[0].EID},体检者={costs[0].Name},订单号={costs[0].ID},OEID={costs[0].OEID}", "3").Save();
}
new Entity.Log($@"体检订单取消记账：体检号={EID},姓名={Name},订单号={id},OEID={OEID}", "3").Save();
return true;
}
return false;
@ -219,7 +212,7 @@ namespace PEIS.Model.Enrollment
}
// 撤回发送到科室
public bool RecallDept(Int64 EId) // 撤回发送科室
public bool RecallDept(Int64 EId, String Name)
{
var checkCost = $@"UPDATE Enrollment_CheckCost SET SendTime = null, SenderCode = null, Sender = null WHERE EID = {EId} AND SendTime is not null AND DeleteTime is null AND WeChatCostTime is null";
var enrollmentPatient = $@"UPDATE Enrollment_Patient SET SignTime = null, SignerCode = null, Signer = null WHERE ID = {EId} AND SignTime is not null";
@ -231,12 +224,7 @@ namespace PEIS.Model.Enrollment
if (cResult > 0 && eResult > 0 && fResult > 0)
{
var enPatients = DAOHelp.GetDataBySQL<EnrollmentPatient>($@"select Name, OEID from Enrollment_Patient where Id = {EId}");
if (enPatients != null && enPatients.Count > 0)
{
new Entity.Log($@"撤回发送到科室：体检号={EId},体检者={enPatients[0].Name},OEID={enPatients[0].OEID}", "3").Save();
}
new Entity.Log($@"撤回发送到科室：体检号={EId},姓名={Name}", "3").Save();
return true;
}
return false;

4
PEIS/Model/Exam/PartModel.cs
Unescape View File

@ -163,7 +163,7 @@ namespace PEIS.Model
{
Debug.WriteLine("[DEBUG] SetConclusion,生成结论");
var part = DAOHelp
.GetDataBySQL<ExamPart>($@"SELECT * FROM Exam_Part Where EID={eid} AND DeptCode='{deptCode}'")
.GetDataBySQL<ExamPart>($@"SELECT * FROM Exam_Part Where EID={eid} AND DeptCode='{deptCode}'")
.FirstOrDefault();
if (part == null)
{
@ -175,7 +175,7 @@ namespace PEIS.Model
var resultStr = "";
// 判断是否为检验科
if(deptCode == "3001")
if(deptCode == "3001" && Global._hospital.Name == "德宏州中医医院")
{
resultStr = $@"SELECT
C.FeeItemName,

6
PEIS/Presenter/EnrollmentOrgPresenter.cs
Unescape View File

@ -95,7 +95,7 @@ namespace PEIS.Presenter
};
View.RecallDept += (send, args) =>
{
View.ShowRecallDept(new EnrollmentOrgModel().RecallDept(args.ID));
View.ShowRecallDept(new EnrollmentOrgModel().RecallDept(args.ID, args.Name, args.OEID));
};
View.FeeCheckCost += (send, args) =>
{
@ -122,7 +122,7 @@ namespace PEIS.Presenter
};
View.CancelCharge += (send, args) =>
{
new EnrollmentPatientModel().CancelCharge(args.ID);
new EnrollmentPatientModel().CancelCharge(args.ID, args.Eid, args.Name, args.OEID);
};
View.AddOrgPatient += (send, args) =>
{
@ -145,7 +145,7 @@ namespace PEIS.Presenter
};
View.CancelRegInfo += (send, args) =>
{
View.ShowCancelRegInfo(new EnrollmentPatientModel().CancelRegInfo(args.ID));
View.ShowCancelRegInfo(new EnrollmentPatientModel().CancelRegInfo(args.ID, args.Name, args.Pid, args.OEID, args.GroupID));
};
View.ChangeCost += (send, args) =>
{

6
PEIS/Presenter/EnrollmentPersonPresenter.cs
Unescape View File

@ -55,7 +55,7 @@ namespace PEIS.Presenter
};
View.CancelRegInfo += (send, args) =>
{
View.ShowCancelRegInfo(new EnrollmentPatientModel().CancelRegInfo(args.ID));
View.ShowCancelRegInfo(new EnrollmentPatientModel().CancelRegInfo(args.ID, args.Name, args.Pid, args.OEID, args.GroupID));
};
View.DeleteOrder += (send, args) =>
{
@ -63,7 +63,7 @@ namespace PEIS.Presenter
};
View.CancelCharge += (send, args) =>
{
View.ShowCancelCharge(new EnrollmentPatientModel().CancelCharge(args.ID));
View.ShowCancelCharge(new EnrollmentPatientModel().CancelCharge(args.ID, args.Eid, args.Name, args.OEID));
};
View.GetExamFeeItem += (send, args) =>
{
@ -87,7 +87,7 @@ namespace PEIS.Presenter
};
View.RecallDept += (send, args) =>
{
new EnrollmentPatientModel().RecallDept(args.ID);
new EnrollmentPatientModel().RecallDept(args.ID, args.Name);
};
}
}

46
PEIS/ReportFiles/Guide.frx
Unescape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="06/08/2023 15:44:02" ReportInfo.Modified="05/19/2025 16:38:32" ReportInfo.CreatorVersion="2022.1.0.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="06/08/2023 15:44:02" ReportInfo.Modified="05/21/2025 11:50:32" ReportInfo.CreatorVersion="2022.1.0.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@ -167,7 +167,7 @@ namespace FastReport
</TableObject>
<BarcodeObject Name="Barcode1" Left="9.45" Top="9.45" Width="143.75" Height="56.7" AutoSize="false" Expression="[ExamID]" Text="" Barcode="Code128" Barcode.AutoEncode="true"/>
</ReportTitleBand>
<DataBand Name="FeeItems" Top="400.41" Width="718.2" Height="94.5" CanGrow="true" CanShrink="true">
<DataBand Name="FeeItems" Top="402.41" Width="718.2" Height="94.5" CanGrow="true" CanShrink="true">
<TableObject Name="Table2" Width="718.2" Height="94.5">
<TableColumn Name="Column11" Width="143.64"/>
<TableColumn Name="Column12" Width="143.64"/>
@ -192,29 +192,27 @@ namespace FastReport
<TableCell Name="Cell45" Border.Lines="All" Font="宋体, 9pt"/>
</TableRow>
</TableObject>
<DataFooterBand Name="DataFooter1" Top="500.91" Width="718.2" Height="66.15">
<TextObject Name="Text20" Left="207.9" Top="9.45" Width="37.8" Height="18.9" CanBreak="false" Text="血压" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
<TextObject Name="Text16" Top="9.45" Width="37.8" Height="18.9" CanBreak="false" Text="身高" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
<TextObject Name="Text17" Left="37.8" Top="9.45" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
<TextObject Name="Text18" Left="103.95" Top="9.45" Width="37.8" Height="18.9" CanBreak="false" Text="体重" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
<TextObject Name="Text19" Left="141.75" Top="9.45" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
<TextObject Name="Text21" Left="245.7" Top="9.45" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
<TextObject Name="Text22" Left="311.85" Top="9.45" Width="37.8" Height="18.9" CanBreak="false" Text="心率" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
<TextObject Name="Text23" Left="349.65" Top="9.45" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
<TextObject Name="Text24" Left="415.8" Top="9.45" Width="37.8" Height="18.9" CanBreak="false" Text="腰围" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
<TextObject Name="Text25" Left="453.6" Top="9.45" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
<TextObject Name="Text28" Left="519.75" Top="9.45" Width="37.8" Height="18.9" CanBreak="false" Text="臀围" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
<TextObject Name="Text29" Left="557.55" Top="9.45" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
<TextObject Name="Text26" Top="37.8" Width="47.25" Height="18.9" CanBreak="false" Text="既往史" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
<TextObject Name="Text27" Left="47.25" Top="37.8" Width="349.65" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
</DataFooterBand>
</DataBand>
<PageFooterBand Name="PageFooter1" Top="496.91" Width="718.2">
<ChildBand Name="Child1" Top="498.91" Width="718.2" Height="56.7">
<TextObject Name="Text26" Top="28.35" Width="47.25" Height="18.9" CanBreak="false" Text="既往史" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
<TextObject Name="Text27" Left="47.25" Top="28.35" Width="349.65" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
<TextObject Name="Text20" Left="207.9" Width="37.8" Height="18.9" CanBreak="false" Text="血压" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
<TextObject Name="Text16" Width="37.8" Height="18.9" CanBreak="false" Text="身高" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
<TextObject Name="Text17" Left="37.8" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
<TextObject Name="Text18" Left="103.95" Width="37.8" Height="18.9" CanBreak="false" Text="体重" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
<TextObject Name="Text19" Left="141.75" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
<TextObject Name="Text21" Left="245.7" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
<TextObject Name="Text22" Left="311.85" Width="37.8" Height="18.9" CanBreak="false" Text="心率" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
<TextObject Name="Text23" Left="349.65" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
<TextObject Name="Text24" Left="415.8" Width="37.8" Height="18.9" CanBreak="false" Text="腰围" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
<TextObject Name="Text25" Left="453.6" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
<TextObject Name="Text28" Left="519.75" Width="37.8" Height="18.9" CanBreak="false" Text="臀围" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>
<TextObject Name="Text29" Left="557.55" Width="66.15" Height="18.9" Border.Lines="Bottom" CanBreak="false" VertAlign="Center" Font="微软雅黑, 9pt"/>
<ChildBand Name="Child2" Top="557.61" Width="718.2" Height="37.8">
<TextObject Name="Text8" Left="500.85" Top="5.67" Width="217.35" Height="28.35" Text="打印时间：[Date]" Font="微软雅黑, 10pt"/>
<TextObject Name="Text7" Top="5.67" Width="160.65" Height="28.35" Text="第[Page#]页，共[TotalPages#]页" Font="微软雅黑, 10pt"/>
<LineObject Name="Line1" Width="718.2" Border.Width="4"/>
</ChildBand>
</ChildBand>
<PageFooterBand Name="PageFooter1" Top="571.06" Width="718.2" Height="37.8">
<TextObject Name="Text8" Left="500.85" Top="5.67" Width="217.35" Height="28.35" Text="打印时间：[Date]" Font="微软雅黑, 10pt"/>
<TextObject Name="Text7" Top="5.67" Width="160.65" Height="28.35" Text="第[Page#]页，共[TotalPages#]页" Font="微软雅黑, 10pt"/>
<LineObject Name="Line1" Width="718.2" Border.Width="4"/>
</PageFooterBand>
</ReportPage>
</Report>

4
PEIS/View/Base/OrgForm.cs
Unescape View File

@ -135,7 +135,7 @@ namespace PEIS.View.Base
if (delConfirm == DialogResult.Cancel) return;
bool _orgDelState = _lstOrg.Where(a => a.ID == oid).ToList()[0].Delete();
if (!_orgDelState) return;
new Log($"删除团体信息：团体名称={name}", "3").Save();
new Entity.Log($"删除团体信息：团体名称={name}", "3").Save();
_lstPatient.ForEach(item => item.Delete());
_lstOrg.RemoveAt(_lstOrg.IndexOf(_lstOrg.Where(a => a.ID == Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString())).ToList()[0]));
DgvOrg.RefreshData();
@ -247,7 +247,7 @@ namespace PEIS.View.Base
bool delState = _lstPatient.Where(a => a.ID == id).ToList()[0].Delete();
if (delState)
{
new Log($@"删除团体成员：PID={DgvPatient.GetRowCellValue(row, "PID")}，姓名={DgvPatient.GetRowCellValue(row, "Name")}", "3").Save();
new Entity.Log($@"删除团体成员：PID={DgvPatient.GetRowCellValue(row, "PID")}，姓名={DgvPatient.GetRowCellValue(row, "Name")}", "3").Save();
_lstPatient.RemoveAt(_lstPatient.IndexOf(_lstPatient.Where(a => a.ID == id).ToList()[0]));
}
}

35
PEIS/View/Enrollment/EnrollmentOrgForm.cs
Unescape View File

@ -355,7 +355,7 @@ namespace PEIS.View.Enrollment
}
//
if (IsOccupational && item.Type.Contains("职业"))
if (IsOccupational && item.Type != null && item.Type.Contains("职业"))
{
if(string.IsNullOrEmpty(item.JobStatus) || string.IsNullOrEmpty(item.HazardFactors))
{
@ -385,7 +385,7 @@ namespace PEIS.View.Enrollment
foreach (var item in _lstGroup)
{
// 同步后的不可更改项目
if (item.CheckTime != null || !(item.Type.Contains("职业"))) continue;
if (item.CheckTime != null || item.Type == null || !(item.Type.Contains("职业"))) continue;
// 避免重复开设，删除分组原有所有项目
DAOHelp.ExecuteSql($@" DELETE FROM Enrollment_OrgFeeItem WHERE GroupID = {item?.ID}");
@ -887,7 +887,7 @@ namespace PEIS.View.Enrollment
ShowOrgPatient(_lstPatient);
DgvPatient.ClearSelection();
DgvPatient.RefreshData();
new Log($@"删除团体成员：PID={baseOrgPatient.PID}，Name={baseOrgPatient.Name}", "3").Save();
new Entity.Log($@"删除团体成员：PID={baseOrgPatient.PID}，姓名={baseOrgPatient.Name}", "3").Save();
}
else
{
@ -1149,7 +1149,7 @@ namespace PEIS.View.Enrollment
DialogResult delConfirm = MessageBox.Show($"确定删除成员【{item.Name}】的收费项目信息并剔除分组?", "警告", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
if(delConfirm == DialogResult.OK)
{
OnCancelRegInfo(item.ID);
OnCancelRegInfo(item);
OnGetOrgPatient();
OnGetGroupPatient(Convert.ToInt64(DgvGroup.GetRowCellValue(DgvGroup.GetSelectedRows()[0], "ID").ToString()), Convert.ToInt64(DgvGroup.GetRowCellValue(DgvGroup.GetSelectedRows()[0], "OID").ToString()));
}
@ -1278,14 +1278,15 @@ namespace PEIS.View.Enrollment
}
}
// 撤回发送
private void FastRecall_Click(object sender, EventArgs e)
{
if (DgvEnrollment.GetRowCellValue(DgvEnrollment.GetSelectedRows()[0], "ID") == null && _chooseRegItem == null) return;
EnrollmentPatient item = DgvEnrollment.GetRow(DgvEnrollment.GetSelectedRows()[0]) as EnrollmentPatient;
if (item.SignTime == null) return;
OnRecallDept(item.ID);
} // 撤回发送
OnRecallDept(item);
}
private void DgvGroup_CellValueChanged(object sender, DevExpress.XtraGrid.Views.Base.CellValueChangedEventArgs e) // 在岗情况判断
{
@ -1326,7 +1327,7 @@ namespace PEIS.View.Enrollment
return;
}
OnCancelCharge(item.ID);
OnCancelCharge(item);
OnGetCheckCost(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString()), _chooseRegItem.ID);
}
@ -1443,7 +1444,7 @@ namespace PEIS.View.Enrollment
return;
}
OnCancelCharge(item.ID);
OnCancelCharge(item);
OnGetCheckCost(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString()), _chooseRegItem.ID);
}
@ -1804,14 +1805,18 @@ namespace PEIS.View.Enrollment
ChangeCost?.Invoke(this, new Args<EnrollmentCheckCost> { ID = ID, EnrollmentOID = oeID });
}
protected virtual void OnCancelRegInfo(Int64 EID)
protected virtual void OnCancelRegInfo(EnrollmentPatient patient)
{
CancelRegInfo?.Invoke(this, new Args<EnrollmentPatient> { ID = EID });
var oEid = patient.OEID == null ? 0 : (long)patient.OEID;
var pid = patient.PID == null ? 0 : (long)patient.PID;
var groupId = patient.GroupID == null ? 0 : (long)patient.GroupID;
CancelRegInfo?.Invoke(this, new Args<EnrollmentPatient> { ID = patient.ID, OEID = oEid, Name = patient.Name, Pid = pid, GroupID = groupId });
}
protected virtual void OnRecallDept(Int64 Id)
protected virtual void OnRecallDept(EnrollmentPatient patient)
{
RecallDept?.Invoke(this, new Args<EnrollmentPatient> { ID = Id });
var oEid = patient.OEID == null ? 0 : (long)patient.OEID;
RecallDept?.Invoke(this, new Args<EnrollmentPatient> { ID = patient.ID, Name = patient.Name, OEID = oEid });
}
protected virtual void OnDelItemByPackId(Int64 Id, Int64 groupId, Int64 packId)
@ -1833,9 +1838,11 @@ namespace PEIS.View.Enrollment
AddOrgPatient?.Invoke(this, new Args<BaseOrgPatient> { BaseOID = oid, ID = pid });
}
protected virtual void OnCancelCharge(Int64 id)
protected virtual void OnCancelCharge(EnrollmentCheckCost cost)
{
CancelCharge?.Invoke(this, new Args<EnrollmentCheckCost> { ID = id });
var oEid = cost.OEID == null ? 0 : (long)cost.OEID;
var eId = cost.EID == null ? 0 : (long)cost.EID;
CancelCharge?.Invoke(this, new Args<EnrollmentCheckCost> { ID = cost.ID, Name = cost.Name, Eid = eId, OEID = oEid });
}
protected virtual void OnDeleteOrder(Int64 id)

25
PEIS/View/Enrollment/EnrollmentPersonForm.cs
Unescape View File

@ -341,7 +341,7 @@ namespace PEIS.View.Enrollment
if (Global.Msg("warn", "确定取消登记该信息？") == DialogResult.No) return;
OnCancelRegInfo(_chooseRegItem.ID);
OnCancelRegInfo(_chooseRegItem);
OnGetRegItems(0);
}
@ -491,7 +491,7 @@ namespace PEIS.View.Enrollment
return;
}
if (item.IsOccupational && _chooseRegItem.Type.Contains("职业"))
if (item.IsOccupational && _chooseRegItem.Type != null && _chooseRegItem.Type.Contains("职业"))
{
Global.Msg("info", "此为职业体检必检项目，不可改动！");
return;
@ -692,7 +692,7 @@ namespace PEIS.View.Enrollment
return;
}
OnCancelCharge(item.ID);
OnCancelCharge(item);
OnGetCheckCost(_chooseRegItem.ID);
}
@ -771,7 +771,7 @@ namespace PEIS.View.Enrollment
private void FastRecallDept_Click(object sender, EventArgs e)
{
if (_chooseRegItem == null || _chooseRegItem.SignTime == null) return;
OnRecallDept(_chooseRegItem.ID);
OnRecallDept(_chooseRegItem);
OnGetRegItems(0);
}
@ -979,9 +979,12 @@ namespace PEIS.View.Enrollment
{
}
protected virtual void OnCancelRegInfo(Int64 EID)
protected virtual void OnCancelRegInfo(EnrollmentPatient patient)
{
CancelRegInfo?.Invoke(this, new Args<EnrollmentPatient> { ID = EID });
var oEid = patient.OEID == null ? 0 : (long)patient.OEID;
var pid = patient.PID == null ? 0 : (long)patient.PID;
var groupId = patient.GroupID == null ? 0 : (long)patient.GroupID;
CancelRegInfo?.Invoke(this, new Args<EnrollmentPatient> { ID = patient.ID, OEID = oEid, Name = patient.Name, Pid = pid, GroupID = groupId });
}
// 删除订单
@ -1014,9 +1017,11 @@ namespace PEIS.View.Enrollment
}));
}
}
protected virtual void OnCancelCharge(Int64 id)
protected virtual void OnCancelCharge(EnrollmentCheckCost cost)
{
CancelCharge?.Invoke(this, new Args<EnrollmentCheckCost> { ID = id });
var oEid = cost.OEID == null ? 0 : (long)cost.OEID;
var eId = cost.EID == null ? 0 : (long)cost.EID;
CancelCharge?.Invoke(this, new Args<EnrollmentCheckCost> { ID = cost.ID, Name = cost.Name, Eid = eId, OEID = oEid });
}
// 移除套餐
@ -1028,9 +1033,9 @@ namespace PEIS.View.Enrollment
// 撤回发送
public event EventHandler<Args<EnrollmentPatient>> RecallDept;
protected virtual void OnRecallDept(Int64 Id)
protected virtual void OnRecallDept(EnrollmentPatient patient)
{
RecallDept?.Invoke(this, new Args<EnrollmentPatient> { ID = Id });
RecallDept?.Invoke(this, new Args<EnrollmentPatient> { ID = patient.ID, Name = patient.Name });
}
#endregion

14
PEIS/View/Enrollment/NewEnrollmentPersonForm.cs
Unescape View File

@ -90,7 +90,7 @@ namespace PEIS.View.Enrollment
private void ExamTypeComboBox_SelectedValueChanged(object sender, EventArgs e)
{
var type = ExamTypeComboBox.SelectedValue?.ToString();
if (type.Contains("职业"))
if (type != null && type.Contains("职业"))
{
JobTypes.Enabled = true;
WorkYears.Enabled = true;
@ -309,7 +309,7 @@ namespace PEIS.View.Enrollment
var ExamType = ExamTypeComboBox.SelectedValue?.ToString();
if (ExamType.Contains("职业"))
if (ExamType != null && ExamType.Contains("职业"))
{
if(string.IsNullOrEmpty(JobTypes.Text.Trim()))
{
@ -344,7 +344,7 @@ namespace PEIS.View.Enrollment
}
var _photo = ImageToBase64();
if (string.IsNullOrEmpty(_photo) && !string.IsNullOrEmpty(_regInfo.Photo))
if (string.IsNullOrEmpty(_photo) && !string.IsNullOrEmpty(_regInfo?.Photo))
{
_photo = _regInfo.Photo;
}
@ -374,9 +374,8 @@ namespace PEIS.View.Enrollment
Description = Description.Text.Trim(),
SpellCode = PingYinHelper.GetTotalPingYin(NameTextBox.Text.Trim()).FirstPingYin.Count == 0 ? null : PingYinHelper.GetTotalPingYin(NameTextBox.Text.Trim()).FirstPingYin[0]
};
if (ExamType.Contains("职业"))
if (ExamType != null && ExamType.Contains("职业"))
{
item.JobTypes = JobTypes.Text.Trim();
item.WorkYears = WorkYears.Text.Trim();
@ -385,7 +384,6 @@ namespace PEIS.View.Enrollment
item.HazardFactors = HazardFactorsComboBox.Text;
}
var _hazardListeee = HazardFactorsComboBox.EditValue as List<object>;
if (_editStatus) // 编辑
@ -395,7 +393,7 @@ namespace PEIS.View.Enrollment
OnUpdateRegItem(item);
// 判断是否更改为职业体检
if (ExamType.Contains("职业"))
if (ExamType != null && ExamType.Contains("职业"))
{
// 避免重复开设，删除个人所有项目
DAOHelp.ExecuteSql($@"UPDATE Enrollment_FeeItem SET EID = -{_regInfo?.ID}, CreateTime = GETDATE(), CreatorCode = '{Global.currentUser.Code}', Creator = '{Global.currentUser.Name}', IsSend = 0 WHERE EID = {_regInfo?.ID}");
@ -451,7 +449,7 @@ namespace PEIS.View.Enrollment
if (item.Save())
{
// 新增成功后判断是否职业体检
if (ExamType.Contains("职业"))
if (ExamType != null && ExamType.Contains("职业"))
{
List<FeeItem> _feeItemsList = new List<FeeItem>();

62
PEIS/View/Exam/PartForm.Designer.cs generated
Unescape View File

@ -879,9 +879,9 @@
//
this.panel1.Controls.Add(this.splitContainerExam);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(176, 35);
this.panel1.Location = new System.Drawing.Point(176, 18);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1018, 617);
this.panel1.Size = new System.Drawing.Size(1018, 634);
this.panel1.TabIndex = 132;
//
// splitContainerExam
@ -899,8 +899,8 @@
this.splitContainerExam.Panel1.Text = "Panel1";
this.splitContainerExam.Panel2.Controls.Add(this.splitContainer2);
this.splitContainerExam.Panel2.Text = "Panel2";
this.splitContainerExam.Size = new System.Drawing.Size(1018, 617);
this.splitContainerExam.SplitterPosition = 404;
this.splitContainerExam.Size = new System.Drawing.Size(1018, 634);
this.splitContainerExam.SplitterPosition = 416;
this.splitContainerExam.TabIndex = 60;
this.splitContainerExam.Text = "splitContainerControl1";
//
@ -961,7 +961,7 @@
this.dgcExamResult.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.SearchLookUpEditSign,
this.popupContainerEdit1});
this.dgcExamResult.Size = new System.Drawing.Size(1018, 404);
this.dgcExamResult.Size = new System.Drawing.Size(1018, 416);
this.dgcExamResult.TabIndex = 130;
this.dgcExamResult.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvExamResult});
@ -1199,7 +1199,7 @@
this.splitContainer2.Panel2.BackColor = System.Drawing.Color.White;
this.splitContainer2.Panel2.Controls.Add(this.panel5);
this.splitContainer2.Panel2.Controls.Add(this.panel6);
this.splitContainer2.Size = new System.Drawing.Size(1018, 208);
this.splitContainer2.Size = new System.Drawing.Size(1018, 213);
this.splitContainer2.SplitterDistance = 496;
this.splitContainer2.TabIndex = 0;
//
@ -1210,7 +1210,7 @@
this.panel17.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel17.Location = new System.Drawing.Point(0, 0);
this.panel17.Name = "panel17";
this.panel17.Size = new System.Drawing.Size(496, 208);
this.panel17.Size = new System.Drawing.Size(496, 213);
this.panel17.TabIndex = 1;
//
// txtSummary
@ -1222,7 +1222,7 @@
this.txtSummary.Multiline = true;
this.txtSummary.Name = "txtSummary";
this.txtSummary.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
this.txtSummary.Size = new System.Drawing.Size(496, 168);
this.txtSummary.Size = new System.Drawing.Size(496, 173);
this.txtSummary.TabIndex = 4;
//
// label17
@ -1244,7 +1244,7 @@
this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel5.Location = new System.Drawing.Point(0, 40);
this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(518, 168);
this.panel5.Size = new System.Drawing.Size(518, 173);
this.panel5.TabIndex = 1;
//
// dgcConclusion
@ -1257,7 +1257,7 @@
this.dgcConclusion.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.CmbSearchConclusion,
this.repositoryItemMemoEdit1});
this.dgcConclusion.Size = new System.Drawing.Size(518, 168);
this.dgcConclusion.Size = new System.Drawing.Size(518, 173);
this.dgcConclusion.TabIndex = 124;
this.dgcConclusion.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvConclusion,
@ -1465,7 +1465,7 @@
this.panelExamBtn.Dock = System.Windows.Forms.DockStyle.Top;
this.panelExamBtn.Location = new System.Drawing.Point(176, 0);
this.panelExamBtn.Name = "panelExamBtn";
this.panelExamBtn.Size = new System.Drawing.Size(1018, 35);
this.panelExamBtn.Size = new System.Drawing.Size(1018, 18);
this.panelExamBtn.TabIndex = 60;
//
// panelDoctor
@ -1480,7 +1480,7 @@
this.panelDoctor.Location = new System.Drawing.Point(0, 0);
this.panelDoctor.Margin = new System.Windows.Forms.Padding(0);
this.panelDoctor.Name = "panelDoctor";
this.panelDoctor.Size = new System.Drawing.Size(1018, 35);
this.panelDoctor.Size = new System.Drawing.Size(1018, 18);
this.panelDoctor.TabIndex = 132;
//
// cmbVerifier
@ -1767,10 +1767,10 @@
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.xtraTabControl1.HeaderLocation = DevExpress.XtraTab.TabHeaderLocation.Left;
this.xtraTabControl1.HeaderOrientation = DevExpress.XtraTab.TabOrientation.Horizontal;
this.xtraTabControl1.Location = new System.Drawing.Point(260, 0);
this.xtraTabControl1.Location = new System.Drawing.Point(130, 0);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.tabPacsRpt;
this.xtraTabControl1.Size = new System.Drawing.Size(929, 652);
this.xtraTabControl1.Size = new System.Drawing.Size(1059, 652);
this.xtraTabControl1.TabIndex = 0;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabPacsRpt,
@ -1780,7 +1780,7 @@
//
this.tabPacsRpt.Controls.Add(this.panelPacsRpt);
this.tabPacsRpt.Name = "tabPacsRpt";
this.tabPacsRpt.Size = new System.Drawing.Size(885, 646);
this.tabPacsRpt.Size = new System.Drawing.Size(1015, 646);
this.tabPacsRpt.Text = "报告";
//
// panelPacsRpt
@ -1791,7 +1791,7 @@
this.panelPacsRpt.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelPacsRpt.Location = new System.Drawing.Point(0, 0);
this.panelPacsRpt.Name = "panelPacsRpt";
this.panelPacsRpt.Size = new System.Drawing.Size(885, 646);
this.panelPacsRpt.Size = new System.Drawing.Size(1015, 646);
this.panelPacsRpt.TabIndex = 3;
//
// picPacsRpt
@ -1799,7 +1799,7 @@
this.picPacsRpt.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.picPacsRpt.Location = new System.Drawing.Point(8, 8);
this.picPacsRpt.Name = "picPacsRpt";
this.picPacsRpt.Size = new System.Drawing.Size(10, 10);
this.picPacsRpt.Size = new System.Drawing.Size(20, 20);
this.picPacsRpt.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
this.picPacsRpt.TabIndex = 1;
this.picPacsRpt.TabStop = false;
@ -1808,7 +1808,7 @@
//
this.tabPacsImg.Controls.Add(this.panel12);
this.tabPacsImg.Name = "tabPacsImg";
this.tabPacsImg.Size = new System.Drawing.Size(885, 646);
this.tabPacsImg.Size = new System.Drawing.Size(1015, 646);
this.tabPacsImg.Text = "图片";
//
// panel12
@ -1817,7 +1817,7 @@
this.panel12.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel12.Location = new System.Drawing.Point(0, 0);
this.panel12.Name = "panel12";
this.panel12.Size = new System.Drawing.Size(885, 646);
this.panel12.Size = new System.Drawing.Size(1015, 646);
this.panel12.TabIndex = 3;
//
// panel13
@ -1828,7 +1828,7 @@
this.panel13.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel13.Location = new System.Drawing.Point(0, 0);
this.panel13.Name = "panel13";
this.panel13.Size = new System.Drawing.Size(885, 646);
this.panel13.Size = new System.Drawing.Size(1015, 646);
this.panel13.TabIndex = 6;
//
// panel15
@ -1838,7 +1838,7 @@
this.panel15.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel15.Location = new System.Drawing.Point(0, 40);
this.panel15.Name = "panel15";
this.panel15.Size = new System.Drawing.Size(885, 606);
this.panel15.Size = new System.Drawing.Size(1015, 606);
this.panel15.TabIndex = 4;
//
// panelPacsImg
@ -1848,7 +1848,7 @@
this.panelPacsImg.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelPacsImg.Location = new System.Drawing.Point(0, 0);
this.panelPacsImg.Name = "panelPacsImg";
this.panelPacsImg.Size = new System.Drawing.Size(861, 606);
this.panelPacsImg.Size = new System.Drawing.Size(991, 606);
this.panelPacsImg.TabIndex = 5;
//
// flowLayoutPanelPacsImg
@ -1860,14 +1860,14 @@
this.flowLayoutPanelPacsImg.Location = new System.Drawing.Point(0, 0);
this.flowLayoutPanelPacsImg.Margin = new System.Windows.Forms.Padding(0);
this.flowLayoutPanelPacsImg.Name = "flowLayoutPanelPacsImg";
this.flowLayoutPanelPacsImg.Size = new System.Drawing.Size(861, 606);
this.flowLayoutPanelPacsImg.Size = new System.Drawing.Size(991, 606);
this.flowLayoutPanelPacsImg.TabIndex = 0;
//
// ListViewPacsImg
//
this.ListViewPacsImg.Dock = System.Windows.Forms.DockStyle.Right;
this.ListViewPacsImg.HideSelection = false;
this.ListViewPacsImg.Location = new System.Drawing.Point(861, 0);
this.ListViewPacsImg.Location = new System.Drawing.Point(991, 0);
this.ListViewPacsImg.Name = "ListViewPacsImg";
this.ListViewPacsImg.Size = new System.Drawing.Size(24, 606);
this.ListViewPacsImg.TabIndex = 4;
@ -1879,7 +1879,7 @@
this.panel14.Dock = System.Windows.Forms.DockStyle.Top;
this.panel14.Location = new System.Drawing.Point(0, 0);
this.panel14.Name = "panel14";
this.panel14.Size = new System.Drawing.Size(885, 40);
this.panel14.Size = new System.Drawing.Size(1015, 40);
this.panel14.TabIndex = 2;
//
// OpsPacsImg
@ -1888,7 +1888,7 @@
this.OpsPacsImg.Location = new System.Drawing.Point(0, 0);
this.OpsPacsImg.Margin = new System.Windows.Forms.Padding(3, 6, 3, 6);
this.OpsPacsImg.Name = "OpsPacsImg";
this.OpsPacsImg.Size = new System.Drawing.Size(885, 40);
this.OpsPacsImg.Size = new System.Drawing.Size(1015, 40);
this.OpsPacsImg.TabIndex = 3;
//
// panelPacsRptList
@ -1897,7 +1897,7 @@
this.panelPacsRptList.Dock = System.Windows.Forms.DockStyle.Left;
this.panelPacsRptList.Location = new System.Drawing.Point(0, 0);
this.panelPacsRptList.Name = "panelPacsRptList";
this.panelPacsRptList.Size = new System.Drawing.Size(260, 652);
this.panelPacsRptList.Size = new System.Drawing.Size(130, 652);
this.panelPacsRptList.TabIndex = 0;
//
// dgcRptPacs
@ -1906,7 +1906,7 @@
this.dgcRptPacs.Location = new System.Drawing.Point(0, 0);
this.dgcRptPacs.MainView = this.DgvRptPacs;
this.dgcRptPacs.Name = "dgcRptPacs";
this.dgcRptPacs.Size = new System.Drawing.Size(260, 652);
this.dgcRptPacs.Size = new System.Drawing.Size(130, 652);
this.dgcRptPacs.TabIndex = 1;
this.dgcRptPacs.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvRptPacs});
@ -1992,9 +1992,9 @@
this.panelReport.BackColor = System.Drawing.Color.WhiteSmoke;
this.panelReport.Controls.Add(this.picReportExt);
this.panelReport.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelReport.Location = new System.Drawing.Point(260, 0);
this.panelReport.Location = new System.Drawing.Point(130, 0);
this.panelReport.Name = "panelReport";
this.panelReport.Size = new System.Drawing.Size(929, 652);
this.panelReport.Size = new System.Drawing.Size(1059, 652);
this.panelReport.TabIndex = 2;
//
// picReportExt
@ -2014,7 +2014,7 @@
this.dgcRptExt.Location = new System.Drawing.Point(0, 0);
this.dgcRptExt.MainView = this.DgvRptExt;
this.dgcRptExt.Name = "dgcRptExt";
this.dgcRptExt.Size = new System.Drawing.Size(260, 652);
this.dgcRptExt.Size = new System.Drawing.Size(130, 652);
this.dgcRptExt.TabIndex = 1;
this.dgcRptExt.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvRptExt});

25
PEIS/View/Exam/PartForm.cs
Unescape View File

@ -126,7 +126,7 @@ namespace PEIS.View.Exam
tsmiReview.Click += TsmiReview_Click;
//菜单-取消审核
tsmiCancel.Click += TsmiReviewCancel_Click;
//菜单-收费项目
//菜单-项目弃检
menuGiveUp1.Click += MenuGiveUp1_Click;
//菜单-科室取消弃检
menuGiveUp2.Click += MenuGiveUp2_Click;
@ -1192,7 +1192,7 @@ namespace PEIS.View.Exam
if (result != DialogResult.Yes) return;
// 检验科判断项目是否完全出结果
if (_examPart.DeptCode == "3001")
if (_examPart.DeptCode == "3001" && Global._hospital.Name == "德宏州中医医院")
{
var feeItem = new List<EnrollmentFeeItem>();
@ -1249,8 +1249,6 @@ namespace PEIS.View.Exam
diff.Add(item1);
}
}
Msg("info", string.Join("、", diff.Select(s => s.FeeItemName).First()) + "未出结果！");
return;
}
@ -1301,7 +1299,11 @@ namespace PEIS.View.Exam
|| _patient.FinishTime != null
|| _examPart.VerifyTime != null
|| _examPart.GiveUpTime != null
|| _examPart.ID <= 0) return;
|| _examPart.ID <= 0)
{
Global.Msg("info", "体检者已结束体检，或者收费项目已审核、已弃检，请检查！");
return;
}
var fid = examResult.FID ?? 0;
var eid = _examPart.EID ?? 0;
@ -1328,8 +1330,7 @@ namespace PEIS.View.Exam
MessageBoxIcon.Question);
if (result != DialogResult.Yes) return;
if (_patient.ID <= 0 || _patient.FinishTime != null || _examPart.VerifyTime != null ||
_examPart.GiveUpTime != null || _examPart.ID <= 0 || examResult.GiveUpTime == null)
return;
_examPart.GiveUpTime != null || _examPart.ID <= 0 || examResult.GiveUpTime == null) return;
var fid = examResult.FID ?? 0;
var eid = _examPart.EID ?? 0;
@ -1345,7 +1346,7 @@ namespace PEIS.View.Exam
}
/// <summary>
/// 弃检
/// 弃检-科室弃检
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@ -1354,7 +1355,11 @@ namespace PEIS.View.Exam
var result = MessageBox.Show(@"是否弃检当前科室所有项目？", @"科室弃检", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
if (result != DialogResult.Yes) return;
if (_patient.ID <= 0 || _patient.FinishTime != null || _examPart.VerifyTime != null ||
_examPart.GiveUpTime != null || _examPart.ID <= 0) return;
_examPart.GiveUpTime != null || _examPart.ID <= 0)
{
Global.Msg("info", "体检者已结束体检，或者收费项目已审核、已弃检，请检查！");
return;
}
GiveUp?.Invoke(this, new Args<DateTime?>
{
@ -1610,7 +1615,7 @@ namespace PEIS.View.Exam
// Invoke(new Action(() => patientInfo.Values = item ?? _patient));
SetPatientInfo(item ?? _patient);
// 是否显示职业问诊按钮
tsmiOccupation.Visible = item == null ? _patient.Type.Contains("职业") : item.Type.Contains("职业");
tsmiOccupation.Visible = item == null ? _patient.Type != null && _patient.Type.Contains("职业") : item.Type != null && item.Type.Contains("职业");
OnGetDeptList();
}

52
PEIS/View/Exam/TotalForm.Designer.cs generated
Unescape View File

@ -349,7 +349,7 @@
// splitContainerBase.Panel2
//
this.splitContainerBase.Panel2.Controls.Add(this.panelRightBase);
this.splitContainerBase.Size = new System.Drawing.Size(722, 483);
this.splitContainerBase.Size = new System.Drawing.Size(1099, 687);
this.splitContainerBase.SplitterDistance = 235;
this.splitContainerBase.TabIndex = 0;
//
@ -362,7 +362,7 @@
this.panelLeftBase.Location = new System.Drawing.Point(0, 0);
this.panelLeftBase.Margin = new System.Windows.Forms.Padding(0);
this.panelLeftBase.Name = "panelLeftBase";
this.panelLeftBase.Size = new System.Drawing.Size(235, 483);
this.panelLeftBase.Size = new System.Drawing.Size(235, 687);
this.panelLeftBase.TabIndex = 0;
//
// DgcPatient
@ -374,7 +374,7 @@
this.DgcPatient.Name = "DgcPatient";
this.DgcPatient.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemCheckEdit2});
this.DgcPatient.Size = new System.Drawing.Size(235, 233);
this.DgcPatient.Size = new System.Drawing.Size(235, 437);
this.DgcPatient.TabIndex = 127;
this.DgcPatient.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvPatient});
@ -843,7 +843,7 @@
this.panelRightBase.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelRightBase.Location = new System.Drawing.Point(0, 0);
this.panelRightBase.Name = "panelRightBase";
this.panelRightBase.Size = new System.Drawing.Size(483, 483);
this.panelRightBase.Size = new System.Drawing.Size(860, 687);
this.panelRightBase.TabIndex = 2;
//
// panelExamInfoBase
@ -853,7 +853,7 @@
this.panelExamInfoBase.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelExamInfoBase.Location = new System.Drawing.Point(0, 181);
this.panelExamInfoBase.Name = "panelExamInfoBase";
this.panelExamInfoBase.Size = new System.Drawing.Size(483, 302);
this.panelExamInfoBase.Size = new System.Drawing.Size(860, 506);
this.panelExamInfoBase.TabIndex = 60;
//
// splitContainerExamInfo
@ -871,8 +871,8 @@
// splitContainerExamInfo.Panel2
//
this.splitContainerExamInfo.Panel2.Controls.Add(this.panelExamInfoL);
this.splitContainerExamInfo.Size = new System.Drawing.Size(483, 302);
this.splitContainerExamInfo.SplitterDistance = 25;
this.splitContainerExamInfo.Size = new System.Drawing.Size(860, 506);
this.splitContainerExamInfo.SplitterDistance = 402;
this.splitContainerExamInfo.TabIndex = 0;
//
// panelTxtSummary
@ -882,7 +882,7 @@
this.panelTxtSummary.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelTxtSummary.Location = new System.Drawing.Point(0, 0);
this.panelTxtSummary.Name = "panelTxtSummary";
this.panelTxtSummary.Size = new System.Drawing.Size(25, 302);
this.panelTxtSummary.Size = new System.Drawing.Size(402, 506);
this.panelTxtSummary.TabIndex = 2;
//
// splitExamPart
@ -899,8 +899,8 @@
// splitExamPart.Panel2
//
this.splitExamPart.Panel2.Controls.Add(this.txtSummary);
this.splitExamPart.Size = new System.Drawing.Size(25, 302);
this.splitExamPart.SplitterDistance = 25;
this.splitExamPart.Size = new System.Drawing.Size(402, 506);
this.splitExamPart.SplitterDistance = 186;
this.splitExamPart.TabIndex = 0;
//
// panel5
@ -911,7 +911,7 @@
this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel5.Location = new System.Drawing.Point(0, 0);
this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(25, 302);
this.panel5.Size = new System.Drawing.Size(186, 506);
this.panel5.TabIndex = 0;
//
// DgcExamResultData
@ -924,7 +924,7 @@
this.DgcExamResultData.Name = "DgcExamResultData";
this.DgcExamResultData.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemMemoEdit4});
this.DgcExamResultData.Size = new System.Drawing.Size(600, 285);
this.DgcExamResultData.Size = new System.Drawing.Size(600, 489);
this.DgcExamResultData.TabIndex = 0;
this.DgcExamResultData.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvExamResultData});
@ -1086,7 +1086,7 @@
this.txtSummary.Name = "txtSummary";
this.txtSummary.ReadOnly = true;
this.txtSummary.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
this.txtSummary.Size = new System.Drawing.Size(25, 302);
this.txtSummary.Size = new System.Drawing.Size(212, 506);
this.txtSummary.TabIndex = 4;
this.txtSummary.Text = "科室小结";
//
@ -1096,7 +1096,7 @@
this.panelExamInfoL.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelExamInfoL.Location = new System.Drawing.Point(0, 0);
this.panelExamInfoL.Name = "panelExamInfoL";
this.panelExamInfoL.Size = new System.Drawing.Size(454, 302);
this.panelExamInfoL.Size = new System.Drawing.Size(454, 506);
this.panelExamInfoL.TabIndex = 2;
//
// TabPart
@ -1124,7 +1124,7 @@
this.TabPart.Name = "TabPart";
this.TabPart.SelectedTabPage = this.tabPageConslusion;
this.TabPart.ShowTabHeader = DevExpress.Utils.DefaultBoolean.True;
this.TabPart.Size = new System.Drawing.Size(454, 302);
this.TabPart.Size = new System.Drawing.Size(454, 506);
this.TabPart.TabIndex = 0;
this.TabPart.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabPageConslusion,
@ -1143,7 +1143,7 @@
this.tabPageConslusion.Image = global::PEIS.Properties.Resources.menu;
this.tabPageConslusion.Margin = new System.Windows.Forms.Padding(2);
this.tabPageConslusion.Name = "tabPageConslusion";
this.tabPageConslusion.Size = new System.Drawing.Size(448, 263);
this.tabPageConslusion.Size = new System.Drawing.Size(448, 467);
this.tabPageConslusion.Text = "结论词";
//
// panelConclussion
@ -1153,7 +1153,7 @@
this.panelConclussion.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelConclussion.Location = new System.Drawing.Point(0, 40);
this.panelConclussion.Name = "panelConclussion";
this.panelConclussion.Size = new System.Drawing.Size(107, 223);
this.panelConclussion.Size = new System.Drawing.Size(107, 427);
this.panelConclussion.TabIndex = 3;
//
// DgcExamConclusion
@ -1168,7 +1168,7 @@
this.repositoryItemMemoEdit2,
this.CmbSearchConclusion,
this.repositoryItemCheckEdit1});
this.DgcExamConclusion.Size = new System.Drawing.Size(107, 223);
this.DgcExamConclusion.Size = new System.Drawing.Size(107, 427);
this.DgcExamConclusion.TabIndex = 5;
this.DgcExamConclusion.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvExamConclusion,
@ -1339,7 +1339,7 @@
this.panelAllConclusion.Dock = System.Windows.Forms.DockStyle.Right;
this.panelAllConclusion.Location = new System.Drawing.Point(107, 40);
this.panelAllConclusion.Name = "panelAllConclusion";
this.panelAllConclusion.Size = new System.Drawing.Size(341, 223);
this.panelAllConclusion.Size = new System.Drawing.Size(341, 427);
this.panelAllConclusion.TabIndex = 2;
//
// DgcAllConclusion
@ -1349,7 +1349,7 @@
this.DgcAllConclusion.Location = new System.Drawing.Point(0, 36);
this.DgcAllConclusion.MainView = this.DgvAllConclusion;
this.DgcAllConclusion.Name = "DgcAllConclusion";
this.DgcAllConclusion.Size = new System.Drawing.Size(500, 170);
this.DgcAllConclusion.Size = new System.Drawing.Size(500, 374);
this.DgcAllConclusion.TabIndex = 2;
this.DgcAllConclusion.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvAllConclusion});
@ -2198,7 +2198,7 @@
this.panelPatientInfo.Margin = new System.Windows.Forms.Padding(0);
this.panelPatientInfo.Name = "panelPatientInfo";
this.panelPatientInfo.Padding = new System.Windows.Forms.Padding(1);
this.panelPatientInfo.Size = new System.Drawing.Size(483, 136);
this.panelPatientInfo.Size = new System.Drawing.Size(860, 136);
this.panelPatientInfo.TabIndex = 59;
//
// panel3
@ -2209,7 +2209,7 @@
this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel3.Location = new System.Drawing.Point(1, 1);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(481, 134);
this.panel3.Size = new System.Drawing.Size(858, 134);
this.panel3.TabIndex = 1;
//
// tableLayoutPanel1
@ -2269,7 +2269,7 @@
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(356, 134);
this.tableLayoutPanel1.Size = new System.Drawing.Size(733, 134);
this.tableLayoutPanel1.TabIndex = 69;
//
// label3
@ -2765,7 +2765,7 @@
this.panelMenu.Dock = System.Windows.Forms.DockStyle.Top;
this.panelMenu.Location = new System.Drawing.Point(0, 0);
this.panelMenu.Name = "panelMenu";
this.panelMenu.Size = new System.Drawing.Size(483, 45);
this.panelMenu.Size = new System.Drawing.Size(860, 45);
this.panelMenu.TabIndex = 58;
//
// menuStrip
@ -2788,7 +2788,7 @@
this.menuStrip.Name = "menuStrip";
this.menuStrip.Padding = new System.Windows.Forms.Padding(2, 0, 5, 0);
this.menuStrip.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.menuStrip.Size = new System.Drawing.Size(483, 45);
this.menuStrip.Size = new System.Drawing.Size(860, 45);
this.menuStrip.TabIndex = 58;
this.menuStrip.Text = "menuStrip2";
//
@ -2883,7 +2883,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(722, 483);
this.ClientSize = new System.Drawing.Size(1099, 687);
this.Controls.Add(this.splitContainerBase);
this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.Name = "TotalForm";

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

@ -685,7 +685,7 @@ namespace PEIS.View.Exam
Invoke(new Action(() => GetExamResultData(_patient.ID)));
GetExamConclusion?.Invoke(this, new Args<object>(_patient.ID));
TsmiOccupational.Visible = selected.Type.Contains("职业");
TsmiOccupational.Visible = selected.Type != null && selected.Type.Contains("职业");
//调用
SelectedPatientEvent?.Invoke(selected?.ID);

Write Preview
Loading…
Cancel
Save