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
501e26f3
Commit
501e26f3
authored
Sep 21, 2020
by
lcx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改获取工作量的系数hospitalID
parent
c4b88c26
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
performance/Performance.Repository/PerforPerAllotRepository.cs
+3
-3
performance/Performance.Services/PersonService.cs
+5
-1
No files found.
performance/Performance.Repository/PerforPerAllotRepository.cs
View file @
501e26f3
...
...
@@ -158,7 +158,7 @@ public void ImportWorkloadData(per_allot allot, object parameters)
/// 查询工作量数据
/// </summary>
/// <param name="allotid"></param>
public
IEnumerable
<
report_original_workload
>
QueryWorkloadData
(
int
allotid
,
string
accountingunit
,
string
unittype
)
public
IEnumerable
<
report_original_workload
>
QueryWorkloadData
(
int
allotid
,
string
accountingunit
,
string
unittype
,
int
hospitalid
)
{
using
(
var
connection
=
context
.
Database
.
GetDbConnection
())
{
...
...
@@ -167,7 +167,7 @@ public IEnumerable<report_original_workload> QueryWorkloadData(int allotid, stri
{
string
clear
=
@"SELECT t3.AccountingUnit as Department,t1.DoctorName,t1.PersonnelNumber,t1.Category,t1.Fee FROM ex_result t1
JOIN per_employee t2 on t1.doctorname = t2.doctorname and t1.personnelnumber = t2.personnelnumber
JOIN (select distinct AccountingUnit,HISDeptName,unittype from per_dept_dic where HospitalId =
45
) 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
AND t2.allotid = @allotid
AND t3.unittype = @unittype
...
...
@@ -175,7 +175,7 @@ public IEnumerable<report_original_workload> QueryWorkloadData(int allotid, stri
AND t1.Source LIKE CONCAT('%',@unittype,'工作量%')
AND T1.IsDelete = 0
ORDER BY t1.doctorname,t1.Category;"
;
return
connection
.
Query
<
report_original_workload
>(
clear
,
new
{
allotid
,
accountingunit
,
unittype
},
commandTimeout
:
60
*
60
);
return
connection
.
Query
<
report_original_workload
>(
clear
,
new
{
allotid
,
accountingunit
,
unittype
,
hospitalid
},
commandTimeout
:
60
*
60
);
}
catch
(
Exception
ex
)
{
...
...
performance/Performance.Services/PersonService.cs
View file @
501e26f3
...
...
@@ -497,7 +497,11 @@ public object DeptWorkloadDetail(WorkDetailRequest request, int userId)
if
(
second
==
null
)
return
null
;
var
data
=
perallotRepository
.
QueryWorkloadData
(
request
.
AllotId
,
request
.
AccountingUnit
,
second
.
UnitType
);
var
allot
=
perallotRepository
.
GetEntity
(
w
=>
w
.
ID
==
request
.
AllotId
);
if
(
allot
==
null
)
return
null
;
var
data
=
perallotRepository
.
QueryWorkloadData
(
request
.
AllotId
,
request
.
AccountingUnit
,
second
.
UnitType
,
allot
.
HospitalId
);
if
(
data
!=
null
&&
data
.
Any
())
{
return
data
.
GroupBy
(
t
=>
new
{
t
.
Department
,
t
.
DoctorName
,
t
.
PersonnelNumber
,
t
.
Category
})
...
...
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