药材料占比奖罚

performance/Performance.Api/wwwroot/Performance.DtoModels.xml

@@ -2458,6 +2458,16 @@
             其他绩效2
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.DeptResponse.MedicineExtra">
+            <summary>
+            药占比奖罚
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.DeptResponse.MaterialsExtra">
+            <summary>
+            材料占比奖罚
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.DeptResponse.Extra">
             <summary>
             医院奖罚

performance/Performance.DtoModels/Response/DeptResponse.cs

@@ -84,6 +84,16 @@ public class DeptResponse
         public Nullable<decimal> OtherPerfor2 { get; set; }
 
         /// <summary>
+        /// 药占比奖罚
+        /// </summary>
+        public Nullable<decimal> MedicineExtra { get; set; }
+
+        /// <summary>
+        /// 材料占比奖罚
+        /// </summary>
+        public Nullable<decimal> MaterialsExtra { get; set; }
+
+        /// <summary>
         /// 医院奖罚
         /// </summary>
         public Nullable<decimal> Extra { get; set; }

performance/Performance.Repository/PerforPerAllotRepository.cs

@@ -162,7 +162,7 @@ public IEnumerable<report_original_workload> QueryWorkloadData(int allotid, stri
                 if (connection.State != ConnectionState.Open) connection.Open();
                 try
                 {
-                    string clear = "select * from report_original_workload t1 join per_employee t2 on t1.doctorname = t2.doctorname and t1.personnelnumber = t2.personnelnumber where t1.allotid = @allotid and t1.accountingunit = @accountingunit and t1.accountingunit = @accountingunit and t2.unittype in @unittype order by fee desc,convert(t1.doctorname using gbk);";
+                    string clear = "select t1.* from report_original_workload t1 join per_employee t2 on t1.doctorname = t2.doctorname and t1.personnelnumber = t2.personnelnumber where t1.allotid = @allotid and t1.accountingunit = @accountingunit and t1.accountingunit = @accountingunit and t2.unittype in @unittype order by fee desc,convert(t1.doctorname using gbk);";
                     return connection.Query<report_original_workload>(clear, new { allotid, accountingunit, unittype }, commandTimeout: 60 * 60);
                 }
                 catch (Exception ex)