Skip to content

P
performance
Commit cba3328a by lcx
Options

人员/科室信息编辑

parent edd8bc96
Showing with 597 additions and 15 deletions
performance/Performance.Api/Controllers/PersonController.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Performance.DtoModels;
using Performance.EntityModels;
using Performance.Services;
namespace Performance.Api.Controllers
{
[Route("api")]
[ApiController]
public class PersonController : Controller
{
private readonly PersonService personService;
private readonly ClaimService claimService;
public PersonController(PersonService personService, ClaimService claimService)
{
this.personService = personService;
this.claimService = claimService;
}
/// <summary>
/// 获取所有员工记录
/// </summary>
/// <param name="allotId"></param>
/// <returns></returns>
[Route("person/list/{allotId}")]
[HttpPost]
public ApiResponse GetPersons(int allotId)
{
var list = personService.GetPersons(allotId);
return new ApiResponse(ResponseType.OK, list);
}
/// <summary>
/// 新增员工信息
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[Route("person/add")]
[HttpPost]
public ApiResponse CreatePerson([FromBody] per_employee request)
{
request.CreateUser = claimService.GetUserId();
var employeee = personService.CreatePerson(request);
return employeee.Id > 0 ? new ApiResponse(ResponseType.OK, "添加成功！", employeee)
: new ApiResponse(ResponseType.Fail, "添加失败！");
}
/// <summary>
/// 修改员工信息
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[Route("person/edit")]
[HttpPost]
public ApiResponse UpdatePerson([FromBody] per_employee request)
{
var result = personService.UpdatePerson(request);
return result ? new ApiResponse(ResponseType.OK, "修改成功！")
: new ApiResponse(ResponseType.OK, "修改失败！");
}
/// <summary>
/// 删除员工
/// </summary>
/// <param name="employeeId"></param>
/// <returns></returns>
[Route("person/delete/{employeeId}")]
[HttpPost]
public ApiResponse DeletePerson(int employeeId)
{
var result = personService.DeletePerson(employeeId);
return result ? new ApiResponse(ResponseType.OK, "删除成功！")
: new ApiResponse(ResponseType.OK, "删除失败！");
}
/// <summary>
/// 获取所有科室记录
/// </summary>
/// <param name="hospitalId"></param>
/// <returns></returns>
[Route("deptdic/list/{hospitalId}")]
[HttpPost]
public ApiResponse GetDepartments(int hospitalId)
{
var list = personService.GetPersons(hospitalId);
return new ApiResponse(ResponseType.OK, list);
}
/// <summary>
/// 新增科室信息
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[Route("deptdic/add")]
[HttpPost]
public ApiResponse CreateDeptDic([FromBody] per_dept_dic request)
{
request.CreateUser = claimService.GetUserId();
var employeee = personService.CreateDeptDic(request);
return employeee.Id > 0 ? new ApiResponse(ResponseType.OK, "添加成功！", employeee)
: new ApiResponse(ResponseType.Fail, "添加失败！");
}
/// <summary>
/// 修改科室信息
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[Route("deptdic/edit")]
[HttpPost]
public ApiResponse UpdateDeptDic([FromBody] per_dept_dic request)
{
var result = personService.UpdateDeptDic(request);
return result ? new ApiResponse(ResponseType.OK, "修改成功！")
: new ApiResponse(ResponseType.OK, "修改失败！");
}
/// <summary>
/// 删除科室
/// </summary>
/// <param name="deptdicId"></param>
/// <returns></returns>
[Route("deptdic/delete/{deptdicId}")]
[HttpPost]
public ApiResponse DeleteDeptDic(int deptdicId)
{
var result = personService.DeleteDeptDic(deptdicId);
return result ? new ApiResponse(ResponseType.OK, "删除成功！")
: new ApiResponse(ResponseType.OK, "删除失败！");
}
}
}
performance/Performance.Api/wwwroot/Performance.Api.xml
......@@ -789,6 +789,62 @@
</summary>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.PersonController.GetPersons(System.Int32)">
<summary>
获取所有员工记录
</summary>
<param name="allotId"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.PersonController.CreatePerson(Performance.EntityModels.per_employee)">
<summary>
新增员工信息
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.PersonController.UpdatePerson(Performance.EntityModels.per_employee)">
<summary>
修改员工信息
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.PersonController.DeletePerson(System.Int32)">
<summary>
删除员工
</summary>
<param name="employeeId"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.PersonController.GetDepartments(System.Int32)">
<summary>
获取所有科室记录
</summary>
<param name="hospitalId"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.PersonController.CreateDeptDic(Performance.EntityModels.per_dept_dic)">
<summary>
新增科室信息
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.PersonController.UpdateDeptDic(Performance.EntityModels.per_dept_dic)">
<summary>
修改科室信息
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.PersonController.DeleteDeptDic(System.Int32)">
<summary>
删除科室
</summary>
<param name="deptdicId"></param>
<returns></returns>
</member>
<member name="T:Performance.Api.Controllers.ReportController">
<summary>
报表
......
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
......@@ -160,6 +160,12 @@
<member name="P:Performance.EntityModels.PerformanceDbContext.per_budget_result">
<summary> 预算控制年度合计 </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.per_dept_dic">
<summary> 科室字典表 </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.per_employee">
<summary> 绩效人员表 </summary>
</member>
<member name="P:Performance.EntityModels.PerformanceDbContext.per_first">
<summary> 首次上传文件地址（当医院存在标准库时，首次上传用户提交固定格式的excel，开发人员配置SQL脚本） </summary>
</member>
......@@ -1624,7 +1630,7 @@
</member>
<member name="P:Performance.EntityModels.ex_special.TypeId">
<summary>
抽取绩效值SQL
</summary>
</member>
<member name="P:Performance.EntityModels.ex_special.ConfigId">
......@@ -3117,6 +3123,161 @@
</summary>
</member>
<member name="T:Performance.EntityModels.per_dept_dic">
<summary>
科室字典表
</summary>
</member>
<member name="P:Performance.EntityModels.per_dept_dic.Id">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.per_dept_dic.HISDeptName">
<summary>
his系统科室名称
</summary>
</member>
<member name="P:Performance.EntityModels.per_dept_dic.Department">
<summary>
科室
</summary>
</member>
<member name="P:Performance.EntityModels.per_dept_dic.AccountingUnit">
<summary>
核算单元
</summary>
</member>
<member name="P:Performance.EntityModels.per_dept_dic.UnitType">
<summary>
核算单元类型
</summary>
</member>
<member name="P:Performance.EntityModels.per_dept_dic.Source">
<summary>
来源住院/门诊
</summary>
</member>
<member name="P:Performance.EntityModels.per_dept_dic.HospitalId">
<summary>
医院Id
</summary>
</member>
<member name="P:Performance.EntityModels.per_dept_dic.CreateTime">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.per_dept_dic.CreateUser">
<summary>
</summary>
</member>
<member name="T:Performance.EntityModels.per_employee">
<summary>
绩效人员表
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.Id">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.AccountingUnit">
<summary>
核算单元
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.Department">
<summary>
科室
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.DoctorName">
<summary>
姓名
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.PersonnelNumber">
<summary>
员工工号
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.JobCategory">
<summary>
正式/临聘
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.Duty">
<summary>
职务
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.JobTitle">
<summary>
职称
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.UnitType">
<summary>
人员类别
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.AttendanceDay">
<summary>
出勤天数
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.Attendance">
<summary>
出勤率
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.Efficiency">
<summary>
效率绩效
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.WorkTime">
<summary>
参加工作时间
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.BirthDate">
<summary>
出生年月
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.Age">
<summary>
年龄
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.Remark">
<summary>
备注
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.HospitalId">
<summary>
医院Id
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.AllotId">
<summary>
绩效Id
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.CreateTime">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.CreateUser">
<summary>
</summary>
</member>
<member name="T:Performance.EntityModels.per_first">
<summary>
首次上传文件地址（当医院存在标准库时，首次上传用户提交固定格式的excel，开发人员配置SQL脚本）
......
performance/Performance.EntityModels/Entity/ex_result.cs
......@@ -7,50 +7,50 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels
namespace Performance.EntityModels
{
/// <summary>
///
/// </summary>
[Table("ex_result")]
public class ex_result
public class ex_result
{
/// <summary>
///
/// </summary>
[Key]
public int Id { get; set; }
public int Id { get; set; }
/// <summary>
///
/// </summary>
public int AllotId { get; set; }
/// <summary>
/// 科室
/// </summary>
public string Department { get; set; }
/// <summary>
/// 费用类型
/// </summary>
public string Category { get; set; }
/// <summary>
/// 费用
/// </summary>
public Nullable<decimal> Fee { get; set; }
/// <summary>
/// 来源
/// </summary>
public string Source { get; set; }
/// <summary>
/// 数据库类型1、Sql Server 2、Orcale
/// </summary>
public int DatabaseType { get; set; }
/// <summary>
/// 数据库配置Id
/// </summary>
......
performance/Performance.EntityModels/Entity/ex_special.cs
......@@ -47,7 +47,7 @@ public class ex_special
public Nullable<decimal> AdjustFactor { get; set; }
/// <summary>
/// 抽取绩效值SQL
///
/// </summary>
public Nullable<int> TypeId { get; set; }
......
performance/Performance.EntityModels/Entity/per_dept_dic.cs 0 → 100644
//-----------------------------------------------------------------------
// <copyright file=" per_dept_dic.cs">
// * FileName: 科室字典表.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels
{
/// <summary>
/// 科室字典表
/// </summary>
[Table("per_dept_dic")]
public class per_dept_dic
{
/// <summary>
///
/// </summary>
[Key]
public int Id { get; set; }
/// <summary>
/// his系统科室名称
/// </summary>
public string HISDeptName { get; set; }
/// <summary>
/// 科室
/// </summary>
public string Department { get; set; }
/// <summary>
/// 核算单元
/// </summary>
public string AccountingUnit { get; set; }
/// <summary>
/// 核算单元类型
/// </summary>
public string UnitType { get; set; }
/// <summary>
/// 来源住院/门诊
/// </summary>
public string Source { get; set; }
/// <summary>
/// 医院Id
/// </summary>
public Nullable<int> HospitalId { get; set; }
/// <summary>
///
/// </summary>
public Nullable<DateTime> CreateTime { get; set; }
/// <summary>
///
/// </summary>
public Nullable<int> CreateUser { get; set; }
}
}
performance/Performance.EntityModels/Entity/per_employee.cs 0 → 100644
//-----------------------------------------------------------------------
// <copyright file=" per_employee.cs">
// * FileName: 绩效人员表.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels
{
/// <summary>
/// 绩效人员表
/// </summary>
[Table("per_employee")]
public class per_employee
{
/// <summary>
///
/// </summary>
[Key]
public int Id { get; set; }
/// <summary>
/// 核算单元
/// </summary>
public string AccountingUnit { get; set; }
/// <summary>
/// 科室
/// </summary>
public string Department { get; set; }
/// <summary>
/// 姓名
/// </summary>
public string DoctorName { get; set; }
/// <summary>
/// 员工工号
/// </summary>
public string PersonnelNumber { get; set; }
/// <summary>
/// 正式/临聘
/// </summary>
public string JobCategory { get; set; }
/// <summary>
/// 职务
/// </summary>
public string Duty { get; set; }
/// <summary>
/// 职称
/// </summary>
public string JobTitle { get; set; }
/// <summary>
/// 人员类别
/// </summary>
public string UnitType { get; set; }
/// <summary>
/// 出勤天数
/// </summary>
public Nullable<int> AttendanceDay { get; set; }
/// <summary>
/// 出勤率
/// </summary>
public Nullable<decimal> Attendance { get; set; }
/// <summary>
/// 效率绩效
/// </summary>
public Nullable<decimal> Efficiency { get; set; }
/// <summary>
/// 参加工作时间
/// </summary>
public Nullable<DateTime> WorkTime { get; set; }
/// <summary>
/// 出生年月
/// </summary>
public Nullable<DateTime> BirthDate { get; set; }
/// <summary>
/// 年龄
/// </summary>
public Nullable<int> Age { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 医院Id
/// </summary>
public Nullable<int> HospitalId { get; set; }
/// <summary>
/// 绩效Id
/// </summary>
public Nullable<int> AllotId { get; set; }
/// <summary>
///
/// </summary>
public Nullable<DateTime> CreateTime { get; set; }
/// <summary>
///
/// </summary>
public Nullable<int> CreateUser { get; set; }
}
}
performance/Performance.Extract.Api/appsettings.Development.json
......@@ -9,8 +9,8 @@
"AllowedHosts": "*",
//连接字符串
"AppConnection": {
"PerformanceConnectionString": "server=192.168.18.166;database=db_performance;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=116.62.245.55;database=db_xindu;uid=suvalue;pwd=suvalue2017;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;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=116.62.245.55;database=db_performance;uid=bigdata;pwd=Suvalue@abc;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;",
"RedisConnectionString": "116.62.245.55:6379,defaultDatabase=2"
},
......
performance/Performance.Repository/Repository/PerforPerdeptdicRepository.cs 0 → 100644
//-----------------------------------------------------------------------
// <copyright file=" per_dept_dic.cs">
// * FileName: per_dept_dic.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using Performance.EntityModels;
namespace Performance.Repository
{
/// <summary>
/// per_dept_dic Repository
/// </summary>
public partial class PerforPerdeptdicRepository : PerforRepository<per_dept_dic>
{
public PerforPerdeptdicRepository(PerformanceDbContext context) : base(context)
{
}
}
}
performance/Performance.Repository/Repository/PerforPeremployeeRepository.cs 0 → 100644
//-----------------------------------------------------------------------
// <copyright file=" per_employee.cs">
// * FileName: per_employee.cs
// </copyright>
//-----------------------------------------------------------------------
using System;
using Performance.EntityModels;
namespace Performance.Repository
{
/// <summary>
/// per_employee Repository
/// </summary>
public partial class PerforPeremployeeRepository : PerforRepository<per_employee>
{
public PerforPeremployeeRepository(PerformanceDbContext context) : base(context)
{
}
}
}
performance/Performance.Services/ConfigService.cs
......@@ -26,7 +26,8 @@ public class ConfigService : IAutoInjection
private PerforImheaderRepository perforImheaderRepository;
private PerforCofdepttypeRepository perforCofdepttypeRepository;
private PerforPerapramountRepository perapramountRepository;
private readonly LogManageService logManageService;
private PersonService personService;
private LogManageService logManageService;
private ILogger<ConfigService> logger;
public ConfigService(PerforCofdirectorRepository cofdirectorRepository,
......@@ -40,6 +41,7 @@ public class ConfigService : IAutoInjection
PerforImheaderRepository perforImheaderRepository,
PerforCofdepttypeRepository perforCofdepttypeRepository,
PerforPerapramountRepository perapramountRepository,
PersonService personService,
LogManageService logManageService,
ILogger<ConfigService> logger)
{
......@@ -54,6 +56,7 @@ public class ConfigService : IAutoInjection
this.perforImheaderRepository = perforImheaderRepository;
this.perforCofdepttypeRepository = perforCofdepttypeRepository;
this.perapramountRepository = perapramountRepository;
this.personService = personService;
this.logManageService = logManageService;
this.logger = logger;
}
......@@ -562,6 +565,8 @@ public void Copy(per_allot allot)
logger.LogInformation($"apramount{allotId} {allot.ID}");
CopyAprData(allotId, allot.ID);
personService.CreateAllotPersons(allot.HospitalId, allot.ID, allotId);
#region 弃用
//var orgDirector = _directorRepository.GetEntities(t => t.AllotID == allot.ID);
......
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