Commits · 953f9b1d02c74b956fcd44312c0c185cc164d430 · zry / performance · GitLab

28 Dec, 2021 2 commits
- 提取规则“列头”修改 · 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 2 commits
- Merge branch 'hotfix/科室预发修复' into develop · 10e4a442
  ruyun.zhang@suvalue.com committed Dec 24, 2021
  
  10e4a442 Browse Files
- 科室预发修复 · 1ee5181d
  ruyun.zhang@suvalue.com committed Dec 24, 2021
  
  1ee5181d Browse Files
23 Dec, 2021 24 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
- Merge branch 'hotfix/删除his_data、ex_result数据' · fd981073
  lcx committed Dec 23, 2021
  
  fd981073 Browse Files
- 删除his_data、ex_result历史数据 · 95be6f76
  lcx committed Dec 23, 2021
  
  95be6f76 Browse Files
- Merge branch 'hotfix/签字表列名修改' into develop · bfcf3737
  ruyun.zhang@suvalue.com committed Dec 23, 2021
  
  bfcf3737 Browse Files
- Merge branch 'hotfix/签字表列名修改' · af4df4a3
  ruyun.zhang@suvalue.com committed Dec 23, 2021
  
  af4df4a3 Browse Files
- 职务职称名称修改 · ff744fc3
  ruyun.zhang@suvalue.com committed Dec 23, 2021
  
  ff744fc3 Browse Files
- bug修复 · c67f9475
  ruyun.zhang@suvalue.com committed Dec 23, 2021
  
  c67f9475 Browse Files
- 下发功能重做 · 8a2a9a7f
  ruyun.zhang@suvalue.com committed Dec 23, 2021
  
  8a2a9a7f Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · f1d21af7
  ruyun.zhang@suvalue.com committed Dec 23, 2021
  
  f1d21af7 Browse Files
- Merge tag 'v20211223' into develop · 93649398
```
开启自定义提取、强制刷新报表
```
  lcx committed Dec 23, 2021
  93649398 Browse Files
- Merge branch 'hotfix/v20211223' · 4645cddc
  lcx committed Dec 23, 2021
  
  4645cddc Browse Files
- 开启自定义提取、强制刷新报表 · d70ef16c
  lcx committed Dec 23, 2021
  
  d70ef16c Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 413c1eae
  ruyun.zhang@suvalue.com committed Dec 23, 2021
  
  413c1eae Browse Files
- 取消自定义提取代码的注释 · 80a5d6f1
  lcx committed Dec 23, 2021
  
  80a5d6f1 Browse Files
- 删除his_data、ex_result数据 · 9e4868f8
  lcx committed Dec 23, 2021
  
  9e4868f8 Browse Files
- Merge branch 'hotfix/修复下发新增判定条件' · 6799bf4a
  ruyun.zhang@suvalue.com committed Dec 23, 2021
  
  6799bf4a Browse Files
- Merge branch 'hotfix/修复下发新增判定条件' into develop · 6e965464
  ruyun.zhang@suvalue.com committed Dec 23, 2021
  
  6e965464 Browse Files
- 修复下发新增判定条件 · 382c1fb2
  ruyun.zhang@suvalue.com committed Dec 23, 2021
  
  382c1fb2 Browse Files
- 刷新报表 · 22114acb
  lcx committed Dec 23, 2021
  
  22114acb Browse Files
22 Dec, 2021 4 commits
- Merge branch 'develop' into 手工录入_ · d4c9a2da
  lcx committed Dec 22, 2021
  
  d4c9a2da Browse Files
- Merge branch 'release/提取隐藏部分功能' · d0722040
  ruyun.zhang@suvalue.com committed Dec 22, 2021
  
  d0722040 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 3bacd8be
  ruyun.zhang@suvalue.com committed Dec 22, 2021
  
  3bacd8be Browse Files
- 隐藏获取手工录入数据 · 6c14da1e
  lcx committed Dec 22, 2021
  
  6c14da1e Browse Files
21 Dec, 2021 8 commits
- Merge branch 'hotfix/全院绩效发放修改人均BUG修复' · 91d9c6d8
  ruyun.zhang@suvalue.com committed Dec 21, 2021
  
  91d9c6d8 Browse Files
- Merge branch 'hotfix/全院绩效发放修改人均BUG修复' into develop · f3e26ac6
  ruyun.zhang@suvalue.com committed Dec 21, 2021
  
  f3e26ac6 Browse Files
- gitflow-hotfix-stash: 全院绩效发放修改人均BUG修复 · 3db35aec
  ruyun.zhang@suvalue.com committed Dec 21, 2021
  
  3db35aec Browse Files
- Merge branch 'release/柳铁12.21.1' · ab9c8f84
  ruyun.zhang@suvalue.com committed Dec 21, 2021
  
  ab9c8f84 Browse Files
- Merge branch '修改下发状态' into develop · f4e5cafe
  ruyun.zhang@suvalue.com committed Dec 21, 2021
  
  f4e5cafe Browse Files
- 管理绩效兼容“科主任/护士长” · 326ebc1f
  ruyun.zhang@suvalue.com committed Dec 21, 2021
  
  326ebc1f Browse Files
- 修改备注 · 477f9390
  钟博 committed Dec 21, 2021
  
  477f9390 Browse Files
- 修改下发状态 · 6a68ad2b
  钟博 committed Dec 21, 2021
  
  6a68ad2b Browse Files