Commits · a9705c11a298d88c3a11b1c0653487921c28968d · zry / performance

20 Jul, 2021 4 commits
- Merge branch 'hotfix/二次科室填报单项奖励BUG修复' · a9705c11
  ruyun.zhang@suvalue.com committed Jul 20, 2021
  
  a9705c11 Browse Files
- 二次科室填报单项奖励BUG修复 · 15e7270a
  ruyun.zhang@suvalue.com committed Jul 20, 2021
  
  15e7270a Browse Files
- Merge branch 'hotfix/4.2空值异常' · bab437e6
  ruyun.zhang@suvalue.com committed Jul 20, 2021
  
  bab437e6 Browse Files
- 4.2空值异常处理 · 79470a8f
  ruyun.zhang@suvalue.com committed Jul 20, 2021
  
  79470a8f Browse Files
19 Jul, 2021 4 commits
- Merge branch 'hotfix/二次分配打印多工作量职称显示错误问题' · bc6892ca
  ruyun.zhang@suvalue.com committed Jul 19, 2021
  
  bc6892ca Browse Files
- 二次分配打印多工作量职称显示错误问题 · 238d8d73
  ruyun.zhang@suvalue.com committed Jul 19, 2021
  
  238d8d73 Browse Files
- Merge branch 'release/v20210709功能分支合并' · 5fd84c8e
  ruyun.zhang@suvalue.com committed Jul 19, 2021
  
  5fd84c8e Browse Files
- 新二次绩效模板打印 · 1ecf3f18
  lcx committed Jul 19, 2021
  
  1ecf3f18 Browse Files
15 Jul, 2021 3 commits
- Merge branch 'feature/划拨' into release/v20210709功能分支合并 · c6f8f484
  钟博 committed Jul 15, 2021
  
  c6f8f484 Browse Files
- 修改异常提示 · 2cf094e7
  钟博 committed Jul 15, 2021
  
  2cf094e7 Browse Files
- 未选择科室类型不带出下拉，增加提交异常提示 · 80a1656a
  钟博 committed Jul 15, 2021
  
  80a1656a Browse Files
14 Jul, 2021 4 commits
- Merge branch 'feature/新二次分配' into release/v20210709功能分支合并 · fe67db6f
  ruyun.zhang@suvalue.com committed Jul 14, 2021
  
  fe67db6f Browse Files
- 二次分配显示"备注" · 7261d280
  ruyun.zhang@suvalue.com committed Jul 14, 2021
  
  7261d280 Browse Files
- Merge branch 'feature/新二次分配' into release/v20210709功能分支合并 · 3f1d5319
  ruyun.zhang@suvalue.com committed Jul 14, 2021
  
  3f1d5319 Browse Files
- 保存后则不再设置默认值 · d063889a
  ruyun.zhang@suvalue.com committed Jul 14, 2021
  
  d063889a Browse Files
13 Jul, 2021 2 commits
- 二次分配新增“备注”列 · 438754fa
  ruyun.zhang@suvalue.com committed Jul 13, 2021
  
  438754fa Browse Files
- 测算表中收入的费用系数来源改变 · b7164ee4
  lcx committed Jul 13, 2021
  
  b7164ee4 Browse Files
12 Jul, 2021 4 commits
- Merge branch 'feature/划拨' into release/v20210709功能分支合并 · bebc5339
```
# Conflicts:
#	performance/Performance.EntityModels/Context/PerformanceDbContext.cs
```
  钟博 committed Jul 12, 2021
  bebc5339 Browse Files
- 修改划拨下拉带出 · fa2bbcba
  钟博 committed Jul 12, 2021
  
  fa2bbcba Browse Files
- Merge branch 'feature/费用类型系数' into feature/划拨 · 5cb55851
```
# Conflicts:
#	performance/Performance.EntityModels/Context/PerformanceDbContext.cs
```
  钟博 committed Jul 12, 2021
  5cb55851 Browse Files
- 人员、科室数据保存，null值检验；数据录入，多角色添加配置 · 3325e3a8
  lcx committed Jul 12, 2021
  
  3325e3a8 Browse Files
09 Jul, 2021 7 commits

