Commits · ec770743fc0dcd3a3e4e44120f30d00b62c24b2c · zry / performance · GitLab

28 Mar, 2019 11 commits
- Merge branch 'feature/reconsitution' into develop · ec770743
  ruyun.zhang@suvalue.com committed Mar 28, 2019
  
  ec770743 Browse Files
- 读取调整 · f89c2766
  ruyun.zhang@suvalue.com committed Mar 28, 2019
  
  f89c2766 Browse Files
- 获取绩效列表 · 8d0a7b15
  李承祥 committed Mar 28, 2019
  
  8d0a7b15 Browse Files
- Merge branch 'feature/reconsitution' into develop · e3528a8d
  ruyun.zhang@suvalue.com committed Mar 28, 2019
  
  e3528a8d Browse Files
- 微调 · 24fe2597
  ruyun.zhang@suvalue.com committed Mar 28, 2019
  
  24fe2597 Browse Files
- 微调 · e8433753
  ruyun.zhang@suvalue.com committed Mar 28, 2019
  
  e8433753 Browse Files
- 第一次重构 · 2cfc4b6b
  ruyun.zhang@suvalue.com committed Mar 28, 2019
  
  2cfc4b6b Browse Files
- 返回绩效发放列表时，修改排序方式 · 3f84d4b8
  李承祥 committed Mar 28, 2019
  
  3f84d4b8 Browse Files
- 基本配置信息copy() -- 方法修改 · 4a1fb586
  李承祥 committed Mar 28, 2019
  
  4a1fb586 Browse Files
- 基本配置信息copy() -- 方法修改 · 1c06b36f
  李承祥 committed Mar 28, 2019
  
  1c06b36f Browse Files
- no message · a02bfe5f
  ruyun.zhang@suvalue.com committed Mar 28, 2019
  
  a02bfe5f Browse Files
27 Mar, 2019 9 commits
- 阿里邮箱发送邮件功能集成 · e53e5151
  ruyun.zhang@suvalue.com committed Mar 27, 2019
  
  e53e5151 Browse Files
- 添加描述 · db4002cd
  李承祥 committed Mar 27, 2019
  
  db4002cd Browse Files
- hospital/disabled-- 启用/禁用医院 · 99f4df54
  李承祥 committed Mar 27, 2019
  
  99f4df54 Browse Files
- 接口禁用 · 44697277
  ruyun.zhang@suvalue.com committed Mar 27, 2019
  
  44697277 Browse Files
- Merge branch 'develop' of http://192.168.0.110:8880/zry/performance into develop · a6619e19
  ruyun.zhang@suvalue.com committed Mar 27, 2019
  
  a6619e19 Browse Files
- 新增禁用特性 · 2d3838af
  ruyun.zhang@suvalue.com committed Mar 27, 2019
  
  2d3838af Browse Files
- 返回绩效发放列表方法内字典key值更改 · 879c2eff
  李承祥 committed Mar 27, 2019
  
  879c2eff Browse Files
- 添加方法描述 · 42b3430f
  李承祥 committed Mar 27, 2019
  
  42b3430f Browse Files
- 代码搬迁位置 · 9ae0577b
  ruyun.zhang@suvalue.com committed Mar 27, 2019
  
  9ae0577b Browse Files
26 Mar, 2019 19 commits
- Merge branch 'develop' of http://192.168.0.110:8880/zry/performance into develop · 4e2343b8
  李承祥 committed Mar 26, 2019
  
  4e2343b8 Browse Files
- 绩效发放--科室医生、护士绩效发放接口 · ddd435e5
  李承祥 committed Mar 26, 2019
  
  ddd435e5 Browse Files
- bug修复 · 6beb91da
  ruyun.zhang@suvalue.com committed Mar 26, 2019
  
  6beb91da Browse Files
- 科室绩效详情 · b0d88cc9
  ruyun.zhang@suvalue.com committed Mar 26, 2019
  
  b0d88cc9 Browse Files
- Merge branch 'develop' of http://192.168.0.110:8880/zry/performance into develop · 3cec2fbd
  ruyun.zhang@suvalue.com committed Mar 26, 2019
  
  3cec2fbd Browse Files
- allot状态调整 · a31c4042
  ruyun.zhang@suvalue.com committed Mar 26, 2019
  
  a31c4042 Browse Files
- 新增allot/getcompute，根据绩效id，核算对象获取计算好的数据；allot/getspecial，获取特殊核算单元绩效；修改基础配置获取信息 · b160d0a7
  李承祥 committed Mar 26, 2019
  
  b160d0a7 Browse Files
- 特殊科室处理 · dc2de372
  ruyun.zhang@suvalue.com committed Mar 26, 2019
  
  dc2de372 Browse Files
- 特殊科室处理 · 810cadcc
  ruyun.zhang@suvalue.com committed Mar 26, 2019
  
  810cadcc Browse Files
- 代码调整 · bb84d139
  ruyun.zhang@suvalue.com committed Mar 26, 2019
  
  bb84d139 Browse Files
- t4 · 065e9d51
  ruyun.zhang@suvalue.com committed Mar 26, 2019
  
  065e9d51 Browse Files
- t4模板生成 · 5db6df9a
  ruyun.zhang@suvalue.com committed Mar 26, 2019
  
  5db6df9a Browse Files
- dbug · 5efc9724
  ruyun.zhang@suvalue.com committed Mar 26, 2019
  
  5efc9724 Browse Files
- dbug · 64f5370e
  ruyun.zhang@suvalue.com committed Mar 26, 2019
  
  64f5370e Browse Files
- 绩效生成状态修改 · c24e41ca
  ruyun.zhang@suvalue.com committed Mar 26, 2019
  
  c24e41ca Browse Files
- token error 修改 · 457718cc
  ruyun.zhang@suvalue.com committed Mar 26, 2019
  
  457718cc Browse Files
- 代码调整 · 47663fc8
  ruyun.zhang@suvalue.com committed Mar 26, 2019
  
  47663fc8 Browse Files
- Merge branch 'develop' of http://192.168.0.110:8880/zry/performance into develop · 5ba21ca7
```
# Conflicts:
#	performance/Performance.Services/PerExcelService/PerExcelService.cs
```
  ruyun.zhang@suvalue.com committed Mar 26, 2019
  5ba21ca7 Browse Files
- 特殊科室计算 · 356f0a1e
  ruyun.zhang@suvalue.com committed Mar 26, 2019
  
  356f0a1e Browse Files
25 Mar, 2019 1 commit
- Merge branch 'develop' of http://192.168.0.110:8880/zry/performance into develop · 8565ffa9
```
# Conflicts:
#	performance/Performance.Services/PerExcelService/PerExcelService.cs
```
  李承祥 committed Mar 25, 2019
  8565ffa9 Browse Files