1、同步main分支更新

PEIS/Model/Enrollment/EnrollmentOrgModel.cs

@@ -51,14 +51,42 @@ namespace PEIS.Model.Enrollment
             var enrollmentPatient = $@"UPDATE Enrollment_Patient SET ExamDate = GETDATE(), SignTime = GETDATE(), SignerCode = '{Global.currentUser.Code}', Signer = '{Global.currentUser.Name}' WHERE ID = {eID} AND SignTime is null";
             var enrollmentFeeItem = $@"UPDATE a SET a.IsSend = 1 FROM Enrollment_FeeItem a LEFT JOIN Enrollment_CheckCost b ON a.OrderNO = b.ID AND a.EID = b.EID WHERE b.SendTime IS NOT NULL AND a.EID = {eID};";
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+            // 插入常规检查男/女
+            var normal = $@"EXEC sp_InsertNormalFeeItem {eID};";
+
+            // 发送后变更执行科室  //同步分检
+            var dept = $@"UPDATE Enrollment_FeeItem SET DeptCode = '01411', DeptName = '内科' WHERE KeyNo = '87933664' AND FeeItemCode = 'Z1061' AND EID = {eID};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01412', DeptName = '外科' WHERE KeyNo = '87933665' AND FeeItemCode = 'Z1062' AND EID = {eID};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01413', DeptName = '五官科' WHERE KeyNo = '87933667' AND FeeItemCode = 'Z1063' AND EID = {eID};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01415', DeptName = '口腔科' WHERE KeyNo = '87933670' AND FeeItemCode = 'Z1064' AND EID = {eID};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01414', DeptName = '一般检查' WHERE KeyNo = '87965917' AND FeeItemCode = 'Z1065' AND EID = {eID};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01414', DeptName = '一般检查' WHERE KeyNo = '87965918' AND FeeItemCode = 'Z1066' AND EID = {eID};  EXEC sp_SyncExamPart {eID};";
+=======
             // 插入分检步骤
             var part = $@"EXEC sp_SyncExamPart {eID}";
+>>>>>>> 81d9dc6 (1、发送到科室，移除中医院定制)
+=======
+            // 插入分检步骤
+            var part = $@"EXEC sp_SyncExamPart {eID}";
+>>>>>>> main
 
             var cResult = DAOHelp.ExecuteSql(checkCost, false);
             var eResult = DAOHelp.ExecuteSql(enrollmentPatient, false);
             var fResult = DAOHelp.ExecuteSql(enrollmentFeeItem, false);
+<<<<<<< HEAD
+<<<<<<< HEAD
+            var nResult = DAOHelp.ExecuteSql(normal);
+            var dResult = DAOHelp.ExecuteSql(dept);
+=======
+
+            var pResult = DAOHelp.ExecuteSql(part);
+>>>>>>> 81d9dc6 (1、发送到科室，移除中医院定制)
+=======
 
             var pResult = DAOHelp.ExecuteSql(part);
+>>>>>>> main
 
             return cResult > 0 && eResult > 0 && fResult > 0;
         }

PEIS/Model/Enrollment/EnrollmentPatientModel.cs

@@ -112,6 +112,35 @@ namespace PEIS.Model.Enrollment
             var enrollmentPatient = $@"UPDATE Enrollment_Patient SET ExamDate = GETDATE(), SignTime = GETDATE(), SignerCode = '{Global.currentUser.Code}', Signer = '{Global.currentUser.Name}' WHERE ID = {EId} AND SignTime is null";
             var enrollmentFeeItem = $@"UPDATE a SET a.IsSend = 1 FROM Enrollment_FeeItem a LEFT JOIN Enrollment_CheckCost b ON a.OrderNO = b.ID AND a.EID = b.EID WHERE b.SendTime IS NOT NULL AND a.EID = {EId}; ";
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+            // 插入常规检查男/女 //同步分检
+            var normal = $@"EXEC sp_InsertNormalFeeItem {EId};";
+            
+            // 发送后变更执行科室
+            var dept = $@"UPDATE Enrollment_FeeItem SET DeptCode = '01411', DeptName = '内科' WHERE KeyNo = '87933664' AND FeeItemCode = 'Z1061' AND EID = {EId};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01412', DeptName = '外科' WHERE KeyNo = '87933665' AND FeeItemCode = 'Z1062' AND EID = {EId};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01413', DeptName = '五官科' WHERE KeyNo = '87933667' AND FeeItemCode = 'Z1063' AND EID = {EId};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01415', DeptName = '口腔科' WHERE KeyNo = '87933670' AND FeeItemCode = 'Z1064' AND EID = {EId};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01414', DeptName = '一般检查' WHERE KeyNo = '87965917' AND FeeItemCode = 'Z1065' AND EID = {EId};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01414', DeptName = '一般检查' WHERE KeyNo = '87965918' AND FeeItemCode = 'Z1066' AND EID = {EId};   EXEC sp_SyncExamPart {EId};";
+            
+            var cResult = DAOHelp.ExecuteSql(checkCost, false);
+            var eResult = DAOHelp.ExecuteSql(enrollmentPatient, false);
+            var fResult = DAOHelp.ExecuteSql(enrollmentFeeItem, false);
+            var nResult = DAOHelp.ExecuteSql(normal);
+            var dResult = DAOHelp.ExecuteSql(dept);
+=======
+            // 插入分检步骤
+            var part = $@"EXEC sp_SyncExamPart {EId}";
+
+       
+            var cResult = DAOHelp.ExecuteSql(checkCost, false);
+            var eResult = DAOHelp.ExecuteSql(enrollmentPatient, false);
+            var fResult = DAOHelp.ExecuteSql(enrollmentFeeItem, false);
+            var pResult = DAOHelp.ExecuteSql(part);
+>>>>>>> 81d9dc6 (1、发送到科室，移除中医院定制)
+=======
             // 插入分检步骤
             var part = $@"EXEC sp_SyncExamPart {EId}";
 
@@ -120,6 +149,7 @@ namespace PEIS.Model.Enrollment
             var eResult = DAOHelp.ExecuteSql(enrollmentPatient, false);
             var fResult = DAOHelp.ExecuteSql(enrollmentFeeItem, false);
             var pResult = DAOHelp.ExecuteSql(part);
+>>>>>>> main
 
             return cResult > 0 && eResult > 0 && fResult > 0;
         }

PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs

@@ -33,8 +33,11 @@
             DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
             DevExpress.XtraGrid.GridFormatRule gridFormatRule2 = new DevExpress.XtraGrid.GridFormatRule();
             DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression2 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
+<<<<<<< HEAD
+=======
             this.gridColumn99 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn102 = new DevExpress.XtraGrid.Columns.GridColumn();
+>>>>>>> main
             this.repositoryItemMemoEdit21 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
             this.panel1 = new System.Windows.Forms.Panel();
             this.DgcOrg = new DevExpress.XtraGrid.GridControl();
@@ -225,7 +228,11 @@
             this.gridColumn158 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn159 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn160 = new DevExpress.XtraGrid.Columns.GridColumn();
+<<<<<<< HEAD
+            this.gridColumn99 = new DevExpress.XtraGrid.Columns.GridColumn();
+=======
             this.gridColumn100 = new DevExpress.XtraGrid.Columns.GridColumn();
+>>>>>>> main
             this.repositoryItemMemoEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
             this.splitter6 = new System.Windows.Forms.Splitter();
             this.panel12 = new System.Windows.Forms.Panel();
@@ -377,6 +384,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.gridColumn100 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn101 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn102 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit21)).BeginInit();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.DgcOrg)).BeginInit();
@@ -3011,7 +3021,10 @@
             this.gridColumn100,
             this.gridColumn99});
             this.DgvCheckCost2.FixedLineWidth = 1;
+<<<<<<< HEAD
+=======
             gridFormatRule1.ApplyToRow = true;
