Commit da889f9d by ryun

二次分配工作量自动带出BUG修复

parent d84c2e13
...@@ -12,10 +12,6 @@ public class view_second_workload_result ...@@ -12,10 +12,6 @@ public class view_second_workload_result
/// 核算单元 /// 核算单元
/// </summary> /// </summary>
public string AccountingUnit { get; set; } public string AccountingUnit { get; set; }
/// <summary>
/// 统计的HIS的原始科室名称
/// </summary>
public string HISDeptName { get; set; }
public string ItemId { get; set; } public string ItemId { get; set; }
public string ItemName { get; set; } public string ItemName { get; set; }
public decimal? FactorValue { get; set; } public decimal? FactorValue { get; set; }
......
...@@ -273,11 +273,11 @@ public IEnumerable<view_second_workload_result> GetSecondWorkload(int allotid, s ...@@ -273,11 +273,11 @@ public IEnumerable<view_second_workload_result> GetSecondWorkload(int allotid, s
try try
{ {
string query = $@" 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 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 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 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); return connection.Query<view_second_workload_result>(query, new { allotid, unittype, accountingunit }, commandTimeout: 60 * 60);
} }
catch (Exception) catch (Exception)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment