Commits · 9810a4f3fa9b229d39a67ca902f2e318edd4f7af · zry / performance · GitLab

10 Jan, 2022 4 commits
- Merge branch 'hotfix/管理绩效科室未下发确可见BUG修复' into develop · 9810a4f3
  ruyun.zhang@suvalue.com committed Jan 10, 2022
  
  9810a4f3 Browse Files
- 管理绩效BUG修复 · 59cad620
  ruyun.zhang@suvalue.com committed Jan 10, 2022
  
  59cad620 Browse Files
- 添加自定义提取的提示 · 91826a16
  lcx committed Jan 10, 2022
  
  91826a16 Browse Files
- 删除错误文件 · 30925aa6
  lcx committed Jan 10, 2022
  
  30925aa6 Browse Files
07 Jan, 2022 5 commits
- 删除Excel中且提取不存在的科室 · 93feaa2e
  lcx committed Jan 07, 2022
  
  93feaa2e Browse Files
- Merge tag '提取工作簿修改' into develop · a1d6df84
  lcx committed Jan 07, 2022
  
  a1d6df84 Browse Files
- Merge branch 'hotfix/提取工作簿修改' · b264cfe8
  lcx committed Jan 07, 2022
  
  b264cfe8 Browse Files
- 跳过值为0的写入，删除多余的列，工作量新增科室跳行 · 5f554e53
  lcx committed Jan 07, 2022
  
  5f554e53 Browse Files
- Merge branch 'feature/实发绩效检验，医技组绩效，绩效汇总表合并' into develop · 654deda7
  lcx committed Jan 07, 2022
  
  654deda7 Browse Files
06 Jan, 2022 3 commits
- 获取数据添加条件 - 医院 · 0a9aedaa
  lcx committed Jan 06, 2022
  
  0a9aedaa Browse Files
- sql优化 · 3deb2184
  纪旭韦 committed Jan 06, 2022
  
  3deb2184 Browse Files
- 三张绩效发放表添加搜索功能，顺便修复实发绩效对比分页失效 · ad4e9676
  纪旭韦 committed Jan 06, 2022
  
  ad4e9676 Browse Files
05 Jan, 2022 3 commits
- Merge tag '提取跳过科室' into develop · 21af914a
  lcx committed Jan 05, 2022
  
  21af914a Browse Files
- Merge branch 'hotfix/提取跳过科室' · eac2d6e9
  lcx committed Jan 05, 2022
  
  eac2d6e9 Browse Files
- 数据提取，获取科室名称时使用去除转义 · fdb0d538
  lcx committed Jan 05, 2022
  
  fdb0d538 Browse Files
04 Jan, 2022 1 commit
- 自定义提取推送日志修改返回内容 · 81a6b18e
  lcx committed Jan 04, 2022
  
  81a6b18e Browse Files
31 Dec, 2021 6 commits
- Merge tag '吴江放射科' into develop · d0f4cf6c
```
二次绩效职称判空为0
```
  lcx committed Dec 31, 2021
  d0f4cf6c Browse Files
- Merge branch 'hotfix/吴江放射科' · c01b3c46
  lcx committed Dec 31, 2021
  
  c01b3c46 Browse Files
- 二次绩效数据保存年资职称绩效占比判空为0 · afcde2a7
  lcx committed Dec 31, 2021
  
  afcde2a7 Browse Files
- Merge branch 'feature/过期限制' into feature/实发绩效检验，医技组绩效，绩效汇总表合并 · 41b5c47f
  lcx committed Dec 31, 2021
  
  41b5c47f Browse Files
- 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
```
  lcx committed Dec 31, 2021
  15e8630f Browse Files
- 修改unittype名称 · 4619a6bc
  lcx committed Dec 31, 2021
  
  4619a6bc Browse Files
30 Dec, 2021 18 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