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
9a7c672f
Commit
9a7c672f
authored
Oct 13, 2022
by
Licx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去除多个分号
parent
446fc5a9
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
14 additions
and
9 deletions
+14
-9
performance/Performance.Api/Controllers/ConfigController.cs
+1
-1
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
+5
-0
performance/Performance.Infrastructure/Helper/ReflectionHelper.cs
+1
-1
performance/Performance.Services/AllotCompute/QueryDataService.cs
+1
-1
performance/Performance.Services/ComputeService.cs
+3
-3
performance/Performance.Services/RedistributionService.cs
+1
-1
performance/Performance.Services/ReportGlobalService.cs
+1
-1
performance/Performance.Services/UserService.cs
+1
-1
No files found.
performance/Performance.Api/Controllers/ConfigController.cs
View file @
9a7c672f
...
@@ -901,7 +901,7 @@ public ApiResponse CopyDropDown()
...
@@ -901,7 +901,7 @@ public ApiResponse CopyDropDown()
new
CopyDrop
{
Label
=
"费用类别系数"
,
Value
=
"drugTypeFactors"
},
new
CopyDrop
{
Label
=
"费用类别系数"
,
Value
=
"drugTypeFactors"
},
//new CopyDrop{Label="科室类型",Value="deptTypes"},
//new CopyDrop{Label="科室类型",Value="deptTypes"},
new
CopyDrop
{
Label
=
"二次绩效配置"
,
Value
=
"agains"
},
new
CopyDrop
{
Label
=
"二次绩效配置"
,
Value
=
"agains"
},
};
;
};
return
new
ApiResponse
(
ResponseType
.
OK
,
result
);
return
new
ApiResponse
(
ResponseType
.
OK
,
result
);
}
}
...
...
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
View file @
9a7c672f
...
@@ -2298,6 +2298,11 @@
...
@@ -2298,6 +2298,11 @@
行政后勤是否显示管理绩效按钮 1 是 2 否
行政后勤是否显示管理绩效按钮 1 是 2 否
</summary>
</summary>
</member>
</member>
<member
name=
"P:Performance.DtoModels.HospitalRequest.IsShowAdjust"
>
<summary>
是否显示调节系数 1 显示 2 不显示
</summary>
</member>
<member
name=
"P:Performance.DtoModels.IncomeRequest.SheetNameKeyword"
>
<member
name=
"P:Performance.DtoModels.IncomeRequest.SheetNameKeyword"
>
<summary>
<summary>
关键字匹配
关键字匹配
...
...
performance/Performance.Infrastructure/Helper/ReflectionHelper.cs
View file @
9a7c672f
...
@@ -30,7 +30,7 @@ public static List<Type> GetClassType<TInterface>(Assembly assembly)
...
@@ -30,7 +30,7 @@ public static List<Type> GetClassType<TInterface>(Assembly assembly)
{
{
var
typeInterface
=
typeof
(
TInterface
);
var
typeInterface
=
typeof
(
TInterface
);
return
assembly
.
GetTypes
()
return
assembly
.
GetTypes
()
.
Where
(
t
=>
typeInterface
.
GetTypeInfo
().
IsAssignableFrom
(
t
)
&&
t
!=
typeInterface
&&
t
.
GetTypeInfo
().
IsAbstract
==
false
).
ToList
();
;
.
Where
(
t
=>
typeInterface
.
GetTypeInfo
().
IsAssignableFrom
(
t
)
&&
t
!=
typeInterface
&&
t
.
GetTypeInfo
().
IsAbstract
==
false
).
ToList
();
}
}
}
}
...
...
performance/Performance.Services/AllotCompute/QueryDataService.cs
View file @
9a7c672f
...
@@ -85,7 +85,7 @@ private PerExcel Query(List<per_sheet> sheets, int allotId)
...
@@ -85,7 +85,7 @@ private PerExcel Query(List<per_sheet> sheets, int allotId)
SheetType
=
(
SheetType
)
t
.
SheetType
,
SheetType
=
(
SheetType
)
t
.
SheetType
,
PerData
=
new
List
<
IPerData
>(),
PerData
=
new
List
<
IPerData
>(),
PerHeader
=
new
List
<
PerHeader
>()
PerHeader
=
new
List
<
PerHeader
>()
});
;
});
});
});
foreach
(
var
sheet
in
perExcel
.
PerSheet
)
foreach
(
var
sheet
in
perExcel
.
PerSheet
)
...
...
performance/Performance.Services/ComputeService.cs
View file @
9a7c672f
...
@@ -614,7 +614,7 @@ public List<DeptResponse> GetAdminPerformance(int allotId)
...
@@ -614,7 +614,7 @@ public List<DeptResponse> GetAdminPerformance(int allotId)
AdjustLaterOtherFee
=
t
.
Sum
(
w
=>
w
.
AdjustLaterOtherFee
),
AdjustLaterOtherFee
=
t
.
Sum
(
w
=>
w
.
AdjustLaterOtherFee
),
RealGiveFee
=
t
.
Sum
(
w
=>
Math
.
Round
((
w
.
GiveFee
*
w
.
Adjust
+
w
.
AdjustLaterOtherFee
)
??
0
,
MidpointRounding
.
AwayFromZero
)),
RealGiveFee
=
t
.
Sum
(
w
=>
Math
.
Round
((
w
.
GiveFee
*
w
.
Adjust
+
w
.
AdjustLaterOtherFee
)
??
0
,
MidpointRounding
.
AwayFromZero
)),
AssessLaterManagementFee
=
0
,
AssessLaterManagementFee
=
0
,
});
;
});
result
.
AddRange
(
officeResult
);
result
.
AddRange
(
officeResult
);
#
endregion
#
endregion
...
@@ -678,7 +678,7 @@ public List<DeptResponse> GetAdminPerformance(int allotId)
...
@@ -678,7 +678,7 @@ public List<DeptResponse> GetAdminPerformance(int allotId)
AprPerforAmount
=
t
.
Amount
,
AprPerforAmount
=
t
.
Amount
,
HideAprOtherPerforAmount
=
0
,
HideAprOtherPerforAmount
=
0
,
RealGiveFee
=
t
.
Amount
,
RealGiveFee
=
t
.
Amount
,
});
;
});
result
.
AddRange
(
otherResult
);
result
.
AddRange
(
otherResult
);
// 不公示其他绩效匹配不上补充
// 不公示其他绩效匹配不上补充
...
@@ -704,7 +704,7 @@ public List<DeptResponse> GetAdminPerformance(int allotId)
...
@@ -704,7 +704,7 @@ public List<DeptResponse> GetAdminPerformance(int allotId)
AprPerforAmount
=
0
,
AprPerforAmount
=
0
,
HideAprOtherPerforAmount
=
t
.
Amount
,
HideAprOtherPerforAmount
=
t
.
Amount
,
RealGiveFee
=
t
.
Amount
,
RealGiveFee
=
t
.
Amount
,
});
;
});
result
.
AddRange
(
hideOtherResult
);
result
.
AddRange
(
hideOtherResult
);
#
endregion
#
endregion
...
...
performance/Performance.Services/RedistributionService.cs
View file @
9a7c672f
...
@@ -929,7 +929,7 @@ private HandsonTableBase ComputeMode_Format3(per_allot allot, List<string> colHe
...
@@ -929,7 +929,7 @@ private HandsonTableBase ComputeMode_Format3(per_allot allot, List<string> colHe
var
fs
=
handson
.
Columns
.
Select
(
col
=>
var
fs
=
handson
.
Columns
.
Select
(
col
=>
{
{
var
f
=
loads
.
FirstOrDefault
(
w
=>
w
.
Title
.
StartsWithIgnoreCase
(
$"Workload_"
)
&&
w
.
Title
.
EqualsIgnoreCase
(
col
.
Data
));
var
f
=
loads
.
FirstOrDefault
(
w
=>
w
.
Title
.
StartsWithIgnoreCase
(
$"Workload_"
)
&&
w
.
Title
.
EqualsIgnoreCase
(
col
.
Data
));
return
f
==
null
?
""
:
(
f
.
State
??
0
).
ToString
(
"0.####"
);
;
return
f
==
null
?
""
:
(
f
.
State
??
0
).
ToString
(
"0.####"
);
});
});
//handson.NestedHeadersArray.Add(handson.ColHeaders);
//handson.NestedHeadersArray.Add(handson.ColHeaders);
...
...
performance/Performance.Services/ReportGlobalService.cs
View file @
9a7c672f
...
@@ -518,7 +518,7 @@ private List<string> GetColumns(ISheet sheet, string sheetName, out string sourc
...
@@ -518,7 +518,7 @@ private List<string> GetColumns(ISheet sheet, string sheetName, out string sourc
}
}
}
}
//if (string.IsNullOrEmpty(sourceType)) return new List<string>();
;
//if (string.IsNullOrEmpty(sourceType)) return new List<string>();
var
columnRow
=
sheet
.
GetOrCreate
(
0
);
var
columnRow
=
sheet
.
GetOrCreate
(
0
);
return
columnRow
.
GetCellValues
();
return
columnRow
.
GetCellValues
();
...
...
performance/Performance.Services/UserService.cs
View file @
9a7c672f
...
@@ -467,7 +467,7 @@ public List<TitleValue<int>> GetDemoUsers()
...
@@ -467,7 +467,7 @@ public List<TitleValue<int>> GetDemoUsers()
{
{
Title
=
t
.
RoleName
,
Title
=
t
.
RoleName
,
Value
=
userrole
.
FirstOrDefault
(
ur
=>
ur
.
RoleID
==
t
.
ID
)?.
UserID
??
0
Value
=
userrole
.
FirstOrDefault
(
ur
=>
ur
.
RoleID
==
t
.
ID
)?.
UserID
??
0
}).
ToList
();
;
}).
ToList
();
}
}
public
UserIdentity
GetDemoUserIdentity
(
int
userId
)
public
UserIdentity
GetDemoUserIdentity
(
int
userId
)
...
...
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