Commits · 7b0c5af747e6bf731ecedca73a83938f74c159dc · zry / performance · GitLab

01 Jun, 2021 10 commits
- 人员字典粘贴数据添加handsontable配置，限流json添加配置 · 7b0c5af7
  lcx committed Jun 01, 2021
  
  7b0c5af7 Browse Files
- Merge branch 'feature/限流' into develop · c21b1c42
  lcx committed Jun 01, 2021
  
  c21b1c42 Browse Files
- Merge branch 'feature/抽取时添加抽取时间' into develop · 103b61d0
  lcx committed Jun 01, 2021
  
  103b61d0 Browse Files
- Merge tag '银行卡号' into develop · 5cf63845
```
# Conflicts:
#	performance/Performance.Services/ComputeService.cs
```
  lcx committed Jun 01, 2021
  5cf63845 Browse Files
- Merge branch 'hotfix/银行卡号' · 0dfb30cc
  lcx committed Jun 01, 2021
  
  0dfb30cc Browse Files
- 人员字典新增银行卡号 · cc72121c
  lcx committed Jun 01, 2021
  
  cc72121c Browse Files
- Merge branch 'hotfix/限流' into feature/限流 · 40791839
  lcx committed Jun 01, 2021
  
  40791839 Browse Files
- 二次绩效提交审核，后端进行金额校验 · 5f9204fa
  lcx committed Jun 01, 2021
  
  5f9204fa Browse Files
- 核算组别配置返回列表修改 · e7d020d7
  lcx committed Jun 01, 2021
  
  e7d020d7 Browse Files
- 人员不存在获取其他绩效时异常 · ded99a36
  lcx committed Jun 01, 2021
  
  ded99a36 Browse Files
31 May, 2021 8 commits
- Merge branch 'hotfix/医院其他绩效大改' · bbfd60a6
  ruyun.zhang@suvalue.com committed May 31, 2021
  
  bbfd60a6 Browse Files
- 医院其他绩效录入科室自动填充 · 27e9051f
  ruyun.zhang@suvalue.com committed May 31, 2021
  
  27e9051f Browse Files
- 补充字典中科室不存在，但医院其他绩效有人员信息 · 60f260d7
  ruyun.zhang@suvalue.com committed May 31, 2021
  
  60f260d7 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · b68a8a78
  ruyun.zhang@suvalue.com committed May 31, 2021
  
  b68a8a78 Browse Files
- Merge branch 'hotfix/科室详情没有收入不显示BUG修复' · ddb13f30
  ruyun.zhang@suvalue.com committed May 31, 2021
  
  ddb13f30 Browse Files
- Merge branch 'hotfix/科室详情没有收入不显示BUG修复' into develop · fe91b30b
  ruyun.zhang@suvalue.com committed May 31, 2021
  
  fe91b30b Browse Files
- 科室详情没有收入不显示BUG修复 · 2112a1c9
  ruyun.zhang@suvalue.com committed May 31, 2021
  
  2112a1c9 Browse Files
- 修改医院其他绩效来源，不在使用per_apr_amount中accountingunit · 5867b3c6
  ruyun.zhang@suvalue.com committed May 31, 2021
  
  5867b3c6 Browse Files
28 May, 2021 1 commit
- Merge branch 'develop' into feature/抽取时添加抽取时间 · c950d818
  lcx committed May 28, 2021
  
  c950d818 Browse Files
27 May, 2021 5 commits
- Merge branch 'develop' into feature/核算单元组别功能修复 · dccc03bb
  lcx committed May 27, 2021
  
  dccc03bb Browse Files
- 核算单元修改 · d9945f8a
  lcx committed May 27, 2021
  
  d9945f8a Browse Files
- Merge branch 'hotfix/二次分配按科室带出医院其他绩效' · f6b63e51
  ruyun.zhang@suvalue.com committed May 27, 2021
  
  f6b63e51 Browse Files
- Merge branch 'hotfix/二次分配按科室带出医院其他绩效' into develop · d00173d0
  ruyun.zhang@suvalue.com committed May 27, 2021
  
  d00173d0 Browse Files
- 医院其他绩效临时解决 · d3f2cf8a
  ruyun.zhang@suvalue.com committed May 27, 2021
  
  d3f2cf8a Browse Files
26 May, 2021 11 commits
- Merge branch 'feature/无法删除科室字典部分数据' into develop · 4f68ede6
  ruyun.zhang@suvalue.com committed May 26, 2021
  
  4f68ede6 Browse Files
- Merge branch 'feature/检查数据同步' into develop · 3f33494a
  ruyun.zhang@suvalue.com committed May 26, 2021
  
  3f33494a Browse Files
- Merge branch 'feature/096' into develop · 1740788c
  ruyun.zhang@suvalue.com committed May 26, 2021
  
  1740788c Browse Files
- 个人系数 · 0063ac1e
  ruyun.zhang@suvalue.com committed May 26, 2021
  
  0063ac1e Browse Files
- 姓名始终按人员字典显示，096新增个人系数 · 37ab0379
  ruyun.zhang@suvalue.com committed May 26, 2021
  
  37ab0379 Browse Files
- Merge branch 'hotfix/打印少人' into develop · 6947baf8
  ruyun.zhang@suvalue.com committed May 26, 2021
  
  6947baf8 Browse Files
- Merge remote-tracking branch 'origin/master' · aca0f8ed
  ruyun.zhang@suvalue.com committed May 26, 2021
  
  aca0f8ed Browse Files
- Merge branch 'hotfix/打印少人' · dabea9e0
  ruyun.zhang@suvalue.com committed May 26, 2021
  
  dabea9e0 Browse Files
- 打印缺人BUG修复 · 7382cf98
  ruyun.zhang@suvalue.com committed May 26, 2021
  
  7382cf98 Browse Files
- 无法删除科室字典部分数据 · e7227bf7
  ruyun.zhang@suvalue.com committed May 26, 2021
  
  e7227bf7 Browse Files
- 验证科室核算单元、工号异步改同步 · 6713b463
  ruyun.zhang@suvalue.com committed May 26, 2021
  
  6713b463 Browse Files
25 May, 2021 3 commits
- Merge tag '医院其他绩效统计表bug' into develop · 11c4b9c9
```
# Conflicts:
#	performance/Performance.Services/ConfigService.cs
```
  钟博 committed May 25, 2021
  11c4b9c9 Browse Files
- Merge branch 'hotfix/医院其他绩效统计表bug' · 0a7eef76
  钟博 committed May 25, 2021
  
  0a7eef76 Browse Files
- 更改医院其他绩效统计表同类型金额求和、更改accounting判断类型 · 48ecc275
  钟博 committed May 25, 2021
  
  48ecc275 Browse Files
24 May, 2021 2 commits
- 添加抽取时间、抽取添加判断规则 · 4b53dbf8
  lcx committed May 24, 2021
  
  4b53dbf8 Browse Files
- Merge branch 'v2020morge-ratelimit' into hotfix/限流 · 89e2611f
```
# Conflicts:
#	performance/Performance.Api/Program.cs
#	performance/Performance.Api/Startup.cs
```
  lcx committed May 24, 2021
  89e2611f Browse Files