Commits · 2216bc23fc6bf4081ab4ca2990016f03af9e4649 · zry / performance · GitLab

02 Jun, 2021 9 commits
- Merge branch 'feature/二次绩效审核' into develop · 2216bc23
  lcx committed Jun 02, 2021
  
  2216bc23 Browse Files
- 注释日志记录 · 6bf5f608
  lcx committed Jun 02, 2021
  
  6bf5f608 Browse Files
- 限流功能调整 · e09bb559
  lcx committed Jun 02, 2021
  
  e09bb559 Browse Files
- 二次绩效审核 · e4d05297
  lcx committed Jun 02, 2021
  
  e4d05297 Browse Files
- Merge branch 'feature/银行卡号' into develop · 92a110ee
  lcx committed Jun 02, 2021
  
  92a110ee Browse Files
- Merge tag '显式管理绩效按钮' into develop · ce4a551e
```
# Conflicts:
#	performance/Performance.Services/SecondAllot/SecondAllotDetails.cs
```
  lcx committed Jun 02, 2021
  ce4a551e Browse Files
- Merge branch 'hotfix/显式管理绩效按钮' · 378f2bec
  lcx committed Jun 02, 2021
  
  378f2bec Browse Files
- 二次绩效列表返回isshowmanagebutton字段 · 90b1cef8
  lcx committed Jun 02, 2021
  
  90b1cef8 Browse Files
- 医院添加是否显示管理绩效按钮配置、可编辑；修复二次绩效获取医院其他绩效 · 4b8c9a31
  lcx committed Jun 02, 2021
  
  4b8c9a31 Browse Files
01 Jun, 2021 12 commits
- 人员字典粘贴数据添加handsontable配置，限流json添加配置 · 7b0c5af7
  lcx committed Jun 01, 2021
  
  7b0c5af7 Browse Files
- Merge branch 'feature/医院其他绩效大改' into develop · 54ca9ffb
  ruyun.zhang@suvalue.com committed Jun 01, 2021
  
  54ca9ffb 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
- 医院其他绩效大改，第二版医院其他绩效匹配不到则强制补充 · 80d9424a
  ruyun.zhang@suvalue.com committed Jun 01, 2021
  
  80d9424a 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 5 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