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
8a353df6
Commit
8a353df6
authored
May 31, 2023
by
ruyun.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
科室详情显示设置接口
parent
3f959877
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
188 additions
and
78 deletions
+188
-78
performance/Performance.Api/Controllers/ComputeController.cs
+28
-46
performance/Performance.Api/wwwroot/Performance.Api.xml
+15
-0
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
+28
-0
performance/Performance.DtoModels/Enum.cs
+30
-15
performance/Performance.DtoModels/Response/UniteDeptDetailResponse.cs
+0
-14
performance/Performance.DtoModels/UniteDeptSetting.cs
+21
-0
performance/Performance.EntityModels/Context/PerformanceDbContext.cs
+2
-0
performance/Performance.EntityModels/Entity/cof_dept_detail.cs
+39
-0
performance/Performance.Repository/Repository/PerforCofDeptDetailRepository.cs
+19
-0
performance/Performance.Services/ComputeService.UniteDeptDetail.cs
+0
-0
performance/Performance.Services/ComputeService.cs
+6
-3
No files found.
performance/Performance.Api/Controllers/ComputeController.cs
View file @
8a353df6
...
@@ -168,6 +168,33 @@ public ApiResponse<List<DeptResponse>> GetAdminPerformance([FromBody] ComputerRe
...
@@ -168,6 +168,33 @@ public ApiResponse<List<DeptResponse>> GetAdminPerformance([FromBody] ComputerRe
}
}
/// <summary>
/// <summary>
/// 科室绩效详情显示隐藏设置--加载
/// </summary>
/// <param name="allotId"></param>
/// <returns></returns>
[
Route
(
"unite/deptdetail/setting/get"
)]
[
HttpPost
]
public
ApiResponse
GetUniteDeptDetailSetting
([
FromQuery
]
int
allotId
)
{
var
response
=
_computeService
.
GetUniteDeptDetailSetting
(
allotId
);
return
new
ApiResponse
(
ResponseType
.
OK
,
response
);
}
/// <summary>
/// 科室绩效详情显示隐藏设置--保存
/// </summary>
/// <param name="allotId"></param>
/// <param name="request"></param>
/// <returns></returns>
[
Route
(
"unite/deptdetail/setting/save"
)]
[
HttpPost
]
public
ApiResponse
SaveUniteDeptDetailSetting
([
FromQuery
]
int
allotId
,
[
FromBody
]
UniteDeptSetting
request
)
{
_computeService
.
SaveUniteDeptDetailSetting
(
allotId
,
request
);
return
new
ApiResponse
(
ResponseType
.
OK
,
"保存成功"
);
}
/// <summary>
/// 科室绩效详情
/// 科室绩效详情
/// </summary>
/// </summary>
/// <param name="request"></param>
/// <param name="request"></param>
...
@@ -176,51 +203,6 @@ public ApiResponse<List<DeptResponse>> GetAdminPerformance([FromBody] ComputerRe
...
@@ -176,51 +203,6 @@ public ApiResponse<List<DeptResponse>> GetAdminPerformance([FromBody] ComputerRe
[
HttpPost
]
[
HttpPost
]
public
ApiResponse
UniteDeptDetail
([
FromBody
]
UniteDeptDetailRequest
request
)
public
ApiResponse
UniteDeptDetail
([
FromBody
]
UniteDeptDetailRequest
request
)
{
{
/*
[
{
"type":"1",
"title":"护理组工作量绩效测算表",
"items":[
{
"项目":"柳州市医保工作量(48H以上)",
"数量":"123",
"系数":"40",
"工作量倾斜":"1",
"金额":"23423"
}
]
},
{
"type":"1",
"title":"护理组工作量绩效测算表",
"items":[
{
"项目":"柳州市医保工作量(48H以上)",
"数量":"123",
"系数":"40",
"工作量倾斜":"1",
"金额":"23423"
}
]
},
{
"type":"1",
"title":"护理组工作量绩效测算表",
"items":[
{
"项目":"柳州市医保工作量(48H以上)",
"数量":"123",
"系数":"40",
"工作量倾斜":"1",
"金额":"23423"
}
]
}
]
*/
if
(!
Enum
.
TryParse
(
request
.
UnitType
,
ignoreCase
:
true
,
out
UnitType
unitType
))
if
(!
Enum
.
TryParse
(
request
.
UnitType
,
ignoreCase
:
true
,
out
UnitType
unitType
))
return
new
ApiResponse
(
ResponseType
.
ParameterError
,
"核算组别错误"
);
return
new
ApiResponse
(
ResponseType
.
ParameterError
,
"核算组别错误"
);
var
userid
=
_claim
.
GetUserId
();
var
userid
=
_claim
.
GetUserId
();
...
@@ -274,7 +256,7 @@ public ApiResponse DeptDetail([FromBody] DeptDetailRequest request)
...
@@ -274,7 +256,7 @@ public ApiResponse DeptDetail([FromBody] DeptDetailRequest request)
var
response
=
_computeService
.
DeptDetail
(
request
.
AccountID
);
var
response
=
_computeService
.
DeptDetail
(
request
.
AccountID
);
return
new
ApiResponse
(
ResponseType
.
OK
,
response
);
return
new
ApiResponse
(
ResponseType
.
OK
,
response
);
}
}
}
}
#
endregion
#
endregion
/// <summary>
/// <summary>
...
...
performance/Performance.Api/wwwroot/Performance.Api.xml
View file @
8a353df6
...
@@ -1045,6 +1045,21 @@
...
@@ -1045,6 +1045,21 @@
<param
name=
"request"
></param>
<param
name=
"request"
></param>
<returns></returns>
<returns></returns>
</member>
</member>
<member
name=
"M:Performance.Api.Controllers.ComputeController.GetUniteDeptDetailSetting(System.Int32)"
>
<summary>
科室绩效详情显示隐藏设置
</summary>
<param
name=
"allotId"
></param>
<returns></returns>
</member>
<member
name=
"M:Performance.Api.Controllers.ComputeController.SaveUniteDeptDetailSetting(System.Int32,Performance.DtoModels.UniteDeptSetting)"
>
<summary>
科室绩效详情显示隐藏设置
</summary>
<param
name=
"allotId"
></param>
<param
name=
"request"
></param>
<returns></returns>
</member>
<member
name=
"M:Performance.Api.Controllers.ComputeController.UniteDeptDetail(Performance.DtoModels.UniteDeptDetailRequest)"
>
<member
name=
"M:Performance.Api.Controllers.ComputeController.UniteDeptDetail(Performance.DtoModels.UniteDeptDetailRequest)"
>
<summary>
<summary>
科室绩效详情
科室绩效详情
...
...
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
View file @
8a353df6
...
@@ -85,6 +85,9 @@
...
@@ -85,6 +85,9 @@
<member
name=
"P:Performance.EntityModels.PerformanceDbContext.cof_cmi"
>
<member
name=
"P:Performance.EntityModels.PerformanceDbContext.cof_cmi"
>
<summary>
</summary>
<summary>
</summary>
</member>
</member>
<member
name=
"P:Performance.EntityModels.PerformanceDbContext.cof_dept_detail"
>
<summary>
</summary>
</member>
<member
name=
"P:Performance.EntityModels.PerformanceDbContext.cof_depttype"
>
<member
name=
"P:Performance.EntityModels.PerformanceDbContext.cof_depttype"
>
<summary>
科室类型
</summary>
<summary>
科室类型
</summary>
</member>
</member>
...
@@ -1850,6 +1853,31 @@
...
@@ -1850,6 +1853,31 @@
可是分类
可是分类
</summary>
</summary>
</member>
</member>
<member
name=
"T:Performance.EntityModels.cof_dept_detail"
>
<summary>
</summary>
</member>
<member
name=
"P:Performance.EntityModels.cof_dept_detail.Id"
>
<summary>
</summary>
</member>
<member
name=
"P:Performance.EntityModels.cof_dept_detail.AllotId"
>
<summary>
</summary>
</member>
<member
name=
"P:Performance.EntityModels.cof_dept_detail.Settings"
>
<summary>
</summary>
</member>
<member
name=
"P:Performance.EntityModels.cof_dept_detail.CreateTime"
>
<summary>
</summary>
</member>
<member
name=
"T:Performance.EntityModels.cof_director"
>
<member
name=
"T:Performance.EntityModels.cof_director"
>
<summary>
<summary>
规模绩效、效率绩效计算系数配置
规模绩效、效率绩效计算系数配置
...
...
performance/Performance.DtoModels/Enum.cs
View file @
8a353df6
...
@@ -200,21 +200,36 @@ public enum Type
...
@@ -200,21 +200,36 @@ public enum Type
}
}
public
enum
Title
public
enum
Title
{
{
[
Description
(
"整数"
)]
业绩分值
=
2100
,
业绩分值
=
2100
,
[
Description
(
"百分比"
)]
预算比例
=
2110
,
预算比例
=
2110
,
[
Description
(
"整数"
)]
业绩绩效
=
2120
,
业绩绩效
=
2120
,
[
Description
(
"整数"
)]
工作量绩效
=
2130
,
工作量绩效
=
2130
,
[
Description
(
"整数"
)]
考核前其他绩效
=
2140
,
考核前其他绩效
=
2140
,
[
Description
(
"整数"
)]
考核前绩效
=
2150
,
考核前绩效
=
2150
,
[
Description
(
"百分比"
)]
考核得分率
=
2160
,
考核得分率
=
2160
,
[
Description
(
"整数"
)]
药占比奖罚
=
2170
,
药占比奖罚
=
2170
,
[
Description
(
"整数"
)]
材料占比奖罚
=
2180
,
材料占比奖罚
=
2180
,
[
Description
(
"整数"
)]
医院奖罚
=
2190
,
医院奖罚
=
2190
,
[
Description
(
"整数"
)]
考核后绩效
=
2200
,
考核后绩效
=
2200
,
[
Description
(
"整数"
)]
考核后其他绩效
=
2210
,
考核后其他绩效
=
2210
,
[
Description
(
"百分比"
)]
调节系数
=
2220
,
调节系数
=
2220
,
[
Description
(
"整数"
)]
调节后其他绩效
=
2230
,
调节后其他绩效
=
2230
,
[
Description
(
"整数"
)]
实发绩效
=
2240
,
实发绩效
=
2240
,
}
public
enum
DisplayRule
{
始终显示
,
下发显示
,
}
public
enum
Format
{
无
,
整数
,
一位小数
,
两位小数
,
三位小数
,
四位小数
,
百分比
,
}
}
}
}
}
}
performance/Performance.DtoModels/Response/UniteDeptDetailResponse.cs
View file @
8a353df6
...
@@ -12,20 +12,6 @@ public class UniteDeptDetailResponse
...
@@ -12,20 +12,6 @@ public class UniteDeptDetailResponse
}
}
public
class
DeptDetailItem
public
class
DeptDetailItem
{
{
//public DeptDetailItem(int type, string title, decimal total, string remark, int sort)
// : this(type, title, total, remark, sort, new List<Dictionary<string, object>>())
//{
//}
//public DeptDetailItem(int type, string title, decimal total, string remark, int sort, List<Dictionary<string, object>> items)
//{
// Type = type;
// Title = title;
// Total = total;
// Remark = remark;
// Sort = sort;
// Items = items;
//}
public
int
Type
{
get
;
set
;
}
public
int
Type
{
get
;
set
;
}
public
string
Title
{
get
;
set
;
}
public
string
Title
{
get
;
set
;
}
public
decimal
Total
{
get
;
set
;
}
public
decimal
Total
{
get
;
set
;
}
...
...
performance/Performance.DtoModels/UniteDeptSetting.cs
0 → 100644
View file @
8a353df6
using
System
;
using
System.Collections.Generic
;
namespace
Performance.DtoModels
{
public
class
UniteDeptSetting
{
public
List
<
UniteDeptDetailItem
>
DetailItems
{
get
;
set
;
}
=
new
List
<
UniteDeptDetailItem
>();
}
public
class
UniteDeptDetailItem
{
public
int
Type
{
get
;
set
;
}
public
int
SheetType
{
get
;
set
;
}
public
string
Title
{
get
;
set
;
}
public
string
Remark
{
get
;
set
;
}
public
string
Format
{
get
;
set
;
}
public
int
Sort
{
get
;
set
;
}
public
string
Display
{
get
;
set
;
}
public
List
<
UniteDeptDetailItem
>
Items
{
get
;
set
;
}
}
}
performance/Performance.EntityModels/Context/PerformanceDbContext.cs
View file @
8a353df6
...
@@ -69,6 +69,8 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
...
@@ -69,6 +69,8 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
public
virtual
DbSet
<
cof_check
>
cof_check
{
get
;
set
;
}
public
virtual
DbSet
<
cof_check
>
cof_check
{
get
;
set
;
}
/// <summary> </summary>
/// <summary> </summary>
public
virtual
DbSet
<
cof_cmi
>
cof_cmi
{
get
;
set
;
}
public
virtual
DbSet
<
cof_cmi
>
cof_cmi
{
get
;
set
;
}
/// <summary> </summary>
public
virtual
DbSet
<
cof_dept_detail
>
cof_dept_detail
{
get
;
set
;
}
/// <summary> 科室类型 </summary>
/// <summary> 科室类型 </summary>
public
virtual
DbSet
<
cof_depttype
>
cof_depttype
{
get
;
set
;
}
public
virtual
DbSet
<
cof_depttype
>
cof_depttype
{
get
;
set
;
}
/// <summary> 规模绩效、效率绩效计算系数配置 </summary>
/// <summary> 规模绩效、效率绩效计算系数配置 </summary>
...
...
performance/Performance.EntityModels/Entity/cof_dept_detail.cs
0 → 100644
View file @
8a353df6
//-----------------------------------------------------------------------
// <copyright file=" cof_dept_detail.cs">
// * FileName: cof_dept_detail.cs
// </copyright>
//-----------------------------------------------------------------------
using
System
;
using
System.ComponentModel.DataAnnotations
;
using
System.ComponentModel.DataAnnotations.Schema
;
namespace
Performance.EntityModels
{
/// <summary>
///
/// </summary>
[
Table
(
"cof_dept_detail"
)]
public
class
cof_dept_detail
{
/// <summary>
///
/// </summary>
[
Key
]
public
int
Id
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
int
AllotId
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
string
Settings
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
DateTime
CreateTime
{
get
;
set
;
}
}
}
performance/Performance.Repository/Repository/PerforCofDeptDetailRepository.cs
0 → 100644
View file @
8a353df6
//-----------------------------------------------------------------------
// <copyright file="cof_dept_detail.cs">
// * FileName: cof_dept_detail.cs
// </copyright>
//-----------------------------------------------------------------------
using
Performance.EntityModels
;
namespace
Performance.Repository
{
/// <summary>
/// cof_cmi Repository
/// </summary>
public
partial
class
PerforCofDeptDetailRepository
:
PerforRepository
<
cof_dept_detail
>
{
public
PerforCofDeptDetailRepository
(
PerformanceDbContext
context
)
:
base
(
context
)
{
}
}
}
performance/Performance.Services/ComputeService.UniteDeptDetail.cs
View file @
8a353df6
This diff is collapsed.
Click to expand it.
performance/Performance.Services/ComputeService.cs
View file @
8a353df6
...
@@ -38,6 +38,7 @@ public partial class ComputeService : IAutoInjection
...
@@ -38,6 +38,7 @@ public partial class ComputeService : IAutoInjection
private
readonly
PerforCofaccountingRepository
_cofaccountingRepository
;
private
readonly
PerforCofaccountingRepository
_cofaccountingRepository
;
private
readonly
PerforCofaliasRepository
cofaliasRepository
;
private
readonly
PerforCofaliasRepository
cofaliasRepository
;
private
readonly
PerforReportRepository
reportRepository
;
private
readonly
PerforReportRepository
reportRepository
;
private
readonly
PerforCofDeptDetailRepository
_perforCofDeptDetailRepository
;
public
ComputeService
(
public
ComputeService
(
IMapper
mapper
,
IMapper
mapper
,
...
@@ -62,7 +63,8 @@ public partial class ComputeService : IAutoInjection
...
@@ -62,7 +63,8 @@ public partial class ComputeService : IAutoInjection
PerforCofworkitemRepository
cofworkitemRepository
,
PerforCofworkitemRepository
cofworkitemRepository
,
PerforCofaccountingRepository
cofaccountingRepository
,
PerforCofaccountingRepository
cofaccountingRepository
,
PerforCofaliasRepository
cofaliasRepository
,
PerforCofaliasRepository
cofaliasRepository
,
PerforReportRepository
reportRepository
)
PerforReportRepository
reportRepository
,
PerforCofDeptDetailRepository
perforCofDeptDetailRepository
)
{
{
_mapper
=
mapper
;
_mapper
=
mapper
;
_userRepository
=
userRepository
;
_userRepository
=
userRepository
;
...
@@ -87,6 +89,7 @@ public partial class ComputeService : IAutoInjection
...
@@ -87,6 +89,7 @@ public partial class ComputeService : IAutoInjection
_cofaccountingRepository
=
cofaccountingRepository
;
_cofaccountingRepository
=
cofaccountingRepository
;
this
.
cofaliasRepository
=
cofaliasRepository
;
this
.
cofaliasRepository
=
cofaliasRepository
;
this
.
reportRepository
=
reportRepository
;
this
.
reportRepository
=
reportRepository
;
_perforCofDeptDetailRepository
=
perforCofDeptDetailRepository
;
}
}
public
int
IsShowManage
(
int
allotId
)
public
int
IsShowManage
(
int
allotId
)
...
@@ -1676,7 +1679,7 @@ public ag_secondallot GetSecondByAccountId(int accountId)
...
@@ -1676,7 +1679,7 @@ public ag_secondallot GetSecondByAccountId(int accountId)
Department
=
special
.
AccountingUnit
,
Department
=
special
.
AccountingUnit
,
UnitType
=
UnitType
.
特殊核算组
.
ToString
()
UnitType
=
UnitType
.
特殊核算组
.
ToString
()
};
};
}
}
#
endregion
#
endregion
public
DeptDataDetails
GetDoctorDetail
(
int
computeId
)
public
DeptDataDetails
GetDoctorDetail
(
int
computeId
)
...
@@ -1735,7 +1738,7 @@ public DeptDataDetails GetDoctorDetail(int computeId)
...
@@ -1735,7 +1738,7 @@ public DeptDataDetails GetDoctorDetail(int computeId)
var
data
=
_perforImDataRepository
.
GetEntities
(
t
=>
t
.
AllotID
==
resCompute
.
AllotID
&&
sheets
.
Select
(
s
=>
s
.
ID
).
Contains
(
t
.
SheetID
.
Value
)
var
data
=
_perforImDataRepository
.
GetEntities
(
t
=>
t
.
AllotID
==
resCompute
.
AllotID
&&
sheets
.
Select
(
s
=>
s
.
ID
).
Contains
(
t
.
SheetID
.
Value
)
&&
t
.
JobNumber
==
resCompute
.
JobNumber
)
??
new
List
<
im_data
>();
&&
t
.
JobNumber
==
resCompute
.
JobNumber
)
??
new
List
<
im_data
>();
data
=
data
.
Where
(
t
=>
t
.
UnitType
!=
null
&&
Enum
.
IsDefined
(
typeof
(
UnitType
),
t
.
UnitType
)
==
true
&&
((
UnitType
)
t
.
UnitType
).
ToString
()
==
resCompute
.
UnitType
&&
t
.
AccountingUnit
==
resCompute
.
AccountingUnit
).
ToList
();
data
=
data
.
Where
(
t
=>
t
.
UnitType
!=
null
&&
Enum
.
IsDefined
(
typeof
(
UnitType
),
t
.
UnitType
)
==
true
&&
((
UnitType
)
t
.
UnitType
).
ToString
()
==
resCompute
.
UnitType
&&
t
.
AccountingUnit
==
resCompute
.
AccountingUnit
).
ToList
();
foreach
(
var
sheet
in
sheets
)
foreach
(
var
sheet
in
sheets
)
{
{
...
...
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