1、个人复制项目加入检索框,2、团体加入复制项目,3、原始报告单附页取消,4、完结按钮弹框提示优化

mzzyy
lsm 8 months ago
parent 3286338155
commit 3e5d9ee1aa
  1. 6
      PEIS/Model/Exam/TotalModel.cs
  2. 18
      PEIS/Model/ReportModel.cs
  3. 2
      PEIS/Presenter/EnrollmentPersonPresenter.cs
  4. 4
      PEIS/Utils/ReportHelper.cs
  5. 6246
      PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs
  6. 24
      PEIS/View/Enrollment/EnrollmentOrgForm.resx
  7. 465
      PEIS/View/Enrollment/EnrollmentPersonForm.Designer.cs
  8. 55
      PEIS/View/Enrollment/EnrollmentPersonForm.cs
  9. 16
      PEIS/View/Enrollment/EnrollmentPersonForm.resx
  10. 2
      PEIS/View/Enrollment/IEnrollmentPersonView.cs
  11. 2
      PEIS/View/Exam/ITotalView.cs
  12. 2
      PEIS/View/Exam/PartForm.cs
  13. 4
      PEIS/View/Exam/TotalForm.cs

@ -304,7 +304,7 @@ ORDER BY A.DeptCode,B.FeeItemName").ToList();
/// <param name="userName"></param> /// <param name="userName"></param>
/// <param name="userCode"></param> /// <param name="userCode"></param>
/// <returns></returns> /// <returns></returns>
public bool Finish(bool isFinish, Int64 id, string userName, string userCode) public int Finish(bool isFinish, Int64 id, string userName, string userCode)
{ {
if (isFinish) if (isFinish)
{ {
@ -328,13 +328,13 @@ ORDER BY A.DeptCode,B.FeeItemName").ToList();
return true; // 返回true表示已处理异常 return true; // 返回true表示已处理异常
}); });
} }
return finish;// && saveRpt; return finish ? 1 : 0;// && saveRpt;
} }
DAOHelp.ExecuteSql($@"UPDATE Exam_Report SET IsDelete=1 WHERE EID={id}"); DAOHelp.ExecuteSql($@"UPDATE Exam_Report SET IsDelete=1 WHERE EID={id}");
return DAOHelp.ExecuteSql($@"UPDATE Enrollment_Patient return DAOHelp.ExecuteSql($@"UPDATE Enrollment_Patient
SET Finisher = NULL, FinisherCode = NULL, FinishTime = NULL SET Finisher = NULL, FinisherCode = NULL, FinishTime = NULL
WHERE Id = {id}") > 0; WHERE Id = {id}") > 0 ? -1 : 0;
} }
/// <summary> /// <summary>

@ -206,24 +206,6 @@ namespace PEIS.Model
var img = stream.ToArray(); var img = stream.ToArray();
pacs.Add(new Report { ReportImage = img }); pacs.Add(new Report { ReportImage = img });
} }
//using (PdfDocument pdfDocument = PdfDocument.Load(memoryStream))
//{
// for (int pageIndex = 0; pageIndex < pdfDocument.PageCount; pageIndex++)
// {
// using (Image bitmap = pdfDocument.Render(pageIndex, 2480, 3508, false))
// {
// using (MemoryStream stream = new MemoryStream())
// {
// bitmap.RotateFlip(RotateFlipType.Rotate90FlipNone);
// bitmap.Save(stream, ImageFormat.Jpeg);
// var img = stream.ToArray();
// pacs.Add(new Report { ReportImage = img });
// }
// }
// }
//}
} }
} }

