Commits · 6c302c21026940f4cb31332b340b6cf65c3552e3 · zry / performance

09 Aug, 2019 1 commit
- 执行脚本修改 · 6c302c21
  ruyun.zhang@suvalue.com committed Aug 09, 2019
  
  6c302c21 Browse Files
08 Aug, 2019 8 commits
- 调整 · ec5066b6
  ruyun.zhang@suvalue.com committed Aug 08, 2019
  
  ec5066b6 Browse Files
- 禁用参数UseScheme · 0af1d473
  李承祥 committed Aug 08, 2019
  
  0af1d473 Browse Files
- 添加日志 · 4e8ad3d1
  李承祥 committed Aug 08, 2019
  
  4e8ad3d1 Browse Files
- 发送邮件 · 331719ba
  李承祥 committed Aug 08, 2019
  
  331719ba Browse Files
- 科室字体 · e6d1e7cf
  李承祥 committed Aug 08, 2019
  
  e6d1e7cf Browse Files
- 列头、特殊科室 · b71df7c9
  李承祥 committed Aug 08, 2019
  
  b71df7c9 Browse Files
- Merge remote-tracking branch 'origin/feature/extract' into feature/extract · ca1235ce
  ruyun.zhang@suvalue.com committed Aug 08, 2019
  
  ca1235ce Browse Files
- 样式 · c026d920
  ruyun.zhang@suvalue.com committed Aug 08, 2019
  
  c026d920 Browse Files
07 Aug, 2019 5 commits
- 抽取数据值类型修改 · 488aa8ce
  李承祥 committed Aug 07, 2019
  
  488aa8ce Browse Files
- Merge branch 'feature/extract' of http://192.168.18.110:8880/zry/performance into feature/extract · 5ac214da
```
# Conflicts:
#	performance/Performance.Services/NewExtractService.cs
```
  ruyun.zhang@suvalue.com committed Aug 07, 2019
  5ac214da Browse Files
- 上次绩效更改调整 · a2c7c234
  ruyun.zhang@suvalue.com committed Aug 07, 2019
  
  a2c7c234 Browse Files
- 工作量写入 · 3198ed0d
  李承祥 committed Aug 07, 2019
  
  3198ed0d Browse Files
- 抽取系数修改 · e0b7db57
  李承祥 committed Aug 07, 2019
  
  e0b7db57 Browse Files
06 Aug, 2019 13 commits
- Merge branch 'feature/extract' of http://192.168.18.110:8880/zry/performance into feature/extract · d9ce261a
  李承祥 committed Aug 06, 2019
  
  d9ce261a Browse Files
- 方案抽取 · f5b6c8d5
  李承祥 committed Aug 06, 2019
  
  f5b6c8d5 Browse Files
- Merge branch 'release/v08022' into feature/extract · f74a4698
  ruyun.zhang@suvalue.com committed Aug 06, 2019
  
  f74a4698 Browse Files
- bug修复 · bb143edf
  ruyun.zhang@suvalue.com committed Aug 06, 2019
  
  bb143edf Browse Files
- bug修复 · 265e08ea
  ruyun.zhang@suvalue.com committed Aug 06, 2019
  
  265e08ea Browse Files
- Merge branch 'release/v08022' into feature/extract · 3a8ab121
  ruyun.zhang@suvalue.com committed Aug 06, 2019
  
  3a8ab121 Browse Files
- 新抽取样式微调 · 01642ec8
  李承祥 committed Aug 06, 2019
  
  01642ec8 Browse Files
- Merge branch 'develop' into feature/extract · 1259ae48
  李承祥 committed Aug 06, 2019
  
  1259ae48 Browse Files
- 调整 · 77060bf7
  ruyun.zhang@suvalue.com committed Aug 06, 2019
  
  77060bf7 Browse Files
- Merge remote-tracking branch 'origin/feature/extract' into feature/extract · a61ec8a5
  ruyun.zhang@suvalue.com committed Aug 06, 2019
  
  a61ec8a5 Browse Files
- bug修复 · a5efc2ba
  ruyun.zhang@suvalue.com committed Aug 06, 2019
  
  a5efc2ba Browse Files
- 调整 · fc9614b8
  ruyun.zhang@suvalue.com committed Aug 06, 2019
  
  fc9614b8 Browse Files
- bug修改 · d30b5594
  李承祥 committed Aug 06, 2019
  
  d30b5594 Browse Files
05 Aug, 2019 6 commits
- 抽取Id保存 · 1cfac1b2
  李承祥 committed Aug 05, 2019
  
  1cfac1b2 Browse Files
- 加了空格 · 131e00f0
  799284587@qq.com committed Aug 05, 2019
  
  131e00f0 Browse Files
- 抽取方案修改 · a925574f
  李承祥 committed Aug 05, 2019
  
  a925574f Browse Files
- 提取 · 18968fad
  799284587@qq.com committed Aug 05, 2019
  
  18968fad Browse Files
- no message · b0823f19
  799284587@qq.com committed Aug 05, 2019
  
  b0823f19 Browse Files
- Merge branch 'develop' into feature/0724 · fb866850
```
# Conflicts:
#	performance/Performance.Api/Controllers/TemplateController.cs
#	performance/Performance.Api/Template/医院绩效模板.xlsx
```
  799284587@qq.com committed Aug 05, 2019
  fb866850 Browse Files
02 Aug, 2019 7 commits

no message · 960c5538
799284587@qq.com committed Aug 02, 2019

960c5538 Browse Files
参数调整 · 6ab669ac
李承祥 committed Aug 02, 2019

6ab669ac Browse Files
特殊科室人均 · f0937a80
李承祥 committed Aug 02, 2019

f0937a80 Browse Files
no message · 9d36c3ff
799284587@qq.com committed Aug 02, 2019

9d36c3ff Browse Files

Merge branch 'feature/jwt' into develop · fb1d4b62

# Conflicts:
#	performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs
#	performance/Performance.DtoModels/PerExcel/ExcelEnum.cs
#	performance/Performance.DtoModels/PerExcel/PerDataAccountBaisc.cs
#	performance/Performance.EntityModels/Entity/mod_module.cs
#	performance/Performance.EntityModels/Entity/res_account.cs
#	performance/Performance.Extract.Api/Controllers/ModExtractController.cs
#	performance/Performance.Services/AllotCompute/ProcessComputService.cs
#	performance/Performance.Services/ComputeService.cs
#	performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadDeptAccountingt.cs

committed Aug 02, 2019

fb1d4b62 Browse Files

返回新增保底绩效 · 123b65a9
799284587@qq.com committed Aug 02, 2019

123b65a9 Browse Files
模板调整 · e8cdadd7
799284587@qq.com committed Aug 02, 2019

e8cdadd7 Browse Files