Merge branch 'develop' of http://192.168.0.110:8880/zry/performance into develop

performance/Performance.Services/SheetSevice.cs

@@ -148,28 +148,7 @@ private void CommonExport(int sheetID, SheetExportResponse response)
             var dataList = _perforImDataRepository.GetEntities(t => t.SheetID == sheetID);
             if (dataList == null || dataList.Count == 0) return;
 
-            //创建列头行
-            var rowhead = new Row(0);
-            response.Header.Add(rowhead);
-            foreach (var header in headList.Where(t => !t.ParentID.HasValue || t.ParentID.Value == 0))
-            {
-                rowhead.Data.Add(new Cell(header.PointCell.Value, header.CellValue, header.MergeRow.Value, header.MergeCell.Value, header.IsTotal == 1, false));
-            }
-            if (headList.Any(t => t.ParentID.HasValue && t.ParentID.Value > 0))
-            {
-                var rowhead2 = new Row(1);
-                response.Header.Add(rowhead2);
-                foreach (var header in headList.Where(t => t.ParentID.HasValue && t.ParentID.Value > 0))
-                {
-                    rowhead2.Data.Add(new Cell(header.PointCell.Value, header.CellValue, header.MergeRow.Value, header.MergeCell.Value, header.IsTotal == 1, false));
-                }
-            }
-            List<im_header> headers = new List<im_header>();
-            foreach (var head in headList)
-            {
-                if (!headList.Any(t => t.ParentID == head.ID))
-                    headers.Add(head);
-            }
+
 
             List<string> sheetNames = new List<string> {
                 "1.1.1 门诊就诊收入","1.1.2 门诊执行收入","1.2.1 住院就诊收入",
@@ -177,7 +156,7 @@ private void CommonExport(int sheetID, SheetExportResponse response)
             };
             //添加系数值
             string sheetName = _perforImSheetRepository.GetEntity(t => t.ID == sheetID).SheetName;
-            var factorhead = new Row(response.Header.Count());
+            var factorhead = new Row(0);
             if (sheetName.Contains("工作量绩效测算表"))
             {
                 factorhead.Data.Add(new Cell(0, "单元工作量绩效标准：", 1, 2, false, false));
@@ -187,12 +166,36 @@ private void CommonExport(int sheetID, SheetExportResponse response)
             {
                 factorhead.Data.Add(new Cell(0, "护理组分割比例", 1, 3, false, false));
                 response = AddFactor(response, factorhead, headList.ToList(), dataList, "护理组");
-                var factorhead1 = new Row(response.Header.Count());
+                var factorhead1 = new Row(1);
                 factorhead1.Data.Add(new Cell(0, "医生组分割比例", 1, 3, false, false));
                 response = AddFactor(response, factorhead1, headList.ToList(), dataList, "医生组");
             }
 
 
+
+            //创建列头行
+            var rowhead = new Row(response.Header.Count());
+            response.Header.Add(rowhead);
+            foreach (var header in headList.Where(t => !t.ParentID.HasValue || t.ParentID.Value == 0))
+            {
+                rowhead.Data.Add(new Cell(header.PointCell.Value, header.CellValue, header.MergeRow.Value, header.MergeCell.Value, header.IsTotal == 1, false));
+            }
+            if (headList.Any(t => t.ParentID.HasValue && t.ParentID.Value > 0))
+            {
+                var rowhead2 = new Row(response.Header.Count());
+                response.Header.Add(rowhead2);
+                foreach (var header in headList.Where(t => t.ParentID.HasValue && t.ParentID.Value > 0))
+                {
+                    rowhead2.Data.Add(new Cell(header.PointCell.Value, header.CellValue, header.MergeRow.Value, header.MergeCell.Value, header.IsTotal == 1, false));
+                }
+            }
+            List<im_header> headers = new List<im_header>();
+            foreach (var head in headList)
+            {
+                if (!headList.Any(t => t.ParentID == head.ID))
+                    headers.Add(head);
+            }
+
             //创建数据行
             Row rowbody = null;
             foreach (var rowNumber in dataList.Select(t => t.RowNumber).OrderBy(t => t).Distinct())
@@ -451,6 +454,15 @@ private void EmployeeExport(int sheetID, SheetExportResponse response)
             }
         }
 
+        /// <summary>
+        /// 添加系数值
+        /// </summary>
+        /// <param name="response"></param>
+        /// <param name="row"></param>
+        /// <param name="headList"></param>
+        /// <param name="dataList"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
         private SheetExportResponse AddFactor(SheetExportResponse response, Row row, List<im_header> headList, List<im_data> dataList, string type)
         {
             int unitType = type.Contains("医生") ? 1 : 2;