Merge branch 'feature/新二次分配' into release/v20210709功能分支合并 · 088ac466

# Conflicts:
#	performance/Performance.Api/appsettings.Localhost.json
#	performance/Performance.Api/wwwroot/Performance.DtoModels.xml
#	performance/Performance.DtoModels/HandsonTable.cs
#	performance/Performance.DtoModels/PerExcel/ExcelEnum.cs
#	performance/Performance.Services/SecondAllotService.cs

committed Jul 09, 2021

088ac466 Browse Files

Merge branch 'feature/划拨' into release/v20210709功能分支合并 · 645e117f

# Conflicts:
#	performance/Performance.Api/wwwroot/Performance.DtoModels.xml
#	performance/Performance.Api/wwwroot/Performance.EntityModels.xml
#	performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs
#	performance/Performance.EntityModels/Context/PerformanceDbContext.cs
#	performance/Performance.EntityModels/Entity/cof_alias.cs
#	performance/Performance.EntityModels/Entity/per_employee.cs
#	performance/Performance.EntityModels/Entity/res_compute.cs

committed Jul 09, 2021

645e117f Browse Files

Merge branch 'feature/费用类型系数' into release/v20210709功能分支合并 · e345c2de

# Conflicts:
#	performance/Performance.Api/Controllers/ConfigController.cs
#	performance/Performance.Api/wwwroot/Performance.EntityModels.xml
#	performance/Performance.EntityModels/Context/PerformanceDbContext.cs
#	performance/Performance.Services/ConfigService.cs

committed Jul 09, 2021

e345c2de Browse Files

Merge branch 'feature/二次绩效打印' into release/v20210709功能分支合并 · a2b3955f
lcx committed Jul 09, 2021

a2b3955f Browse Files
Merge branch 'feature/hrp' into release/v20210709功能分支合并 · da43572f
lcx committed Jul 09, 2021

da43572f Browse Files
绩效提取，获取核算单元修改 · 97a18f72
lcx committed Jul 09, 2021

97a18f72 Browse Files
二次绩效打印修改 · 53dce077
lcx committed Jul 09, 2021

53dce077 Browse Files

08 Jul, 2021 2 commits
- 工作量计算结果包含cmi系数值 · 081bd1ba
  lcx committed Jul 08, 2021
  
  081bd1ba Browse Files
- Merge branch 'feature/自定义模板抽取' into develop · 39985a14
  lcx committed Jul 08, 2021
  
  39985a14 Browse Files
07 Jul, 2021 9 commits
- 支出费用添加非空验证 · f59f0a4e
  钟博 committed Jul 07, 2021
  
  f59f0a4e Browse Files
- 二次绩效提交状态判断 · 5ded73b0
  lcx committed Jul 07, 2021
  
  5ded73b0 Browse Files
- 系数列表返回参数修改 · 8138b430
  lcx committed Jul 07, 2021
  
  8138b430 Browse Files
- Merge branch 'feature/预留绩效' into develop · f6a324b8
  ruyun.zhang@suvalue.com committed Jul 07, 2021
  
  f6a324b8 Browse Files
- Merge branch 'feature/打印逻辑调整' into develop · 2c6fcddc
  ruyun.zhang@suvalue.com committed Jul 07, 2021
  
  2c6fcddc Browse Files
- Merge branch 'feature/全院发放表金额不一致' into develop · b9c84c1e
  ruyun.zhang@suvalue.com committed Jul 07, 2021
  
  b9c84c1e Browse Files
- Merge remote-tracking branch 'origin/feature/新二次分配' into feature/新二次分配 · 2723f63b
  ruyun.zhang@suvalue.com committed Jul 07, 2021
  
  2723f63b Browse Files
- Merge branch 'feature/自定义列头' into develop · 1d4c85e1
  钟博 committed Jul 07, 2021
  
  1d4c85e1 Browse Files
- 新增支出费用类别配置 · 11df8604
  钟博 committed Jul 07, 2021
  
  11df8604 Browse Files
06 Jul, 2021 1 commit
- 二次绩效单项奖励、工作量配置名称重复问题修复 · 829b1b92
  lcx committed Jul 06, 2021
  
  829b1b92 Browse Files