diff --git a/PEIS/Model/Enrollment/EnrollmentOrgModel.cs b/PEIS/Model/Enrollment/EnrollmentOrgModel.cs index 8ee8621..4f890f1 100644 --- a/PEIS/Model/Enrollment/EnrollmentOrgModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentOrgModel.cs @@ -50,7 +50,7 @@ namespace PEIS.Model.Enrollment and b.CostTime is not null and b.OEID is not null )) 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 { @@ -68,7 +68,7 @@ namespace PEIS.Model.Enrollment and b.CostTime is not null and b.OEID is not null )) 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"); } } diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.cs index 4ef78de..239371d 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.cs @@ -1406,9 +1406,9 @@ namespace PEIS.View.Enrollment // 撤回发送 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; OnRecallDept(item); } @@ -2211,6 +2211,7 @@ namespace PEIS.View.Enrollment int rowHandle = DgvEnrollment.LocateByValue("ID", topRowIndex); DgvEnrollment.FocusedRowHandle = rowHandle; DgvEnrollment.SelectRow(rowHandle); + DgcEnrollment.Refresh(); } })); DgvEnrollment.BestFitColumns(); diff --git a/PEIS/View/Exam/PartForm.cs b/PEIS/View/Exam/PartForm.cs index 45087fc..3fa6873 100644 --- a/PEIS/View/Exam/PartForm.cs +++ b/PEIS/View/Exam/PartForm.cs @@ -1291,7 +1291,7 @@ namespace PEIS.View.Exam } }*/ // 检验科判断项目是否完全出结果 - if (!string.IsNullOrEmpty(_lisViewName)) + if (_examPart.DeptCode == "3001" && Global._hospital.Name == "德宏州中医医院" &&!string.IsNullOrEmpty(_lisViewName)) { List _noResultItem = DAOHelp.GetDataBySQL($@"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 = "";