Commits · 15e8630f92ba32b56947e0bcc52450809e94d398 · zry / performance

31 Dec, 2021 2 commits

Merge branch 'feature/绩效发放' into feature/实发绩效检验，医技组绩效，绩效汇总表合并 · 15e8630f

# Conflicts:
#	performance/Performance.Api/Controllers/ReportController.cs
#	performance/Performance.Api/wwwroot/Performance.Api.xml
#	performance/Performance.Api/wwwroot/Performance.EntityModels.xml
#	performance/Performance.DtoModels/Request/ComputerRequest.cs
#	performance/Performance.Repository/PerforReportRepository .cs
#	performance/Performance.Services/ComputeService.cs

committed Dec 31, 2021

15e8630f Browse Files

修改unittype名称 · 4619a6bc
lcx committed Dec 31, 2021

4619a6bc Browse Files

30 Dec, 2021 19 commits
- Merge branch 'feature/v22.1.7' into feature/实发绩效检验，医技组绩效，绩效汇总表合并 · 3fe6637c
```
# Conflicts:
#	performance/Performance.Api/wwwroot/Performance.EntityModels.xml
```
  lcx committed Dec 30, 2021
  3fe6637c Browse Files
- Merge branch 'feature/医技组科室绩效' into feature/用于合并 · 1cd79ae3
  纪旭韦 committed Dec 30, 2021
  
  1cd79ae3 Browse Files
- Merge branch 'feature/实发绩效校验' into feature/用于合并 · 4b92abd0
  纪旭韦 committed Dec 30, 2021
  
  4b92abd0 Browse Files
- 修改忘记改的参数 · 89505b3c
  纪旭韦 committed Dec 30, 2021
  
  89505b3c Browse Files
- 解决页面报错 · e39fcd7b
  纪旭韦 committed Dec 30, 2021
  
  e39fcd7b Browse Files
- 解决下载报错 · bc96131c
  纪旭韦 committed Dec 30, 2021
  
  bc96131c Browse Files
- Merge branch 'feature/绩效发放汇总表' into feature/绩效发放汇总表_ · 504d5033
  纪旭韦 committed Dec 30, 2021
  
  504d5033 Browse Files
- 自定义列头修改 · 099e2e68
  纪旭韦 committed Dec 30, 2021
  
  099e2e68 Browse Files
- 忘记传入分页信息 · 69bd23f4
  纪旭韦 committed Dec 30, 2021
  
  69bd23f4 Browse Files
- 去掉自定义列头不必要的代码 · 11d7cce9
  纪旭韦 committed Dec 30, 2021
  
  11d7cce9 Browse Files
- 解决列头报错 · be92e228
  纪旭韦 committed Dec 30, 2021
  
  be92e228 Browse Files
- 汇总表添加是否求和状态 · cc67323c
  纪旭韦 committed Dec 30, 2021
  
  cc67323c Browse Files
- 修改汇总表列头 · 0a06e354
  纪旭韦 committed Dec 30, 2021
  
  0a06e354 Browse Files
- 汇总表列头增加是否求和状态 · 88c0b969
  纪旭韦 committed Dec 30, 2021
  
  88c0b969 Browse Files
- 自定义提取日志推送 · 980923c5
  lcx committed Dec 30, 2021
  
  980923c5 Browse Files
- 基本完成绩效汇总三个表 · c5d7f4fc
  纪旭韦 committed Dec 30, 2021
  
  c5d7f4fc Browse Files
- Merge tag '获取二次绩效列表' into develop · e2f79e1f
  lcx committed Dec 30, 2021
  
  e2f79e1f Browse Files
- Merge branch 'hotfix/获取二次绩效列表' · 66fd829d
  lcx committed Dec 30, 2021
  
  66fd829d Browse Files
- 修改ef内linq使用方法 · 50d72b2a
  lcx committed Dec 30, 2021
  
  50d72b2a Browse Files
29 Dec, 2021 6 commits
- 解决缺少视图的问题 · f0ae6e37
  纪旭韦 committed Dec 29, 2021
  
  f0ae6e37 Browse Files
- no message · cdff00e8
  纪旭韦 committed Dec 29, 2021
  
  cdff00e8 Browse Files
- no message · aea7d36f
  纪旭韦 committed Dec 29, 2021
  
  aea7d36f Browse Files
- no message · 2dbc74f7
  纪旭韦 committed Dec 29, 2021
  
  2dbc74f7 Browse Files
- 完成实发绩效检验 · c36fa6be
  纪旭韦 committed Dec 29, 2021
  
  c36fa6be Browse Files
- 完成实发绩效对比的汇总接口 · a04ebd61
  纪旭韦 committed Dec 29, 2021
  
  a04ebd61 Browse Files
28 Dec, 2021 4 commits
- 医生组和医技组分开 · 3c4292a9
  纪旭韦 committed Dec 28, 2021
  
  3c4292a9 Browse Files
- 同步手工录入数据并导出 · fae509c7
  lcx committed Dec 28, 2021
  
  fae509c7 Browse Files
- 提取规则“列头”修改 · 953f9b1d
  lcx committed Dec 28, 2021
  
  953f9b1d Browse Files
- Merge branch '手工录入_' into feature/v22.1.7 · fae1b083
```
# Conflicts:
#	performance/Performance.Api/wwwroot/Performance.Api.xml
```
  lcx committed Dec 28, 2021
  fae1b083 Browse Files
24 Dec, 2021 3 commits
- Merge branch 'hotfix/科室预发修复' into develop · 10e4a442
  ruyun.zhang@suvalue.com committed Dec 24, 2021
  
  10e4a442 Browse Files
- Merge branch 'hotfix/科室预发修复' · 62f8a819
  ruyun.zhang@suvalue.com committed Dec 24, 2021
  
  62f8a819 Browse Files
- 科室预发修复 · 1ee5181d
  ruyun.zhang@suvalue.com committed Dec 24, 2021
  
  1ee5181d Browse Files
23 Dec, 2021 6 commits
- Merge remote-tracking branch 'origin/develop' into develop · 179ea63b
  ruyun.zhang@suvalue.com committed Dec 23, 2021
  
  179ea63b Browse Files
- Merge remote-tracking branch 'origin/master' · 34930cfb
  ruyun.zhang@suvalue.com committed Dec 23, 2021
  
  34930cfb Browse Files
- Merge branch 'hotfix/下发功能重做' into develop · d3babb6f
  ruyun.zhang@suvalue.com committed Dec 23, 2021
  
  d3babb6f Browse Files
- Merge branch 'hotfix/下发功能重做' · 5896236d
  ruyun.zhang@suvalue.com committed Dec 23, 2021
  
  5896236d Browse Files
- 下发去除删除操作 · d6f5dde2
  ruyun.zhang@suvalue.com committed Dec 23, 2021
  
  d6f5dde2 Browse Files
- Merge tag '删除his_data、ex_result数据' into develop · 89d5c7c1
```
# Conflicts:
#	performance/Performance.Services/ExtractExcelService/DictionaryService.cs
```
  lcx committed Dec 23, 2021
  89d5c7c1 Browse Files