Skip to content

P
performance
Commit 65c06afe by ruyun.zhang@suvalue.com
Options

Merge branch 'release/v20210709功能分支合并' into develop

parents 97a18f72 1ecf3f18
Showing with 1843 additions and 568 deletions
performance/Performance.Api/Controllers/AllotController.cs
...@@ -34,6 +34,7 @@ public class AllotController : Controller ...@@ -34,6 +34,7 @@ public class AllotController : Controller
private ILogger<AllotController> _logger; private ILogger<AllotController> _logger;
private ClaimService _claim; private ClaimService _claim;
private LogManageService _logManageService; private LogManageService _logManageService;
private readonly CostTransferService costTransferService;
private IBackgroundTaskQueue _backgroundTaskQueue; private IBackgroundTaskQueue _backgroundTaskQueue;
private IServiceScopeFactory _serviceScopeFactory; private IServiceScopeFactory _serviceScopeFactory;
...@@ -45,7 +46,8 @@ public class AllotController : Controller ...@@ -45,7 +46,8 @@ public class AllotController : Controller
IBackgroundTaskQueue backgroundTaskQueue, IBackgroundTaskQueue backgroundTaskQueue,
IServiceScopeFactory serviceScopeFactory, IServiceScopeFactory serviceScopeFactory,
ClaimService claim, ClaimService claim,
LogManageService logManageService) LogManageService logManageService,
CostTransferService costTransferService)
{ {
_allotService = allotService; _allotService = allotService;
_resultComputeService = resultComputeService; _resultComputeService = resultComputeService;
...@@ -53,6 +55,7 @@ public class AllotController : Controller ...@@ -53,6 +55,7 @@ public class AllotController : Controller
_evn = evn; _evn = evn;
_claim = claim; _claim = claim;
_logManageService = logManageService; _logManageService = logManageService;
this.costTransferService = costTransferService;
_configService = configService; _configService = configService;
_backgroundTaskQueue = backgroundTaskQueue; _backgroundTaskQueue = backgroundTaskQueue;
_serviceScopeFactory = serviceScopeFactory; _serviceScopeFactory = serviceScopeFactory;
...@@ -96,6 +99,8 @@ public ApiResponse Insert([FromBody] AllotRequest request) ...@@ -96,6 +99,8 @@ public ApiResponse Insert([FromBody] AllotRequest request)
var userId = _claim.GetUserId(); var userId = _claim.GetUserId();
var result = _allotService.InsertAllot(request, userId); var result = _allotService.InsertAllot(request, userId);
_configService.Copy(result); _configService.Copy(result);
//带出上月划拨记录
costTransferService.IntoLastTiemData(request.HospitalId.Value, result.ID);
return new ApiResponse(ResponseType.OK, result); return new ApiResponse(ResponseType.OK, result);
} }
...@@ -421,6 +426,8 @@ public ApiResponse Issued([FromBody] AllotRequest request) ...@@ -421,6 +426,8 @@ public ApiResponse Issued([FromBody] AllotRequest request)
_allotService.UpdateAllotStates(allot.ID, (int)AllotStates.GenerateSucceed, EnumHelper.GetDescription(AllotStates.GenerateSucceed)); _allotService.UpdateAllotStates(allot.ID, (int)AllotStates.GenerateSucceed, EnumHelper.GetDescription(AllotStates.GenerateSucceed));
// 科室下发 // 科室下发
_resultComputeService.GenerateSecondAllot(allot); _resultComputeService.GenerateSecondAllot(allot);
//绩效划拨，下发驳回
costTransferService.RejectedApplicat(allot.ID);
return new ApiResponse(ResponseType.OK); return new ApiResponse(ResponseType.OK);
} }
......
performance/Performance.Api/Controllers/ConfigController.cs
using FluentValidation.AspNetCore; using FluentValidation.AspNetCore;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.ApiExplorer;
using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using Performance.DtoModels; using Performance.DtoModels;
using Performance.DtoModels.AppSettings;
using Performance.EntityModels; using Performance.EntityModels;
using Performance.Infrastructure; using Performance.Infrastructure;
using Performance.Services; using Performance.Services;
using Performance.Services.ExtractExcelService;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks;
namespace Performance.Api.Controllers namespace Performance.Api.Controllers
{ {
[Route("api/[controller]")] [Route("api/[controller]")]
public class ConfigController : Controller public class ConfigController : Controller
{ {
private ConfigService _configService; private readonly ConfigService _configService;
private AllotService _allotService; private readonly AllotService _allotService;
public ConfigController(ConfigService configService, AllotService allotService) private readonly DictionaryService _dictionaryService;
public ConfigController(ConfigService configService, AllotService allotService, DictionaryService dictionaryService)
{ {
_configService = configService; _configService = configService;
_allotService = allotService; _allotService = allotService;
_dictionaryService = dictionaryService;
} }
#region 弃用 #region 弃用
...@@ -673,6 +675,7 @@ public ApiResponse BatchAccountingStructrue([FromRoute] int allotId) ...@@ -673,6 +675,7 @@ public ApiResponse BatchAccountingStructrue([FromRoute] int allotId)
/// 核算单元及组别批量添加 /// 核算单元及组别批量添加
/// </summary> /// </summary>
/// <param name="allotId"></param> /// <param name="allotId"></param>
/// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[Route("BatchSaveAccounting/{allotId}")] [Route("BatchSaveAccounting/{allotId}")]
[HttpPost] [HttpPost]
...@@ -725,7 +728,9 @@ public ApiResponse GetHrpDeptHands([FromRoute] int hospitalId, int allotId) ...@@ -725,7 +728,9 @@ public ApiResponse GetHrpDeptHands([FromRoute] int hospitalId, int allotId)
/// <summary> /// <summary>
/// 保存HRP人员科室 /// 保存HRP人员科室
/// </summary> /// </summary>
/// <param name=""></param> /// <param name="hospitalId"></param>
/// <param name="allotId"></param>
/// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[Route("savehrpdept/{hospitalId}/allot/{allotId}")] [Route("savehrpdept/{hospitalId}/allot/{allotId}")]
[HttpPost] [HttpPost]
...@@ -738,6 +743,21 @@ public ApiResponse SaveHrpDept(int hospitalId, int allotId, [FromBody] SaveColle ...@@ -738,6 +743,21 @@ public ApiResponse SaveHrpDept(int hospitalId, int allotId, [FromBody] SaveColle
_configService.SaveDepttypeHands(hospitalId, allotId, request); _configService.SaveDepttypeHands(hospitalId, allotId, request);
return new ApiResponse(ResponseType.OK); return new ApiResponse(ResponseType.OK);
} }
/// <summary>
/// 校正HRP人员的科室信息
/// </summary>
/// <param name="allotId"></param>
/// <returns></returns>
[Route("standardhrpdept/{allotId}")]
[HttpPost]
public ApiResponse StandardHrpDept(int allotId)
{
if (allotId <= 0)
return new ApiResponse(ResponseType.Fail, "参数错误", "allotid无效");
_dictionaryService.CorrectionHRPDepartment(allotId);
return new ApiResponse(ResponseType.OK);
}
#endregion #endregion
#region 二次分配别名配置 #region 二次分配别名配置
...@@ -768,5 +788,30 @@ public ApiResponse SaveSecondaryAlias([FromBody] SaveCollectData request) ...@@ -768,5 +788,30 @@ public ApiResponse SaveSecondaryAlias([FromBody] SaveCollectData request)
} }
#endregion #endregion
#region 费用类型系数
[HttpPost("drugtype/factor")]
public ApiResponse GetDrugtypeFactor([FromBody] AllotDeptRequest request)
{
var data = _configService.GetDrugtypeFactor(request);
return new ApiResponse(ResponseType.OK, data);
}
[HttpPost("drugtype/factor/config")]
public ApiResponse GetDrugtypeFactorConfig([FromBody] AllotDeptRequest request)
{
var data = _configService.GetDrugtypeFactorConfig(request.HospitalId, request.AllotId);
return new ApiResponse(ResponseType.OK, data);
}
[HttpPost("drugtype/factor/save")]
public ApiResponse SaveDrugtypeFactor([FromBody] DrugtypeFactorRequest request)
{
_configService.SaveDrugtypeFactor(request);
return new ApiResponse(ResponseType.OK, "保存成功！");
}
#endregion
} }
} }
\ No newline at end of file
performance/Performance.Api/Controllers/CostTransferController.cs 0 → 100644
using Microsoft.AspNetCore.Mvc;
using Performance.DtoModels;
using Performance.EntityModels;
using Performance.Services;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Performance.Api.Controllers
{
[Route("api/[controller]")]
public class CostTransferController : Controller
{
private readonly CostTransferService costTransferService;
private readonly ClaimService claim;
private readonly RoleService roleService;
private readonly UserService userService;
public CostTransferController(
CostTransferService costTransferService,
ClaimService claim,
RoleService roleService,
UserService userService)
{
this.costTransferService = costTransferService;
this.claim = claim;
this.roleService = roleService;
this.userService = userService;
}
/// <summary>
/// 申请划拨
/// </summary>
/// <returns></returns>
[Route("submit")]
[HttpPost]
public ApiResponse SubmitApplications([FromBody] CostTransferRequest request)
{
if (request.AllotId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
var result = costTransferService.Applicat(request);
return new ApiResponse(ResponseType.OK, result);
}
/// <summary>
///
/// </summary>
/// <returns></returns>
[Route("common/{hospitalId}/allot/{allotId}")]
[HttpPost]
public ApiResponse Common(int hospitalId, int allotId, [FromBody] DepartmentDetail detail)
{
if (hospitalId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数HospitalId无效！");
if (allotId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
var userid = claim.GetUserId();
var user = userService.GetUser(userid);
var role = roleService.GetARole(user.UserID);
var result = costTransferService.Common(allotId, hospitalId, role.Type.Value, user.Department, detail);
result.deparment = user.Department ?? "";
return new ApiResponse(ResponseType.OK, result);
}
/// <summary>
/// 当前科室、类别
/// </summary>
/// <returns></returns>
[Route("deptdetial/{hospitalId}/allot/{allotId}")]
[HttpPost]
public ApiResponse DeptDetial(int hospitalId, int allotId)
{
if (hospitalId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数HospitalId无效！");
if (allotId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
var userid = claim.GetUserId();
var user = userService.GetUser(userid);
var role = roleService.GetARole(user.UserID);
var result = costTransferService.DeptDetial(allotId, hospitalId, role.Type.Value, user.Department);
result.Item2.Department = user.Department ?? "";
return new ApiResponse(ResponseType.OK, result.Item2);
}
/// <summary>
/// 撤回提交
/// </summary>
/// <param name="itemId"></param>
/// <returns></returns>
[Route("withdrawsubmit/{itemId}")]
[HttpPost]
public ApiResponse WithdrawSubmit(int itemId)
{
if (itemId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数itemId无效!");
costTransferService.WithdrawSubmit(itemId);
return new ApiResponse(ResponseType.OK);
}
/// <summary>
/// 审核列表
/// </summary>
/// <param name="allotId"></param>
/// <param name="menuType"></param>
/// <returns></returns>
[Route("auditlist/{allotId}/menuType/{menuType}")]
[HttpPost]
public ApiResponse AuditList(int allotId, int menuType)
{
if (allotId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
var userid = claim.GetUserId();
var user = userService.GetUser(userid);
var role = roleService.GetARole(user.UserID);
var result = costTransferService.GetAuditList(allotId, menuType, role.Type.Value, user.Department);
return new ApiResponse(ResponseType.OK, result);
}
/// <summary>
/// 划拨审核
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[Route("costtransferaudit")]
[HttpPost]
public ApiResponse Audit([FromBody] AuditRequest request)
{
if (request.AllotId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
var userid = claim.GetUserId();
var user = userService.GetUser(userid);
var role = roleService.GetARole(user.UserID);
var roleArr = new[] { 1, 2, 5 };
if (roleArr.Contains(role.Type.Value))
costTransferService.CostTransferAudit(request, true);
else
costTransferService.CostTransferAudit(request, false);
return new ApiResponse(ResponseType.OK);
}
/// <summary>
/// 驳回修改
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[Route("updateapplicat")]
[HttpPost]
public ApiResponse UpdateApplicat([FromBody] CostTransferUpdateRequest request)
{
if (request.AllotId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
costTransferService.UpdateApplicat(request);
return new ApiResponse(ResponseType.OK);
}
/// <summary>
/// 划拨报表
/// </summary>
/// <param name="allotId"></param>
/// <param name="auditType"></param>
/// <param name="detail"></param>
/// <returns></returns>
[Route("transfercontent/{allotId}/auditType/{auditType}")]
[HttpPost]
public ApiResponse TransferContent(int allotId,int auditType ,[FromBody] DepartmentDetail detail)
{
if (allotId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
var result=costTransferService.TransferContent(allotId,auditType,detail);
return new ApiResponse(ResponseType.OK,result);
}
}
}
performance/Performance.Api/Filters/RequestRateLimitingMiddleware.cs
...@@ -73,7 +73,7 @@ public class RequestRateLimitingMiddleware ...@@ -73,7 +73,7 @@ public class RequestRateLimitingMiddleware
var response = new ApiResponse var response = new ApiResponse
{ {
State = ResponseType.TooManyRequests, State = ResponseType.TooManyRequests,
Message = "访问过于频繁，请稍后重试" Message = "您的操作正在处理，请稍等片刻！"
}; };
await context.Response.WriteAsync(JsonHelper.Serialize(response)); await context.Response.WriteAsync(JsonHelper.Serialize(response));
} }
......
performance/Performance.Api/Properties/PublishProfiles/FolderProfile.pubxml
...@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. ...@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration> <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform> <LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider> <PublishProvider>FileSystem</PublishProvider>
<PublishUrl>bin\Release\netcoreapp2.2\publish\</PublishUrl> <PublishUrl>D:\publish\jx.suvalue.com2</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod> <WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish /> <SiteUrlToLaunchAfterPublish />
<TargetFramework>netcoreapp2.2</TargetFramework> <TargetFramework>netcoreapp2.2</TargetFramework>
......
performance/Performance.Api/appsettings.Localhost.json
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
}, },
"AppConnection": { "AppConnection": {
//"PerformanceConnectionString": "server=112.124.13.17;database=db_performance;uid=suvalue;pwd=suvalue2016;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;", //"PerformanceConnectionString": "server=112.124.13.17;database=db_performance;uid=suvalue;pwd=suvalue2016;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
"PerformanceConnectionString": "server=192.168.18.166;database=db_test_yubei;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;", "PerformanceConnectionString": "server=192.168.18.166;database=db_performance_screen;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
"HangfireConnectionString": "server=192.168.18.166;database=db_hangfire;uid=root;pwd=1234qwer;port=3306;allow user variables=true;", "HangfireConnectionString": "server=192.168.18.166;database=db_hangfire;uid=root;pwd=1234qwer;port=3306;allow user variables=true;",
"RedisConnectionString": "116.62.245.55:6379,defaultDatabase=2" "RedisConnectionString": "116.62.245.55:6379,defaultDatabase=2"
}, },
...@@ -38,7 +38,13 @@ ...@@ -38,7 +38,13 @@
"HttpPost": "http://localhost:50997/api/" "HttpPost": "http://localhost:50997/api/"
}, },
"RateLimitingConfig": { "RateLimitingConfig": {
"Endpoints": [ "/api/second/savevalue", "/api/second/savedata", "/api/second/other/save" ], "Endpoints": [
"/api/second/savevalue",
"/api/second/savedata",
"/api/second/other/save",
"/api/second/redistribution/save",
"/api/second/redistribution/submit"
],
"Period": "1", // 单位为秒 "Period": "1", // 单位为秒
"Limit": 1 "Limit": 1
} }
......
performance/Performance.Api/wwwroot/Performance.Api.xml
...@@ -696,6 +696,7 @@ ...@@ -696,6 +696,7 @@
核算单元及组别批量添加 核算单元及组别批量添加
</summary> </summary>
<param name="allotId"></param> <param name="allotId"></param>
<param name="request"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.ConfigController.WorkHeader(Performance.DtoModels.WorkItemRequest)"> <member name="M:Performance.Api.Controllers.ConfigController.WorkHeader(Performance.DtoModels.WorkItemRequest)">
...@@ -717,7 +718,16 @@ ...@@ -717,7 +718,16 @@
<summary> <summary>
保存HRP人员科室 保存HRP人员科室
</summary> </summary>
<param name=""></param> <param name="hospitalId"></param>
<param name="allotId"></param>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ConfigController.StandardHrpDept(System.Int32)">
<summary>
校正HRP人员的科室信息
</summary>
<param name="allotId"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.ConfigController.GetSecondaryAlias"> <member name="M:Performance.Api.Controllers.ConfigController.GetSecondaryAlias">
...@@ -732,6 +742,62 @@ ...@@ -732,6 +742,62 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.CostTransferController.SubmitApplications(Performance.DtoModels.CostTransferRequest)">
<summary>
申请划拨
</summary>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.CostTransferController.Common(System.Int32,System.Int32,Performance.DtoModels.DepartmentDetail)">
<summary>
</summary>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.CostTransferController.DeptDetial(System.Int32,System.Int32)">
<summary>
当前科室、类别
</summary>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.CostTransferController.WithdrawSubmit(System.Int32)">
<summary>
撤回提交
</summary>
<param name="itemId"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.CostTransferController.AuditList(System.Int32,System.Int32)">
<summary>
审核列表
</summary>
<param name="allotId"></param>
<param name="menuType"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.CostTransferController.Audit(Performance.DtoModels.AuditRequest)">
<summary>
划拨审核
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.CostTransferController.UpdateApplicat(Performance.DtoModels.CostTransferUpdateRequest)">
<summary>
驳回修改
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.CostTransferController.TransferContent(System.Int32,System.Int32,Performance.DtoModels.DepartmentDetail)">
<summary>
划拨报表
</summary>
<param name="allotId"></param>
<param name="auditType"></param>
<param name="detail"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.EmployeeController.GetEmployeeList(Performance.DtoModels.EmployeeRequest)"> <member name="M:Performance.Api.Controllers.EmployeeController.GetEmployeeList(Performance.DtoModels.EmployeeRequest)">
<summary> <summary>
获取人员列表 获取人员列表
...@@ -1536,6 +1602,12 @@ ...@@ -1536,6 +1602,12 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.SecondAllotController.WorkloadMap(System.Int32)">
<summary>
获取二次分配 提取工作量带出字典
</summary>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.SecondAllotController.SingleSave(Performance.EntityModels.ag_workload_type,System.Int32)"> <member name="M:Performance.Api.Controllers.SecondAllotController.SingleSave(Performance.EntityModels.ag_workload_type,System.Int32)">
<summary> <summary>
保存二次绩效工作量类型 保存二次绩效工作量类型
...@@ -1647,6 +1719,55 @@ ...@@ -1647,6 +1719,55 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.SecondAllotController.RedistributionLoad(Performance.DtoModels.SecondLoadDto)">
<summary>
二次绩效录入页面
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.SecondAllotController.RedistributionCheck(Performance.DtoModels.SecondComputeDto)">
<summary>
提交数据正确性检验
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.SecondAllotController.RedistributionCompute(Performance.DtoModels.SecondComputeDto)">
<summary>
二次绩效结果计算
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.SecondAllotController.RedistributionSave(Performance.DtoModels.SecondComputeDto)">
<summary>
二次绩效保存
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.SecondAllotController.RedistributionSubmit(Performance.DtoModels.SecondComputeDto)">
<summary>
二次绩效提交
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.SecondAllotController.RedistributionEmployee(Performance.DtoModels.SecondEmployeeDto)">
<summary>
二次分配人员字典带出
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.SecondAllotController.RedistributionDetail(Performance.DtoModels.SecondBaseDto)">
<summary>
二次分配审核后查看详情
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.SheetController.SheetList(Performance.DtoModels.SheetRequest)"> <member name="M:Performance.Api.Controllers.SheetController.SheetList(Performance.DtoModels.SheetRequest)">
<summary> <summary>
sheet 列表 sheet 列表
......
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
<summary> 正在生成绩效 </summary> <summary> 正在生成绩效 </summary>
</member> </member>
<member name="F:Performance.DtoModels.AllotStates.GenerateSucceed"> <member name="F:Performance.DtoModels.AllotStates.GenerateSucceed">
<summary> 绩效结果通过审核，允许下发 </summary> <summary> 绩效下发 </summary>
</member> </member>
<member name="F:Performance.DtoModels.AllotStates.GenerateFail"> <member name="F:Performance.DtoModels.AllotStates.GenerateFail">
<summary> 绩效解析失败 </summary> <summary> 绩效解析失败 </summary>
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
<summary> 归档 </summary> <summary> 归档 </summary>
</member> </member>
<member name="F:Performance.DtoModels.AllotStates.Wait"> <member name="F:Performance.DtoModels.AllotStates.Wait">
<summary> 归档 </summary> <summary> 等待 </summary>
</member> </member>
<member name="F:Performance.DtoModels.AllotStates.GenerateAccomplish"> <member name="F:Performance.DtoModels.AllotStates.GenerateAccomplish">
<summary> 绩效结果解析成功 </summary> <summary> 绩效结果解析成功 </summary>
...@@ -848,6 +848,9 @@ ...@@ -848,6 +848,9 @@
<member name="F:Performance.DtoModels.SheetType.Custom"> <member name="F:Performance.DtoModels.SheetType.Custom">
<summary> 自定义抽取模板 </summary> <summary> 自定义抽取模板 </summary>
</member> </member>
<member name="F:Performance.DtoModels.SheetType.OnlyExtract">
<summary> 抽取数据，不写入 </summary>
</member>
<member name="T:Performance.DtoModels.AccountUnitType"> <member name="T:Performance.DtoModels.AccountUnitType">
<summary> <summary>
核算单元类型 核算单元类型
...@@ -2531,6 +2534,11 @@ ...@@ -2531,6 +2534,11 @@
是否是单项奖励 是否是单项奖励
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.WorkloadRequest.SourceCategory">
<summary>
工作量带出HIS来源
</summary>
</member>
<member name="P:Performance.DtoModels.WorkyearRequest.MaxRange"> <member name="P:Performance.DtoModels.WorkyearRequest.MaxRange">
<summary> <summary>
最大工龄范围（小于） 最大工龄范围（小于）
...@@ -2977,6 +2985,36 @@ ...@@ -2977,6 +2985,36 @@
职称 职称
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.CostTransferResponse.AllotId">
<summary>
</summary>
</member>
<member name="P:Performance.DtoModels.CostTransferResponse.ApplicantUnitType">
<summary>
申请者核算单元类型
</summary>
</member>
<member name="P:Performance.DtoModels.CostTransferResponse.ApplicantDepartment">
<summary>
申请者科室
</summary>
</member>
<member name="P:Performance.DtoModels.CostTransferResponse.AdoptedUnitType">
<summary>
审核者核算单元类型
</summary>
</member>
<member name="P:Performance.DtoModels.CostTransferResponse.AdoptedDepartment">
<summary>
审核者科室
</summary>
</member>
<member name="P:Performance.DtoModels.CostTransferResponse.Status">
<summary>
0 未审核 1 部分审核 2 全部审核
</summary>
</member>
<member name="P:Performance.DtoModels.DeptDataDetails`1.Pandect"> <member name="P:Performance.DtoModels.DeptDataDetails`1.Pandect">
<summary> 概览</summary> <summary> 概览</summary>
</member> </member>
...@@ -3702,6 +3740,61 @@ ...@@ -3702,6 +3740,61 @@
签字 签字
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.SecPrintHeaderResponse.TotalPerformance">
<summary>
可分配绩效
</summary>
</member>
<member name="P:Performance.DtoModels.SecPrintHeaderResponse.TotalDistPerformance">
<summary>
科室总绩效
</summary>
</member>
<member name="P:Performance.DtoModels.SecPrintHeaderResponse.TheTotalAllocationOfPerformanceResults">
<summary>
科室单项奖励
</summary>
</member>
<member name="P:Performance.DtoModels.SecPrintHeaderResponse.DirectorBasisPerformance">
<summary>
主任基础绩效
</summary>
</member>
<member name="P:Performance.DtoModels.SecPrintHeaderResponse.NightShiftWorkPerforTotal">
<summary>
夜班绩效总和
</summary>
</member>
<member name="P:Performance.DtoModels.SecPrintHeaderResponse.HosOtherPerformance">
<summary>
医院其他绩效
</summary>
</member>
<member name="P:Performance.DtoModels.SecPrintHeaderResponse.SeniorityTitlesAccountedPerformance">
<summary>
年资职称绩效占比
</summary>
</member>
<member name="P:Performance.DtoModels.SecPrintHeaderResponse.SeniorityTitlesPerformance">
<summary>
年资职称绩效
</summary>
</member>
<member name="P:Performance.DtoModels.SecPrintHeaderResponse.Workload_Ratio_Default">
<summary>
工作量绩效占比
</summary>
</member>
<member name="P:Performance.DtoModels.SecPrintHeaderResponse.Workload_Amount_Default">
<summary>
工作量分配绩效金额
</summary>
</member>
<member name="P:Performance.DtoModels.SecPrintHeaderResponse.WorkloadTypes">
<summary>
其他工作量占比
</summary>
</member>
<member name="P:Performance.DtoModels.SheetExportResponse.SheetID"> <member name="P:Performance.DtoModels.SheetExportResponse.SheetID">
<summary> <summary>
sheetID sheetID
...@@ -3787,6 +3880,81 @@ ...@@ -3787,6 +3880,81 @@
绩效系数 绩效系数
</summary> </summary>
</member> </member>
<member name="T:Performance.DtoModels.Second.ComputeMode">
<summary>
二次分配计算方式
</summary>
</member>
<member name="F:Performance.DtoModels.Second.ComputeMode.NotCalculate">
<summary>
填报(不计算)
</summary>
</member>
<member name="F:Performance.DtoModels.Second.ComputeMode.Horizontal">
<summary>
横向计算
</summary>
</member>
<member name="F:Performance.DtoModels.Second.ComputeMode.Vertical">
<summary>
纵向计算
</summary>
</member>
<member name="P:Performance.DtoModels.SecondBaseDto.ComputeMode">
<summary>
计算方式：11 不计算 12 横向计算 13 纵向计算
</summary>
</member>
<member name="P:Performance.DtoModels.SecondColumnDictionary.Label">
<summary>
描述
</summary>
</member>
<member name="P:Performance.DtoModels.SecondColumnDictionary.Key">
<summary>
主键
</summary>
</member>
<member name="P:Performance.DtoModels.SecondColumnDictionary.IsTrue">
<summary>
是否显示 true显示
</summary>
</member>
<member name="P:Performance.DtoModels.SecondColumnDictionary.Width">
<summary>
宽度
</summary>
</member>
<member name="P:Performance.DtoModels.SecondColumnDictionary.Sort">
<summary>
排序
</summary>
</member>
<member name="P:Performance.DtoModels.SecondColumnDictionary.Site">
<summary>
位置 Top、Table
</summary>
</member>
<member name="P:Performance.DtoModels.SecondColumnDictionary.Type">
<summary>
类型 单项奖励：SingleAwards，工作量：Workload
</summary>
</member>
<member name="P:Performance.DtoModels.SecondColumnDictionary.Color">
<summary>
颜色class名称
</summary>
</member>
<member name="P:Performance.DtoModels.SecondEmployeeDto.ComputeMode">
<summary>
计算方式：11 不计算 12 横向计算 13 纵向计算
</summary>
</member>
<member name="P:Performance.DtoModels.SecondLoadDto.OverrideMode">
<summary>
数据加载方式：0 保存，1 上次，2 字典
</summary>
</member>
<member name="P:Performance.DtoModels.SelectionOptions.SelectionID"> <member name="P:Performance.DtoModels.SelectionOptions.SelectionID">
<summary> <summary>
ID ID
...@@ -3842,24 +4010,29 @@ ...@@ -3842,24 +4010,29 @@
数据集合 数据集合
</summary> </summary>
</member> </member>
<member name="T:Performance.DtoModels.TitleValue`1"> <member name="T:Performance.DtoModels.TitleValue`2">
<summary> <summary>
title value title value
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.TitleValue`1.Title"> <member name="P:Performance.DtoModels.TitleValue`2.Title">
<summary> <summary>
Title Title
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.TitleValue`1.Value"> <member name="P:Performance.DtoModels.TitleValue`2.Value">
<summary> <summary>
Value Value
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.TitleValue`1.State"> <member name="P:Performance.DtoModels.TitleValue`2.State">
<summary> <summary>
1、已选，2、未选，3、已被选择 存储数据
</summary>
</member>
<member name="T:Performance.DtoModels.TitleValue`1">
<summary>
title value
</summary> </summary>
</member> </member>
<member name="T:Performance.DtoModels.TitleValue"> <member name="T:Performance.DtoModels.TitleValue">
......
performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs
...@@ -235,10 +235,13 @@ public AutoMapperConfigs() ...@@ -235,10 +235,13 @@ public AutoMapperConfigs()
CreateMap<HistoryData, report_original_surgery>() CreateMap<HistoryData, report_original_surgery>()
.ForMember(dest => dest.PersonTime, opt => opt.MapFrom(src => src.ResultData)) .ForMember(dest => dest.PersonTime, opt => opt.MapFrom(src => src.ResultData))
.ReverseMap(); .ReverseMap();
}
public void xx() CreateMap<cost_transfer, CostTransferResponse>(
{ ).ForMember(back => back.Items, n => n.Ignore());
CreateMap<cost_transfer, cost_transfer>(
).ForMember(back => back.Id, n => n.Ignore());
CreateMap<ag_headsource, SecPrintHeaderResponse>().ReverseMap();
} }
} }
} }
performance/Performance.DtoModels/Enum.cs
...@@ -65,8 +65,8 @@ public enum AllotStates ...@@ -65,8 +65,8 @@ public enum AllotStates
/// <summary> 正在生成绩效 </summary> /// <summary> 正在生成绩效 </summary>
[Description("正在生成绩效")] [Description("正在生成绩效")]
InGenerate = 5, InGenerate = 5,
/// <summary> 绩效结果通过审核，允许下发 </summary> /// <summary> 绩效下发 </summary>
[Description("数据验证通过")] [Description("绩效下发")]
GenerateSucceed = 6, GenerateSucceed = 6,
/// <summary> 绩效解析失败 </summary> /// <summary> 绩效解析失败 </summary>
[Description("绩效解析失败")] [Description("绩效解析失败")]
...@@ -74,7 +74,7 @@ public enum AllotStates ...@@ -74,7 +74,7 @@ public enum AllotStates
/// <summary> 归档 </summary> /// <summary> 归档 </summary>
[Description("归档")] [Description("归档")]
Archive = 8, Archive = 8,
/// <summary> 归档 </summary> /// <summary> 等待 </summary>
[Description("等待")] [Description("等待")]
Wait = 9, Wait = 9,
/// <summary> 绩效结果解析成功 </summary> /// <summary> 绩效结果解析成功 </summary>
......
performance/Performance.DtoModels/HandsonTable.cs
...@@ -13,13 +13,13 @@ public HandsonTableBase() ...@@ -13,13 +13,13 @@ public HandsonTableBase()
ColHeaders = new List<string>(); ColHeaders = new List<string>();
Columns = new List<HandsonColumn>(); Columns = new List<HandsonColumn>();
Data = new List<Dictionary<string, object>>(); Data = new List<Dictionary<string, object>>();
NestedHeadersArray = new List<List<string>>(); NestedHeadersArray = new object[] { };
} }
public List<string> ColHeaders { get; set; } public List<string> ColHeaders { get; set; }
public List<Dictionary<string, object>> Data { get; set; } public List<Dictionary<string, object>> Data { get; set; }
public List<HandsonColumn> Columns { get; set; } public List<HandsonColumn> Columns { get; set; }
public List<List<string>> NestedHeadersArray { get; set; } public object[] NestedHeadersArray { get; set; }
} }
public class HandsonTable : HandsonTableBase public class HandsonTable : HandsonTableBase
...@@ -185,4 +185,17 @@ public HandsonCellData(string name, object value) ...@@ -185,4 +185,17 @@ public HandsonCellData(string name, object value)
public string Name { get; set; } public string Name { get; set; }
public object Value { get; set; } public object Value { get; set; }
} }
public class NestedHeader
{
public NestedHeader(string label, int colspan)
{
Label = label;
Colspan = colspan;
}
public string Label { get; set; }
public int Colspan { get; set; }
}
} }
performance/Performance.DtoModels/PerExcel/ExcelEnum.cs
...@@ -195,6 +195,10 @@ public enum SheetType ...@@ -195,6 +195,10 @@ public enum SheetType
/// <summary> 自定义抽取模板 </summary> /// <summary> 自定义抽取模板 </summary>
[Description("自定义抽取模板")] [Description("自定义抽取模板")]
Custom = 101, Custom = 101,
/// <summary> 抽取数据，不写入 </summary>
[Description("抽取数据，不写入")]
OnlyExtract = 102,
} }
/// <summary> /// <summary>
......
performance/Performance.DtoModels/Request/CostTransferItemRequest.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Text;
namespace Performance.DtoModels
{
public class CostTransferItemRequest
{
public string Category { get; set; }
public string Source { get; set; }
public decimal? Ratio { get; set; }
public decimal? Amount { get; set; }
public decimal? CalculationAmount { get; set; }
public int IsUseRatio { get; set; }
public string ApplicationRemark { get; set; }
}
}
performance/Performance.DtoModels/Request/CostTransferRequest.cs 0 → 100644
using Performance.EntityModels;
using System;
using System.Collections.Generic;
using System.Text;
namespace Performance.DtoModels
{
public class CostTransferRequest
{
public int AllotId { get; set; }
public DepartmentDetail Applicant { get; set; }
public DepartmentDetail Adopted { get; set; }
public List<CostTransferItemRequest> Items { get; set; }
}
public class DepartmentDetail
{
public string UnitType { get; set; }
public string Department { get; set; }
}
public class CostTransferUpdateRequest : CostTransferRequest
{
public int TransferId { get; set; }
public new List<cost_transfer_item> Items { get; set; }
}
public class AuditRequest
{
public int AllotId { get; set; }
public int[] TransferItemId { get; set; }
public int Status { get; set; }
public string Remake { get; set; }
}
}
performance/Performance.DtoModels/Request/DrugtypeFactorRequest.cs 0 → 100644
using System.Collections.Generic;
namespace Performance.DtoModels
{
public class DrugtypeFactorRequest
{
public int HospitalId { get; set; }
public int AllotId { get; set; }
public List<Dictionary<string, object>> Data { get; set; }
}
}
performance/Performance.DtoModels/Request/WorkloadRequest.cs
...@@ -51,6 +51,11 @@ public class WorkloadRequest ...@@ -51,6 +51,11 @@ public class WorkloadRequest
/// 是否是单项奖励 /// 是否是单项奖励
/// </summary> /// </summary>
public bool IsSingleAwards { get; set; } public bool IsSingleAwards { get; set; }
/// <summary>
/// 工作量带出HIS来源
/// </summary>
public string SourceCategory { get; set; }
} }
public class WorkloadRequestValidator : AbstractValidator<WorkloadRequest> public class WorkloadRequestValidator : AbstractValidator<WorkloadRequest>
{ {
......
performance/Performance.DtoModels/Response/CostTransferResponse.cs 0 → 100644
using Performance.EntityModels;
using System;
using System.Collections.Generic;
using System.Text;
namespace Performance.DtoModels
{
public class CostTransferResponse
{
public int Id { get; set; }
/// <summary>
///
/// </summary>
public int AllotId { get; set; }
/// <summary>
/// 申请者核算单元类型
/// </summary>
public string ApplicantUnitType { get; set; }
/// <summary>
/// 申请者科室
/// </summary>
public string ApplicantDepartment { get; set; }
/// <summary>
/// 审核者核算单元类型
/// </summary>
public string AdoptedUnitType { get; set; }
/// <summary>
/// 审核者科室
/// </summary>
public string AdoptedDepartment { get; set; }
/// <summary>
/// 0 未审核 1 部分审核 2 全部审核
/// </summary>
public int Status { get; set; }
public int AdminStatus { get; set; }
public decimal AmountSum { get; set; }
public List<Option> Items { get; set; }
}
public class CommonResponse
{
public string deparment { get; set; }
public string unitType { get; set; }
public List<TitleValue> account { get; set; }
public List<Common> Data { get; set; }
}
public class Common
{
public string Source { get; set; }
public string Category { get; set; }
public decimal? Ratio { get; set; }
}
public class Option : cost_transfer_item
{
public string[] options { get; set; }
public string ApplicantDepartment { get; set; }
public string AdoptedDepartment { get; set; }
}
}
performance/Performance.DtoModels/Response/SecPrintResponse.cs
...@@ -61,4 +61,62 @@ public class SecPrintResponse ...@@ -61,4 +61,62 @@ public class SecPrintResponse
public int RowNumber { get; set; } public int RowNumber { get; set; }
} }
public class SecPrintHeaderResponse
{
/// <summary>
/// 可分配绩效
/// </summary>
public decimal TotalPerformance { get; set; }
/// <summary>
/// 科室总绩效
/// </summary>
public decimal TotalDistPerformance { get; set; }
/// <summary>
/// 科室单项奖励
/// </summary>
public decimal TheTotalAllocationOfPerformanceResults { get; set; }
/// <summary>
/// 主任基础绩效
/// </summary>
public decimal DirectorBasisPerformance { get; set; }
/// <summary>
/// 夜班绩效总和
/// </summary>
public decimal NightShiftWorkPerforTotal { get; set; }
/// <summary>
/// 医院其他绩效
/// </summary>
public decimal HosOtherPerformance { get; set; }
/// <summary>
/// 年资职称绩效占比
/// </summary>
public decimal SeniorityTitlesAccountedPerformance { get; set; }
/// <summary>
/// 年资职称绩效
/// </summary>
public decimal SeniorityTitlesPerformance { get; set; }
/// <summary>
/// 工作量绩效占比
/// </summary>
public decimal Workload_Ratio_Default { get; set; }
/// <summary>
/// 工作量分配绩效金额
/// </summary>
public decimal Workload_Amount_Default { get; set; }
/// <summary>
/// 其他工作量占比
/// </summary>
public List<TitleValue<decimal>> WorkloadTypes { get; set; }
}
} }
performance/Performance.DtoModels/Response/TransferReportResponse.cs 0 → 100644
using Performance.EntityModels;
using System;
using System.Collections.Generic;
using System.Text;
namespace Performance.DtoModels
{
public class TransferReportResponse
{
public List<Transfer> Transfers { get; set; }
public List<TransferItem> Items { get; set; }
}
public class Transfer
{
public string ApplicantUnitType { get; set; }
public string ApplicantDepartment { get; set; }
public decimal? AmountSum { get; set; }
public string AdoptedUnitType { get; set; }
public string AdoptedDepartment { get; set; }
public decimal? PassAmountSum { get; set; }
}
public class TransferItem : cost_transfer_item
{
public string ApplicantUnitType { get; set; }
public string ApplicantDepartment { get; set; }
public string AdoptedUnitType { get; set; }
public string AdoptedDepartment { get; set; }
}
}
performance/Performance.DtoModels/ResponseType.cs
...@@ -14,5 +14,6 @@ public enum ResponseType ...@@ -14,5 +14,6 @@ public enum ResponseType
ParameterError = 6, ParameterError = 6,
Disable = 7, Disable = 7,
TooManyRequests = 8, TooManyRequests = 8,
Warning = 9,
} }
} }
performance/Performance.DtoModels/Second/Constant.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace Performance.DtoModels.Second
{
/// <summary>
/// 二次分配计算方式
/// </summary>
public enum ComputeMode
{
/// <summary>
/// 填报(不计算)
/// </summary>
[Description("填报")]
NotCalculate = 11,
/// <summary>
/// 横向计算
/// </summary>
[Description("横向计算")]
Horizontal = 12,
/// <summary>
/// 纵向计算
/// </summary>
[Description("纵向计算")]
Vertical = 13,
}
}
performance/Performance.DtoModels/Second/SecondBaseDto.cs 0 → 100644
namespace Performance.DtoModels
{
public class SecondBaseDto
{
public int SecondId { get; set; }
/// <summary>
/// 计算方式：11 不计算 12 横向计算 13 纵向计算
/// </summary>
public int ComputeMode { get; set; }
}
}
performance/Performance.DtoModels/Second/SecondColumnDictionary.cs 0 → 100644
namespace Performance.DtoModels
{
public class SecondColumnDictionary
{
/// <summary>
/// 描述
/// </summary>
public string Label { get; set; }
/// <summary>
/// 主键
/// </summary>
public string Key { get; set; }
/// <summary>
/// 是否显示 true显示
/// </summary>
public bool IsTrue { get; set; }
/// <summary>
/// 宽度
/// </summary>
public string Width { get; set; }
/// <summary>
/// 排序
/// </summary>
public int Sort { get; set; }
/// <summary>
/// 位置 Top、Table
/// </summary>
public string Site { get; set; }
/// <summary>
/// 类型 单项奖励：SingleAwards，工作量：Workload
/// </summary>
public string Type { get; set; }
/// <summary>
/// 颜色class名称
/// </summary>
public string Color { get; set; }
public SecondColumnDictionary()
{
}
public SecondColumnDictionary(string label, string key, bool isTrue, int sort, string site = "Table", string type = "", string color = "", int? width = null)
{
Label = label;
Key = key;
IsTrue = isTrue;
Sort = sort;
Site = site;
Type = type;
Color = color;
Width = width.HasValue ? width.ToString() : ((label ?? "").Length * 20 + 10).ToString();
}
}
}
performance/Performance.DtoModels/Second/SecondComputeCheckResultDto.cs 0 → 100644
namespace Performance.DtoModels
{
public class SecondComputeCheckResultDto
{
public SecondComputeCheckResultDto(string level, string personnelNumber, string personnelName, string message)
{
Level = level;
PersonnelNumber = personnelNumber;
PersonnelName = personnelName;
Message = message;
}
public string Level { get; set; }
public string PersonnelNumber { get; set; }
public string PersonnelName { get; set; }
public string Message { get; set; }
}
}
performance/Performance.DtoModels/Second/SecondComputeDto.cs 0 → 100644
using System.Collections.Generic;
namespace Performance.DtoModels
{
public class SecondComputeDto : SecondLoadDto
{
public Dictionary<string, object> Head { get; set; }
public List<Dictionary<string, object>> Body { get; set; }
}
}
performance/Performance.DtoModels/Second/SecondDetailDto.cs 0 → 100644
using System.Collections.Generic;
namespace Performance.DtoModels
{
public class SecondDetailDto
{
public object Head { get; set; }
public HandsonTableBase Body { get; set; }
public List<SecondColumnDictionary> Dic { get; set; }
}
}
performance/Performance.DtoModels/Second/SecondEmployeeDto.cs 0 → 100644
namespace Performance.DtoModels
{
public class SecondEmployeeDto : PersonParamsRequest
{
public int SecondId { get; set; }
/// <summary>
/// 计算方式：11 不计算 12 横向计算 13 纵向计算
/// </summary>
public int ComputeMode { get; set; }
}
}
performance/Performance.DtoModels/Second/SecondLoadDto.cs 0 → 100644
namespace Performance.DtoModels
{
public class SecondLoadDto : SecondBaseDto
{
/// <summary>
/// 数据加载方式：0 保存，1 上次，2 字典
/// </summary>
public int OverrideMode { get; set; }
}
}
performance/Performance.DtoModels/Second/SecondWorkLoadDto.cs 0 → 100644
using System;
using System.Collections.Generic;
namespace Performance.DtoModels
{
public class SecondWorkLoadDto
{
public SecondWorkLoadDto(string name)
{
Name = name;
Unit_Price = 0m;
Items = new List<string>();
AssessmentScore = $"AssessmentScore_{Name}";
WorkPerformance = $"WorkPerformance_{Name}";
WorkloadScore = $"WorkloadScore_{Name}";
}
public string AssessmentScore { get; set; }
public string WorkPerformance { get; set; }
public string WorkloadScore { get; set; }
public decimal Unit_Price { get; set; }
public List<string> Items { get; set; }
public string Name { get; set; }
public void AddItem(string name)
{
if (!Items.Contains(name))
Items.Add(name);
}
}
}
performance/Performance.DtoModels/TitleValue.cs
...@@ -7,7 +7,7 @@ namespace Performance.DtoModels ...@@ -7,7 +7,7 @@ namespace Performance.DtoModels
/// <summary> /// <summary>
/// title value /// title value
/// </summary> /// </summary>
public class TitleValue<T> public class TitleValue<TV, TS>
{ {
/// <summary> /// <summary>
/// Title /// Title
...@@ -16,11 +16,17 @@ public class TitleValue<T> ...@@ -16,11 +16,17 @@ public class TitleValue<T>
/// <summary> /// <summary>
/// Value /// Value
/// </summary> /// </summary>
public T Value { get; set; } public TV Value { get; set; }
/// <summary> /// <summary>
/// 1、已选，2、未选，3、已被选择 /// 存储数据
/// </summary> /// </summary>
public int State { get; set; } public TS State { get; set; }
}
/// <summary>
/// title value
/// </summary>
public class TitleValue<T> : TitleValue<T, int>
{
} }
/// <summary> /// <summary>
/// title value /// title value
......
performance/Performance.EntityModels/Entity/Sys_User.cs
...@@ -7,70 +7,70 @@ ...@@ -7,70 +7,70 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Table("sys_user")] [Table("sys_user")]
public class sys_user public class sys_user
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
public Nullable<DateTime> CreateDate { get; set; } public Nullable<DateTime> CreateDate { get; set; }
/// <summary> /// <summary>
/// 创建人 /// 创建人
/// </summary> /// </summary>
public Nullable<int> CreateUser { get; set; } public Nullable<int> CreateUser { get; set; }
/// <summary> /// <summary>
/// 真实名称 /// 真实名称
/// </summary> /// </summary>
public string RealName { get; set; } public string RealName { get; set; }
/// <summary> /// <summary>
/// 手机号 /// 手机号
/// </summary> /// </summary>
public string Mobile { get; set; } public string Mobile { get; set; }
/// <summary> /// <summary>
/// 登录名称 /// 登录名称
/// </summary> /// </summary>
public string Login { get; set; } public string Login { get; set; }
/// <summary> /// <summary>
/// 密码 /// 密码
/// </summary> /// </summary>
public string Password { get; set; } public string Password { get; set; }
/// <summary> /// <summary>
/// 邮箱 /// 邮箱
/// </summary> /// </summary>
public string Mail { get; set; } public string Mail { get; set; }
/// <summary> /// <summary>
/// 用户状态 1启用 2禁用 /// 用户状态 1启用 2禁用
/// </summary> /// </summary>
public Nullable<int> States { get; set; } public Nullable<int> States { get; set; }
/// <summary> /// <summary>
/// 用户科室 /// 用户科室
/// </summary> /// </summary>
public string Department { get; set; } public string Department { get; set; }
/// <summary> /// <summary>
/// 删除状态 1可用 2删除 /// 删除状态 1可用 2删除
/// </summary> /// </summary>
public Nullable<int> IsDelete { get; set; } public Nullable<int> IsDelete { get; set; }
/// <summary> /// <summary>
/// 父级ID /// 父级ID
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/ag_againsituation.cs
...@@ -7,80 +7,80 @@ ...@@ -7,80 +7,80 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 二次分配概览 /// 二次分配概览
/// </summary> /// </summary>
[Table("ag_againsituation")] [Table("ag_againsituation")]
public class ag_againsituation public class ag_againsituation
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AllotID { get; set; } public Nullable<int> AllotID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AgainAllotID { get; set; } public Nullable<int> AgainAllotID { get; set; }
/// <summary> /// <summary>
/// 夜班费 /// 夜班费
/// </summary> /// </summary>
public Nullable<decimal> NightShift { get; set; } public Nullable<decimal> NightShift { get; set; }
/// <summary> /// <summary>
/// 科室总绩效 /// 科室总绩效
/// </summary> /// </summary>
public Nullable<decimal> DepartmentTotal { get; set; } public Nullable<decimal> DepartmentTotal { get; set; }
/// <summary> /// <summary>
/// 护士长或科主任基础绩效 /// 护士长或科主任基础绩效
/// </summary> /// </summary>
public Nullable<decimal> BossPerfor { get; set; } public Nullable<decimal> BossPerfor { get; set; }
/// <summary> /// <summary>
/// 重点奖励 /// 重点奖励
/// </summary> /// </summary>
public Nullable<decimal> Award { get; set; } public Nullable<decimal> Award { get; set; }
/// <summary> /// <summary>
/// 管理津贴 /// 管理津贴
/// </summary> /// </summary>
public Nullable<decimal> Allowance { get; set; } public Nullable<decimal> Allowance { get; set; }
/// <summary> /// <summary>
/// 业绩分配绩效 /// 业绩分配绩效
/// </summary> /// </summary>
public Nullable<decimal> AllotPerfor { get; set; } public Nullable<decimal> AllotPerfor { get; set; }
/// <summary> /// <summary>
/// 职称绩效 /// 职称绩效
/// </summary> /// </summary>
public Nullable<decimal> JobPerfor { get; set; } public Nullable<decimal> JobPerfor { get; set; }
/// <summary> /// <summary>
/// 工作量绩效 /// 工作量绩效
/// </summary> /// </summary>
public Nullable<decimal> WorkloadPerfor { get; set; } public Nullable<decimal> WorkloadPerfor { get; set; }
/// <summary> /// <summary>
/// 单独核算人员绩效 /// 单独核算人员绩效
/// </summary> /// </summary>
public decimal AlonePerfor { get; set; } public decimal AlonePerfor { get; set; }
/// <summary> /// <summary>
/// 出勤 /// 出勤
/// </summary> /// </summary>
public Nullable<decimal> Attendance { get; set; } public Nullable<decimal> Attendance { get; set; }
/// <summary> /// <summary>
/// 科室系数人均 /// 科室系数人均
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/ag_bodysource.cs
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 二次绩效保存数据 /// 二次绩效保存数据
/// </summary> /// </summary>
[Table("ag_bodysource")] [Table("ag_bodysource")]
public class ag_bodysource public class ag_bodysource
{ {
/// <summary> /// <summary>
/// ///
...@@ -72,24 +72,34 @@ public class ag_bodysource ...@@ -72,24 +72,34 @@ public class ag_bodysource
public Nullable<decimal> TitleCoefficient { get; set; } public Nullable<decimal> TitleCoefficient { get; set; }
/// <summary> /// <summary>
/// 职称绩效 /// 职称绩效得分
/// </summary> /// </summary>
public Nullable<decimal> TitlePerformance { get; set; } public Nullable<decimal> TitlePerformanceScore { get; set; }
/// <summary> /// <summary>
/// 管理津贴 /// 职称绩效
/// </summary> /// </summary>
public Nullable<decimal> ManagementAllowance { get; set; } public Nullable<decimal> TitlePerformance { get; set; }
/// <summary> /// <summary>
/// 单项奖励 /// 工作量绩效
/// </summary> /// </summary>
public Nullable<decimal> IndividualReward { get; set; } public Nullable<decimal> WorkPerformance { get; set; }
/// <summary> ///// <summary>
/// 重点专科分配 ///// 管理津贴
/// </summary> ///// </summary>
public Nullable<decimal> AllocationOfKeySpecialty { get; set; } //public Nullable<decimal> ManagementAllowance { get; set; }
///// <summary>
///// 单项奖励
///// </summary>
//public Nullable<decimal> IndividualReward { get; set; }
///// <summary>
///// 重点专科分配
///// </summary>
//public Nullable<decimal> AllocationOfKeySpecialty { get; set; }
/// <summary> /// <summary>
/// 科室单项奖励 /// 科室单项奖励
...@@ -117,7 +127,7 @@ public class ag_bodysource ...@@ -117,7 +127,7 @@ public class ag_bodysource
public Nullable<decimal> NightWorkPerformance { get; set; } public Nullable<decimal> NightWorkPerformance { get; set; }
/// <summary> /// <summary>
/// 实发绩效工资金额 /// 实发绩效(不含医院其他绩效)
/// </summary> /// </summary>
public Nullable<decimal> RealAmount { get; set; } public Nullable<decimal> RealAmount { get; set; }
...@@ -135,5 +145,15 @@ public class ag_bodysource ...@@ -135,5 +145,15 @@ public class ag_bodysource
/// 预留金额 /// 预留金额
/// </summary> /// </summary>
public Nullable<decimal> ReservedAmount { get; set; } public Nullable<decimal> ReservedAmount { get; set; }
/// <summary>
/// 实发绩效(参考，含医院其他绩效)
/// </summary>
public Nullable<decimal> ReferToRealAmount { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
} }
} }
performance/Performance.EntityModels/Entity/ag_compute.cs
...@@ -7,75 +7,75 @@ ...@@ -7,75 +7,75 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 二次绩效结果表 /// 二次绩效结果表
/// </summary> /// </summary>
[Table("ag_compute")] [Table("ag_compute")]
public class ag_compute public class ag_compute
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// 绩效ID /// 绩效ID
/// </summary> /// </summary>
public Nullable<int> AllotId { get; set; } public Nullable<int> AllotId { get; set; }
/// <summary> /// <summary>
/// 二次绩效ID /// 二次绩效ID
/// </summary> /// </summary>
public Nullable<int> SecondId { get; set; } public Nullable<int> SecondId { get; set; }
/// <summary> /// <summary>
/// 科室类型 /// 科室类型
/// </summary> /// </summary>
public string UnitType { get; set; } public string UnitType { get; set; }
/// <summary> /// <summary>
/// 科室 /// 科室
/// </summary> /// </summary>
public string Department { get; set; } public string Department { get; set; }
/// <summary> /// <summary>
/// 职称 /// 职称
/// </summary> /// </summary>
public string WorkPost { get; set; } public string WorkPost { get; set; }
/// <summary> /// <summary>
/// 工号 /// 工号
/// </summary> /// </summary>
public string JobNumber { get; set; } public string JobNumber { get; set; }
/// <summary> /// <summary>
/// 人员名称 /// 人员名称
/// </summary> /// </summary>
public string PersonName { get; set; } public string PersonName { get; set; }
/// <summary> /// <summary>
/// 可分配绩效 /// 可分配绩效
/// </summary> /// </summary>
public Nullable<decimal> PerforSumFee { get; set; } public Nullable<decimal> PerforSumFee { get; set; }
/// <summary> /// <summary>
/// 管理绩效 /// 管理绩效
/// </summary> /// </summary>
public Nullable<decimal> PerforManagementFee { get; set; } public Nullable<decimal> PerforManagementFee { get; set; }
/// <summary> /// <summary>
/// 医院其他绩效 /// 医院其他绩效
/// </summary> /// </summary>
public Nullable<decimal> OthePerfor { get; set; } public Nullable<decimal> OthePerfor { get; set; }
/// <summary> /// <summary>
/// 夜班工作量绩效 /// 夜班工作量绩效
/// </summary> /// </summary>
public Nullable<decimal> NightWorkPerfor { get; set; } public Nullable<decimal> NightWorkPerfor { get; set; }
/// <summary> /// <summary>
/// 实发金额 /// 实发金额
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/ag_data.cs
...@@ -7,70 +7,70 @@ ...@@ -7,70 +7,70 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 二次分配不固定数据 /// 二次分配不固定数据
/// </summary> /// </summary>
[Table("ag_data")] [Table("ag_data")]
public class ag_data public class ag_data
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AllotID { get; set; } public Nullable<int> AllotID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AgainAllotID { get; set; } public Nullable<int> AgainAllotID { get; set; }
/// <summary> /// <summary>
/// 行号 /// 行号
/// </summary> /// </summary>
public Nullable<int> RowNumber { get; set; } public Nullable<int> RowNumber { get; set; }
/// <summary> /// <summary>
/// 列头类型名称 /// 列头类型名称
/// </summary> /// </summary>
public string TypeName { get; set; } public string TypeName { get; set; }
/// <summary> /// <summary>
/// 单元格value /// 单元格value
/// </summary> /// </summary>
public Nullable<decimal> CellValue { get; set; } public Nullable<decimal> CellValue { get; set; }
/// <summary> /// <summary>
/// 1 汇总 2原始数据 /// 1 汇总 2原始数据
/// </summary> /// </summary>
public Nullable<int> IsTotal { get; set; } public Nullable<int> IsTotal { get; set; }
/// <summary> /// <summary>
/// 是否带入系数计算 1 带入 2 不带入 /// 是否带入系数计算 1 带入 2 不带入
/// </summary> /// </summary>
public Nullable<int> IsFactor { get; set; } public Nullable<int> IsFactor { get; set; }
/// <summary> /// <summary>
/// 系数值 /// 系数值
/// </summary> /// </summary>
public Nullable<decimal> FactorValue { get; set; } public Nullable<decimal> FactorValue { get; set; }
/// <summary> /// <summary>
/// 单元格注释 /// 单元格注释
/// </summary> /// </summary>
public string Annotation { get; set; } public string Annotation { get; set; }
/// <summary> /// <summary>
/// 单元格备注 /// 单元格备注
/// </summary> /// </summary>
public string Remark { get; set; } public string Remark { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/ag_employee.cs
...@@ -7,100 +7,100 @@ ...@@ -7,100 +7,100 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 二次分配人员名单 /// 二次分配人员名单
/// </summary> /// </summary>
[Table("ag_employee")] [Table("ag_employee")]
public class ag_employee public class ag_employee
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AllotID { get; set; } public Nullable<int> AllotID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AgainAllotID { get; set; } public Nullable<int> AgainAllotID { get; set; }
/// <summary> /// <summary>
/// 行号 /// 行号
/// </summary> /// </summary>
public Nullable<int> RowNumber { get; set; } public Nullable<int> RowNumber { get; set; }
/// <summary> /// <summary>
/// 姓名 /// 姓名
/// </summary> /// </summary>
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// 职务 /// 职务
/// </summary> /// </summary>
public string JobTitle { get; set; } public string JobTitle { get; set; }
/// <summary> /// <summary>
/// 职称系数 /// 职称系数
/// </summary> /// </summary>
public Nullable<decimal> JobFactor { get; set; } public Nullable<decimal> JobFactor { get; set; }
/// <summary> /// <summary>
/// 出勤 /// 出勤
/// </summary> /// </summary>
public Nullable<decimal> Attendance { get; set; } public Nullable<decimal> Attendance { get; set; }
/// <summary> /// <summary>
/// 年资 /// 年资
/// </summary> /// </summary>
public Nullable<decimal> YearFactor { get; set; } public Nullable<decimal> YearFactor { get; set; }
/// <summary> /// <summary>
/// 重点奖励 /// 重点奖励
/// </summary> /// </summary>
public Nullable<decimal> Award { get; set; } public Nullable<decimal> Award { get; set; }
/// <summary> /// <summary>
/// 管理津贴 /// 管理津贴
/// </summary> /// </summary>
public Nullable<decimal> Allowance { get; set; } public Nullable<decimal> Allowance { get; set; }
/// <summary> /// <summary>
/// 单独核算人员绩效 /// 单独核算人员绩效
/// </summary> /// </summary>
public Nullable<decimal> AlonePerfor { get; set; } public Nullable<decimal> AlonePerfor { get; set; }
/// <summary> /// <summary>
/// 夜班费 /// 夜班费
/// </summary> /// </summary>
public Nullable<decimal> NightShift { get; set; } public Nullable<decimal> NightShift { get; set; }
/// <summary> /// <summary>
/// 职称出勤系数(需计算) /// 职称出勤系数(需计算)
/// </summary> /// </summary>
public Nullable<decimal> JobAttendanceFactor { get; set; } public Nullable<decimal> JobAttendanceFactor { get; set; }
/// <summary> /// <summary>
/// 年资出勤系数(需计算) /// 年资出勤系数(需计算)
/// </summary> /// </summary>
public Nullable<decimal> YearAttendanceFactor { get; set; } public Nullable<decimal> YearAttendanceFactor { get; set; }
/// <summary> /// <summary>
/// 职称出勤绩效(需计算) /// 职称出勤绩效(需计算)
/// </summary> /// </summary>
public Nullable<decimal> JobAttendancePerfor { get; set; } public Nullable<decimal> JobAttendancePerfor { get; set; }
/// <summary> /// <summary>
/// 应发绩效(需计算) /// 应发绩效(需计算)
/// </summary> /// </summary>
public Nullable<decimal> GiveFee { get; set; } public Nullable<decimal> GiveFee { get; set; }
/// <summary> /// <summary>
/// 实发绩效(需计算) /// 实发绩效(需计算)
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/ag_fixatitem.cs
...@@ -7,70 +7,70 @@ ...@@ -7,70 +7,70 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 二次绩效固定项 /// 二次绩效固定项
/// </summary> /// </summary>
[Table("ag_fixatitem")] [Table("ag_fixatitem")]
public class ag_fixatitem public class ag_fixatitem
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AllotId { get; set; } public Nullable<int> AllotId { get; set; }
/// <summary> /// <summary>
/// 二次绩效ID /// 二次绩效ID
/// </summary> /// </summary>
public Nullable<int> SecondId { get; set; } public Nullable<int> SecondId { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string UnitType { get; set; } public string UnitType { get; set; }
/// <summary> /// <summary>
/// 行号 /// 行号
/// </summary> /// </summary>
public Nullable<int> RowNumber { get; set; } public Nullable<int> RowNumber { get; set; }
/// <summary> /// <summary>
/// 项目名 /// 项目名
/// </summary> /// </summary>
public string ItemName { get; set; } public string ItemName { get; set; }
/// <summary> /// <summary>
/// 值 /// 值
/// </summary> /// </summary>
public string ItemValue { get; set; } public string ItemValue { get; set; }
/// <summary> /// <summary>
/// 系数 /// 系数
/// </summary> /// </summary>
public Nullable<decimal> FactorValue { get; set; } public Nullable<decimal> FactorValue { get; set; }
/// <summary> /// <summary>
/// 排序 /// 排序
/// </summary> /// </summary>
public Nullable<decimal> Sort { get; set; } public Nullable<decimal> Sort { get; set; }
/// <summary> /// <summary>
/// 字段类型 1 顶部概况 2 表格固定 3 工作量 /// 字段类型 1 顶部概况 2 表格固定 3 工作量
/// </summary> /// </summary>
public Nullable<int> Type { get; set; } public Nullable<int> Type { get; set; }
/// <summary> /// <summary>
/// 1 自动带出 2 计算得出 /// 1 自动带出 2 计算得出
/// </summary> /// </summary>
public Nullable<int> SourceType { get; set; } public Nullable<int> SourceType { get; set; }
/// <summary> /// <summary>
/// 1 value相加值为1 /// 1 value相加值为1
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/ag_header.cs
...@@ -7,70 +7,70 @@ ...@@ -7,70 +7,70 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 二次分配不固定列头数据 /// 二次分配不固定列头数据
/// </summary> /// </summary>
[Table("ag_header")] [Table("ag_header")]
public class ag_header public class ag_header
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AllotID { get; set; } public Nullable<int> AllotID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AgainAllotID { get; set; } public Nullable<int> AgainAllotID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> ParentID { get; set; } public Nullable<int> ParentID { get; set; }
/// <summary> /// <summary>
/// 行坐标 /// 行坐标
/// </summary> /// </summary>
public Nullable<int> PointRow { get; set; } public Nullable<int> PointRow { get; set; }
/// <summary> /// <summary>
/// 列坐标 /// 列坐标
/// </summary> /// </summary>
public Nullable<int> PointCell { get; set; } public Nullable<int> PointCell { get; set; }
/// <summary> /// <summary>
/// 是否合并 1 合并 2 不合并 /// 是否合并 1 合并 2 不合并
/// </summary> /// </summary>
public Nullable<int> IsMerge { get; set; } public Nullable<int> IsMerge { get; set; }
/// <summary> /// <summary>
/// 合并行 /// 合并行
/// </summary> /// </summary>
public Nullable<int> MergeRow { get; set; } public Nullable<int> MergeRow { get; set; }
/// <summary> /// <summary>
/// 合并列 /// 合并列
/// </summary> /// </summary>
public Nullable<int> MergeCell { get; set; } public Nullable<int> MergeCell { get; set; }
/// <summary> /// <summary>
/// 单元格内容 /// 单元格内容
/// </summary> /// </summary>
public string CellValue { get; set; } public string CellValue { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string SignID { get; set; } public string SignID { get; set; }
/// <summary> /// <summary>
/// 1 汇总 2原始数据 /// 1 汇总 2原始数据
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/ag_headsource.cs
...@@ -29,7 +29,7 @@ public class ag_headsource ...@@ -29,7 +29,7 @@ public class ag_headsource
/// <summary> /// <summary>
/// 可分配绩效 /// 可分配绩效
/// </summary> /// </summary>
public Nullable<decimal> TotalPerformance { get; set; } public decimal TotalPerformance { get; set; }
/// <summary> /// <summary>
/// 医院其他绩效 /// 医院其他绩效
...@@ -52,14 +52,19 @@ public class ag_headsource ...@@ -52,14 +52,19 @@ public class ag_headsource
public Nullable<decimal> DirectorBasisPerformance { get; set; } public Nullable<decimal> DirectorBasisPerformance { get; set; }
/// <summary> /// <summary>
/// 科室单项奖励 /// 业绩分配绩效总额
/// </summary> /// </summary>
public Nullable<decimal> TheTotalAllocationOfPerformanceResults { get; set; } public Nullable<decimal> TheTotalAllocationOfPerformanceResults { get; set; }
/// <summary> /// <summary>
/// 业绩分配绩效总额 /// 科室单项奖励
/// </summary> /// </summary>
public Nullable<decimal> BasisPerformance { get; set; } public Nullable<decimal> TotalDeptReward { get; set; }
///// <summary>
///// 业绩分配绩效总额
///// </summary>
//public Nullable<decimal> BasisPerformance { get; set; }
/// <summary> /// <summary>
/// 年资职称绩效占比 /// 年资职称绩效占比
......
performance/Performance.EntityModels/Entity/ag_itemvalue.cs
...@@ -7,35 +7,35 @@ ...@@ -7,35 +7,35 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 科室二次绩效录入内容 /// 科室二次绩效录入内容
/// </summary> /// </summary>
[Table("ag_itemvalue")] [Table("ag_itemvalue")]
public class ag_itemvalue public class ag_itemvalue
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// 绩效Id /// 绩效Id
/// </summary> /// </summary>
public Nullable<int> AllotId { get; set; } public Nullable<int> AllotId { get; set; }
/// <summary> /// <summary>
/// 二次绩效ID /// 二次绩效ID
/// </summary> /// </summary>
public Nullable<int> SecondId { get; set; } public Nullable<int> SecondId { get; set; }
/// <summary> /// <summary>
/// 绩效项来源 1 模板 2 工作量 /// 绩效项来源 1 模板 2 工作量
/// </summary> /// </summary>
public Nullable<int> SourceType { get; set; } public Nullable<int> SourceType { get; set; }
/// <summary> /// <summary>
/// 值 /// 值
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/ag_othersource.cs
...@@ -7,100 +7,100 @@ ...@@ -7,100 +7,100 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 二次绩效其他绩效来源 /// 二次绩效其他绩效来源
/// </summary> /// </summary>
[Table("ag_othersource")] [Table("ag_othersource")]
public class ag_othersource public class ag_othersource
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> SecondId { get; set; } public Nullable<int> SecondId { get; set; }
/// <summary> /// <summary>
/// 工号 /// 工号
/// </summary> /// </summary>
public string WorkNumber { get; set; } public string WorkNumber { get; set; }
/// <summary> /// <summary>
/// 姓名 /// 姓名
/// </summary> /// </summary>
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// 科室 /// 科室
/// </summary> /// </summary>
public string Department { get; set; } public string Department { get; set; }
/// <summary> /// <summary>
/// 职称 /// 职称
/// </summary> /// </summary>
public string WorkPost { get; set; } public string WorkPost { get; set; }
/// <summary> /// <summary>
/// 职称绩效 /// 职称绩效
/// </summary> /// </summary>
public Nullable<decimal> TitlePerformance { get; set; } public Nullable<decimal> TitlePerformance { get; set; }
/// <summary> /// <summary>
/// 工作量绩效工资 /// 工作量绩效工资
/// </summary> /// </summary>
public Nullable<decimal> WorkPerformance { get; set; } public Nullable<decimal> WorkPerformance { get; set; }
/// <summary> /// <summary>
/// 科室单项奖励(只读) /// 科室单项奖励(只读)
/// </summary> /// </summary>
public Nullable<decimal> DeptReward { get; set; } public Nullable<decimal> DeptReward { get; set; }
/// <summary> /// <summary>
/// 可分配绩效 /// 可分配绩效
/// </summary> /// </summary>
public Nullable<decimal> DistPerformance { get; set; } public Nullable<decimal> DistPerformance { get; set; }
/// <summary> /// <summary>
/// 医院其他绩效 /// 医院其他绩效
/// </summary> /// </summary>
public Nullable<decimal> OtherPerformance { get; set; } public Nullable<decimal> OtherPerformance { get; set; }
/// <summary> /// <summary>
/// 夜班工作量绩效 /// 夜班工作量绩效
/// </summary> /// </summary>
public Nullable<decimal> NightWorkPerformance { get; set; } public Nullable<decimal> NightWorkPerformance { get; set; }
/// <summary> /// <summary>
/// 实发绩效工资金额 /// 实发绩效工资金额
/// </summary> /// </summary>
public Nullable<decimal> RealAmount { get; set; } public Nullable<decimal> RealAmount { get; set; }
/// <summary> /// <summary>
/// 预留比例 /// 预留比例
/// </summary> /// </summary>
public Nullable<decimal> ReservedRatio { get; set; } public Nullable<decimal> ReservedRatio { get; set; }
/// <summary> /// <summary>
/// 预留金额 /// 预留金额
/// </summary> /// </summary>
public Nullable<decimal> ReservedAmount { get; set; } public Nullable<decimal> ReservedAmount { get; set; }
/// <summary> /// <summary>
/// 管理津贴 /// 管理津贴
/// </summary> /// </summary>
public Nullable<decimal> ManagementAllowance { get; set; } public Nullable<decimal> ManagementAllowance { get; set; }
/// <summary> /// <summary>
/// 单项奖励 /// 单项奖励
/// </summary> /// </summary>
public Nullable<decimal> IndividualReward { get; set; } public Nullable<decimal> IndividualReward { get; set; }
/// <summary> /// <summary>
/// 重点专科分配 /// 重点专科分配
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/ag_secondallot.cs
...@@ -7,127 +7,128 @@ ...@@ -7,127 +7,128 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 二次绩效列表 /// 二次绩效列表
/// </summary> /// </summary>
[Table("ag_secondallot")] [Table("ag_secondallot")]
public class ag_secondallot public class ag_secondallot
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// 绩效ID /// 绩效ID
/// </summary> /// </summary>
public Nullable<int> AllotId { get; set; } public Nullable<int> AllotId { get; set; }
/// <summary> /// <summary>
/// 使用模板 /// 使用模板
/// </summary> /// </summary>
public Nullable<int> UseTempId { get; set; } public Nullable<int> UseTempId { get; set; }
/// <summary> /// <summary>
/// 科室类型 /// 科室类型
/// </summary> /// </summary>
public string UnitType { get; set; } public string UnitType { get; set; }
/// <summary> /// <summary>
/// 年 /// 年
/// </summary> /// </summary>
public Nullable<int> Year { get; set; } public Nullable<int> Year { get; set; }
/// <summary> /// <summary>
/// 月 /// 月
/// </summary> /// </summary>
public Nullable<int> Month { get; set; } public Nullable<int> Month { get; set; }
/// <summary> /// <summary>
/// 科室 /// 科室
/// </summary> /// </summary>
public string Department { get; set; } public string Department { get; set; }
/// <summary> /// <summary>
/// 科室实发金额 /// 科室实发金额
/// </summary> /// </summary>
public Nullable<decimal> RealGiveFee { get; set; } public Nullable<decimal> RealGiveFee { get; set; }
/// <summary> /// <summary>
/// 效率绩效 /// 效率绩效
/// </summary> /// </summary>
public Nullable<decimal> Efficiency { get; set; } public Nullable<decimal> Efficiency { get; set; }
/// <summary> /// <summary>
/// 规模绩效 /// 规模绩效
/// </summary> /// </summary>
public Nullable<decimal> Scale { get; set; } public Nullable<decimal> Scale { get; set; }
/// <summary> /// <summary>
/// 发放系数 /// 发放系数
/// </summary> /// </summary>
public Nullable<decimal> Grant { get; set; } public Nullable<decimal> Grant { get; set; }
/// <summary> /// <summary>
/// 应发管理绩效 /// 应发管理绩效
/// </summary> /// </summary>
public Nullable<decimal> ShouldGiveFee { get; set; } public Nullable<decimal> ShouldGiveFee { get; set; }
/// <summary> /// <summary>
/// 状态 1 未提交 2 等待审核 3 审核通过 4 驳回 /// 状态 1 未提交 2 等待审核 3 审核通过 4 驳回
/// </summary> /// </summary>
public Nullable<int> Status { get; set; } public Nullable<int> Status { get; set; }
/// <summary> /// <summary>
/// 提交类型 1 使用模板 2 其他类型数据 /// 提交类型 1使用模板 2 其他类型数据
/// </summary> /// </summary>
public Nullable<int> SubmitType { get; set; } public Nullable<int> SubmitType { get; set; }
/// <summary> /// <summary>
/// 提交时间 /// 提交时间
/// </summary> /// </summary>
public Nullable<DateTime> SubmitTime { get; set; } public Nullable<DateTime> SubmitTime { get; set; }
/// <summary> /// <summary>
/// 审核时间 /// 审核时间
/// </summary> /// </summary>
public Nullable<DateTime> AuditTime { get; set; } public Nullable<DateTime> AuditTime { get; set; }
/// <summary> /// <summary>
/// 审核人 /// 审核人
/// </summary> /// </summary>
public Nullable<int> AuditUser { get; set; } public Nullable<int> AuditUser { get; set; }
/// <summary> /// <summary>
/// 备注 /// 备注
/// </summary> /// </summary>
public string Remark { get; set; } public string Remark { get; set; }
/// <summary> /// <summary>
/// 护理部审核时间 /// 护理部审核时间
/// </summary> /// </summary>
public Nullable<DateTime> NursingDeptAuditTime { get; set; } public Nullable<DateTime> NursingDeptAuditTime { get; set; }
/// <summary> /// <summary>
/// 护理部审核人 /// 护理部审核人
/// </summary> /// </summary>
public Nullable<int> NursingDeptAuditUser { get; set; } public Nullable<int> NursingDeptAuditUser { get; set; }
/// <summary> /// <summary>
/// 护理部备注 /// 护理部备注
/// </summary> /// </summary>
public string NursingDeptRemark { get; set; } public string NursingDeptRemark { get; set; }
/// <summary> /// <summary>
/// 护理部审核状态 2 等待审核 3 审核通过 4 驳回 /// 护理部审核状态 2 等待审核 3 审核通过 4 驳回
/// </summary> /// </summary>
public Nullable<int> NursingDeptStatus { get; set; } public Nullable<int> NursingDeptStatus { get; set; }
/// <summary> /// <summary>
/// 夜班绩效 /// 夜班绩效
/// </summary> /// </summary>
public decimal? NightShiftWorkPerforFee { get; set; } public Nullable<decimal> NightShiftWorkPerforFee { get; set; }
} }
} }
performance/Performance.EntityModels/Entity/ag_temp.cs
...@@ -3,34 +3,33 @@ ...@@ -3,34 +3,33 @@
// * FileName: 二次绩效模板.cs // * FileName: 二次绩效模板.cs
// </copyright> // </copyright>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 二次绩效模板 /// 二次绩效模板
/// </summary> /// </summary>
[Table("ag_temp")] [Table("ag_temp")]
public class ag_temp public class ag_temp
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// 模板名称 /// 模板名称
/// </summary> /// </summary>
public string TempName { get; set; } public string TempName { get; set; }
/// <summary> /// <summary>
/// 类型 /// 类型
/// </summary> /// </summary>
public string UnitType { get; set; } public string UnitType { get; set; }
/// <summary> /// <summary>
/// 是否可用 1 可用 2 不可用 /// 是否可用 1 可用 2 不可用
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/ag_tempitem.cs
...@@ -7,55 +7,55 @@ ...@@ -7,55 +7,55 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 二次绩效模板项 /// 二次绩效模板项
/// </summary> /// </summary>
[Table("ag_tempitem")] [Table("ag_tempitem")]
public class ag_tempitem public class ag_tempitem
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// 模板ID /// 模板ID
/// </summary> /// </summary>
public Nullable<int> TempId { get; set; } public Nullable<int> TempId { get; set; }
/// <summary> /// <summary>
/// 字段ID /// 字段ID
/// </summary> /// </summary>
public string FiledId { get; set; } public string FiledId { get; set; }
/// <summary> /// <summary>
/// 字段名称 /// 字段名称
/// </summary> /// </summary>
public string FiledName { get; set; } public string FiledName { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<decimal> Sort { get; set; } public Nullable<decimal> Sort { get; set; }
/// <summary> /// <summary>
/// 字段类型 1 顶部概况 2 表格固定 /// 字段类型 1 顶部概况 2 表格固定
/// </summary> /// </summary>
public Nullable<int> Type { get; set; } public Nullable<int> Type { get; set; }
/// <summary> /// <summary>
/// 1 自动带出 2 计算得出 /// 1 自动带出 2 计算得出
/// </summary> /// </summary>
public Nullable<int> SourceType { get; set; } public Nullable<int> SourceType { get; set; }
/// <summary> /// <summary>
/// 1 带出历史数据 2不带出 /// 1 带出历史数据 2不带出
/// </summary> /// </summary>
public Nullable<int> IsBring { get; set; } public Nullable<int> IsBring { get; set; }
/// <summary> /// <summary>
/// 1 value相加值为1 /// 1 value相加值为1
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/ag_usetemp.cs
...@@ -7,35 +7,35 @@ ...@@ -7,35 +7,35 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Table("ag_usetemp")] [Table("ag_usetemp")]
public class ag_usetemp public class ag_usetemp
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> HospitalId { get; set; } public Nullable<int> HospitalId { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string Department { get; set; } public string Department { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string UnitType { get; set; } public string UnitType { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/ag_workload.cs
...@@ -7,58 +7,63 @@ ...@@ -7,58 +7,63 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 二次绩效工作量绩效 /// 二次绩效工作量绩效
/// </summary> /// </summary>
[Table("ag_workload")] [Table("ag_workload")]
public class ag_workload public class ag_workload
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// 医院ID /// 医院ID
/// </summary> /// </summary>
public Nullable<int> HospitalId { get; set; } public Nullable<int> HospitalId { get; set; }
/// <summary> /// <summary>
/// 科室 /// 科室
/// </summary> /// </summary>
public string Department { get; set; } public string Department { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string UnitType { get; set; } public string UnitType { get; set; }
/// <summary> /// <summary>
/// 工作量考核项ID /// 工作量考核项ID
/// </summary> /// </summary>
public string ItemId { get; set; } public string ItemId { get; set; }
/// <summary> /// <summary>
/// 工作量名称 /// 工作量名称
/// </summary> /// </summary>
public string ItemName { get; set; } public string ItemName { get; set; }
/// <summary> /// <summary>
/// 工作量系数 /// 工作量系数
/// </summary> /// </summary>
public Nullable<decimal> FactorValue { get; set; } public Nullable<decimal> FactorValue { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<decimal> Sort { get; set; } public Nullable<decimal> Sort { get; set; }
/// <summary> /// <summary>
/// 1、单项奖励 2、工作量占比 ..（自定义占比） /// -1、单项奖励 0、工作量占比 ..（自定义占比）
/// </summary> /// </summary>
public int WorkTypeId { get; set; } public int WorkTypeId { get; set; }
/// <summary>
/// 工作量来源类型
/// </summary>
public string SourceCategory { get; set; }
} }
} }
performance/Performance.EntityModels/Entity/ag_workload_source.cs
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// <copyright file=" ag_workload_source.cs"> // <copyright file=" ag_workload_source.cs">
// * FileName: .cs // * FileName: .cs
// </copyright> // </copyright>
...@@ -57,7 +57,7 @@ public class ag_workload_source ...@@ -57,7 +57,7 @@ public class ag_workload_source
public Nullable<decimal> Value { get; set; } public Nullable<decimal> Value { get; set; }
/// <summary> /// <summary>
/// 1、单项奖励 2、工作量占比 ..（自定义占比） /// -1、单项奖励 0、工作量占比 ..（自定义占比）
/// </summary> /// </summary>
public Nullable<int> WorkTypeId { get; set; } public Nullable<int> WorkTypeId { get; set; }
} }
......
performance/Performance.EntityModels/Entity/ag_workload_type.cs
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// <copyright file=" ag_workload_type.cs"> // <copyright file=" ag_workload_type.cs">
// * FileName: .cs // * FileName: 二次绩效工作量绩效分类.cs
// </copyright> // </copyright>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// /// 二次绩效工作量绩效分类
/// </summary> /// </summary>
[Table("ag_workload_type")] [Table("ag_workload_type")]
public class ag_workload_type public class ag_workload_type
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public int HospitalId { get; set; } public int HospitalId { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string TypeName { get; set; } public string TypeName { get; set; }
/// <summary> /// <summary>
/// 科室 /// 科室
/// </summary> /// </summary>
public string Department { get; set; } public string Department { get; set; }
/// <summary> /// <summary>
/// 科室类型 /// 科室类型
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/ag_worktype_source.cs
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// <copyright file=" ag_worktype_source.cs"> // <copyright file=" ag_worktype_source.cs">
// * FileName: ag_worktype_source.cs // * FileName: .cs
// </copyright> // </copyright>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
using System; using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Table("ag_worktype_source")] [Table("ag_worktype_source")]
public class ag_worktype_source public class ag_worktype_source
{ {
/// <summary> /// <summary>
/// ///
......
performance/Performance.EntityModels/Entity/as_assess.cs
...@@ -7,25 +7,25 @@ ...@@ -7,25 +7,25 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 考核类别 /// 考核类别
/// </summary> /// </summary>
[Table("as_assess")] [Table("as_assess")]
public class as_assess public class as_assess
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// 绩效ID /// 绩效ID
/// </summary> /// </summary>
public Nullable<int> AllotID { get; set; } public Nullable<int> AllotID { get; set; }
/// <summary> /// <summary>
/// 考核类别 /// 考核类别
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/as_columns.cs
...@@ -7,40 +7,40 @@ ...@@ -7,40 +7,40 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 考核列头 /// 考核列头
/// </summary> /// </summary>
[Table("as_columns")] [Table("as_columns")]
public class as_columns public class as_columns
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// 考核类别 /// 考核类别
/// </summary> /// </summary>
public Nullable<int> AssessID { get; set; } public Nullable<int> AssessID { get; set; }
/// <summary> /// <summary>
/// 父级列头ID /// 父级列头ID
/// </summary> /// </summary>
public Nullable<int> ParentID { get; set; } public Nullable<int> ParentID { get; set; }
/// <summary> /// <summary>
/// 列头名称 /// 列头名称
/// </summary> /// </summary>
public string ColumnName { get; set; } public string ColumnName { get; set; }
/// <summary> /// <summary>
/// 原始模板ID /// 原始模板ID
/// </summary> /// </summary>
public Nullable<int> TempColumnID { get; set; } public Nullable<int> TempColumnID { get; set; }
/// <summary> /// <summary>
/// 排序 /// 排序
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/as_data.cs
...@@ -7,35 +7,35 @@ ...@@ -7,35 +7,35 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 考核数据 /// 考核数据
/// </summary> /// </summary>
[Table("as_data")] [Table("as_data")]
public class as_data public class as_data
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AllotID { get; set; } public Nullable<int> AllotID { get; set; }
/// <summary> /// <summary>
/// 考核类别ID /// 考核类别ID
/// </summary> /// </summary>
public Nullable<int> AssessID { get; set; } public Nullable<int> AssessID { get; set; }
/// <summary> /// <summary>
/// 科室 /// 科室
/// </summary> /// </summary>
public string Department { get; set; } public string Department { get; set; }
/// <summary> /// <summary>
/// 行数据JSON /// 行数据JSON
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/as_tempassess.cs
...@@ -3,24 +3,23 @@ ...@@ -3,24 +3,23 @@
// * FileName: 考核类别.cs // * FileName: 考核类别.cs
// </copyright> // </copyright>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 考核类别 /// 考核类别
/// </summary> /// </summary>
[Table("as_tempassess")] [Table("as_tempassess")]
public class as_tempassess public class as_tempassess
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// 考核类别 /// 考核类别
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/as_tempcolumns.cs
...@@ -7,35 +7,35 @@ ...@@ -7,35 +7,35 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 考核列头 /// 考核列头
/// </summary> /// </summary>
[Table("as_tempcolumns")] [Table("as_tempcolumns")]
public class as_tempcolumns public class as_tempcolumns
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// 考核类别 /// 考核类别
/// </summary> /// </summary>
public Nullable<int> AssessID { get; set; } public Nullable<int> AssessID { get; set; }
/// <summary> /// <summary>
/// 父级列头ID /// 父级列头ID
/// </summary> /// </summary>
public Nullable<int> ParentID { get; set; } public Nullable<int> ParentID { get; set; }
/// <summary> /// <summary>
/// 列头名称 /// 列头名称
/// </summary> /// </summary>
public string ColumnName { get; set; } public string ColumnName { get; set; }
/// <summary> /// <summary>
/// 排序 /// 排序
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/cof_accounting.cs
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// <copyright file=" cof_accounting.cs"> // <copyright file=" cof_accounting.cs">
// * FileName: .cs // * FileName: .cs
// </copyright> // </copyright>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
......
performance/Performance.EntityModels/Entity/cof_again.cs
...@@ -7,40 +7,40 @@ ...@@ -7,40 +7,40 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Table("cof_again")] [Table("cof_again")]
public class cof_again public class cof_again
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AllotID { get; set; } public Nullable<int> AllotID { get; set; }
/// <summary> /// <summary>
/// 科室 /// 科室
/// </summary> /// </summary>
public string Department { get; set; } public string Department { get; set; }
/// <summary> /// <summary>
/// 1 职称绩效 2 工作量绩效 3 满勤天数 /// 1 职称绩效 2 工作量绩效 3 满勤天数
/// </summary> /// </summary>
public Nullable<int> Type { get; set; } public Nullable<int> Type { get; set; }
/// <summary> /// <summary>
/// 参数名称 /// 参数名称
/// </summary> /// </summary>
public string TypeName { get; set; } public string TypeName { get; set; }
/// <summary> /// <summary>
/// 参数值 /// 参数值
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/cof_alias.cs
using System.ComponentModel.DataAnnotations; //-----------------------------------------------------------------------
// <copyright file=" cof_alias.cs">
// * FileName: 别名配置.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary>
/// 别名配置
/// </summary>
[Table("cof_alias")] [Table("cof_alias")]
public class cof_alias public class cof_alias
{ {
/// <summary>
///
/// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary>
///
/// </summary>
public int HospitalId { get; set; } public int HospitalId { get; set; }
/// <summary>
/// 前端路由地址
/// </summary>
public string Route { get; set; } public string Route { get; set; }
/// <summary>
/// 描述名称
/// </summary>
public string Name { get; set; } public string Name { get; set; }
/// <summary>
/// 原始名
/// </summary>
public string OriginalName { get; set; } public string OriginalName { get; set; }
/// <summary>
/// 别名
/// </summary>
public string Alias { get; set; } public string Alias { get; set; }
public int States { get; set; }
/// <summary>
/// 状态 1 可用 0 禁用
/// </summary>
public Nullable<int> States { get; set; }
} }
} }
performance/Performance.EntityModels/Entity/cof_check.cs
...@@ -7,25 +7,25 @@ ...@@ -7,25 +7,25 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 上传excel文件校验配置 /// 上传excel文件校验配置
/// </summary> /// </summary>
[Table("cof_check")] [Table("cof_check")]
public class cof_check public class cof_check
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// sheet类型。1、无法识别，2、医院人员名单，3、收入，4、其他收入，5、支出，6、加班，7、工作量，8、特殊核算单元，9、临床科室医护绩效测算基础 /// sheet类型。1、无法识别，2、医院人员名单，3、收入，4、其他收入，5、支出，6、加班，7、工作量，8、特殊核算单元，9、临床科室医护绩效测算基础
/// </summary> /// </summary>
public Nullable<int> Type { get; set; } public Nullable<int> Type { get; set; }
/// <summary> /// <summary>
/// 单元格列头名称 /// 单元格列头名称
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/cof_cmi.cs
...@@ -7,35 +7,35 @@ ...@@ -7,35 +7,35 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Table("cof_cmi")] [Table("cof_cmi")]
public class cof_cmi public class cof_cmi
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public int AllotId { get; set; } public int AllotId { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public int UnitType { get; set; } public int UnitType { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string AccountingUnit { get; set; } public string AccountingUnit { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/cof_depttype.cs
...@@ -7,30 +7,30 @@ ...@@ -7,30 +7,30 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 科室类型 /// 科室类型
/// </summary> /// </summary>
[Table("cof_depttype")] [Table("cof_depttype")]
public class cof_depttype public class cof_depttype
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AllotID { get; set; } public Nullable<int> AllotID { get; set; }
/// <summary> /// <summary>
/// 科室 /// 科室
/// </summary> /// </summary>
public string Charge { get; set; } public string Charge { get; set; }
/// <summary> /// <summary>
/// 可是分类 /// 可是分类
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/cof_director.cs
...@@ -7,40 +7,40 @@ ...@@ -7,40 +7,40 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 规模绩效、效率绩效计算系数配置 /// 规模绩效、效率绩效计算系数配置
/// </summary> /// </summary>
[Table("cof_director")] [Table("cof_director")]
public class cof_director public class cof_director
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AllotID { get; set; } public Nullable<int> AllotID { get; set; }
/// <summary> /// <summary>
/// 科室 /// 科室
/// </summary> /// </summary>
public string Department { get; set; } public string Department { get; set; }
/// <summary> /// <summary>
/// 绩效类型 /// 绩效类型
/// </summary> /// </summary>
public string TypeName { get; set; } public string TypeName { get; set; }
/// <summary> /// <summary>
/// 职务名称 /// 职务名称
/// </summary> /// </summary>
public string JobTitle { get; set; } public string JobTitle { get; set; }
/// <summary> /// <summary>
/// 绩效系数 /// 绩效系数
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/cof_drugprop.cs
...@@ -7,35 +7,35 @@ ...@@ -7,35 +7,35 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 工作量门诊药占比系数 /// 工作量门诊药占比系数
/// </summary> /// </summary>
[Table("cof_drugprop")] [Table("cof_drugprop")]
public class cof_drugprop public class cof_drugprop
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AllotID { get; set; } public Nullable<int> AllotID { get; set; }
/// <summary> /// <summary>
/// 药占比最大范围（小于） /// 药占比最大范围（小于）
/// </summary> /// </summary>
public Nullable<decimal> MaxRange { get; set; } public Nullable<decimal> MaxRange { get; set; }
/// <summary> /// <summary>
/// 药占比最小范围（大于等于） /// 药占比最小范围（大于等于）
/// </summary> /// </summary>
public Nullable<decimal> MinRange { get; set; } public Nullable<decimal> MinRange { get; set; }
/// <summary> /// <summary>
/// 药占比对应系数 /// 药占比对应系数
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/cof_drugtype.cs
...@@ -7,19 +7,19 @@ ...@@ -7,19 +7,19 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 药占比费用列头名称 /// 药占比费用列头名称
/// </summary> /// </summary>
[Table("cof_drugtype")] [Table("cof_drugtype")]
public class cof_drugtype public class cof_drugtype
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// ///
...@@ -30,12 +30,12 @@ public class cof_drugtype ...@@ -30,12 +30,12 @@ public class cof_drugtype
/// ///
/// </summary> /// </summary>
public Nullable<int> AllotID { get; set; } public Nullable<int> AllotID { get; set; }
/// <summary> /// <summary>
/// 费用名称 /// 费用名称
/// </summary> /// </summary>
public string Charge { get; set; } public string Charge { get; set; }
/// <summary> /// <summary>
/// 费用类别 /// 费用类别
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/cof_drugtype_factor.cs 0 → 100644
//-----------------------------------------------------------------------
// <copyright file=" cof_drugtype_factor.cs">
// * FileName: 药占比费用列头名称.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels
{
/// <summary>
/// 药占比费用列头名称
/// </summary>
[Table("cof_drugtype_factor")]
public class cof_drugtype_factor
{
/// <summary>
///
/// </summary>
[Key]
public int ID { get; set; }
/// <summary>
///
/// </summary>
public Nullable<int> HospitalId { get; set; }
/// <summary>
///
/// </summary>
public Nullable<int> AllotID { get; set; }
/// <summary>
/// 费用名称
/// </summary>
public string Charge { get; set; }
/// <summary>
/// 收入类型
/// </summary>
public Nullable<int> ExModuleId { get; set; }
/// <summary>
/// 医生组
/// </summary>
public Nullable<decimal> YSZ { get; set; }
/// <summary>
/// 护理组
/// </summary>
public Nullable<decimal> HLZ { get; set; }
/// <summary>
/// 医技组
/// </summary>
public Nullable<decimal> YJZ { get; set; }
}
}
performance/Performance.EntityModels/Entity/cof_guarantee.cs
...@@ -7,40 +7,40 @@ ...@@ -7,40 +7,40 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 保底科室配置 /// 保底科室配置
/// </summary> /// </summary>
[Table("cof_guarantee")] [Table("cof_guarantee")]
public class cof_guarantee public class cof_guarantee
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AllotId { get; set; } public Nullable<int> AllotId { get; set; }
/// <summary> /// <summary>
/// 优先级 /// 优先级
/// </summary> /// </summary>
public Nullable<int> Priority { get; set; } public Nullable<int> Priority { get; set; }
/// <summary> /// <summary>
/// 核算单元类型 1 医生组 2 护理组 3 医技组 /// 核算单元类型 1 医生组 2 护理组 3 医技组
/// </summary> /// </summary>
public Nullable<int> UnitType { get; set; } public Nullable<int> UnitType { get; set; }
/// <summary> /// <summary>
/// 保底科室 /// 保底科室
/// </summary> /// </summary>
public string Target { get; set; } public string Target { get; set; }
/// <summary> /// <summary>
/// 保底来源科室 /// 保底来源科室
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/cof_hrp_department.cs
...@@ -3,39 +3,38 @@ ...@@ -3,39 +3,38 @@
// * FileName: .cs // * FileName: .cs
// </copyright> // </copyright>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Table("cof_hrp_department")] [Table("cof_hrp_department")]
public class cof_hrp_department public class cof_hrp_department
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public int HospitalId { get; set; } public int HospitalId { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public int AllotId { get; set; } public int AllotId { get; set; }
/// <summary> /// <summary>
/// HRP人员科室 /// HRP人员科室
/// </summary> /// </summary>
public string HRPDepartment { get; set; } public string HRPDepartment { get; set; }
/// <summary> /// <summary>
/// 核算单元 /// 核算单元
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/cof_income.cs
...@@ -7,35 +7,35 @@ ...@@ -7,35 +7,35 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// ICU医生护士有效收入汇总计算系数 /// ICU医生护士有效收入汇总计算系数
/// </summary> /// </summary>
[Table("cof_income")] [Table("cof_income")]
public class cof_income public class cof_income
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AllotID { get; set; } public Nullable<int> AllotID { get; set; }
/// <summary> /// <summary>
/// 关键字匹配 /// 关键字匹配
/// </summary> /// </summary>
public string SheetNameKeyword { get; set; } public string SheetNameKeyword { get; set; }
/// <summary> /// <summary>
/// 分组名称（医生、护理） /// 分组名称（医生、护理）
/// </summary> /// </summary>
public string UnitName { get; set; } public string UnitName { get; set; }
/// <summary> /// <summary>
/// 有效收入占比 /// 有效收入占比
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/cof_singlefactor.cs
...@@ -7,40 +7,40 @@ ...@@ -7,40 +7,40 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 特殊绩效项指标 /// 特殊绩效项指标
/// </summary> /// </summary>
[Table("cof_singlefactor")] [Table("cof_singlefactor")]
public class cof_singlefactor public class cof_singlefactor
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// 1 工作量 /// 1 工作量
/// </summary> /// </summary>
public Nullable<int> Type { get; set; } public Nullable<int> Type { get; set; }
/// <summary> /// <summary>
/// 类型名称 /// 类型名称
/// </summary> /// </summary>
public string TypeName { get; set; } public string TypeName { get; set; }
/// <summary> /// <summary>
/// 绩效核算单元 /// 绩效核算单元
/// </summary> /// </summary>
public string AccountingUnit { get; set; } public string AccountingUnit { get; set; }
/// <summary> /// <summary>
/// 绩效项系数 /// 绩效项系数
/// </summary> /// </summary>
public string ItemName { get; set; } public string ItemName { get; set; }
/// <summary> /// <summary>
/// 系数值 /// 系数值
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/cof_workitem.cs
...@@ -7,30 +7,30 @@ ...@@ -7,30 +7,30 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Table("cof_workitem")] [Table("cof_workitem")]
public class cof_workitem public class cof_workitem
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AllotID { get; set; } public Nullable<int> AllotID { get; set; }
/// <summary> /// <summary>
/// 工作量中需做运算的项 /// 工作量中需做运算的项
/// </summary> /// </summary>
public string Item { get; set; } public string Item { get; set; }
/// <summary> /// <summary>
/// 1. 药占比 2. CMI /// 1. 药占比 2. CMI
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/cof_workloadtype.cs
...@@ -7,35 +7,35 @@ ...@@ -7,35 +7,35 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 工作量分类 /// 工作量分类
/// </summary> /// </summary>
[Table("cof_workloadtype")] [Table("cof_workloadtype")]
public class cof_workloadtype public class cof_workloadtype
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AllotID { get; set; } public Nullable<int> AllotID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string SourceType { get; set; } public string SourceType { get; set; }
/// <summary> /// <summary>
/// 名称 /// 名称
/// </summary> /// </summary>
public string Original { get; set; } public string Original { get; set; }
/// <summary> /// <summary>
/// 类别 /// 类别
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/cof_workyear.cs
...@@ -7,35 +7,35 @@ ...@@ -7,35 +7,35 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 工龄对应绩效系数配置 /// 工龄对应绩效系数配置
/// </summary> /// </summary>
[Table("cof_workyear")] [Table("cof_workyear")]
public class cof_workyear public class cof_workyear
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AllotID { get; set; } public Nullable<int> AllotID { get; set; }
/// <summary> /// <summary>
/// 最大工龄范围（小于） /// 最大工龄范围（小于）
/// </summary> /// </summary>
public Nullable<decimal> MaxRange { get; set; } public Nullable<decimal> MaxRange { get; set; }
/// <summary> /// <summary>
/// 最小工龄范围（大于等于） /// 最小工龄范围（大于等于）
/// </summary> /// </summary>
public Nullable<decimal> MinRange { get; set; } public Nullable<decimal> MinRange { get; set; }
/// <summary> /// <summary>
/// 绩效系数 /// 绩效系数
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/collect_data.cs
...@@ -3,79 +3,78 @@ ...@@ -3,79 +3,78 @@
// * FileName: .cs // * FileName: .cs
// </copyright> // </copyright>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Table("collect_data")] [Table("collect_data")]
public class collect_data public class collect_data
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public int AllotID { get; set; } public int AllotID { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string SheetName { get; set; } public string SheetName { get; set; }
/// <summary> /// <summary>
/// 核算单元类别 1 医生组 2护理组 3医技组 /// 核算单元类别 1 医生组 2护理组 3医技组
/// </summary> /// </summary>
public string UnitType { get; set; } public string UnitType { get; set; }
/// <summary> /// <summary>
/// 行号 /// 行号
/// </summary> /// </summary>
public int RowNumber { get; set; } public int RowNumber { get; set; }
/// <summary> /// <summary>
/// 人员姓名 /// 人员姓名
/// </summary> /// </summary>
public string EmployeeName { get; set; } public string EmployeeName { get; set; }
/// <summary> /// <summary>
/// 人员工号 /// 人员工号
/// </summary> /// </summary>
public string JobNumber { get; set; } public string JobNumber { get; set; }
/// <summary> /// <summary>
/// 核算单元名称医技 /// 核算单元名称医技
/// </summary> /// </summary>
public string AccountingUnitTechnician { get; set; } public string AccountingUnitTechnician { get; set; }
/// <summary> /// <summary>
/// 核算单元名称护士 /// 核算单元名称护士
/// </summary> /// </summary>
public string AccountingUnitNurse { get; set; } public string AccountingUnitNurse { get; set; }
/// <summary> /// <summary>
/// 核算单元名称医生 /// 核算单元名称医生
/// </summary> /// </summary>
public string AccountingUnitDoctor { get; set; } public string AccountingUnitDoctor { get; set; }
/// <summary> /// <summary>
/// 科室名称 /// 科室名称
/// </summary> /// </summary>
public string Department { get; set; } public string Department { get; set; }
/// <summary> /// <summary>
/// 列头类型名称 /// 列头类型名称
/// </summary> /// </summary>
public string TypeName { get; set; } public string TypeName { get; set; }
/// <summary> /// <summary>
/// 单元格value /// 单元格value
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/collect_permission.cs
...@@ -3,59 +3,58 @@ ...@@ -3,59 +3,58 @@
// * FileName: .cs // * FileName: .cs
// </copyright> // </copyright>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Table("collect_permission")] [Table("collect_permission")]
public class collect_permission public class collect_permission
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public int HospitalId { get; set; } public int HospitalId { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public int UserId { get; set; } public int UserId { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public int SheetType { get; set; } public int SheetType { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string SheetName { get; set; } public string SheetName { get; set; }
/// <summary> /// <summary>
/// 列头名称 /// 列头名称
/// </summary> /// </summary>
public string HeadName { get; set; } public string HeadName { get; set; }
/// <summary> /// <summary>
/// 0 可见 1 只读 /// 0 可见 1 只读
/// </summary> /// </summary>
public int Visible { get; set; } public int Visible { get; set; }
/// <summary> /// <summary>
/// 0 可读可写 1 只读 /// 0 可读可写 1 只读
/// </summary> /// </summary>
public int Readnoly { get; set; } public int Readnoly { get; set; }
/// <summary> /// <summary>
/// 是否附带上次绩效 0 附带 1 不附带 /// 是否附带上次绩效 0 附带 1 不附带
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/cost_transfer.cs 0 → 100644
//-----------------------------------------------------------------------
// <copyright file=" cost_transfer.cs">
// * FileName: .cs
// </copyright>
//-----------------------------------------------------------------------
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels
{
/// <summary>
///
/// </summary>
[Table("cost_transfer")]
public class cost_transfer
{
/// <summary>
///
/// </summary>
[Key]
public int Id { get; set; }
/// <summary>
///
/// </summary>
public int AllotId { get; set; }
/// <summary>
/// 申请者核算单元类型
/// </summary>
public string ApplicantUnitType { get; set; }
/// <summary>
/// 申请者科室
/// </summary>
public string ApplicantDepartment { get; set; }
/// <summary>
/// 审核者核算单元类型
/// </summary>
public string AdoptedUnitType { get; set; }
/// <summary>
/// 审核者科室
/// </summary>
public string AdoptedDepartment { get; set; }
/// <summary>
/// 0 未审核 1 全部通过 2 部分通过 3 全部驳回 4 含有下发驳回
/// </summary>
public int Status { get; set; }
/// <summary>
/// 0 未审核 1 全部通过 2 部分通过 3 全部驳回 4 含有下发驳回
/// </summary>
public int AdminStatus { get; set; }
}
}
performance/Performance.EntityModels/Entity/cost_transfer_item.cs 0 → 100644
//-----------------------------------------------------------------------
// <copyright file=" cost_transfer_item.cs">
// * FileName: .cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels
{
/// <summary>
///
/// </summary>
[Table("cost_transfer_item")]
public class cost_transfer_item
{
/// <summary>
///
/// </summary>
[Key]
public int Id { get; set; }
/// <summary>
///
/// </summary>
public int TransferId { get; set; }
/// <summary>
/// 来源，sheet名称
/// </summary>
public string Source { get; set; }
/// <summary>
/// 费用类型
/// </summary>
public string Category { get; set; }
/// <summary>
/// 金额
/// </summary>
public Nullable<decimal> Amount { get; set; }
/// <summary>
/// 分割比例
/// </summary>
public Nullable<decimal> Ratio { get; set; }
/// <summary>
/// 实际金额
/// </summary>
public Nullable<decimal> CalculationAmount { get; set; }
/// <summary>
/// 是否使用分割比例
/// </summary>
public int IsUseRatio { get; set; }
/// <summary>
/// 申请理由
/// </summary>
public string ApplicationRemark { get; set; }
/// <summary>
/// 科室备注
/// </summary>
public string DepartmentRemark { get; set; }
/// <summary>
/// 管理员备注
/// </summary>
public string AdminRemark { get; set; }
/// <summary>
/// 0 默认 1 通过 2 驳回 3 下发驳回 4 撤回
/// </summary>
public int Status { get; set; }
/// <summary>
/// 0 默认 1 通过 2 驳回 3 下发驳回 4 撤回
/// </summary>
public int AdminStatus { get; set; }
/// <summary>
/// 数据是否被写入
/// </summary>
public int IsWrited { get; set; }
}
}
performance/Performance.EntityModels/Entity/cust_script.cs
...@@ -3,54 +3,53 @@ ...@@ -3,54 +3,53 @@
// * FileName: 自定义导出.cs // * FileName: 自定义导出.cs
// </copyright> // </copyright>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// 自定义导出 /// 自定义导出
/// </summary> /// </summary>
[Table("cust_script")] [Table("cust_script")]
public class cust_script public class cust_script
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// 医院ID /// 医院ID
/// </summary> /// </summary>
public int HospitalId { get; set; } public int HospitalId { get; set; }
/// <summary> /// <summary>
/// 是否允许一次分配下载 1 允许 2 禁止 /// 是否允许一次分配下载 1 允许 2 禁止
/// </summary> /// </summary>
public int IsOnceAllot { get; set; } public int IsOnceAllot { get; set; }
/// <summary> /// <summary>
/// 是否允许二次分配下载 1 允许 2 禁止 /// 是否允许二次分配下载 1 允许 2 禁止
/// </summary> /// </summary>
public int IsSecondAllot { get; set; } public int IsSecondAllot { get; set; }
/// <summary> /// <summary>
/// 名称 /// 名称
/// </summary> /// </summary>
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string Script { get; set; } public string Script { get; set; }
/// <summary> /// <summary>
/// 配置Id /// 配置Id
/// </summary> /// </summary>
public int ConfigId { get; set; } public int ConfigId { get; set; }
/// <summary> /// <summary>
/// 是否可用 1 可用 2 不可用 /// 是否可用 1 可用 2 不可用
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/ex_item.cs
...@@ -7,55 +7,55 @@ ...@@ -7,55 +7,55 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Table("ex_item")] [Table("ex_item")]
public class ex_item public class ex_item
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> ModuleId { get; set; } public Nullable<int> ModuleId { get; set; }
/// <summary> /// <summary>
/// 绩效考核项 /// 绩效考核项
/// </summary> /// </summary>
public string ItemName { get; set; } public string ItemName { get; set; }
/// <summary> /// <summary>
/// 默认系数或医生系数 /// 默认系数或医生系数
/// </summary> /// </summary>
public Nullable<decimal> FactorValue1 { get; set; } public Nullable<decimal> FactorValue1 { get; set; }
/// <summary> /// <summary>
/// 护理系数 /// 护理系数
/// </summary> /// </summary>
public Nullable<decimal> FactorValue2 { get; set; } public Nullable<decimal> FactorValue2 { get; set; }
/// <summary> /// <summary>
/// 医技系数 /// 医技系数
/// </summary> /// </summary>
public Nullable<decimal> FactorValue3 { get; set; } public Nullable<decimal> FactorValue3 { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> TypeId { get; set; } public Nullable<int> TypeId { get; set; }
/// <summary> /// <summary>
/// 数据库地址 /// 数据库地址
/// </summary> /// </summary>
public Nullable<int> ConfigId { get; set; } public Nullable<int> ConfigId { get; set; }
/// <summary> /// <summary>
/// 只读 0、否 1、是 /// 只读 0、否 1、是
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/ex_module.cs
...@@ -7,50 +7,50 @@ ...@@ -7,50 +7,50 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Table("ex_module")] [Table("ex_module")]
public class ex_module public class ex_module
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> HospitalId { get; set; } public Nullable<int> HospitalId { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> SheetType { get; set; } public Nullable<int> SheetType { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string ModuleName { get; set; } public string ModuleName { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string Description { get; set; } public string Description { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> TypeId { get; set; } public Nullable<int> TypeId { get; set; }
/// <summary> /// <summary>
/// 数据库地址 /// 数据库地址
/// </summary> /// </summary>
public Nullable<int> ConfigId { get; set; } public Nullable<int> ConfigId { get; set; }
/// <summary> /// <summary>
/// 只读 0、否 1、是 /// 只读 0、否 1、是
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/ex_result.cs
...@@ -7,70 +7,70 @@ ...@@ -7,70 +7,70 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Table("ex_result")] [Table("ex_result")]
public class ex_result public class ex_result
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public int AllotId { get; set; } public int AllotId { get; set; }
/// <summary> /// <summary>
/// 科室 /// 科室
/// </summary> /// </summary>
public string Department { get; set; } public string Department { get; set; }
/// <summary> /// <summary>
/// 医生姓名 /// 医生姓名
/// </summary> /// </summary>
public string DoctorName { get; set; } public string DoctorName { get; set; }
/// <summary> /// <summary>
/// 人员工号 /// 人员工号
/// </summary> /// </summary>
public string PersonnelNumber { get; set; } public string PersonnelNumber { get; set; }
/// <summary> /// <summary>
/// 费用类型 /// 费用类型
/// </summary> /// </summary>
public string Category { get; set; } public string Category { get; set; }
/// <summary> /// <summary>
/// 费用 /// 费用
/// </summary> /// </summary>
public Nullable<decimal> Fee { get; set; } public Nullable<decimal> Fee { get; set; }
/// <summary> /// <summary>
/// 来源 /// 来源
/// </summary> /// </summary>
public string Source { get; set; } public string Source { get; set; }
/// <summary> /// <summary>
/// 数据库类型1、Sql Server 2、Orcale /// 数据库类型1、Sql Server 2、Orcale
/// </summary> /// </summary>
public int DatabaseType { get; set; } public int DatabaseType { get; set; }
/// <summary> /// <summary>
/// 数据库配置Id /// 数据库配置Id
/// </summary> /// </summary>
public int ConfigId { get; set; } public int ConfigId { get; set; }
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
public Nullable<DateTime> CreateTime { get; set; } public Nullable<DateTime> CreateTime { get; set; }
/// <summary> /// <summary>
/// 1 删除 0 未删除 /// 1 删除 0 未删除
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/ex_script.cs
...@@ -3,44 +3,43 @@ ...@@ -3,44 +3,43 @@
// * FileName: .cs // * FileName: .cs
// </copyright> // </copyright>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Table("ex_script")] [Table("ex_script")]
public class ex_script public class ex_script
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// 执行sql /// 执行sql
/// </summary> /// </summary>
public string ExecScript { get; set; } public string ExecScript { get; set; }
/// <summary> /// <summary>
/// 数据库类型1、Sql Server 2、Orcale /// 数据库类型1、Sql Server 2、Orcale
/// </summary> /// </summary>
public int DatabaseType { get; set; } public int DatabaseType { get; set; }
/// <summary> /// <summary>
/// ExTypeId /// ExTypeId
/// </summary> /// </summary>
public int TypeId { get; set; } public int TypeId { get; set; }
/// <summary> /// <summary>
/// 配置Id /// 配置Id
/// </summary> /// </summary>
public int ConfigId { get; set; } public int ConfigId { get; set; }
/// <summary> /// <summary>
/// 是否可用 1 可用 2 不可用 /// 是否可用 1 可用 2 不可用
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/ex_special.cs
...@@ -7,50 +7,50 @@ ...@@ -7,50 +7,50 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Table("ex_special")] [Table("ex_special")]
public class ex_special public class ex_special
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> HospitalId { get; set; } public Nullable<int> HospitalId { get; set; }
/// <summary> /// <summary>
/// 科室 /// 科室
/// </summary> /// </summary>
public string Department { get; set; } public string Department { get; set; }
/// <summary> /// <summary>
/// 量化指标 /// 量化指标
/// </summary> /// </summary>
public string Target { get; set; } public string Target { get; set; }
/// <summary> /// <summary>
/// 量化指标绩效分值 /// 量化指标绩效分值
/// </summary> /// </summary>
public Nullable<decimal> TargetFactor { get; set; } public Nullable<decimal> TargetFactor { get; set; }
/// <summary> /// <summary>
/// 调节系数 /// 调节系数
/// </summary> /// </summary>
public Nullable<decimal> AdjustFactor { get; set; } public Nullable<decimal> AdjustFactor { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> TypeId { get; set; } public Nullable<int> TypeId { get; set; }
/// <summary> /// <summary>
/// 数据库地址 /// 数据库地址
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/ex_type.cs
...@@ -3,39 +3,38 @@ ...@@ -3,39 +3,38 @@
// * FileName: .cs // * FileName: .cs
// </copyright> // </copyright>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Table("ex_type")] [Table("ex_type")]
public class ex_type public class ex_type
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// 医院Id /// 医院Id
/// </summary> /// </summary>
public int HospitalId { get; set; } public int HospitalId { get; set; }
/// <summary> /// <summary>
/// 名称 /// 名称
/// </summary> /// </summary>
public string EName { get; set; } public string EName { get; set; }
/// <summary> /// <summary>
/// 描述 /// 描述
/// </summary> /// </summary>
public string Description { get; set; } public string Description { get; set; }
/// <summary> /// <summary>
/// 来源 /// 来源
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/his_data.cs
...@@ -7,90 +7,90 @@ ...@@ -7,90 +7,90 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Table("his_data")] [Table("his_data")]
public class his_data public class his_data
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public int HospitalId { get; set; } public int HospitalId { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public int AllotId { get; set; } public int AllotId { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public int Year { get; set; } public int Year { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public int Month { get; set; } public int Month { get; set; }
/// <summary> /// <summary>
/// His科室 /// His科室
/// </summary> /// </summary>
public string HisDepartment { get; set; } public string HisDepartment { get; set; }
/// <summary> /// <summary>
/// 核算单元 /// 核算单元
/// </summary> /// </summary>
public string AccountingUnit { get; set; } public string AccountingUnit { get; set; }
/// <summary> /// <summary>
/// 科室 /// 科室
/// </summary> /// </summary>
public string Department { get; set; } public string Department { get; set; }
/// <summary> /// <summary>
/// 医生姓名 /// 医生姓名
/// </summary> /// </summary>
public string PersonnelName { get; set; } public string PersonnelName { get; set; }
/// <summary> /// <summary>
/// 人员工号 /// 人员工号
/// </summary> /// </summary>
public string PersonnelNumber { get; set; } public string PersonnelNumber { get; set; }
/// <summary> /// <summary>
/// 来源 /// 来源
/// </summary> /// </summary>
public string SourceType { get; set; } public string SourceType { get; set; }
/// <summary> /// <summary>
/// 费用类型 /// 费用类型
/// </summary> /// </summary>
public string Category { get; set; } public string Category { get; set; }
/// <summary> /// <summary>
/// 原始分类 /// 原始分类
/// </summary> /// </summary>
public string Original { get; set; } public string Original { get; set; }
/// <summary> /// <summary>
/// 标准分类 /// 标准分类
/// </summary> /// </summary>
public string ItemName { get; set; } public string ItemName { get; set; }
/// <summary> /// <summary>
/// 费用 /// 费用
/// </summary> /// </summary>
public Nullable<decimal> Value { get; set; } public Nullable<decimal> Value { get; set; }
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/his_import_account.cs
...@@ -7,60 +7,60 @@ ...@@ -7,60 +7,60 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Table("his_import_account")] [Table("his_import_account")]
public class his_import_account public class his_import_account
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// 医院ID /// 医院ID
/// </summary> /// </summary>
public int HospitalId { get; set; } public int HospitalId { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AllotId { get; set; } public Nullable<int> AllotId { get; set; }
/// <summary> /// <summary>
/// 绩效发放年 /// 绩效发放年
/// </summary> /// </summary>
public int Year { get; set; } public int Year { get; set; }
/// <summary> /// <summary>
/// 绩效发放月 /// 绩效发放月
/// </summary> /// </summary>
public int Month { get; set; } public int Month { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string UnitType { get; set; } public string UnitType { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string AccountingUnit { get; set; } public string AccountingUnit { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<decimal> Number { get; set; } public Nullable<decimal> Number { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<decimal> RealGiveFee { get; set; } public Nullable<decimal> RealGiveFee { get; set; }
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/his_import_baiscnorm.cs
...@@ -7,60 +7,60 @@ ...@@ -7,60 +7,60 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Table("his_import_baiscnorm")] [Table("his_import_baiscnorm")]
public class his_import_baiscnorm public class his_import_baiscnorm
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> HospitalId { get; set; } public Nullable<int> HospitalId { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AllotId { get; set; } public Nullable<int> AllotId { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> Year { get; set; } public Nullable<int> Year { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> Month { get; set; } public Nullable<int> Month { get; set; }
/// <summary> /// <summary>
/// 绩效核算人群 /// 绩效核算人群
/// </summary> /// </summary>
public string PositionName { get; set; } public string PositionName { get; set; }
/// <summary> /// <summary>
/// 绩效总额 /// 绩效总额
/// </summary> /// </summary>
public Nullable<decimal> TotelValue { get; set; } public Nullable<decimal> TotelValue { get; set; }
/// <summary> /// <summary>
/// 人均绩效 /// 人均绩效
/// </summary> /// </summary>
public Nullable<decimal> AvgValue { get; set; } public Nullable<decimal> AvgValue { get; set; }
/// <summary> /// <summary>
/// 总人数 /// 总人数
/// </summary> /// </summary>
public Nullable<decimal> TotelNumber { get; set; } public Nullable<decimal> TotelNumber { get; set; }
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/his_import_clinic.cs
...@@ -7,75 +7,75 @@ ...@@ -7,75 +7,75 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Table("his_import_clinic")] [Table("his_import_clinic")]
public class his_import_clinic public class his_import_clinic
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// 医院ID /// 医院ID
/// </summary> /// </summary>
public int HospitalId { get; set; } public int HospitalId { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AllotId { get; set; } public Nullable<int> AllotId { get; set; }
/// <summary> /// <summary>
/// 绩效发放年 /// 绩效发放年
/// </summary> /// </summary>
public int Year { get; set; } public int Year { get; set; }
/// <summary> /// <summary>
/// 绩效发放月 /// 绩效发放月
/// </summary> /// </summary>
public int Month { get; set; } public int Month { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string UnitType { get; set; } public string UnitType { get; set; }
/// <summary> /// <summary>
/// 核算单元类型（医技科室、临床科室等） /// 核算单元类型（医技科室、临床科室等）
/// </summary> /// </summary>
public string AccountType { get; set; } public string AccountType { get; set; }
/// <summary> /// <summary>
/// 核算单元 /// 核算单元
/// </summary> /// </summary>
public string AccountingUnit { get; set; } public string AccountingUnit { get; set; }
/// <summary> /// <summary>
/// 工号 /// 工号
/// </summary> /// </summary>
public string JobNumber { get; set; } public string JobNumber { get; set; }
/// <summary> /// <summary>
/// 人员姓名 /// 人员姓名
/// </summary> /// </summary>
public string EmployeeName { get; set; } public string EmployeeName { get; set; }
/// <summary> /// <summary>
/// 基础绩效系数 /// 基础绩效系数
/// </summary> /// </summary>
public Nullable<decimal> Basics { get; set; } public Nullable<decimal> Basics { get; set; }
/// <summary> /// <summary>
/// 实发绩效 /// 实发绩效
/// </summary> /// </summary>
public Nullable<decimal> RealGiveFee { get; set; } public Nullable<decimal> RealGiveFee { get; set; }
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
......
performance/Performance.EntityModels/Entity/his_importdata.cs
...@@ -7,85 +7,85 @@ ...@@ -7,85 +7,85 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels namespace Performance.EntityModels
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Table("his_importdata")] [Table("his_importdata")]
public class his_importdata public class his_importdata
{ {
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
[Key] [Key]
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// 医院ID /// 医院ID
/// </summary> /// </summary>
public int HospitalId { get; set; } public int HospitalId { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public Nullable<int> AllotId { get; set; } public Nullable<int> AllotId { get; set; }
/// <summary> /// <summary>
/// 年 /// 年
/// </summary> /// </summary>
public int Year { get; set; } public int Year { get; set; }
/// <summary> /// <summary>
/// 月 /// 月
/// </summary> /// </summary>
public int Month { get; set; } public int Month { get; set; }
/// <summary> /// <summary>
/// 科室核算单元 /// 科室核算单元
/// </summary> /// </summary>
public string AccountingUnit { get; set; } public string AccountingUnit { get; set; }
/// <summary> /// <summary>
/// 科室 /// 科室
/// </summary> /// </summary>
public string Department { get; set; } public string Department { get; set; }
/// <summary> /// <summary>
/// 医生姓名 /// 医生姓名
/// </summary> /// </summary>
public string PersonnelName { get; set; } public string PersonnelName { get; set; }
/// <summary> /// <summary>
/// 人员工号 /// 人员工号
/// </summary> /// </summary>
public string PersonnelNumber { get; set; } public string PersonnelNumber { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string SourceType { get; set; } public string SourceType { get; set; }
/// <summary> /// <summary>
/// 一级分类 /// 一级分类
/// </summary> /// </summary>
public string Category { get; set; } public string Category { get; set; }
/// <summary> /// <summary>
/// 原始分类 /// 原始分类
/// </summary> /// </summary>
public string Original { get; set; } public string Original { get; set; }
/// <summary> /// <summary>
/// 二级分类 /// 二级分类
/// </summary> /// </summary>
public string ItemName { get; set; } public string ItemName { get; set; }
/// <summary> /// <summary>
/// 值 /// 值
/// </summary> /// </summary>
public Nullable<decimal> Value { get; set; } public Nullable<decimal> Value { get; set; }
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
......
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