+>>>>>>> main
             gridFormatRule1.Column = this.gridColumn99;
             gridFormatRule1.Name = "Format0";
             formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Gray;
@@ -3285,6 +3298,25 @@
             this.gridColumn160.VisibleIndex = 13;
             this.gridColumn160.Width = 130;
             // 
+<<<<<<< HEAD
+            // gridColumn99
+            // 
+            this.gridColumn99.Caption = "退费时间";
+            this.gridColumn99.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
+            this.gridColumn99.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.gridColumn99.FieldName = "CancelTime";
+            this.gridColumn99.Name = "gridColumn99";
+            this.gridColumn99.OptionsColumn.AllowEdit = false;
+            this.gridColumn99.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn99.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn99.OptionsColumn.AllowMove = false;
+            this.gridColumn99.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn99.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn99.OptionsColumn.ReadOnly = true;
+            this.gridColumn99.OptionsFilter.AllowFilter = false;
+            this.gridColumn99.Visible = true;
+            this.gridColumn99.VisibleIndex = 15;
+=======
             // gridColumn100
             // 
             this.gridColumn100.Caption = "退费人";
@@ -3300,6 +3332,7 @@
             this.gridColumn100.OptionsFilter.AllowFilter = false;
             this.gridColumn100.Visible = true;
             this.gridColumn100.VisibleIndex = 14;
+>>>>>>> main
             // 
             // repositoryItemMemoEdit2
             // 
@@ -5224,6 +5257,56 @@
             // 
             this.gridView8.Name = "gridView8";
             // 
+            // gridColumn100
+            // 
+            this.gridColumn100.Caption = "退费人";
+            this.gridColumn100.FieldName = "Cancer";
+            this.gridColumn100.Name = "gridColumn100";
+            this.gridColumn100.OptionsColumn.AllowEdit = false;
+            this.gridColumn100.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn100.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn100.OptionsColumn.AllowMove = false;
+            this.gridColumn100.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn100.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn100.OptionsColumn.ReadOnly = true;
+            this.gridColumn100.OptionsFilter.AllowFilter = false;
+            this.gridColumn100.Visible = true;
+            this.gridColumn100.VisibleIndex = 14;
+            // 
+            // gridColumn101
+            // 
+            this.gridColumn101.Caption = "退费人";
+            this.gridColumn101.FieldName = "Cancer";
+            this.gridColumn101.Name = "gridColumn101";
+            this.gridColumn101.OptionsColumn.AllowEdit = false;
+            this.gridColumn101.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn101.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn101.OptionsColumn.AllowMove = false;
+            this.gridColumn101.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn101.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn101.OptionsColumn.ReadOnly = true;
+            this.gridColumn101.OptionsFilter.AllowFilter = false;
+            this.gridColumn101.Visible = true;
+            this.gridColumn101.VisibleIndex = 14;
+            // 
+            // gridColumn102
+            // 
+            this.gridColumn102.Caption = "退费时间";
+            this.gridColumn102.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
+            this.gridColumn102.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.gridColumn102.FieldName = "CancelTime";
+            this.gridColumn102.Name = "gridColumn102";
+            this.gridColumn102.OptionsColumn.AllowEdit = false;
+            this.gridColumn102.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn102.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn102.OptionsColumn.AllowMove = false;
+            this.gridColumn102.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn102.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn102.OptionsColumn.ReadOnly = true;
+            this.gridColumn102.OptionsFilter.AllowFilter = false;
+            this.gridColumn102.Visible = true;
+            this.gridColumn102.VisibleIndex = 15;
+            // 
             // EnrollmentOrgForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 31F);
@@ -5687,7 +5770,10 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn100;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn101;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn102;
+<<<<<<< HEAD
+=======
         private System.Windows.Forms.ToolStripMenuItem FastExportTime;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn104;
+>>>>>>> main
     }
 }

PEIS/View/Enrollment/EnrollmentOrgForm.cs

@@ -1378,7 +1378,11 @@ namespace PEIS.View.Enrollment
             grid.GroupText = Convert.ToBoolean(DgvCheckCost.GetRowCellValue(index, "GroupTag")) ? "分组缴费订单" : "未分组缴费订单";
         }
 
+<<<<<<< HEAD
+        private void DgvEnrollmentFeeItem_RowStyle(object sender, DevExpress.XtraGrid.Views.Grid.RowStyleEventArgs e)
+=======
         private void DgvEnrollmentFeeItem_RowStyle(object sender, RowStyleEventArgs e)
+>>>>>>> main
         {
             if (DgvEnrollmentFeeItem.RowCount == 0) return;
             e.Appearance.ForeColor = DgvEnrollmentFeeItem.GetRowCellValue(e.RowHandle, "OrderNo") == null ? Color.Black : Color.DodgerBlue;

PEIS/View/Enrollment/EnrollmentPersonForm.Designer.cs

@@ -30,9 +30,19 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnrollmentPersonForm));
+<<<<<<< HEAD
+<<<<<<< HEAD
+            this.gridColumn118 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
+=======
+            DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule();
+            DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
+            this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
+=======
             DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule();
             DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
             this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
+>>>>>>> main
             this.gridColumn118 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn123 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn142 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -47,6 +57,10 @@
             this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
+<<<<<<< HEAD
+>>>>>>> d9d3303 (1、删除线)
+=======
+>>>>>>> main
             this.RegListPanel = new System.Windows.Forms.Panel();
             this.DgcRegItem = new DevExpress.XtraGrid.GridControl();
             this.RegMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
@@ -328,8 +342,20 @@
             this.gridColumn118.VisibleIndex = 0;
             this.gridColumn118.Width = 63;
             // 
+<<<<<<< HEAD
+<<<<<<< HEAD
+            // gridColumn52
+            // 
+            this.gridColumn52.Caption = "退费时间";
+            this.gridColumn52.FieldName = "CancelTime";
+            this.gridColumn52.Name = "gridColumn52";
+=======
+            // gridColumn123
+            // 
+=======
             // gridColumn123
             // 
+>>>>>>> main
             this.gridColumn123.Caption = "体检号";
             this.gridColumn123.FieldName = "EID";
             this.gridColumn123.Name = "gridColumn123";
@@ -561,6 +587,10 @@
             this.gridColumn38.Visible = true;
             this.gridColumn38.VisibleIndex = 13;
             this.gridColumn38.Width = 130;
+<<<<<<< HEAD
+>>>>>>> d9d3303 (1、删除线)
+=======
+>>>>>>> main
             // 
             // RegListPanel
             // 
@@ -2714,6 +2744,11 @@
             this.gridColumn53,
             this.gridColumn52});
             this.DgvCheckCost.FixedLineWidth = 1;
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+=======
+>>>>>>> main
             gridFormatRule1.ApplyToRow = true;
             gridFormatRule1.Column = this.gridColumn52;
             gridFormatRule1.Name = "Format0";
@@ -2723,6 +2758,10 @@
             formatConditionRuleExpression1.PredefinedName = "Strikeout Text";
             gridFormatRule1.Rule = formatConditionRuleExpression1;
             this.DgvCheckCost.FormatRules.Add(gridFormatRule1);
+<<<<<<< HEAD
+>>>>>>> d9d3303 (1、删除线)
+=======
+>>>>>>> main
             this.DgvCheckCost.GridControl = this.DgcCheckCost;
             this.DgvCheckCost.IndicatorWidth = 40;
             this.DgvCheckCost.Name = "DgvCheckCost";

PEIS/View/Exam/TotalForm.resx

@@ -120,12 +120,15 @@
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>497, 55</value>
   </metadata>
+<<<<<<< HEAD
+=======
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>497, 55</value>
   </metadata>
   <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>377, 55</value>
   </metadata>
+>>>>>>> main
   <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>377, 55</value>
   </metadata>