Merge branch '临时发布承德' into release/v23.2.19高县版

performance/Performance.EntityModels/Other/view_second_workload_result.cs

@@ -12,10 +12,6 @@ public class view_second_workload_result
         /// 核算单元
         /// </summary>
         public string AccountingUnit { get; set; }
-        /// <summary>
-        /// 统计的HIS的原始科室名称
-        /// </summary>
-        public string HISDeptName { get; set; }
         public string ItemId { get; set; }
         public string ItemName { get; set; }
         public decimal? FactorValue { get; set; }

performance/Performance.Repository/PerforPerAllotRepository.cs

@@ -273,11 +273,11 @@ public IEnumerable<view_second_workload_result> GetSecondWorkload(int allotid, s
                 try
                 {
                     string query = $@"
-SELECT TAB1.HospitalId,AllotId,TAB1.UnitType,AccountingUnit,HISDeptName,ItemId,ItemName,FactorValue,DoctorName,PersonnelNumber,Category,SUM(Fee) Value 
+SELECT TAB1.HospitalId,AllotId,TAB1.UnitType,AccountingUnit,ItemId,ItemName,FactorValue,DoctorName,PersonnelNumber,Category,SUM(Fee) Value 
 FROM view_second_workload TAB1
  JOIN view_second_workload_his TAB2 ON TAB1.HospitalId = TAB2.HospitalId AND (TAB1.UnitType = TAB2.UnitType OR TAB2.UnitType = '通用工作量') AND TAB1.HISDeptName = TAB2.Department AND TAB1.SourceCategory = TAB2.Category
 WHERE AllotId = @allotid AND TAB1.UnitType = @unittype AND AccountingUnit = @accountingunit
-GROUP BY TAB1.HospitalId,AllotId,TAB1.UnitType,AccountingUnit,HISDeptName,ItemId,ItemName,FactorValue,DoctorName,PersonnelNumber,Category";
+GROUP BY TAB1.HospitalId,AllotId,TAB1.UnitType,AccountingUnit,ItemId,ItemName,FactorValue,DoctorName,PersonnelNumber,Category";
                     return connection.Query<view_second_workload_result>(query, new { allotid, unittype, accountingunit }, commandTimeout: 60 * 60);
                 }
                 catch (Exception)