Commits · 0b80d627f704bed4913e2c23581255b194e9fb6c · zry / performance · GitLab

08 May, 2020 1 commit
- 人事科权限修改 · 0b80d627
  lcx committed May 08, 2020
  
  0b80d627 Browse Files
06 May, 2020 3 commits
- 更新上传文件 · cef7e40f
  lcx committed May 06, 2020
  
  cef7e40f Browse Files
- 使用预算管理系数替换发放、调节系数的发布文件 · 680b11d7
  lcx committed May 06, 2020
  
  680b11d7 Browse Files
- 获取预算比例添加日志，取消使用预算比例（调节、发放系数） · fdd84150
  lcx committed May 06, 2020
  
  fdd84150 Browse Files
29 Apr, 2020 1 commit
- 预算系数绑定修改 · cff05abc
  lcx committed Apr 29, 2020
  
  cff05abc Browse Files
28 Apr, 2020 6 commits
- 返回log信息修改 · e9c7ba17
  lcx committed Apr 28, 2020
  
  e9c7ba17 Browse Files
- 报表科主任、护士长相关修改，获取科室改为获取核算单元 · a5ad549c
  lcx committed Apr 28, 2020
  
  a5ad549c Browse Files
- Merge branch 'readExcel' into v2020 · 514df09d
  lcx committed Apr 28, 2020
  
  514df09d Browse Files
- Merge branch 'budget' into readExcel · 58367fb6
  lcx committed Apr 28, 2020
  
  58367fb6 Browse Files
- perheader过滤、筛选条件过滤 · 8d87daf6
  lcx committed Apr 28, 2020
  
  8d87daf6 Browse Files
- 添加字段确定预算年限 · 148ac0e2
  lcx committed Apr 28, 2020
  
  148ac0e2 Browse Files
27 Apr, 2020 4 commits
- 更替adjust 、 grant · e49e553d
  lcx committed Apr 27, 2020
  
  e49e553d Browse Files
- 预算管理 · 903d85ac
  lcx committed Apr 27, 2020
  
  903d85ac Browse Files
- 更新实体 · 5684b17e
  lcx committed Apr 27, 2020
  
  5684b17e Browse Files
- 生成绩效时补充费用占比 · 3bd57de9
  lcx committed Apr 27, 2020
  
  3bd57de9 Browse Files
26 Apr, 2020 1 commit
- 抽取sql根据isenabled字段判断是否显示，特殊科室数量字段根据值判断是否填充样式 · 512290f7
  lcx committed Apr 26, 2020
  
  512290f7 Browse Files
22 Apr, 2020 1 commit
- 抽取修改 · 5de67c14
  lcx committed Apr 22, 2020
  
  5de67c14 Browse Files
17 Apr, 2020 1 commit
- 二次绩效列表Unittype不匹配 · 3a4266e1
  lcx committed Apr 17, 2020
  
  3a4266e1 Browse Files
16 Apr, 2020 1 commit
- 科主任/护士长应发绩效 (乘以出勤率), 增加菜单其他业务中层绩效 · 990bdfad
  lcx committed Apr 16, 2020
  
  990bdfad Browse Files
15 Apr, 2020 1 commit
- 二次绩效详情返回head数据与模板不同, filedid存在空值 · d61a092a
  lcx committed Apr 15, 2020
  
  d61a092a Browse Files
14 Apr, 2020 5 commits
- Merge branch 'feature/new_report' into v2020 · 2b497215
  lcx committed Apr 14, 2020
  
  2b497215 Browse Files
- 二次绩效bug修改，提交数据时更新usertempid，用于审核显示与查看数据时，获取不同的数据来源 · 2a093e97
  lcx committed Apr 14, 2020
  
  2a093e97 Browse Files
- V20200414正式版发布 · 2aebe274
```
文本修改
```
  ruyun.zhang@suvalue.com committed Apr 14, 2020
  2aebe274 Browse Files
- bug修改，核算数据值为负数时不显示 · cccf0e4a
  lcx committed Apr 14, 2020
  
  cccf0e4a Browse Files
- 收入费用类别(药、材料占比)修改，其他组改为其他 · df4cf65c
  lcx committed Apr 14, 2020
  
  df4cf65c Browse Files
13 Apr, 2020 4 commits
- 添加效率绩效人数 · 0ccd1604
  lcx committed Apr 13, 2020
  
  0ccd1604 Browse Files
- Merge branch 'feature/new_report' into feature/new_report_field · fbc9248f
```
# Conflicts:
#	performance/Performance.Services/AllotCompute/ResultComputeService.cs
#	performance/Performance.Services/PerExcelService/ComputeEmpolyee/ComputeDirector.cs
```
  lcx committed Apr 13, 2020
  fbc9248f Browse Files
- 共用科主任/护士长计算修改，最终数据添加发放系数，科主任人数，核算科室人数字段 · 4c3c052a
  lcx committed Apr 13, 2020
  
  4c3c052a Browse Files
- 药品费用类别修改、发放系数 · 22d17ee5
  lcx committed Apr 13, 2020
  
  22d17ee5 Browse Files
10 Apr, 2020 8 commits
- Merge branch 'dev' into v2020 · 12a2b71e
  ruyun.zhang@suvalue.com committed Apr 10, 2020
  
  12a2b71e Browse Files
- Merge branch 'feature/new_report' into dev · 8a51a500
  ruyun.zhang@suvalue.com committed Apr 10, 2020
  
  8a51a500 Browse Files
- signalr · fc7f11fb
  ruyun.zhang@suvalue.com committed Apr 10, 2020
  
  fc7f11fb Browse Files
- 临床人员名单=》业务中层；职称=》职务分类 · fb2314e2
  lcx committed Apr 10, 2020
  
  fb2314e2 Browse Files
- 邮件发送添加配置 · 5dd9c7f5
  lcx committed Apr 10, 2020
  
  5dd9c7f5 Browse Files
- Merge remote-tracking branch 'origin/feature/df' into dev · 0a860949
  ruyun.zhang@suvalue.com committed Apr 10, 2020
  
  0a860949 Browse Files
- Merge branch 'feature/new_report' into dev · 9da16caa
  ruyun.zhang@suvalue.com committed Apr 10, 2020
  
  9da16caa Browse Files
- 弃用REDIS · ba95946d
  ruyun.zhang@suvalue.com committed Apr 10, 2020
  
  ba95946d Browse Files
09 Apr, 2020 1 commit
- 获取人员名单接口修改、添加获取生成成功/归档的绩效列表 · be83b464
  lcx committed Apr 09, 2020
  
  be83b464 Browse Files
25 Mar, 2020 2 commits
- Merge remote-tracking branch 'origin/feature/new_report' into feature/new_report · 6e161b9d
  ruyun.zhang@suvalue.com committed Mar 25, 2020
  
  6e161b9d Browse Files
- 新增用户bug修复 · 324445cc
  ruyun.zhang@suvalue.com committed Mar 25, 2020
  
  324445cc Browse Files