@ -35,7 +35,7 @@ namespace PEIS.Presenter
// 获取登记列表 // 获取登记列表
View.GetRegItems += (send, args) => View.GetRegItems += (send, args) =>
{ {
View.ShowRegItems(new EnrollmentPatientModel().GetEnrollmentPatientRegItems(args.Item.begDate, args.Item.endDate, args.Item.name)); View.ShowRegItems(new EnrollmentPatientModel().GetEnrollmentPatientRegItems(args.Item.begDate, args.Item.endDate, args.Item.name), args.Item.code);
}; };
View.GetRegInfo += (send, args) => View.GetRegInfo += (send, args) =>
{ {

@ -252,7 +252,9 @@ namespace PEIS.Utils
var lstGeneral = new ReportModel().GetGeneralResult(eid); var lstGeneral = new ReportModel().GetGeneralResult(eid);
var lstLis = new ReportModel().GetLisResult(eid); var lstLis = new ReportModel().GetLisResult(eid);
var lstPacs = new ReportModel().GetPacsResult(eid); var lstPacs = new ReportModel().GetPacsResult(eid);
var lstPacsPhotos = new ReportModel().GetPacsPhoto(eid); //var lstPacsPhotos = new ReportModel().GetPacsPhoto(eid);
// 蒙自中医不需要附原始报告单
var lstPacsPhotos = new List<Entity.Report>();
// 登记信息 // 登记信息
rpt.SetParameterValue("PatientName", patient.Name); rpt.SetParameterValue("PatientName", patient.Name);

File diff suppressed because it is too large Load Diff

@ -120,9 +120,6 @@
<metadata name="menuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="menuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>510, 16</value> <value>510, 16</value>
</metadata> </metadata>
<metadata name="menuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>510, 16</value>
</metadata>
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1597, 17</value> <value>1597, 17</value>
</metadata> </metadata>
@ -276,9 +273,18 @@
4OWtCNeHAAAAAElFTkSuQmCC 4OWtCNeHAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="CopyMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1914, 17</value> <value>2034, 17</value>
</metadata> </metadata>
<data name="TsmiCopyFeeItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAOBJREFUSEvt
luENgyAQhRmq5XeHgAm6SIdxAhfoENB5Wg7vKEEpd1VjSPySFz3DvQcEEtXJoWjjHlfjn1xp6+7YKkdb
P2rj31JdjLuhhYzcgCsYDytFCxkUiGWT/gLpIGDZZHWgFHZgOPoDbR9HYAjXBdsTrEBoLA15enm0SLAC
p9nK7g6FYpnoIxCeNcWGwKaBVC8pNgTKmvg7sKbYEMgD4TvVX81PcIIa8i1rQcbwPgu0foyDapSByzOe
FBsCZS3i8EAO/QZytSoQ/kHIQCY3oIUcmDWslKuf9+xkf5T6AK7FDQdfUvQCAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1914, 17</value> <value>1914, 17</value>
</metadata> </metadata>
@ -311,7 +317,7 @@
frF0DeOou0VjfCumLZLL/QM6DnLkln25BAAAAABJRU5ErkJggg== frF0DeOou0VjfCumLZLL/QM6DnLkln25BAAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="TsmiPrintCost.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="TsmiPrintPerson.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft
VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G
@ -323,7 +329,7 @@
E2hYuQ0bCqJpvgGNsilBELCZFAAAAABJRU5ErkJggg== E2hYuQ0bCqJpvgGNsilBELCZFAAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="TsmiPrintPerson.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="TsmiPrintTeam.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft
VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G
@ -335,7 +341,7 @@
E2hYuQ0bCqJpvgGNsilBELCZFAAAAABJRU5ErkJggg== E2hYuQ0bCqJpvgGNsilBELCZFAAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="TsmiPrintTeam.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="TsmiPrintGroup.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft
VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G
@ -347,7 +353,7 @@
E2hYuQ0bCqJpvgGNsilBELCZFAAAAABJRU5ErkJggg== E2hYuQ0bCqJpvgGNsilBELCZFAAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="TsmiPrintGroup.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="TsmiPrintCost.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft
VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G

File diff suppressed because it is too large Load Diff

@ -23,7 +23,7 @@ namespace PEIS.View.Enrollment
public partial class EnrollmentPersonForm : ViewBase, IEnrollmentPersonView public partial class EnrollmentPersonForm : ViewBase, IEnrollmentPersonView
{ {
List<Pack> _lstPack = null; List<Pack> _lstPack = null;
List<EnrollmentPatient> _lstRegItems = null; List<EnrollmentPatient> _lstRegItems = null, _lstRegItems2 = null;
List<EnrollmentFeeItem> _lstEFeeItem = null, _lstCopyFeeItem = null; List<EnrollmentFeeItem> _lstEFeeItem = null, _lstCopyFeeItem = null;
List<EnrollmentCheckCost> _lstCheckCost = null; List<EnrollmentCheckCost> _lstCheckCost = null;
List<FeeItem> _lstFeeItem = null, _lstPackFeeItem = null; List<FeeItem> _lstFeeItem = null, _lstPackFeeItem = null;
@ -137,6 +137,7 @@ namespace PEIS.View.Enrollment
DgvCopyItem.CustomColumnDisplayText += DgvCopyItem_CustomColumnDisplayText; DgvCopyItem.CustomColumnDisplayText += DgvCopyItem_CustomColumnDisplayText;
DgvRegItem2.SelectionChanged += DgvRegItem2_SelectionChanged; DgvRegItem2.SelectionChanged += DgvRegItem2_SelectionChanged;
NameSearch2.KeyDown += NameSearch2_KeyDown;
#region 判断双击位置 #region 判断双击位置
DgvPack.MouseDown += DgvPack_MouseDown; DgvPack.MouseDown += DgvPack_MouseDown;
@ -145,7 +146,6 @@ namespace PEIS.View.Enrollment
#endregion #endregion
} }
private void DgvEFeeItem_MouseDown(object sender, MouseEventArgs e) private void DgvEFeeItem_MouseDown(object sender, MouseEventArgs e)
{ {
eInfo = DgvEFeeItem.CalcHitInfo(e.X, e.Y); eInfo = DgvEFeeItem.CalcHitInfo(e.X, e.Y);
@ -223,7 +223,7 @@ namespace PEIS.View.Enrollment
ThreadPool.QueueUserWorkItem(state => ThreadPool.QueueUserWorkItem(state =>
{ {
OnGetRegItems(); OnGetRegItems(0);
OnGetPackItem(); // 获取体检套餐 OnGetPackItem(); // 获取体检套餐
OnGetFeeItem(); // 获取收费项目 OnGetFeeItem(); // 获取收费项目
}); });
@ -235,14 +235,14 @@ namespace PEIS.View.Enrollment
private void NameSearch_KeyDown(object sender, KeyEventArgs e) // 模糊检索 private void NameSearch_KeyDown(object sender, KeyEventArgs e) // 模糊检索
{ {
if (e.KeyCode == Keys.Enter) OnGetRegItems(); if (e.KeyCode == Keys.Enter) OnGetRegItems(0);
} }
private void TsmiRegRefresh_Click(object sender, EventArgs e) // 刷新按钮 private void TsmiRegRefresh_Click(object sender, EventArgs e) // 刷新按钮
{ {
// 使当前控件获得焦点,避免日期选择器修改后未生效 // 使当前控件获得焦点,避免日期选择器修改后未生效
menuStrip1.Focus(); menuStrip1.Focus();
OnGetRegItems(); OnGetRegItems(0);
} }
private void DgvRegItem_SelectionChanged(object sender, DevExpress.Data.SelectionChangedEventArgs e) // 登记列表切换 private void DgvRegItem_SelectionChanged(object sender, DevExpress.Data.SelectionChangedEventArgs e) // 登记列表切换
@ -303,7 +303,7 @@ namespace PEIS.View.Enrollment
{ {
NewEnrollmentPersonForm enrollmentPersonForm = new NewEnrollmentPersonForm(null, false); NewEnrollmentPersonForm enrollmentPersonForm = new NewEnrollmentPersonForm(null, false);
enrollmentPersonForm.ShowDialog(); enrollmentPersonForm.ShowDialog();
OnGetRegItems(); OnGetRegItems(0);
} }
private void TsmiRegEdit_Click(object sender, EventArgs e) // 编辑登记信息 private void TsmiRegEdit_Click(object sender, EventArgs e) // 编辑登记信息
@ -311,7 +311,7 @@ namespace PEIS.View.Enrollment
if (_lstRegItems == null || _lstRegItems.Count() == 0) return; if (_lstRegItems == null || _lstRegItems.Count() == 0) return;
NewEnrollmentPersonForm enrollmentPersonForm = new NewEnrollmentPersonForm(_chooseRegItem, true); NewEnrollmentPersonForm enrollmentPersonForm = new NewEnrollmentPersonForm(_chooseRegItem, true);
enrollmentPersonForm.ShowDialog(); enrollmentPersonForm.ShowDialog();
OnGetRegItems(); OnGetRegItems(0);
} }
private void TsmiRegCancel_Click(object sender, EventArgs e) // 取消登记 private void TsmiRegCancel_Click(object sender, EventArgs e) // 取消登记
@ -331,7 +331,7 @@ namespace PEIS.View.Enrollment
if (Global.Msg("warn", "确定取消登记该信息?") == DialogResult.No) return; if (Global.Msg("warn", "确定取消登记该信息?") == DialogResult.No) return;
OnCancelRegInfo(_chooseRegItem.ID); OnCancelRegInfo(_chooseRegItem.ID);
OnGetRegItems(); OnGetRegItems(0);
} }
#endregion #endregion
@ -510,7 +510,7 @@ namespace PEIS.View.Enrollment
try try
{ {
var items = new List<EnrollmentFeeItem>(); var items = new List<EnrollmentFeeItem>();
_lstEFeeItem.Where(w => w.OrderNo != null && !w.IsHide && !(w.DeptName.Contains("金域"))).GroupBy(g => g.DeptCode).ForEach(dept => _lstEFeeItem.Where(w => w.OrderNo != null && !w.IsHide ).GroupBy(g => g.DeptCode).ForEach(dept =>
{ {
var item = new EnrollmentFeeItem() var item = new EnrollmentFeeItem()
{ {
@ -604,7 +604,7 @@ namespace PEIS.View.Enrollment
//CostToHis(_chooseRegItem.ID); //CostToHis(_chooseRegItem.ID);
OnSendToDept(_chooseRegItem.ID); OnSendToDept(_chooseRegItem.ID);
OnGetRegItems(); OnGetRegItems(0);
OnGetCheckCost(_chooseRegItem.ID); OnGetCheckCost(_chooseRegItem.ID);
} }
@ -701,7 +701,7 @@ namespace PEIS.View.Enrollment
private void FeeItemSearch_TextChanged(object sender, EventArgs e) private void FeeItemSearch_TextChanged(object sender, EventArgs e)
{ {
DgcFeeItem.DataSource = _lstFeeItem.Where(a => a?.FeeItemName.Contains(FeeItemSearch.Text) == true); DgcFeeItem.DataSource = _lstFeeItem.Where(a => a?.FeeItemName.Contains(FeeItemSearch.Text) == true || a?.SpellCode?.Contains(FeeItemSearch.Text) == true);
} }
private void TsmiCopyFeeItem_Click(object sender, EventArgs e) private void TsmiCopyFeeItem_Click(object sender, EventArgs e)
@ -755,9 +755,13 @@ namespace PEIS.View.Enrollment
{ {
if (_chooseRegItem == null || _chooseRegItem.SignTime == null) return; if (_chooseRegItem == null || _chooseRegItem.SignTime == null) return;
OnRecallDept(_chooseRegItem.ID); OnRecallDept(_chooseRegItem.ID);
OnGetRegItems(); OnGetRegItems(0);
} }
private void NameSearch2_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Enter) OnGetRegItems(1);
}
#endregion #endregion
@ -765,17 +769,13 @@ namespace PEIS.View.Enrollment
// 获取登记列表 // 获取登记列表
public event EventHandler<Args<dynamic>> GetRegItems; public event EventHandler<Args<dynamic>> GetRegItems;
public void ShowRegItems(List<EnrollmentPatient> items) public void ShowRegItems(List<EnrollmentPatient> items, int code)
{ {
if (code == 0) {
items.ForEach(a => a.Sex = a.Sex.Equals("1") ? "男" : a.Sex.Equals("2") ? "女" : ""); items.ForEach(a => a.Sex = a.Sex.Equals("1") ? "男" : a.Sex.Equals("2") ? "女" : "");
Invoke(new Action(() => _lstRegItems = items)); Invoke(new Action(() => _lstRegItems = items));
Invoke(new Action(() => { DgcRegItem.DataSource = null; DgcRegItem2.DataSource = null; })); Invoke(new Action(() => DgcRegItem.DataSource = null));
Invoke(new Action(() => { DgcRegItem.DataSource = _lstRegItems.Where(a => a?.Name.Contains(NameSearch.Text) == true || a?.ID.ToString().Contains(NameSearch.Text) == true || a?.SpellCode?.Contains(NameSearch.Text) == true); })); Invoke(new Action(() => { DgcRegItem.DataSource = _lstRegItems.Where(a => a?.Name.Contains(NameSearch.Text) == true || a?.ID.ToString().Contains(NameSearch.Text) == true || a?.SpellCode?.Contains(NameSearch.Text) == true); }));
Invoke(new Action(() =>
{
var list = new List<EnrollmentPatient>();
DgcRegItem2.DataSource = list.Concat(items);
}));
if (_lstRegItems.Where(a => a?.Name.Contains(NameSearch.Text) == true || a?.ID.ToString().Contains(NameSearch.Text) == true).Count() != 0) if (_lstRegItems.Where(a => a?.Name.Contains(NameSearch.Text) == true || a?.ID.ToString().Contains(NameSearch.Text) == true).Count() != 0)
{ {
@ -788,19 +788,28 @@ namespace PEIS.View.Enrollment
{ {
DgcEFeeItem.DataSource = _lstEFeeItem = null; DgcEFeeItem.DataSource = _lstEFeeItem = null;
DgcCheckCost.DataSource = _lstCheckCost = null; DgcCheckCost.DataSource = _lstCheckCost = null;
DgcCopyItem.DataSource = _lstCopyFeeItem = null;
_chooseRegItem = null; _chooseRegItem = null;
RegDataBinds(_chooseRegItem); RegDataBinds(_chooseRegItem);
} }
}
else
{
Invoke(new Action(() => _lstRegItems2 = items));
Invoke(new Action(() => DgcRegItem2.DataSource = null));
Invoke(new Action(() => { DgcRegItem2.DataSource = _lstRegItems2.Where(a => a?.Name.Contains(NameSearch2.Text) == true || a?.ID.ToString().Contains(NameSearch2.Text) == true || a?.SpellCode?.Contains(NameSearch2.Text) == true); }));
if (_lstRegItems2.Where(a => a?.Name.Contains(NameSearch2.Text) == true || a?.ID.ToString().Contains(NameSearch2.Text) == true).Count() == 0) DgcCopyItem.DataSource = _lstCopyFeeItem = null;
}
DgvRegItem.ExpandAllGroups(); DgvRegItem.ExpandAllGroups();
Invoke(new Action(() => DgvRegItem.BestFitColumns())); Invoke(new Action(() => { DgvRegItem.BestFitColumns(); DgvRegItem2.BestFitColumns(); }));
} }
protected virtual void OnGetRegItems() protected virtual void OnGetRegItems(int code)
{ {
dynamic searchData = new ExpandoObject(); dynamic searchData = new ExpandoObject();
searchData.begDate = BegDate.Value.ToShortDateString(); searchData.begDate = BegDate.Value.ToShortDateString();
searchData.endDate = EndDate.Value.ToShortDateString(); searchData.endDate = EndDate.Value.ToShortDateString();
searchData.name = NameSearch.Text; searchData.name = code == 0 ? NameSearch.Text : NameSearch2.Text;
searchData.code = code;
GetRegItems?.Invoke(this, new Args<dynamic>() GetRegItems?.Invoke(this, new Args<dynamic>()
{ {
Item = searchData Item = searchData

@ -250,7 +250,7 @@
<data name="新建NToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="新建NToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAERSURBVDhPrZDbSgJRGIXnpewd6jXsjSQvIrwoI0RQMChU YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAERSURBVDhPrZDbSgJRGIXnpewd6jXsjSQvIrwoI0RQMChU
0iiDPCGiE3ZCRkvR8VzTeBhnyR5/ccaZNnPhB4t9sdf6Ln5hb8QeathNJFVFKF5C8DqL4ksDVHWGDf7j 0iiDPCGiE3ZCRkvR8VzTeBhnyR5/ccaZNnPhB4t9sdf6Ln5hb8QeathNJFVFKF5C8DqL4ksDVHWGDf7j
LHyPg6NjviSaFqlu5yQYR+KpupaIkrMknCxT3Y7v/NYYb0ITK1c3BarbWWhLQ7IR0cTKReyZ6lZ0XYei LHyPg6NjviSaFqlu5yQYR+KpupaIkrMknCxT3Y7v/NYYb0ITK1c3BarbWWhLQ7IR0cTKReyZ6lZ0XYei
ztHpK4bAc+h1FgQijzSxMptrGIxVSO0xX3AaStFki7bUMVFmaMm/eJMGfIH/MkGzLep0AXn4h/r3CJV3 ztHpK4bAc+h1FgQijzSxMptrGIxVSO0xX3AaStFki7bUMVFmaMm/eJMGfIH/MkGzLep0AXn4h/r3CJV3
@ -261,7 +261,7 @@
<data name="打开OToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="打开OToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp
olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdNKMwr7kApFItTUkWZqVhSVYmao5Nevvy7UoYR3HXh4 olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdNKMwr7kApFItTUkWZqVhSVYmao5Nevvy7UoYR3HXh4
4XCe33nOKyy3lAY7l9RWMo0O/raWXxEyo5spVYTNvOGyfIRPfW+ptOkXqaPl6T83hcRmExSdgzAz3NVm 4XCe33nOKyy3lAY7l9RWMo0O/raWXxEyo5spVYTNvOGyfIRPfW+ptOkXqaPl6T83hcRmExSdgzAz3NVm
YWyoYla/B+1M9JtxWLPpaH22JORIjI6gKAMB0jyEimIdo4OlbuaprwVMOOMovammpDADc34qppwUrmnl YWyoYla/B+1M9JtxWLPpaH22JORIjI6gKAMB0jyEimIdo4OlbuaprwVMOOMovammpDADc34qppwUrmnl
@ -277,7 +277,7 @@
<data name="保存SToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="保存SToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW
DcOKsB9vpFmaLtNExco0av6CbIVLJ61Wk3BSkT/AFCkRZSpZmrmiJQ41xSaCwdfznL15XEUX0Reem5f3 DcOKsB9vpFmaLtNExco0av6CbIVLJ61Wk3BSkT/AFCkRZSpZmrmiJQ41xSaCwdfznL15XEUX0Reem5f3
8znnec4j/Zc8fxYGla91CS3eRTx0z6OpMYS7jmnU1X6B/VYA18snUVoyjsKCt8jLHcH5c36ouCQR2NUJ 8znnec4j/Zc8fxYGla91CS3eRTx0z6OpMYS7jmnU1X6B/VYA18snUVoyjsKCt8jLHcH5c36ouCQR2NUJ
1Nas4G9ZXlmFKbULh1Kf8lJxSfI+WeCCyopv6q+/h+DQ/DJ2WV5Ao1FgPegRAveDOS4oLfmq/h6dn/DH 1Nas4G9ZXlmFKbULh1Kf8lJxSfI+WeCCyopv6q+/h+DQ/DJ2WV5Ao1FgPegRAveDOS4oLfmq/h6dn/DH
@ -293,7 +293,7 @@
<data name="打印PToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="打印PToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAIpSURBVDhPtZL/T1JRGMb5p1itrVZbbRpqZbawnBENV1I0 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIpSURBVDhPtZL/T1JRGMb5p1itrVZbbRpqZbawnBENV1I0
jGlByTSyJTXJwq2oKZQb1KAv6JCYWSxvBrkkZUq4CeQEiRABFeLL072Xa0zRra31bO8v57zP5znnPYf1 jGlByTSyJTXJwq2oKZQb1KAv6JCYWSxvBrkkZUq4CeQEiRABFeLL072Xa0zRra31bO8v57zP5znnPYf1
X+TxhWF6O7VtGYcnwbSWijKPOLzYrPSvLPwLS3huGUMlT7o9wGD9grVUBj+icdid03S9tDmgNxNwTgVQ X+TxhWF6O7VtGYcnwbSWijKPOLzYrPSvLPwLS3huGUMlT7o9wGD9grVUBj+icdid03S9tDmgNxNwTgVQ
J+rA8XNtWwM+uuZATMwxmQVRycuJFNyzIRitDlScugKzjSgFRGJJaIwEsrk8AsHIhnSL/Ssck37UNipQ J+rA8XNtWwM+uuZATMwxmQVRycuJFNyzIRitDlScugKzjSgFRGJJaIwEsrk8AsHIhnSL/Ssck37UNipQ
@ -308,7 +308,7 @@
<data name="打印预览VToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="打印预览VToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAGCSURBVDhPnZK9S0JRGMb9F1xb2gqaq6mhwCGDtvYIIyLI YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGCSURBVDhPnZK9S0JRGMb9F1xb2gqaq6mhwCGDtvYIIyLI
cJOE1paoIYpMKUjFRDH87lpoakGlIZF9DA2hZJEQhJXl1xPn3HPV29WQfvBwOfA+P95zuDJ39A6/4wyl cJOE1paoIYpMKUjFRDH87lpoakGlIZF9DA2hZJEQhJXl1xPn3HPV29WQfvBwOfA+P95zuDJ39A6/4wyl
YOOSMHvOcHGThuwvSKEVRvsR+pQqWD3R1pK98DUbl7Jm5hA8SfESd6S5xH5wycalrO4E0D8yWQuriLH6 YOOSMHvOcHGThuwvSKEVRvsR+pQqWD3R1pK98DUbl7Jm5hA8SfESd6S5xH5wycalrO4E0D8yWQuriLH6
E2xcSqlcoRJBxCpiTO5TNi4m/ZgDF4nDsOulsfujyGRzUsmWM8YqdcggKbveS3A88bEkslRye58RSzZt E2xcSqlcoRJBxCpiTO5TNi4m/ZgDF4nDsOulsfujyGRzUsmWM8YqdcggKbveS3A88bEkslRye58RSzZt
@ -321,7 +321,7 @@
<data name="剪切TToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="剪切TToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAGDSURBVDhPrZFNSwJRGIX9NYGbFoUlFElY1EJQKEYhCJsi YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGDSURBVDhPrZFNSwJRGIX9NYGbFoUlFElY1EJQKEYhCJsi
LaVsERnRF5iCaSZJO1toCDVGFkgoFpWQWWRR2aIvUxm1BKN1wSnHCFw4TOCzue+9nPNw4eVVnav4Izzb LaVsERnRF5iCaSZJO1toCDVGFkgoFpWQWWRR2aIvUxm1BKN1wSnHCFw4TOCzue+9nPNw4eVVnav4Izzb
QfxeGZ5TWaxT/rK3irzmC7CsusvC1G4IkbNLboIiDieF4GGUKeTeClDpppF8eeEu2PIfwfrzizSdw3Hk QfxeGZ5TWaxT/rK3irzmC7CsusvC1G4IkbNLboIiDieF4GGUKeTeClDpppF8eeEu2PIfwfrzizSdw3Hk
EnKlFpkMzV2wH77AosOFTV8A+vkl9CiHuJeLJNNZjM8tYWB0FkTvMAwmy/8ERTR6CwjlGAi1Ccence6C EnKlFpkMzV2wH77AosOFTV8A+vkl9CiHuJeLJNNZjM8tYWB0FkTvMAwmy/8ERTR6CwjlGAi1Ccence6C
@ -334,7 +334,7 @@
<data name="复制CToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="复制CToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAHkSURBVDhPvZHfS1NhHIf3p5QypLr2D4goMwoMCi/qIugH YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHkSURBVDhPvZHfS1NhHIf3p5QypLr2D4goMwoMCi/qIugH
Xe1Cr7qKDIMkZixwNhfWLGWbnuki0kXKzLU023KubBNPJrbRdOzocm6e2dPOO21mMS+CHvjcvOf9PF++ Xe1Cr7qKDIMkZixwNhfWLGWbnuki0kXKzLU023KubBNPJrbRdOzocm6e2dPOO21mMS+CHvjcvOf9PF++
79H9M+7RT2iRRsIi9sEAXe43yAvf2LpSHq28G9uAnytNT4jMLewtcQ2Ht2pF8ps/aOt+gccX5lxD694S 79H9M+7RT2iRRsIi9sEAXe43yAvf2LpSHq28G9uAnytNT4jMLewtcQ2Ht2pF8ps/aOt+gccX5lxD694S
+1BQFD1RkN5DSFa4Z3uONKbgHE3h8KZ4OJTC1J8UiSzmfhd2uf1CoJHbyKOsZokl0kKwm+aeJaov+wjO +1BQFD1RkN5DSFa4Z3uONKbgHE3h8KZ4OJTC1J8UiSzmfhd2uf1CoJHbyKOsZokl0kKwm+aeJaov+wjO
@ -348,7 +348,7 @@
<data name="粘贴PToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="粘贴PToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAJSSURBVDhPtZJrSJNRGMdf6IN9KbpQn/pUEH2JIoLqQ0Zh YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJSSURBVDhPtZJrSJNRGMdf6IN9KbpQn/pUEH2JIoLqQ0Zh
FqYZRmJG1iKmUqKyLB2pqSm6vC1Nm5GXoeatEsVJ0RASR3eNzegikRq5lrV3857Fr/d9ddlICoL+8OfA FqYZRmJG1iKmUqKyLB2pqSm6vC1Nm5GXoeatEsVJ0RASR3eNzegikRq5lrV3857Fr/d9ddlICoL+8OfA
Oef/e57zcIT/os7WLMw302muSGJ2689qqi7A44q8IzjtNYzarzHQm8tZtT8FmRqu6LToMxN+B8qhCbGR Oef/e57zcIT/os7WLMw302muSGJ2689qqi7A44q8IzjtNYzarzHQm8tZtT8FmRqu6LToMxN+B8qhCbGR
KVcDE85ajKUaxoaryEuL4UVXIudPB5Ko2oy98xjDptXERuz3hsgAOTzlqqMk6yjdllzE90UM9Wp5azlB KVcDE85ajKUaxoaryEuL4UVXIudPB5Ko2oy98xjDptXERuz3hsgAOTzlqqMk6yjdllzE90UM9Wp5azlB

@ -28,7 +28,7 @@ namespace PEIS.View.Enrollment
{ {
// 获取登记列表 // 获取登记列表
event EventHandler<Args<dynamic>> GetRegItems; event EventHandler<Args<dynamic>> GetRegItems;
void ShowRegItems(List<EnrollmentPatient> items); void ShowRegItems(List<EnrollmentPatient> items, int code);
// 获取登记信息 // 获取登记信息
event EventHandler<Args<EnrollmentPatient>> GetRegInfo; event EventHandler<Args<EnrollmentPatient>> GetRegInfo;

@ -55,7 +55,7 @@ namespace PEIS.View.Exam
/// </summary> /// </summary>
event EventHandler<Args<bool>> Finish; event EventHandler<Args<bool>> Finish;
void ShowFinish(bool status); void ShowFinish(int status);
/// <summary> /// <summary>
/// 修改是否允许微信查看报告 /// 修改是否允许微信查看报告

@ -1323,7 +1323,7 @@ namespace PEIS.View.Exam
{ {
if (_examPart.VerifyTime != null || _examPart.GiveUpTime != null || _examPart.ID <= 0) return; if (_examPart.VerifyTime != null || _examPart.GiveUpTime != null || _examPart.ID <= 0) return;
if (_patient.FinishTime != null || _patient.ID <= 0) return; if (_patient.FinishTime != null || _patient.ID <= 0) return;
_conclusion.Add(new ExamConclusion() _conclusion.Insert(0, new ExamConclusion()
{ {
PID = _examPart.ID, PID = _examPart.ID,
EID = _examPart.EID, EID = _examPart.EID,

@ -584,9 +584,9 @@ namespace PEIS.View.Exam
/// </summary> /// </summary>
public event EventHandler<Args<bool>> Finish; public event EventHandler<Args<bool>> Finish;
public void ShowFinish(bool status) public void ShowFinish(int status)
{ {
Global.MsgInfo(status ? @"完结成功!" : "完结失败,请重试!"); Global.MsgInfo(status == 1 ? @"完结成功!" : status == -1 ? "取消完结成功!" : "操作失败,请重试!");
if (DgvPatient.GetFocusedRow() is EnrollmentPatient selected) if (DgvPatient.GetFocusedRow() is EnrollmentPatient selected)
{ {
GetPatient?.Invoke(this, new Args<object>(selected.ID)); GetPatient?.Invoke(this, new Args<object>(selected.ID));

Loading…
Cancel
Save