Commits · 2b49721513e625ecb4e7547f8f550e79e69d9a46 · zry / performance · GitLab

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 5 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
- 绩效下发 · 7ec5bd17
  lcx committed Mar 25, 2020
  
  7ec5bd17 Browse Files
- Merge branch 'feature/debug' into feature/new_report · b5931dfa
  ruyun.zhang@suvalue.com committed Mar 25, 2020
  
  b5931dfa Browse Files
- 修复0读取BUG · 41c22317
  ruyun.zhang@suvalue.com committed Mar 25, 2020
  
  41c22317 Browse Files
23 Mar, 2020 1 commit
- 条件排序 · 739c6a2c
  ruyun.zhang@suvalue.com committed Mar 23, 2020
  
  739c6a2c Browse Files
20 Mar, 2020 4 commits
- 新增绩效年月列表 · d9a5bfd3
  ruyun.zhang@suvalue.com committed Mar 20, 2020
  
  d9a5bfd3 Browse Files
- 条件修改 · d4048578
  ruyun.zhang@suvalue.com committed Mar 20, 2020
  
  d4048578 Browse Files
- Merge remote-tracking branch 'origin/feature/new_report' into feature/new_report · 6a000306
  ruyun.zhang@suvalue.com committed Mar 20, 2020
  
  6a000306 Browse Files
- 报表抽取 · 3abb61e8
  ruyun.zhang@suvalue.com committed Mar 20, 2020
  
  3abb61e8 Browse Files
19 Mar, 2020 6 commits
- 数据为null过滤 · c02a7144
  lcx committed Mar 19, 2020
  
  c02a7144 Browse Files
- 功能完善 · ebbfab54
  ruyun.zhang@suvalue.com committed Mar 19, 2020
  
  ebbfab54 Browse Files
- 提取数据含有历史绩效时，保留科室，补充数据 · e73d4b6a
  lcx committed Mar 19, 2020
  
  e73d4b6a Browse Files
- 功能完善 · b2576190
  ruyun.zhang@suvalue.com committed Mar 19, 2020
  
  b2576190 Browse Files
- 报表结构 · a8ab812c
  ruyun.zhang@suvalue.com committed Mar 19, 2020
  
  a8ab812c Browse Files
- 报表 · b3fc5681
  ruyun.zhang@suvalue.com committed Mar 19, 2020
  
  b3fc5681 Browse Files
17 Mar, 2020 1 commit
- 添加日志，收入全导，其他(非公式)全导；二次绩效加载根据unittype判断 · 6b98dbdb
  lcx committed Mar 17, 2020
  
  6b98dbdb Browse Files
16 Mar, 2020 1 commit
- df2发布分支 · 38a07311
  ruyun.zhang@suvalue.com committed Mar 16, 2020
  
  38a07311 Browse Files
13 Mar, 2020 2 commits
- 角色添加type，替换roleId; 二次绩效替换模板，修改usetempid · 464215c5
  lcx committed Mar 13, 2020
  
  464215c5 Browse Files
- 其他来源数据修改 · 58138c57
  lcx committed Mar 13, 2020
  
  58138c57 Browse Files
12 Mar, 2020 2 commits
- 实体，修改bug · eb1dd67f
  lcx committed Mar 12, 2020
  
  eb1dd67f Browse Files
- 返回数据排序，更替模板新增数据过滤 · 247fdbd5
  lcx committed Mar 12, 2020
  
  247fdbd5 Browse Files