Skip to content

P
performance
Commit 911392b9 by ruyun.zhang@suvalue.com
Options

Merge remote-tracking branch 'origin/feature/dongfang' into feature/dongfang

parents af06d961 9dbcb36e
Showing with 83 additions and 84 deletions
performance/Performance.Api/wwwroot/Performance.Api.xml
......@@ -249,34 +249,6 @@
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ConfigController.GetDireList(Performance.DtoModels.DirectorRequest)">
<summary>
获取规模/效率绩效配置列表
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ConfigController.DireInsert(Performance.DtoModels.DirectorRequest)">
<summary>
新增规模/效率绩效配置
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ConfigController.DireUpdate(Performance.DtoModels.DirectorRequest)">
<summary>
更新规模/效率绩效配置
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ConfigController.DireDelete(Performance.DtoModels.DirectorRequest)">
<summary>
删除规模/效率绩效配置
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ConfigController.GetDrugList(Performance.DtoModels.DrugpropRequest)">
<summary>
获取 药占比配置信息列表
......@@ -333,62 +305,6 @@
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ConfigController.GetIncomeList(Performance.DtoModels.IncomeRequest)">
<summary>
获取ICU有效收入配置列表
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ConfigController.Insert(Performance.DtoModels.IncomeRequest)">
<summary>
新增ICU有效收入配置
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ConfigController.Update(Performance.DtoModels.IncomeRequest)">
<summary>
修改ICU有效收入配置
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ConfigController.Delete(Performance.DtoModels.IncomeRequest)">
<summary>
删除ICU有效收入配置
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ConfigController.GetWorkList(Performance.DtoModels.WorkyearRequest)">
<summary>
获取年资系数配置列表
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ConfigController.WorkyearInsert(Performance.DtoModels.WorkyearRequest)">
<summary>
新增年资系数配置
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ConfigController.WorkyearUpdate(Performance.DtoModels.WorkyearRequest)">
<summary>
修改年资系数配置
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ConfigController.WorkyearDelete(Performance.DtoModels.WorkyearRequest)">
<summary>
删除年资系数配置
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ConfigController.GetAgainList(Performance.DtoModels.CofAgainRequest)">
<summary>
获取二次绩效配置列表
......
performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs
......@@ -191,6 +191,7 @@ public AutoMapperConfigs()
CreateMap<ag_fixatitem, BodyItem>()
.ForMember(dest => dest.FiledName, opt => opt.MapFrom(src => src.ItemName))
.ForMember(dest => dest.Value, opt => opt.MapFrom(src => src.ItemValue));
CreateMap<HeadItem, BodyItem>().ReverseMap();
CreateMap<ag_temp, SecondTempResponse>();
CreateMap<ag_secondallot, SecondListResponse>().ReverseMap();
......
performance/Performance.Infrastructure/Helper/CommonHelper.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
namespace Performance.Infrastructure
{
public static class CommonHelper
{
public static IEnumerable<T> ToDistinct<T>(this IEnumerable<T> source)
{
return source.Distinct(new TCompare<T>());
}
public static IEnumerable<T> ToDistinct<T, C>(this IEnumerable<T> source, Func<T, C> field)
{
return source.Distinct(new TCompare<T, C>(field));
}
public class TCompare<T> : IEqualityComparer<T>
{
public bool Equals(T x, T y)
{
try
{
bool result = true;
PropertyInfo[] propertyInfos = typeof(T).GetProperties();
foreach (var propertyInfo in propertyInfos) //可设置i的起始值或判断i的值，来跳过不需要比较的字段
{
result = propertyInfo.GetValue(x, null)?.ToString()
== propertyInfo.GetValue(y, null)?.ToString();
if (!result) break;
}
return result;
}
catch
{
return false;
}
}
public int GetHashCode(T obj)
{
return 1;
}
}
public class TCompare<T, C> : IEqualityComparer<T>
{
private readonly Func<T, C> field;
public TCompare(Func<T, C> field)
{
this.field = field;
}
public bool Equals(T x, T y)
{
return EqualityComparer<C>.Default.Equals(field(x), field(y));
}
public int GetHashCode(T obj)
{
return EqualityComparer<C>.Default.GetHashCode(field(obj));
}
}
}
}
performance/Performance.Repository/PerforPerAllotRepository.cs
......@@ -34,5 +34,21 @@ public int ImportData(int allotId)
select distinct allotid,year,month,hospitalid,sourcetype,department,typename,cellvalue from view_report_original_income where allotid=@allotId;";
return Execute(sql, new { allotId });
}
/// <summary>
///
/// </summary>
/// <param name="allotId"></param>
/// <returns></returns>
public int SupplyData(int allotId)
{
string sql = @"
insert into cof_drugtype(charge,allotid) select distinct id.typename charge,
@allotId allotid from im_data id
inner join per_sheet ps on id.sheetid = ps.id
where id.allotid = @allotId and ps.sheettype = 3 and ifnull(id.typename, '') != ''
and id.typename not in (select charge from cof_drugtype where allotid = @allotId);";
return Execute(sql, new { allotId });
}
}
}
performance/Performance.Services/ReportService.cs
......@@ -228,6 +228,7 @@ internal int ImportData(int allotId)
{
try
{
var flag = perforPerallotRepository.SupplyData(allotId);
return perforPerallotRepository.ImportData(allotId);
}
catch { }
......
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