Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
performance
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zry
performance
Commits
c1a948f2
Commit
c1a948f2
authored
Jun 11, 2020
by
lcx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
医院人员分配额外金额,注释部分配置
parent
b412f956
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
340 additions
and
35 deletions
+340
-35
performance/Performance.Api/Controllers/EmployeeController.cs
+75
-8
performance/Performance.Api/wwwroot/Performance.Api.xml
+28
-0
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
+49
-1
performance/Performance.EntityModels/Context/PerformanceDbContext.cs
+2
-0
performance/Performance.EntityModels/Entity/ag_workload_type.cs
+1
-1
performance/Performance.EntityModels/Entity/per_allot.cs
+1
-1
performance/Performance.EntityModels/Entity/per_apr_amount.cs
+59
-0
performance/Performance.Repository/PerforCofdirectorRepository.cs
+50
-5
performance/Performance.Repository/Repository/PerforPerapramountRepository.cs
+20
-0
performance/Performance.Services/ComputeService.cs
+0
-15
performance/Performance.Services/ConfigService.cs
+0
-0
performance/Performance.Services/EmployeeService.cs
+55
-1
performance/Performance.Services/PerExcelService/PerSheetService.cs
+0
-3
No files found.
performance/Performance.Api/Controllers/EmployeeController.cs
View file @
c1a948f2
...
@@ -29,7 +29,7 @@ public EmployeeController(EmployeeService employeeService, ClaimService claim)
...
@@ -29,7 +29,7 @@ public EmployeeController(EmployeeService employeeService, ClaimService claim)
/// <returns></returns>
/// <returns></returns>
[
Route
(
"getlist"
)]
[
Route
(
"getlist"
)]
[
HttpPost
]
[
HttpPost
]
public
ApiResponse
GetEmployeeList
([
CustomizeValidator
(
RuleSet
=
"Select"
),
FromBody
]
EmployeeRequest
request
)
public
ApiResponse
GetEmployeeList
([
CustomizeValidator
(
RuleSet
=
"Select"
),
FromBody
]
EmployeeRequest
request
)
{
{
var
employee
=
employeeService
.
GetEmployeeList
(
request
.
AllotID
,
claim
.
GetUserId
());
var
employee
=
employeeService
.
GetEmployeeList
(
request
.
AllotID
,
claim
.
GetUserId
());
return
new
ApiResponse
(
ResponseType
.
OK
,
"ok"
,
employee
);
return
new
ApiResponse
(
ResponseType
.
OK
,
"ok"
,
employee
);
...
@@ -42,7 +42,7 @@ public ApiResponse GetEmployeeList([CustomizeValidator(RuleSet = "Select"), From
...
@@ -42,7 +42,7 @@ public ApiResponse GetEmployeeList([CustomizeValidator(RuleSet = "Select"), From
/// <returns></returns>
/// <returns></returns>
[
Route
(
"insert"
)]
[
Route
(
"insert"
)]
[
HttpPost
]
[
HttpPost
]
public
ApiResponse
Insert
([
CustomizeValidator
(
RuleSet
=
"Insert"
),
FromBody
]
EmployeeRequest
request
)
public
ApiResponse
Insert
([
CustomizeValidator
(
RuleSet
=
"Insert"
),
FromBody
]
EmployeeRequest
request
)
{
{
var
employee
=
employeeService
.
Insert
(
request
);
var
employee
=
employeeService
.
Insert
(
request
);
return
new
ApiResponse
(
ResponseType
.
OK
,
"ok"
,
employee
);
return
new
ApiResponse
(
ResponseType
.
OK
,
"ok"
,
employee
);
...
@@ -55,7 +55,7 @@ public ApiResponse Insert([CustomizeValidator(RuleSet = "Insert"), FromBody]Empl
...
@@ -55,7 +55,7 @@ public ApiResponse Insert([CustomizeValidator(RuleSet = "Insert"), FromBody]Empl
/// <returns></returns>
/// <returns></returns>
[
Route
(
"update"
)]
[
Route
(
"update"
)]
[
HttpPost
]
[
HttpPost
]
public
ApiResponse
Update
([
CustomizeValidator
(
RuleSet
=
"Update"
),
FromBody
]
EmployeeRequest
request
)
public
ApiResponse
Update
([
CustomizeValidator
(
RuleSet
=
"Update"
),
FromBody
]
EmployeeRequest
request
)
{
{
var
employee
=
employeeService
.
Update
(
request
);
var
employee
=
employeeService
.
Update
(
request
);
return
new
ApiResponse
(
ResponseType
.
OK
,
"ok"
,
employee
);
return
new
ApiResponse
(
ResponseType
.
OK
,
"ok"
,
employee
);
...
@@ -68,7 +68,7 @@ public ApiResponse Update([CustomizeValidator(RuleSet = "Update"), FromBody]Empl
...
@@ -68,7 +68,7 @@ public ApiResponse Update([CustomizeValidator(RuleSet = "Update"), FromBody]Empl
/// <returns></returns>
/// <returns></returns>
[
Route
(
"delete"
)]
[
Route
(
"delete"
)]
[
HttpPost
]
[
HttpPost
]
public
ApiResponse
Delete
([
CustomizeValidator
(
RuleSet
=
"Delete"
),
FromBody
]
EmployeeRequest
request
)
public
ApiResponse
Delete
([
CustomizeValidator
(
RuleSet
=
"Delete"
),
FromBody
]
EmployeeRequest
request
)
{
{
if
(!
employeeService
.
Delete
(
request
))
if
(!
employeeService
.
Delete
(
request
))
return
new
ApiResponse
(
ResponseType
.
Fail
);
return
new
ApiResponse
(
ResponseType
.
Fail
);
...
@@ -82,7 +82,7 @@ public ApiResponse Delete([CustomizeValidator(RuleSet = "Delete"), FromBody]Empl
...
@@ -82,7 +82,7 @@ public ApiResponse Delete([CustomizeValidator(RuleSet = "Delete"), FromBody]Empl
/// <returns></returns>
/// <returns></returns>
[
Route
(
"clinic/getlist"
)]
[
Route
(
"clinic/getlist"
)]
[
HttpPost
]
[
HttpPost
]
public
ApiResponse
GetEmployeeClinicList
([
CustomizeValidator
(
RuleSet
=
"Select"
),
FromBody
]
im_employee_clinic
request
)
public
ApiResponse
GetEmployeeClinicList
([
FromBody
]
im_employee_clinic
request
)
{
{
//if ((request.AllotID ?? 0) == 0)
//if ((request.AllotID ?? 0) == 0)
// return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效!");
// return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效!");
...
@@ -98,7 +98,7 @@ public ApiResponse GetEmployeeClinicList([CustomizeValidator(RuleSet = "Select")
...
@@ -98,7 +98,7 @@ public ApiResponse GetEmployeeClinicList([CustomizeValidator(RuleSet = "Select")
/// <returns></returns>
/// <returns></returns>
[
Route
(
"clinic/insert"
)]
[
Route
(
"clinic/insert"
)]
[
HttpPost
]
[
HttpPost
]
public
ApiResponse
InsertClinic
([
CustomizeValidator
(
RuleSet
=
"Insert"
),
FromBody
]
im_employee_clinic
request
)
public
ApiResponse
InsertClinic
([
FromBody
]
im_employee_clinic
request
)
{
{
if
((
request
.
AllotID
??
0
)
==
0
)
if
((
request
.
AllotID
??
0
)
==
0
)
return
new
ApiResponse
(
ResponseType
.
ParameterError
,
"参数AllotId无效!"
);
return
new
ApiResponse
(
ResponseType
.
ParameterError
,
"参数AllotId无效!"
);
...
@@ -120,7 +120,7 @@ public ApiResponse InsertClinic([CustomizeValidator(RuleSet = "Insert"), FromBod
...
@@ -120,7 +120,7 @@ public ApiResponse InsertClinic([CustomizeValidator(RuleSet = "Insert"), FromBod
/// <returns></returns>
/// <returns></returns>
[
Route
(
"clinic/update"
)]
[
Route
(
"clinic/update"
)]
[
HttpPost
]
[
HttpPost
]
public
ApiResponse
UpdateClinic
([
CustomizeValidator
(
RuleSet
=
"Update"
),
FromBody
]
im_employee_clinic
request
)
public
ApiResponse
UpdateClinic
([
FromBody
]
im_employee_clinic
request
)
{
{
if
((
request
.
AllotID
??
0
)
==
0
)
if
((
request
.
AllotID
??
0
)
==
0
)
return
new
ApiResponse
(
ResponseType
.
ParameterError
,
"参数AllotId无效!"
);
return
new
ApiResponse
(
ResponseType
.
ParameterError
,
"参数AllotId无效!"
);
...
@@ -141,7 +141,7 @@ public ApiResponse UpdateClinic([CustomizeValidator(RuleSet = "Update"), FromBod
...
@@ -141,7 +141,7 @@ public ApiResponse UpdateClinic([CustomizeValidator(RuleSet = "Update"), FromBod
/// <returns></returns>
/// <returns></returns>
[
Route
(
"clinic/delete"
)]
[
Route
(
"clinic/delete"
)]
[
HttpPost
]
[
HttpPost
]
public
ApiResponse
DeleteClinic
([
CustomizeValidator
(
RuleSet
=
"Delete"
),
FromBody
]
im_employee_clinic
request
)
public
ApiResponse
DeleteClinic
([
FromBody
]
im_employee_clinic
request
)
{
{
if
(
request
.
ID
==
0
)
if
(
request
.
ID
==
0
)
return
new
ApiResponse
(
ResponseType
.
ParameterError
,
"参数ID无效!"
);
return
new
ApiResponse
(
ResponseType
.
ParameterError
,
"参数ID无效!"
);
...
@@ -163,5 +163,71 @@ public ApiResponse Audit(int allotid)
...
@@ -163,5 +163,71 @@ public ApiResponse Audit(int allotid)
var
result
=
employeeService
.
Audit
(
allotid
);
var
result
=
employeeService
.
Audit
(
allotid
);
return
result
?
new
ApiResponse
(
ResponseType
.
OK
,
"提交成功"
)
:
new
ApiResponse
(
ResponseType
.
Fail
,
"提交失败"
);
return
result
?
new
ApiResponse
(
ResponseType
.
OK
,
"提交成功"
)
:
new
ApiResponse
(
ResponseType
.
Fail
,
"提交失败"
);
}
}
/// <summary>
/// 获取人员补充绩效列表
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[
Route
(
"apr/getlist"
)]
[
HttpPost
]
public
ApiResponse
GetAprList
([
FromBody
]
per_apr_amount
request
)
{
if
(
request
.
AllotId
==
0
)
return
new
ApiResponse
(
ResponseType
.
ParameterError
,
"参数AllotId无效!"
);
var
employee
=
employeeService
.
GetAprList
(
request
.
AllotId
);
return
new
ApiResponse
(
ResponseType
.
OK
,
"ok"
,
employee
);
}
/// <summary>
/// 新增人员补充绩效
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[
Route
(
"apr/insert"
)]
[
HttpPost
]
public
ApiResponse
InsertApr
([
FromBody
]
per_apr_amount
request
)
{
if
(
request
.
AllotId
==
0
)
return
new
ApiResponse
(
ResponseType
.
ParameterError
,
"参数AllotId无效!"
);
var
employee
=
employeeService
.
InsertApr
(
request
,
claim
.
GetUserId
());
return
new
ApiResponse
(
ResponseType
.
OK
,
"ok"
,
employee
);
}
/// <summary>
/// 修改人员补充绩效
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[
Route
(
"apr/update"
)]
[
HttpPost
]
public
ApiResponse
UpdateApr
([
FromBody
]
per_apr_amount
request
)
{
if
(
request
.
AllotId
==
0
)
return
new
ApiResponse
(
ResponseType
.
ParameterError
,
"参数AllotId无效!"
);
var
employee
=
employeeService
.
UpdateApr
(
request
);
return
new
ApiResponse
(
ResponseType
.
OK
,
"ok"
,
employee
);
}
/// <summary>
/// 删除人员补充绩效
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[
Route
(
"apr/delete"
)]
[
HttpPost
]
public
ApiResponse
DeleteApr
([
FromBody
]
per_apr_amount
request
)
{
if
(
request
.
Id
==
0
)
return
new
ApiResponse
(
ResponseType
.
ParameterError
,
"参数无效!"
);
if
(!
employeeService
.
DeleteApr
(
request
.
Id
))
return
new
ApiResponse
(
ResponseType
.
Fail
);
return
new
ApiResponse
(
ResponseType
.
OK
);
}
}
}
}
}
\ No newline at end of file
performance/Performance.Api/wwwroot/Performance.Api.xml
View file @
c1a948f2
...
@@ -551,6 +551,34 @@
...
@@ -551,6 +551,34 @@
<param
name=
"allotid"
></param>
<param
name=
"allotid"
></param>
<returns></returns>
<returns></returns>
</member>
</member>
<member
name=
"M:Performance.Api.Controllers.EmployeeController.GetAprList(Performance.EntityModels.per_apr_amount)"
>
<summary>
获取人员补充绩效列表
</summary>
<param
name=
"request"
></param>
<returns></returns>
</member>
<member
name=
"M:Performance.Api.Controllers.EmployeeController.InsertApr(Performance.EntityModels.per_apr_amount)"
>
<summary>
新增人员补充绩效
</summary>
<param
name=
"request"
></param>
<returns></returns>
</member>
<member
name=
"M:Performance.Api.Controllers.EmployeeController.UpdateApr(Performance.EntityModels.per_apr_amount)"
>
<summary>
修改人员补充绩效
</summary>
<param
name=
"request"
></param>
<returns></returns>
</member>
<member
name=
"M:Performance.Api.Controllers.EmployeeController.DeleteApr(Performance.EntityModels.per_apr_amount)"
>
<summary>
删除人员补充绩效
</summary>
<param
name=
"request"
></param>
<returns></returns>
</member>
<member
name=
"M:Performance.Api.Controllers.GuaranteeController.Guarantee(Performance.DtoModels.GuaranteeRequest)"
>
<member
name=
"M:Performance.Api.Controllers.GuaranteeController.Guarantee(Performance.DtoModels.GuaranteeRequest)"
>
<summary>
<summary>
保底绩效配置列表
保底绩效配置列表
...
...
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
View file @
c1a948f2
...
@@ -142,6 +142,9 @@
...
@@ -142,6 +142,9 @@
<member
name=
"P:Performance.EntityModels.PerformanceDbContext.per_allot"
>
<member
name=
"P:Performance.EntityModels.PerformanceDbContext.per_allot"
>
<summary>
医院绩效分配
</summary>
<summary>
医院绩效分配
</summary>
</member>
</member>
<member
name=
"P:Performance.EntityModels.PerformanceDbContext.per_apr_amount"
>
<summary>
</summary>
</member>
<member
name=
"P:Performance.EntityModels.PerformanceDbContext.per_budget_amount"
>
<member
name=
"P:Performance.EntityModels.PerformanceDbContext.per_budget_amount"
>
<summary>
预算管理金额
</summary>
<summary>
预算管理金额
</summary>
</member>
</member>
...
@@ -2595,7 +2598,7 @@
...
@@ -2595,7 +2598,7 @@
</member>
</member>
<member
name=
"P:Performance.EntityModels.per_allot.Generate"
>
<member
name=
"P:Performance.EntityModels.per_allot.Generate"
>
<summary>
<summary>
1、人事科提交重新生成
1、人事科提交重新生成
2、生成成功 3、原始数据修改
</summary>
</summary>
</member>
</member>
<member
name=
"P:Performance.EntityModels.per_allot.ShowFormula"
>
<member
name=
"P:Performance.EntityModels.per_allot.ShowFormula"
>
...
@@ -2603,6 +2606,51 @@
...
@@ -2603,6 +2606,51 @@
0 不显示 1 显示
0 不显示 1 显示
</summary>
</summary>
</member>
</member>
<member
name=
"T:Performance.EntityModels.per_apr_amount"
>
<summary>
</summary>
</member>
<member
name=
"P:Performance.EntityModels.per_apr_amount.Id"
>
<summary>
</summary>
</member>
<member
name=
"P:Performance.EntityModels.per_apr_amount.AllotId"
>
<summary>
</summary>
</member>
<member
name=
"P:Performance.EntityModels.per_apr_amount.PersonnelNumber"
>
<summary>
人员工号
</summary>
</member>
<member
name=
"P:Performance.EntityModels.per_apr_amount.DoctorName"
>
<summary>
医生姓名
</summary>
</member>
<member
name=
"P:Performance.EntityModels.per_apr_amount.PerforType"
>
<summary>
</summary>
</member>
<member
name=
"P:Performance.EntityModels.per_apr_amount.Amount"
>
<summary>
金额
</summary>
</member>
<member
name=
"P:Performance.EntityModels.per_apr_amount.CreateDate"
>
<summary>
</summary>
</member>
<member
name=
"P:Performance.EntityModels.per_apr_amount.CreateUser"
>
<summary>
</summary>
</member>
<member
name=
"T:Performance.EntityModels.per_budget_amount"
>
<member
name=
"T:Performance.EntityModels.per_budget_amount"
>
<summary>
<summary>
预算管理金额
预算管理金额
...
...
performance/Performance.EntityModels/Context/PerformanceDbContext.cs
View file @
c1a948f2
...
@@ -104,6 +104,8 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
...
@@ -104,6 +104,8 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
public
virtual
DbSet
<
per_againallot
>
per_againallot
{
get
;
set
;
}
public
virtual
DbSet
<
per_againallot
>
per_againallot
{
get
;
set
;
}
/// <summary> 医院绩效分配 </summary>
/// <summary> 医院绩效分配 </summary>
public
virtual
DbSet
<
per_allot
>
per_allot
{
get
;
set
;
}
public
virtual
DbSet
<
per_allot
>
per_allot
{
get
;
set
;
}
/// <summary> </summary>
public
virtual
DbSet
<
per_apr_amount
>
per_apr_amount
{
get
;
set
;
}
/// <summary> 预算管理金额 </summary>
/// <summary> 预算管理金额 </summary>
public
virtual
DbSet
<
per_budget_amount
>
per_budget_amount
{
get
;
set
;
}
public
virtual
DbSet
<
per_budget_amount
>
per_budget_amount
{
get
;
set
;
}
/// <summary> 预算管理占比 </summary>
/// <summary> 预算管理占比 </summary>
...
...
performance/Performance.EntityModels/Entity/ag_workload_type.cs
View file @
c1a948f2
//-----------------------------------------------------------------------
//-----------------------------------------------------------------------
// <copyright file=" ag_workload_type.cs">
// <copyright file=" ag_workload_type.cs">
// * FileName: .cs
// * FileName: .cs
// </copyright>
// </copyright>
...
...
performance/Performance.EntityModels/Entity/per_allot.cs
View file @
c1a948f2
...
@@ -82,7 +82,7 @@ public class per_allot
...
@@ -82,7 +82,7 @@ public class per_allot
public
Nullable
<
int
>
IsExtracting
{
get
;
set
;
}
public
Nullable
<
int
>
IsExtracting
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 1、人事科提交重新生成
/// 1、人事科提交重新生成
2、生成成功 3、原始数据修改
/// </summary>
/// </summary>
public
int
Generate
{
get
;
set
;
}
public
int
Generate
{
get
;
set
;
}
...
...
performance/Performance.EntityModels/Entity/per_apr_amount.cs
0 → 100644
View file @
c1a948f2
//-----------------------------------------------------------------------
// <copyright file=" per_apr_amount.cs">
// * FileName: .cs
// </copyright>
//-----------------------------------------------------------------------
using
System
;
using
System.ComponentModel.DataAnnotations
;
using
System.ComponentModel.DataAnnotations.Schema
;
namespace
Performance.EntityModels
{
/// <summary>
///
/// </summary>
[
Table
(
"per_apr_amount"
)]
public
class
per_apr_amount
{
/// <summary>
///
/// </summary>
[
Key
]
public
int
Id
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
int
AllotId
{
get
;
set
;
}
/// <summary>
/// 人员工号
/// </summary>
public
string
PersonnelNumber
{
get
;
set
;
}
/// <summary>
/// 医生姓名
/// </summary>
public
string
DoctorName
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
PerforType
{
get
;
set
;
}
/// <summary>
/// 金额
/// </summary>
public
Nullable
<
decimal
>
Amount
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
Nullable
<
DateTime
>
CreateDate
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
Nullable
<
int
>
CreateUser
{
get
;
set
;
}
}
}
performance/Performance.Repository/PerforCofdirectorRepository.cs
View file @
c1a948f2
...
@@ -86,25 +86,70 @@ public int SupplementaryData(int allotid)
...
@@ -86,25 +86,70 @@ public int SupplementaryData(int allotid)
{
{
using
(
var
connection
=
context
.
Database
.
GetDbConnection
())
using
(
var
connection
=
context
.
Database
.
GetDbConnection
())
{
{
var
sql
=
@"insert into cof_drugtype(allotid,charge) select
#
region
MyRegion
// var sql = @"insert into cof_drugtype(allotid,charge) select
//distinct @allotid allotid,typename charge
//from per_sheet sheet
// inner join im_data im on sheet.id = im.sheetid
// left join cof_drugtype dtype on sheet.allotid = dtype.allotid
// and im.typename != dtype.charge
//where sheet.allotid = @allotid and sheet.sheettype = 3 and im.typename not in
// (select charge from cof_drugtype where allotid = @allotid);
//insert into cof_depttype(allotid,charge) select
//distinct @allotid allotid,department charge
//from per_sheet sheet
// inner join im_data im on sheet.id = im.sheetid
// left join cof_depttype dtype on sheet.allotid = dtype.allotid
// and im.department != dtype.charge
//where sheet.allotid = @allotid and sheet.sheettype = 9 and im.department not in
// (select charge from cof_depttype where allotid = @allotid);";
#
endregion
List
<
string
>
sqls
=
new
List
<
string
>
{
@"insert into cof_drugtype(allotid,charge) select
distinct @allotid allotid,typename charge
distinct @allotid allotid,typename charge
from per_sheet sheet
from per_sheet sheet
inner join im_data im on sheet.id = im.sheetid
inner join im_data im on sheet.id = im.sheetid
left join cof_drugtype dtype on sheet.allotid = dtype.allotid
left join cof_drugtype dtype on sheet.allotid = dtype.allotid
and im.typename != dtype.charge
and im.typename != dtype.charge
where sheet.allotid = @allotid and sheet.sheettype = 3 and im.typename not in
where sheet.allotid = @allotid and sheet.sheettype = 3 and im.typename not in
(select charge from cof_drugtype where allotid = @allotid);
(select charge from cof_drugtype where allotid = @allotid);
"
,
insert into cof_depttype(allotid,charge) select
@"
insert into cof_depttype(allotid,charge) select
distinct @allotid allotid,department charge
distinct @allotid allotid,department charge
from per_sheet sheet
from per_sheet sheet
inner join im_data im on sheet.id = im.sheetid
inner join im_data im on sheet.id = im.sheetid
left join cof_depttype dtype on sheet.allotid = dtype.allotid
left join cof_depttype dtype on sheet.allotid = dtype.allotid
and im.department != dtype.charge
and im.department != dtype.charge
where sheet.allotid = @allotid and sheet.sheettype = 9 and im.department not in
where sheet.allotid = @allotid and sheet.sheettype = 9 and im.department not in
(select charge from cof_depttype where allotid = @allotid);"
;
(select charge from cof_depttype where allotid = @allotid);"
,
@"insert into per_apr_amount(AllotId, PersonnelNumber, DoctorName)
select distinct @allotid AllotId, t.PersonnelNumber, t.DoctorName from
(
select AllotId,PeopleNumber PersonnelNumber,DoctorName from im_employee where allotid = @allotid
union all
select AllotId,PersonnelNumber,DoctorName from im_employee_clinic where allotid = @allotid
) t where DoctorName not in (select DoctorName from per_apr_amount where allotid = @allotid);"
};
return
connection
.
Execute
(
sql
,
new
{
allotid
},
commandTimeout
:
60
*
60
);
int
flag
=
0
;
foreach
(
var
sql
in
sqls
)
{
try
{
flag
=
connection
.
Execute
(
sql
,
new
{
allotid
},
commandTimeout
:
60
*
60
);
}
catch
(
Exception
ex
)
{
}
}
return
flag
;
}
}
}
}
}
}
...
...
performance/Performance.Repository/Repository/PerforPerapramountRepository.cs
0 → 100644
View file @
c1a948f2
//-----------------------------------------------------------------------
// <copyright file=" per_apr_amount.cs">
// * FileName: per_apr_amount.cs
// </copyright>
//-----------------------------------------------------------------------
using
System
;
using
Performance.EntityModels
;
namespace
Performance.Repository
{
/// <summary>
/// per_apr_amount Repository
/// </summary>
public
partial
class
PerforPerapramountRepository
:
PerforRepository
<
per_apr_amount
>
{
public
PerforPerapramountRepository
(
PerformanceDbContext
context
)
:
base
(
context
)
{
}
}
}
performance/Performance.Services/ComputeService.cs
View file @
c1a948f2
...
@@ -15,17 +15,12 @@ namespace Performance.Services
...
@@ -15,17 +15,12 @@ namespace Performance.Services
public
class
ComputeService
:
IAutoInjection
public
class
ComputeService
:
IAutoInjection
{
{
private
readonly
PerforResaccountRepository
perforResaccountRepository
;
private
readonly
PerforResaccountRepository
perforResaccountRepository
;
//private readonly PerforResaccountnurseRepository _perforResAccountnurseRepository;
private
readonly
PerforPersheetRepository
_perforPerSheetRepository
;
private
readonly
PerforPersheetRepository
_perforPerSheetRepository
;
private
readonly
PerforImdataRepository
_perforImDataRepository
;
private
readonly
PerforImdataRepository
_perforImDataRepository
;
private
readonly
PerforImheaderRepository
_perforImheaderRepository
;
private
readonly
PerforImheaderRepository
_perforImheaderRepository
;
private
readonly
PerforRescomputeRepository
_perforRescomputeRepository
;
private
readonly
PerforRescomputeRepository
_perforRescomputeRepository
;
private
readonly
PerforResspecialunitRepository
_perforResspecialunitRepository
;
private
readonly
PerforResspecialunitRepository
_perforResspecialunitRepository
;
private
readonly
PerforPeragainallotRepository
_perforPeragainallotRepository
;
private
readonly
PerforUserRepository
_perforUserRepository
;
private
readonly
PerforAgemployeeRepository
_perforAgemployeeRepository
;
private
readonly
PerforResbaiscnormRepository
perforResbaiscnormRepository
;
private
readonly
PerforResbaiscnormRepository
perforResbaiscnormRepository
;
private
readonly
PerforCofincomeRepository
_perforCofincomeRepository
;
private
readonly
PerforAgsecondallotRepository
_perforAgsecondallotRepository
;
private
readonly
PerforAgsecondallotRepository
_perforAgsecondallotRepository
;
private
readonly
PerforAgcomputeRepository
_perforAgcomputeRepository
;
private
readonly
PerforAgcomputeRepository
_perforAgcomputeRepository
;
private
readonly
PerforImemployeeclinicRepository
_perforImemployeeclinicRepository
;
private
readonly
PerforImemployeeclinicRepository
_perforImemployeeclinicRepository
;
...
@@ -34,17 +29,12 @@ public class ComputeService : IAutoInjection
...
@@ -34,17 +29,12 @@ public class ComputeService : IAutoInjection
private
readonly
PerforHospitalRepository
hospitalRepository
;
private
readonly
PerforHospitalRepository
hospitalRepository
;
public
ComputeService
(
PerforResaccountRepository
perforResaccountRepository
,
public
ComputeService
(
PerforResaccountRepository
perforResaccountRepository
,
//PerforResaccountnurseRepository perforResAccountnurseRepository,
PerforPersheetRepository
perforPerSheetRepository
,
PerforPersheetRepository
perforPerSheetRepository
,
PerforImdataRepository
perforImDataRepository
,
PerforImdataRepository
perforImDataRepository
,
PerforImheaderRepository
perforImheaderRepository
,
PerforImheaderRepository
perforImheaderRepository
,
PerforRescomputeRepository
perforRescomputeRepository
,
PerforRescomputeRepository
perforRescomputeRepository
,
PerforResspecialunitRepository
perforResspecialunitRepository
,
PerforResspecialunitRepository
perforResspecialunitRepository
,
PerforPeragainallotRepository
perforPeragainallotRepository
,
PerforUserRepository
perforUserRepository
,
PerforAgemployeeRepository
perforAgemployeeRepository
,
PerforResbaiscnormRepository
perforResbaiscnormRepository
,
PerforResbaiscnormRepository
perforResbaiscnormRepository
,
PerforCofincomeRepository
perforCofincomeRepository
,
PerforAgsecondallotRepository
perforAgsecondallotRepository
,
PerforAgsecondallotRepository
perforAgsecondallotRepository
,
PerforAgcomputeRepository
perforAgcomputeRepository
,
PerforAgcomputeRepository
perforAgcomputeRepository
,
PerforImemployeeclinicRepository
perforImemployeeclinicRepository
,
PerforImemployeeclinicRepository
perforImemployeeclinicRepository
,
...
@@ -53,17 +43,12 @@ public class ComputeService : IAutoInjection
...
@@ -53,17 +43,12 @@ public class ComputeService : IAutoInjection
PerforHospitalRepository
hospitalRepository
)
PerforHospitalRepository
hospitalRepository
)
{
{
this
.
perforResaccountRepository
=
perforResaccountRepository
;
this
.
perforResaccountRepository
=
perforResaccountRepository
;
//this._perforResAccountnurseRepository = perforResAccountnurseRepository;
this
.
_perforPerSheetRepository
=
perforPerSheetRepository
;
this
.
_perforPerSheetRepository
=
perforPerSheetRepository
;
this
.
_perforImDataRepository
=
perforImDataRepository
;
this
.
_perforImDataRepository
=
perforImDataRepository
;
this
.
_perforImheaderRepository
=
perforImheaderRepository
;
this
.
_perforImheaderRepository
=
perforImheaderRepository
;
this
.
_perforRescomputeRepository
=
perforRescomputeRepository
;
this
.
_perforRescomputeRepository
=
perforRescomputeRepository
;
this
.
_perforResspecialunitRepository
=
perforResspecialunitRepository
;
this
.
_perforResspecialunitRepository
=
perforResspecialunitRepository
;
this
.
_perforPeragainallotRepository
=
perforPeragainallotRepository
;
this
.
_perforUserRepository
=
perforUserRepository
;
this
.
_perforAgemployeeRepository
=
perforAgemployeeRepository
;
this
.
perforResbaiscnormRepository
=
perforResbaiscnormRepository
;
this
.
perforResbaiscnormRepository
=
perforResbaiscnormRepository
;
this
.
_perforCofincomeRepository
=
perforCofincomeRepository
;
this
.
_perforAgsecondallotRepository
=
perforAgsecondallotRepository
;
this
.
_perforAgsecondallotRepository
=
perforAgsecondallotRepository
;
this
.
_perforAgcomputeRepository
=
perforAgcomputeRepository
;
this
.
_perforAgcomputeRepository
=
perforAgcomputeRepository
;
this
.
_perforImemployeeclinicRepository
=
perforImemployeeclinicRepository
;
this
.
_perforImemployeeclinicRepository
=
perforImemployeeclinicRepository
;
...
...
performance/Performance.Services/ConfigService.cs
View file @
c1a948f2
This diff is collapsed.
Click to expand it.
performance/Performance.Services/EmployeeService.cs
View file @
c1a948f2
using
AutoMapper
;
using
AutoMapper
;
using
Microsoft.AspNetCore.Hosting
;
using
Microsoft.AspNetCore.Hosting
;
using
Microsoft.Extensions.Logging
;
using
Microsoft.Extensions.Logging
;
using
NPOI.SS.Util
;
using
Performance.DtoModels
;
using
Performance.DtoModels
;
using
Performance.EntityModels
;
using
Performance.EntityModels
;
using
Performance.Infrastructure
;
using
Performance.Infrastructure
;
...
@@ -21,12 +22,15 @@ public class EmployeeService : IAutoInjection
...
@@ -21,12 +22,15 @@ public class EmployeeService : IAutoInjection
private
PerforImemployeeclinicRepository
perforImemployeeclinicRepository
;
private
PerforImemployeeclinicRepository
perforImemployeeclinicRepository
;
private
PerforUserhospitalRepository
perforUserhospitalRepository
;
private
PerforUserhospitalRepository
perforUserhospitalRepository
;
private
PerforPerallotRepository
perallotRepository
;
private
PerforPerallotRepository
perallotRepository
;
private
PerforPerapramountRepository
perapramountRepository
;
public
EmployeeService
(
PerforImemployeeRepository
perforImemployeeRepository
,
public
EmployeeService
(
PerforImemployeeRepository
perforImemployeeRepository
,
PerforPersheetRepository
perforPersheetRepository
,
PerforPersheetRepository
perforPersheetRepository
,
PerforPerallotRepository
perforPerallotRepository
,
PerforPerallotRepository
perforPerallotRepository
,
PerforImemployeeclinicRepository
perforImemployeeclinicRepository
,
PerforImemployeeclinicRepository
perforImemployeeclinicRepository
,
PerforUserhospitalRepository
perforUserhospitalRepository
,
PerforUserhospitalRepository
perforUserhospitalRepository
,
PerforPerallotRepository
perallotRepository
)
PerforPerallotRepository
perallotRepository
,
PerforPerapramountRepository
perapramountRepository
)
{
{
this
.
perforImemployeeRepository
=
perforImemployeeRepository
;
this
.
perforImemployeeRepository
=
perforImemployeeRepository
;
this
.
perforPersheetRepository
=
perforPersheetRepository
;
this
.
perforPersheetRepository
=
perforPersheetRepository
;
...
@@ -34,6 +38,7 @@ public class EmployeeService : IAutoInjection
...
@@ -34,6 +38,7 @@ public class EmployeeService : IAutoInjection
this
.
perforImemployeeclinicRepository
=
perforImemployeeclinicRepository
;
this
.
perforImemployeeclinicRepository
=
perforImemployeeclinicRepository
;
this
.
perforUserhospitalRepository
=
perforUserhospitalRepository
;
this
.
perforUserhospitalRepository
=
perforUserhospitalRepository
;
this
.
perallotRepository
=
perallotRepository
;
this
.
perallotRepository
=
perallotRepository
;
this
.
perapramountRepository
=
perapramountRepository
;
}
}
#
region
行政人员
#
region
行政人员
...
@@ -262,5 +267,54 @@ public bool Audit(int allotId)
...
@@ -262,5 +267,54 @@ public bool Audit(int allotId)
allot
.
Generate
=
(
int
)
AllotGenerate
.
PersonnelOffice
;
allot
.
Generate
=
(
int
)
AllotGenerate
.
PersonnelOffice
;
return
perforPerallotRepository
.
Update
(
allot
);
return
perforPerallotRepository
.
Update
(
allot
);
}
}
public
List
<
per_apr_amount
>
GetAprList
(
int
allotId
)
{
var
list
=
perapramountRepository
.
GetEntities
(
t
=>
t
.
AllotId
==
allotId
);
if
(
list
!=
null
&&
list
.
Any
())
list
=
list
.
OrderBy
(
t
=>
t
.
DoctorName
).
ToList
();
return
list
;
}
public
bool
InsertApr
(
per_apr_amount
request
,
int
userId
)
{
if
(
request
==
null
)
return
false
;
var
data
=
perapramountRepository
.
GetEntity
(
t
=>
t
.
PersonnelNumber
==
request
.
PersonnelNumber
&&
t
.
AllotId
==
request
.
AllotId
);
if
(
data
!=
null
)
throw
new
PerformanceException
(
"人员工号已存在"
);
request
.
CreateDate
=
DateTime
.
Now
;
request
.
CreateUser
=
userId
;
return
perapramountRepository
.
Add
(
request
);
}
public
bool
UpdateApr
(
per_apr_amount
request
)
{
if
(
request
==
null
)
return
false
;
var
data
=
perapramountRepository
.
GetEntity
(
t
=>
t
.
Id
==
request
.
Id
);
if
(
data
==
null
)
throw
new
PerformanceException
(
"修改数据无效"
);
data
.
PersonnelNumber
=
request
.
PersonnelNumber
;
data
.
DoctorName
=
request
.
DoctorName
;
data
.
PerforType
=
request
.
PerforType
;
data
.
Amount
=
request
.
Amount
;
return
perapramountRepository
.
Add
(
request
);
}
public
bool
DeleteApr
(
int
id
)
{
var
data
=
perapramountRepository
.
GetEntity
(
t
=>
t
.
Id
==
id
);
if
(
data
!=
null
)
return
perapramountRepository
.
Remove
(
data
);
return
true
;
}
}
}
}
}
performance/Performance.Services/PerExcelService/PerSheetService.cs
View file @
c1a948f2
...
@@ -14,16 +14,13 @@ namespace Performance.Services
...
@@ -14,16 +14,13 @@ namespace Performance.Services
public
class
PerSheetService
:
IAutoInjection
public
class
PerSheetService
:
IAutoInjection
{
{
private
PerHeaderService
_perHeader
;
private
PerHeaderService
_perHeader
;
private
PerforCofincomeRepository
_perforCofincomeRepository
;
private
PerforCofdrugpropRepository
_perforCofdrugpropRepository
;
private
PerforCofdrugpropRepository
_perforCofdrugpropRepository
;
private
PerforCofdrugtypeRepository
_perforCofdrugtypeRepository
;
private
PerforCofdrugtypeRepository
_perforCofdrugtypeRepository
;
public
PerSheetService
(
PerHeaderService
perHeader
,
public
PerSheetService
(
PerHeaderService
perHeader
,
PerforCofincomeRepository
perforCofincomeRepository
,
PerforCofdrugpropRepository
perforCofdrugpropRepository
,
PerforCofdrugpropRepository
perforCofdrugpropRepository
,
PerforCofdrugtypeRepository
perforCofdrugtypeRepository
)
PerforCofdrugtypeRepository
perforCofdrugtypeRepository
)
{
{
_perHeader
=
perHeader
;
_perHeader
=
perHeader
;
_perforCofincomeRepository
=
perforCofincomeRepository
;
_perforCofdrugpropRepository
=
perforCofdrugpropRepository
;
_perforCofdrugpropRepository
=
perforCofdrugpropRepository
;
_perforCofdrugtypeRepository
=
perforCofdrugtypeRepository
;
_perforCofdrugtypeRepository
=
perforCofdrugtypeRepository
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment