Skip to content

P
performance
Commit d4d03d68 by lcx
Options

his人员工号

parent 902fd7e5
Showing with 99 additions and 26 deletions
performance/Performance.Api/wwwroot/Performance.Api.xml
...@@ -5,11 +5,24 @@ ...@@ -5,11 +5,24 @@
</assembly> </assembly>
<members> <members>
<member name="M:Performance.Api.Controllers.AccountController.Login(Performance.DtoModels.LoginRequest)"> <member name="M:Performance.Api.Controllers.AccountController.Login(Performance.DtoModels.LoginRequest)">
<summary> <summary>
登录 登录
</summary> </summary>
<param name="request"></param> <remarks>
<returns></returns> Sample request:
POST /Todo
{
"logintype": 2,
"account": "admin",
"password": "1111",
"appname": "string",
"device": "web"
}
</remarks>
<param name="request"></param>
<returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.AccountController.Refresh"> <member name="M:Performance.Api.Controllers.AccountController.Refresh">
<summary> <summary>
...@@ -115,20 +128,6 @@ ...@@ -115,20 +128,6 @@
<param name="form"></param> <param name="form"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.AgainAllotController.DepartmentDetail(Performance.DtoModels.AgainAllotRequest)">
<summary>
查看科室绩效
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.AgainAllotController.Generate(Performance.DtoModels.AgainAllotRequest)">
<summary>
生成绩效
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.AgainAllotController.Detail(Performance.DtoModels.AgainAllotRequest)"> <member name="M:Performance.Api.Controllers.AgainAllotController.Detail(Performance.DtoModels.AgainAllotRequest)">
<summary> <summary>
查看绩效详情 查看绩效详情
...@@ -227,6 +226,12 @@ ...@@ -227,6 +226,12 @@
<param name="request"></param> <param name="request"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.AllotController.Reserved(Performance.DtoModels.ReservedRequest)">
<summary>
获取
</summary>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.BudgetController.Query(Performance.DtoModels.Request.BudgetRequest)"> <member name="M:Performance.Api.Controllers.BudgetController.Query(Performance.DtoModels.Request.BudgetRequest)">
<summary> <summary>
预算管理查询（包含金额、占比） 预算管理查询（包含金额、占比）
...@@ -284,6 +289,13 @@ ...@@ -284,6 +289,13 @@
<param name="id"></param> <param name="id"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.BudgetController.Collect(Performance.DtoModels.Request.BudgetCollectRequest)">
<summary>
统计指定月份绩效信息
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.CollectController.GetCollectContent(System.Int32,System.Int32)"> <member name="M:Performance.Api.Controllers.CollectController.GetCollectContent(System.Int32,System.Int32)">
<summary> <summary>
查询采集内容 查询采集内容
...@@ -372,6 +384,13 @@ ...@@ -372,6 +384,13 @@
<param name="request"></param> <param name="request"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.ComputeController.AllComputeAvg(Performance.DtoModels.ComputerRequest)">
<summary>
获取全院绩效平均
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ComputeController.AllManageCompute(Performance.DtoModels.ComputerRequest)"> <member name="M:Performance.Api.Controllers.ComputeController.AllManageCompute(Performance.DtoModels.ComputerRequest)">
<summary> <summary>
获取全院管理绩效列表 获取全院管理绩效列表
...@@ -687,6 +706,12 @@ ...@@ -687,6 +706,12 @@
<param name="request"></param> <param name="request"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.EmployeeController.AuditResult(Performance.DtoModels.AprAmountAuditRequest)">
<summary>
医院其他绩效审核;驳回、成功
</summary>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.EmployeeController.Import(Microsoft.AspNetCore.Http.IFormCollection)"> <member name="M:Performance.Api.Controllers.EmployeeController.Import(Microsoft.AspNetCore.Http.IFormCollection)">
<summary> <summary>
上传人员绩效文件 上传人员绩效文件
...@@ -837,6 +862,13 @@ ...@@ -837,6 +862,13 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.HistoryController.Import(Microsoft.AspNetCore.Http.IFormCollection)">
<summary>
上传历史绩效数据
</summary>
<param name="form"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.HospitalController.GetHospitalList"> <member name="M:Performance.Api.Controllers.HospitalController.GetHospitalList">
<summary> <summary>
获取当前登录用户管辖医院列表 获取当前登录用户管辖医院列表
...@@ -965,7 +997,7 @@ ...@@ -965,7 +997,7 @@
系统/标准科室字典 系统/标准科室字典
</summary> </summary>
<param name="hospitalId">医院Id</param> <param name="hospitalId">医院Id</param>
<param name="type">1系统科室 2标准科室 3核算单元</param> <param name="type">1系统科室 2标准科室 3核算单元 4行政后勤 5特殊核算组</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.PersonController.DeptWorkloadDetail(Performance.DtoModels.WorkDetailRequest)"> <member name="M:Performance.Api.Controllers.PersonController.DeptWorkloadDetail(Performance.DtoModels.WorkDetailRequest)">
...@@ -974,6 +1006,12 @@ ...@@ -974,6 +1006,12 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.PersonController.DeptIncomeDetail(Performance.DtoModels.WorkDetailRequest)">
<summary>
门诊开单收入详情
</summary>
<returns></returns>
</member>
<member name="T:Performance.Api.Controllers.ReportController"> <member name="T:Performance.Api.Controllers.ReportController">
<summary> <summary>
报表 报表
...@@ -1078,6 +1116,18 @@ ...@@ -1078,6 +1116,18 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.SecondAllotController.AutoComplete(Performance.DtoModels.SecondEmpRequest)">
<summary>
二次绩效录入页面自动补全
</summary>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.SecondAllotController.OtherAutoComplete(Performance.DtoModels.SecondEmpRequest)">
<summary>
二次绩效录入页面其他模板自动补全
</summary>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.SecondAllotController.Temp(Performance.DtoModels.AllotDeptRequest)"> <member name="M:Performance.Api.Controllers.SecondAllotController.Temp(Performance.DtoModels.AllotDeptRequest)">
<summary> <summary>
选择二次绩效模板 选择二次绩效模板
...@@ -1163,6 +1213,18 @@ ...@@ -1163,6 +1213,18 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.SecondAllotController.NursingDeptlist(Performance.DtoModels.AllotDeptRequest)">
<summary>
护理部二次绩效审核列表
</summary>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.SecondAllotController.NursingDeptAuditResult(Performance.DtoModels.SecondAuditRequest)">
<summary>
护理部二次绩效审核结果;驳回、成功
</summary>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.SecondAllotController.OtherList(Performance.DtoModels.AgOtherRequest)"> <member name="M:Performance.Api.Controllers.SecondAllotController.OtherList(Performance.DtoModels.AgOtherRequest)">
<summary> <summary>
二次绩效其他绩效详情 二次绩效其他绩效详情
......
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
...@@ -3630,6 +3630,11 @@ ...@@ -3630,6 +3630,11 @@
</member> </member>
<member name="P:Performance.EntityModels.per_employee.PersonnelNumber"> <member name="P:Performance.EntityModels.per_employee.PersonnelNumber">
<summary> <summary>
员工工号（HIS）
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.JobNumber">
<summary>
员工工号 员工工号
</summary> </summary>
</member> </member>
......
performance/Performance.EntityModels/Entity/per_employee.cs
...@@ -45,12 +45,17 @@ public class per_employee ...@@ -45,12 +45,17 @@ public class per_employee
/// 姓名 /// 姓名
/// </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>
/// 员工工号（HIS）
/// </summary>
public string JobNumber { get; set; }
/// <summary> /// <summary>
/// 正式/临聘 /// 正式/临聘
/// </summary> /// </summary>
......
performance/Performance.Extract.Api/appsettings.Development.json
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
//连接字符串 //连接字符串
"AppConnection": { "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=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=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=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;", //"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;", "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"
......
performance/Performance.Repository/PerforPerAllotRepository.cs
...@@ -165,8 +165,8 @@ public IEnumerable<report_original_workload> QueryWorkloadData(int allotid, stri ...@@ -165,8 +165,8 @@ public IEnumerable<report_original_workload> QueryWorkloadData(int allotid, stri
if (connection.State != ConnectionState.Open) connection.Open(); if (connection.State != ConnectionState.Open) connection.Open();
try try
{ {
string clear = @"SELECT t3.AccountingUnit as Department,t1.DoctorName,t1.PersonnelNumber,t1.Category,t1.Fee FROM ex_result t1 string clear = @"SELECT t3.AccountingUnit as Department,t1.DoctorName,if(ifnull(t2.PersonnelNumber,'')='', t2.JobNumber, t2.PersonnelNumber) PersonnelNumber,t1.Category,t1.Fee FROM ex_result t1
JOIN per_employee t2 on t1.doctorname = t2.doctorname and t1.personnelnumber = t2.personnelnumber JOIN per_employee t2 on t1.doctorname = t2.doctorname and t1.personnelnumber = t2.jobnumber
JOIN (select distinct AccountingUnit,HISDeptName,unittype from per_dept_dic where HospitalId = @hospitalid) t3 ON t1.Department = t3.HISDeptName JOIN (select distinct AccountingUnit,HISDeptName,unittype from per_dept_dic where HospitalId = @hospitalid) t3 ON t1.Department = t3.HISDeptName
WHERE t1.allotid = @allotid WHERE t1.allotid = @allotid
AND t2.allotid = @allotid AND t2.allotid = @allotid
...@@ -195,8 +195,8 @@ public IEnumerable<ex_result> QueryIncomeData(int allotid, string accountingunit ...@@ -195,8 +195,8 @@ public IEnumerable<ex_result> QueryIncomeData(int allotid, string accountingunit
if (connection.State != ConnectionState.Open) connection.Open(); if (connection.State != ConnectionState.Open) connection.Open();
try try
{ {
string clear = @"SELECT t3.AccountingUnit as Department,t1.DoctorName,t1.PersonnelNumber,t1.Category,t1.Fee FROM ex_result t1 string clear = @"SELECT t3.AccountingUnit as Department,t1.DoctorName,if(ifnull(t2.PersonnelNumber,'')='', t2.JobNumber, t2.PersonnelNumber) PersonnelNumber,t1.Category,t1.Fee FROM ex_result t1
JOIN per_employee t2 on t1.doctorname = t2.doctorname and t1.personnelnumber = t2.personnelnumber JOIN per_employee t2 on t1.doctorname = t2.doctorname and t1.personnelnumber = t2.jobnumber
JOIN (select distinct AccountingUnit,HISDeptName,unittype from per_dept_dic where HospitalId = @hospitalid) t3 ON t1.Department = t3.HISDeptName JOIN (select distinct AccountingUnit,HISDeptName,unittype from per_dept_dic where HospitalId = @hospitalid) t3 ON t1.Department = t3.HISDeptName
WHERE t1.allotid = @allotid WHERE t1.allotid = @allotid
AND t2.allotid = @allotid AND t2.allotid = @allotid
......
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