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
4f28315a
Commit
4f28315a
authored
Apr 07, 2021
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
无效变量注释
parent
7252bb9c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
15 deletions
+11
-15
performance/Performance.Services/CollectService.cs
+3
-7
performance/Performance.Services/ExtractExcelService/ExtractHelper/ExtractHelper.cs
+1
-1
performance/Performance.Services/SecondAllotService.cs
+7
-7
No files found.
performance/Performance.Services/CollectService.cs
View file @
4f28315a
...
@@ -386,7 +386,7 @@ public HandsonTable GetCollectData(int userId, int allotId, string sheetName)
...
@@ -386,7 +386,7 @@ public HandsonTable GetCollectData(int userId, int allotId, string sheetName)
if
(
sTypes
.
Contains
((
int
)
sheet
.
SheetType
)
||
sTypeName
.
Contains
(
sheet
.
SheetName
))
if
(
sTypes
.
Contains
((
int
)
sheet
.
SheetType
)
||
sTypeName
.
Contains
(
sheet
.
SheetName
))
{
{
List
<
HandsonCellData
>
cells
=
new
List
<
HandsonCellData
>();
List
<
HandsonCellData
>
cells
=
new
List
<
HandsonCellData
>();
var
perSheet
=
perforPersheetRepository
.
GetEntity
(
t
=>
t
.
AllotID
==
allotId
&&
t
.
SheetName
==
"4.1 临床科室医护绩效测算表"
);
var
perSheet
=
perforPersheetRepository
.
GetEntity
(
t
=>
t
.
AllotID
==
allotId
&&
t
.
SheetName
==
"4.1 临床科室医护绩效测算表"
);
var
dept
=
perforPerdeptdicRepository
.
GetAccountBasicAccountingUnit
(
allot
.
HospitalId
);
var
dept
=
perforPerdeptdicRepository
.
GetAccountBasicAccountingUnit
(
allot
.
HospitalId
);
GetAccountBasic
(
perSheet
,
dept
,
cells
);
GetAccountBasic
(
perSheet
,
dept
,
cells
);
UnitFit
(
rowDatas
,
cells
,
sheet
);
UnitFit
(
rowDatas
,
cells
,
sheet
);
...
@@ -751,10 +751,6 @@ private void UnitFit(List<HandsonRowData> rowDatas, List<HandsonCellData> cellDa
...
@@ -751,10 +751,6 @@ private void UnitFit(List<HandsonRowData> rowDatas, List<HandsonCellData> cellDa
bool
exists
=
false
;
bool
exists
=
false
;
bool
exists2
=
false
;
bool
exists2
=
false
;
var
cells
=
new
List
<
HandsonCellData
>();
var
cells
=
new
List
<
HandsonCellData
>();
if
(
cell
.
Name
==
"总务科"
)
{
var
ss
=
1
;
}
foreach
(
var
rowData
in
rowDatas
)
foreach
(
var
rowData
in
rowDatas
)
{
{
foreach
(
var
cellData
in
rowData
.
CellData
)
foreach
(
var
cellData
in
rowData
.
CellData
)
...
@@ -787,7 +783,7 @@ private void UnitFit(List<HandsonRowData> rowDatas, List<HandsonCellData> cellDa
...
@@ -787,7 +783,7 @@ private void UnitFit(List<HandsonRowData> rowDatas, List<HandsonCellData> cellDa
if
(
exists
==
false
||
(
exists
==
false
&&
exists2
==
false
)
||
exists2
==
false
)
if
(
exists
==
false
||
(
exists
==
false
&&
exists2
==
false
)
||
exists2
==
false
)
{
{
cells
.
Add
(
new
HandsonCellData
(
"核算单元"
,
cell
.
Name
));
cells
.
Add
(
new
HandsonCellData
(
"核算单元"
,
cell
.
Name
));
if
(
sheet
.
SheetName
==
"5.2业务中层行政中高层医院奖罚"
)
if
(
sheet
.
SheetName
==
"5.2业务中层行政中高层医院奖罚"
)
{
{
...
@@ -801,7 +797,7 @@ private void UnitFit(List<HandsonRowData> rowDatas, List<HandsonCellData> cellDa
...
@@ -801,7 +797,7 @@ private void UnitFit(List<HandsonRowData> rowDatas, List<HandsonCellData> cellDa
{
{
cells
.
Add
(
new
HandsonCellData
(
"核算单元类型"
,
cell
.
Value
));
cells
.
Add
(
new
HandsonCellData
(
"核算单元类型"
,
cell
.
Value
));
}
}
suppRowDatas
.
Add
(
new
HandsonRowData
(++
rowCount
,
cells
));
suppRowDatas
.
Add
(
new
HandsonRowData
(++
rowCount
,
cells
));
}
}
}
}
...
...
performance/Performance.Services/ExtractExcelService/ExtractHelper/ExtractHelper.cs
View file @
4f28315a
...
@@ -175,7 +175,7 @@ public static void CloseAutoFilter(string path)
...
@@ -175,7 +175,7 @@ public static void CloseAutoFilter(string path)
package
.
Save
();
package
.
Save
();
}
}
}
}
catch
(
Exception
ex
)
catch
(
Exception
)
{
{
}
}
}
}
...
...
performance/Performance.Services/SecondAllotService.cs
View file @
4f28315a
...
@@ -1346,14 +1346,14 @@ public bool AuditSubmit(ag_secondallot second, int userId)
...
@@ -1346,14 +1346,14 @@ public bool AuditSubmit(ag_secondallot second, int userId)
if
(
temp
==
null
)
if
(
temp
==
null
)
throw
new
PerformanceException
(
"选择模板不可用,请确定模板及数据是否存在!"
);
throw
new
PerformanceException
(
"选择模板不可用,请确定模板及数据是否存在!"
);
bool
method
(
decimal
?
submitDataAmount
,
decimal
?
realGiveFee
)
//
bool method(decimal? submitDataAmount, decimal? realGiveFee)
{
//
{
if
(!
submitDataAmount
.
HasValue
||
!
realGiveFee
.
HasValue
)
//
if (!submitDataAmount.HasValue || !realGiveFee.HasValue)
return
false
;
//
return false;
decimal
floatValue
=
0.5
m
;
//
decimal floatValue = 0.5m;
return
submitDataAmount
>=
(
realGiveFee
-
floatValue
)
&&
submitDataAmount
<=
(
realGiveFee
+
floatValue
);
//
return submitDataAmount >= (realGiveFee - floatValue) && submitDataAmount <= (realGiveFee + floatValue);
}
//
}
if
(
temp
.
UseTempId
==
6
)
if
(
temp
.
UseTempId
==
6
)
{
{
...
...
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