diff --git a/PEIS/Model/BaseOrgModel.cs b/PEIS/Model/BaseOrgModel.cs index dd8d2e8..07a4d6a 100644 --- a/PEIS/Model/BaseOrgModel.cs +++ b/PEIS/Model/BaseOrgModel.cs @@ -42,7 +42,7 @@ namespace PEIS.Model public List GetPatient(Int64 orgID) { - return DAOHelp.GetDataBySQL($"SELECT a.*, b.Name,b.Birthday,b.CardType, b.CardNo,b.Education, b.Marriage,b.Nation, b.Tel1,b.Address1, b.Tel2, CASE b.Sex WHEN 1 THEN '男' WHEN 2 THEN '女' ELSE '' END AS Sex FROM Base_OrgPatient a LEFT JOIN Base_Patient b ON a.PID = b.ID WHERE OID = {orgID} ORDER BY a.Seq"); + return DAOHelp.GetDataBySQL($"SELECT a.*, b.Name,b.Birthday,b.CardType, b.CardNo,b.Education, b.Marriage,b.Nation, b.Tel1,b.Address1, b.Tel2, CASE b.Sex WHEN 1 THEN '男' WHEN 2 THEN '女' ELSE '' END AS Sex FROM Base_OrgPatient a LEFT JOIN Base_Patient b ON a.PID = b.ID WHERE OID = {orgID} ORDER BY a.ID"); } public List GetPatientByEnrollment(Int64 orgID, Int64 enrollmentID) diff --git a/PEIS/Model/Enrollment/EnrollmentOrgModel.cs b/PEIS/Model/Enrollment/EnrollmentOrgModel.cs index 4f890f1..ab2cef0 100644 --- a/PEIS/Model/Enrollment/EnrollmentOrgModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentOrgModel.cs @@ -47,10 +47,11 @@ namespace PEIS.Model.Enrollment FROM Enrollment_CheckCost B WHERE B.EID = A.ID and b.DeleteTime is null + and b.CancelTime is null 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}') order by c.Name"); + from Enrollment_Org c Where c.ExamDate Between '{begTime}' And DateAdd(day, 1,'{endTime}') order by c.ExamDate"); } else { @@ -65,10 +66,11 @@ namespace PEIS.Model.Enrollment FROM Enrollment_CheckCost B WHERE B.EID = A.ID and b.DeleteTime is null + and b.CancelTime is null 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}%' order by c.Name"); + from Enrollment_Org c Where c.Name like '%{name}%' or c.SpellCode like '%{name}%' order by c.ExamDate"); } } @@ -145,7 +147,7 @@ namespace PEIS.Model.Enrollment c.DeptName, a.SignTime, (SELECT SUM ([sum]) FROM Enrollment_CheckCost WHERE a.ID = EID AND a.OEID = OEID AND DeleteTime IS NULL AND CancelTime IS NULL ) AS Price, - (SELECT ROUND(CAST((SUM (Fee) / SUM([Sum]) * 10) AS DECIMAL(10,2)), 2) FROM Enrollment_CheckCost WHERE a.ID = EID AND a.OEID = OEID AND DeleteTime IS NULL AND CancelTime IS NULL ) AS Discount, + (SELECT ROUND(CAST(ISNULL((SUM (Fee) / NULLIF(SUM([Sum]),0) * 10),0) AS DECIMAL(10,2)), 2) FROM Enrollment_CheckCost WHERE a.ID = EID AND a.OEID = OEID AND DeleteTime IS NULL AND CancelTime IS NULL ) AS Discount, (SELECT SUM(Fee) FROM Enrollment_CheckCost WHERE a.ID = EID AND a.OEID = OEID AND DeleteTime IS NULL) AS Fee, a.Description FROM diff --git a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs index 4df951e..700ec10 100644 --- a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs @@ -64,7 +64,8 @@ namespace PEIS.Model.Enrollment HazardFactors = '{item.HazardFactors}' WHERE ID = {item.ID}"; - var baseStr = $@"update base_patient set name = '{item.Name}', Sex = '{item.Sex}', Birthday = '{item.Birthday}', CardType = '{item.CardType}', CardNo = '{item.CardNo}', SpellCode = '{item.SpellCode}', Marriage = '{item.Marriage}', Description = '{item.Description}' where ID = {item.PID}"; + //var baseStr = $@"update base_patient set name = '{item.Name}', Sex = '{item.Sex}', Birthday = '{item.Birthday}', CardType = '{item.CardType}', CardNo = '{item.CardNo}', SpellCode = '{item.SpellCode}', Marriage = '{item.Marriage}', Description = '{item.Description}' where ID = {item.PID}"; + var baseStr = $@"update base_patient set name = '{item.Name}', Sex = '{item.Sex}', Birthday = '{item.Birthday}', CardType = '{item.CardType}', CardNo = '{item.CardNo}', SpellCode = '{item.SpellCode}', Marriage = '{item.Marriage}' where ID = {item.PID}"; DAOHelp.ExecuteSql(baseStr, false); return DAOHelp.ExecuteSql(sql, false) > 0; @@ -84,11 +85,12 @@ namespace PEIS.Model.Enrollment a.SignTime, a.Tel1, a.SpellCode, + a.Description, CASE WHEN a.SignTime IS NULL THEN NULL ELSE '已发送' END AS Signer - from Enrollment_Patient a LEFT JOIN Base_Patient b ON a.PID = b.ID LEFT JOIN Base_OrgPatient c ON c.OID = a.OID AND c.PID = b.ID Where a.OEID = {oeID} order by c.DeptName,a.SignTime"); + from Enrollment_Patient a LEFT JOIN Base_Patient b ON a.PID = b.ID LEFT JOIN Base_OrgPatient c ON c.OID = a.OID AND c.PID = b.ID Where a.OEID = {oeID} order by c.DeptName,a.SignTime,a.ID"); } // 记 账 diff --git a/PEIS/Model/Exam/PartModel.cs b/PEIS/Model/Exam/PartModel.cs index bfddbba..2d9aff9 100644 --- a/PEIS/Model/Exam/PartModel.cs +++ b/PEIS/Model/Exam/PartModel.cs @@ -48,7 +48,8 @@ namespace PEIS.Model var list = DAOHelp.GetDataBySQL(sql); var data = Global._lstAllDept.Select(t => { - t.Status = list.FirstOrDefault(p => p.DeptCode == t.DeptCode && p.DeptName == t.DeptName)?.Status; + //t.Status = list.FirstOrDefault(p => p.DeptCode == t.DeptCode && p.DeptName == t.DeptName)?.Status; + t.Status = list.FirstOrDefault(p => p.DeptCode == t.DeptCode)?.Status; return t; }).ToList(); return data; @@ -174,7 +175,7 @@ namespace PEIS.Model var resultStr = ""; // 判断是否为检验科 - if(deptCode == "3001" && Global._hospital.Name == "德宏州中医医院") + if (deptCode == "3001" && Global._hospital.Name == "德宏州中医医院") { resultStr = $@"SELECT C.FeeItemName, @@ -229,7 +230,7 @@ namespace PEIS.Model A.ItemClass = '检查' AND B.summary <> '' AND A.EID = {eid} AND A.DeptCode = '{deptCode}'"; } - var results = DAOHelp.GetDataBySQL(resultStr).OrderBy(o=>o.SeqReport).ToList(); + var results = DAOHelp.GetDataBySQL(resultStr).OrderBy(o => o.SeqReport).ToList(); // 检验检查心电科室Code var deptCodeList = Global._lstConfig.Where(p => p.Key == "CheckDeptCode").Select(p => p.Code).ToList(); @@ -586,16 +587,16 @@ namespace PEIS.Model Debug.WriteLine("[DEBUG] NotVerifyExamResult,未审核科室项目"); var giveUp = GiveUpExamResult(eid, deptCode); var general = GeneralExamResult(eid, deptCode); - var lis = deptCode== "3001" ? LisExamResult(eid, deptCode) : new List(); + var lis = deptCode == "3001" ? LisExamResult(eid, deptCode) : new List(); var jyLis = GetJyLisResult(eid, deptCode); - var pacs = PacsExamResult(eid, deptCode); + var pacs = PacsExamResult(eid, deptCode); var data = giveUp.Union(general).ToList() .Union(lis).ToList() .Union(jyLis).ToList() .Union(pacs).ToList() .Distinct().ToList(); - return data.Distinct().OrderBy(o => o.FID).ThenBy(t => t.RID).ToList(); + return data.Distinct().OrderBy(o => o.FID).ThenBy(t => t.RID).ToList(); } /// @@ -737,7 +738,7 @@ namespace PEIS.Model /// public List LisExamResult(long eid, string deptCode) { - var lisResult = DAOHelp.GetDataBySQL($@"Exec sp_GetLisResult @EID = '{eid}'").ToList(); + var lisResult = DAOHelp.GetDataBySQL($@"Exec sp_GetLisResult @EID = '{eid}'").ToList(); return lisResult; } diff --git a/PEIS/Model/StatisticalReportModel.cs b/PEIS/Model/StatisticalReportModel.cs index 698615e..f5e49a8 100644 --- a/PEIS/Model/StatisticalReportModel.cs +++ b/PEIS/Model/StatisticalReportModel.cs @@ -365,7 +365,7 @@ namespace PEIS.Model LEFT JOIN Enrollment_CheckCost b ON a.OrderNo = b.ID LEFT JOIN Enrollment_Patient c ON a.EID = c.ID WHERE c.SignTime Between '{begTime:yyyy-MM-dd}' and DateAdd(day, 1,'{endTime:yyyy-MM-dd}') - AND a.OrderNo IS NOT NULL AND a.OEID IS NOT NULL" + + AND a.OrderNo IS NOT NULL AND a.OEID IS NOT NULL AND a.DeptName IS NOT NULL AND a.FeeItemName IS NOT NULL" + (oEid == -1 ? "" : $@" AND c.OEID = {oEid}") + '\r' + $@"GROUP BY a.FeeItemCode, @@ -389,7 +389,7 @@ namespace PEIS.Model LEFT JOIN Enrollment_Patient c ON a.EID = c.ID WHERE a.DeptCode = '{deptCode}' And c.SignTime Between '{begTime:yyyy-MM-dd}' and DateAdd(day, 1,'{endTime:yyyy-MM-dd}') - AND a.OrderNo IS NOT NULL AND a.OEID IS NOT NULL" + + AND a.OrderNo IS NOT NULL AND a.OEID IS NOT NULL AND a.DeptName IS NOT NULL AND a.FeeItemName IS NOT NULL" + (oEid == -1 ? "" : $@" AND c.OEID = {oEid}") + '\r' + $@"GROUP BY a.FeeItemCode, @@ -416,7 +416,7 @@ namespace PEIS.Model LEFT JOIN Enrollment_CheckCost b ON a.OrderNo = b.ID LEFT JOIN Enrollment_Patient c ON a.EID = c.ID WHERE c.SignTime Between '{begTime:yyyy-MM-dd}' and DateAdd(day, 1,'{endTime:yyyy-MM-dd}') - AND a.OrderNo IS NOT NULL AND a.OEID IS NULL + AND a.OrderNo IS NOT NULL AND a.OEID IS NULL AND a.DeptName IS NOT NULL AND a.FeeItemName IS NOT NULL GROUP BY a.FeeItemCode, a.DeptName, @@ -439,7 +439,7 @@ namespace PEIS.Model LEFT JOIN Enrollment_Patient c ON a.EID = c.ID WHERE a.DeptCode = '{deptCode}' And c.SignTime Between '{begTime:yyyy-MM-dd}' and DateAdd(day, 1,'{endTime:yyyy-MM-dd}') - AND a.OrderNo IS NOT NULL AND a.OEID IS NULL + AND a.OrderNo IS NOT NULL AND a.OEID IS NULL AND a.DeptName IS NOT NULL AND a.FeeItemName IS NOT NULL GROUP BY a.FeeItemCode, a.DeptName, @@ -465,7 +465,7 @@ namespace PEIS.Model LEFT JOIN Enrollment_CheckCost b ON a.OrderNo = b.ID LEFT JOIN Enrollment_Patient c ON a.EID = c.ID WHERE c.SignTime Between '{begTime:yyyy-MM-dd}' and DateAdd(day, 1,'{endTime:yyyy-MM-dd}') - AND a.OrderNo IS NOT NULL + AND a.OrderNo IS NOT NULL AND a.DeptName IS NOT NULL AND a.FeeItemName IS NOT NULL GROUP BY a.FeeItemCode, a.DeptName, @@ -488,7 +488,7 @@ namespace PEIS.Model LEFT JOIN Enrollment_Patient c ON a.EID = c.ID WHERE a.DeptCode = '{deptCode}' And c.SignTime Between '{begTime:yyyy-MM-dd}' and DateAdd(day, 1,'{endTime:yyyy-MM-dd}') - AND a.OrderNo IS NOT NULL + AND a.OrderNo IS NOT NULL AND a.DeptName IS NOT NULL AND a.FeeItemName IS NOT NULL GROUP BY a.FeeItemCode, a.DeptName, diff --git a/PEIS/PEIS.csproj b/PEIS/PEIS.csproj index a85b10f..f1ccdbc 100644 --- a/PEIS/PEIS.csproj +++ b/PEIS/PEIS.csproj @@ -610,7 +610,7 @@ LoginForm.cs Designer - + NewOrgForm.cs diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs index d7a95b0..4f56c5c 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs @@ -385,6 +385,9 @@ 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(); @@ -4791,13 +4794,16 @@ this.gridColumn90, this.gridColumn108, this.gridColumn91, + this.gridColumn42, this.gridColumn93, this.gridColumn94, this.gridColumn95, this.gridColumn96, this.gridColumn105, this.gridColumn104, - this.gridColumn92}); + this.gridColumn92, + this.gridColumn39, + this.gridColumn40}); this.DgvEnrollment.GridControl = this.DgcEnrollment; this.DgvEnrollment.GroupCount = 1; this.DgvEnrollment.GroupFormat = ""; @@ -5009,7 +5015,7 @@ this.gridColumn95.OptionsColumn.ReadOnly = true; this.gridColumn95.OptionsFilter.AllowFilter = false; this.gridColumn95.Visible = true; - this.gridColumn95.VisibleIndex = 7; + this.gridColumn95.VisibleIndex = 8; this.gridColumn95.Width = 80; // // gridColumn96 @@ -5029,7 +5035,7 @@ this.gridColumn96.OptionsColumn.ReadOnly = true; this.gridColumn96.OptionsFilter.AllowFilter = false; this.gridColumn96.Visible = true; - this.gridColumn96.VisibleIndex = 8; + this.gridColumn96.VisibleIndex = 9; this.gridColumn96.Width = 160; // // gridColumn105 @@ -5047,7 +5053,7 @@ this.gridColumn105.OptionsColumn.ReadOnly = true; this.gridColumn105.OptionsFilter.AllowFilter = false; this.gridColumn105.Visible = true; - this.gridColumn105.VisibleIndex = 10; + this.gridColumn105.VisibleIndex = 11; // // gridColumn104 // @@ -5066,7 +5072,7 @@ this.gridColumn104.OptionsColumn.ReadOnly = true; this.gridColumn104.OptionsFilter.AllowFilter = false; this.gridColumn104.Visible = true; - this.gridColumn104.VisibleIndex = 11; + this.gridColumn104.VisibleIndex = 12; // // gridColumn92 // @@ -5084,7 +5090,7 @@ this.gridColumn92.OptionsColumn.ReadOnly = true; this.gridColumn92.OptionsFilter.AllowFilter = false; this.gridColumn92.Visible = true; - this.gridColumn92.VisibleIndex = 9; + this.gridColumn92.VisibleIndex = 10; // // PatientSearch // @@ -5305,6 +5311,32 @@ // 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); @@ -5780,5 +5812,8 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn38; private System.Windows.Forms.ToolStripMenuItem TsmiOrgUpdate; private System.Windows.Forms.Button BtnCancelGroupFeeItem; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn42; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn39; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn40; } } \ No newline at end of file diff --git a/PEIS/View/Exam/TotalForm.Designer.cs b/PEIS/View/Exam/TotalForm.Designer.cs index d72bc21..da41e1b 100644 --- a/PEIS/View/Exam/TotalForm.Designer.cs +++ b/PEIS/View/Exam/TotalForm.Designer.cs @@ -927,7 +927,7 @@ // // DgcExamResultData // - this.DgcExamResultData.Dock = System.Windows.Forms.DockStyle.Left; + this.DgcExamResultData.Dock = System.Windows.Forms.DockStyle.Fill; this.DgcExamResultData.EmbeddedNavigator.Appearance.Options.UseTextOptions = true; this.DgcExamResultData.EmbeddedNavigator.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.DgcExamResultData.Location = new System.Drawing.Point(0, 0); @@ -935,7 +935,7 @@ this.DgcExamResultData.Name = "DgcExamResultData"; this.DgcExamResultData.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemMemoEdit4}); - this.DgcExamResultData.Size = new System.Drawing.Size(423, 489); + this.DgcExamResultData.Size = new System.Drawing.Size(310, 506); this.DgcExamResultData.TabIndex = 0; this.DgcExamResultData.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvExamResultData});