1.分检界面的审核按钮的检验科项目完成校验逻辑修复
2.团体登记界面的人员列表右键菜单功能修复
3.团体登记界面的单位列表增加排序
dhzzyy
LiJiaWen 1 week ago
parent 695d766843
commit 6977054f7c
  1. 4
      PEIS/Model/Enrollment/EnrollmentOrgModel.cs
  2. 5
      PEIS/View/Enrollment/EnrollmentOrgForm.cs
  3. 2
      PEIS/View/Exam/PartForm.cs

@ -50,7 +50,7 @@ namespace PEIS.Model.Enrollment
and b.CostTime is not null and b.CostTime is not null
and b.OEID is not null and b.OEID is not null
)) as OrgCostStatus )) as OrgCostStatus
from Enrollment_Org c Where c.ExamDate Between '{begTime}' And DateAdd(day, 1,'{endTime}')"); from Enrollment_Org c Where c.ExamDate Between '{begTime}' And DateAdd(day, 1,'{endTime}') order by c.Name");
} }
else else
{ {
@ -68,7 +68,7 @@ namespace PEIS.Model.Enrollment
and b.CostTime is not null and b.CostTime is not null
and b.OEID is not null and b.OEID is not null
)) as OrgCostStatus )) as OrgCostStatus
from Enrollment_Org c Where c.Name like '%{name}%' or c.SpellCode like '%{name}%'"); from Enrollment_Org c Where c.Name like '%{name}%' or c.SpellCode like '%{name}%' order by c.Name");
} }
} }

@ -1406,9 +1406,9 @@ namespace PEIS.View.Enrollment
// 撤回发送 // 撤回发送
private void FastRecall_Click(object sender, EventArgs e) private void FastRecall_Click(object sender, EventArgs e)
{ {
if (DgvEnrollment.GetRowCellValue(DgvEnrollment.GetSelectedRows()[0], "ID") == null && _chooseRegItem == null) return; if (DgvEnrollment.GetRowCellValue(DgvEnrollment.FocusedRowHandle, "ID") == null && _chooseRegItem == null) return;
EnrollmentPatient item = DgvEnrollment.GetRow(DgvEnrollment.GetSelectedRows()[0]) as EnrollmentPatient; EnrollmentPatient item = DgvEnrollment.GetRow(DgvEnrollment.FocusedRowHandle) as EnrollmentPatient;
if (item.SignTime == null) return; if (item.SignTime == null) return;
OnRecallDept(item); OnRecallDept(item);
} }
@ -2211,6 +2211,7 @@ namespace PEIS.View.Enrollment
int rowHandle = DgvEnrollment.LocateByValue("ID", topRowIndex); int rowHandle = DgvEnrollment.LocateByValue("ID", topRowIndex);
DgvEnrollment.FocusedRowHandle = rowHandle; DgvEnrollment.FocusedRowHandle = rowHandle;
DgvEnrollment.SelectRow(rowHandle); DgvEnrollment.SelectRow(rowHandle);
DgcEnrollment.Refresh();
} }
})); }));
DgvEnrollment.BestFitColumns(); DgvEnrollment.BestFitColumns();

@ -1291,7 +1291,7 @@ namespace PEIS.View.Exam
} }
}*/ }*/
// 检验科判断项目是否完全出结果 // 检验科判断项目是否完全出结果
if (!string.IsNullOrEmpty(_lisViewName)) if (_examPart.DeptCode == "3001" && Global._hospital.Name == "德宏州中医医院" &&!string.IsNullOrEmpty(_lisViewName))
{ {
List<EnrollmentFeeItem> _noResultItem = DAOHelp.GetDataBySQL<EnrollmentFeeItem>($@"select * from Enrollment_FeeItem where ItemClass = '检验' and GiveUpTime is null and EID = {_patient.ID} and NOT exists (select * from {_lisViewName} where req_id = id)"); List<EnrollmentFeeItem> _noResultItem = DAOHelp.GetDataBySQL<EnrollmentFeeItem>($@"select * from Enrollment_FeeItem where ItemClass = '检验' and GiveUpTime is null and EID = {_patient.ID} and NOT exists (select * from {_lisViewName} where req_id = id)");
string message = ""; string message = "";

Loading…
Cancel
Save