Commits · d15d08c89028c39ba2a9ae8c168b2255d1a5214b · zry / performance

25 Feb, 2021 2 commits
- Merge branch 'v2020morge' into v2020morge-graphql · d15d08c8
  lcx committed Feb 25, 2021
  
  d15d08c8 Browse Files
- his_data抽取数据时，数据实体修改 · d1a3b266
  lcx committed Feb 25, 2021
  
  d1a3b266 Browse Files
23 Feb, 2021 1 commit
- 接口返回参数调整 · fe4853ca
  lcx committed Feb 23, 2021
  
  fe4853ca Browse Files
22 Feb, 2021 2 commits
- 大屏数据导入工作量效率优化 · e430cd4d
  lcx committed Feb 22, 2021
  
  e430cd4d Browse Files
- 抽取前科室、类型校验 · 95faf43c
  lcx committed Feb 22, 2021
  
  95faf43c Browse Files
19 Feb, 2021 2 commits
- Merge branch 'v2020morge' into v2020morge-graphql · 7e47f334
  lcx committed Feb 19, 2021
  
  7e47f334 Browse Files
- Merge branch 'v20201230yubei' into v2020morge · cfddeca9
  lcx committed Feb 19, 2021
  
  cfddeca9 Browse Files
07 Feb, 2021 3 commits
- 获取审核通过的其他绩效 · 38e7014a
  lcx committed Feb 07, 2021
  
  38e7014a Browse Files
- 全院核算绩效发放其他绩效 · 0ea12a2e
  lcx committed Feb 07, 2021
  
  0ea12a2e Browse Files
- 全院核算绩效发放添加字段显示 · 1aec9af6
  lcx committed Feb 07, 2021
  
  1aec9af6 Browse Files
05 Feb, 2021 3 commits
- 全院核算绩效发放数据分组合并、5.2读取数据设置起始行、人员信息中的医院奖罚数据来源修改 · 943a6d0b
  lcx committed Feb 05, 2021
  
  943a6d0b Browse Files
- Merge branch 'v2020morge' into v2020morge-graphql · d9c5858d
  lcx committed Feb 05, 2021
  
  d9c5858d Browse Files
- 二次绩效其他模板数据根据审核状态设置只读字段 · d874732a
  lcx committed Feb 05, 2021
  
  d874732a Browse Files
04 Feb, 2021 2 commits
- Merge branch 'v2020morge' into v2020morge-graphql · 3a01c5dc
```
# Conflicts:
#	performance/Performance.EntityModels/Entity/report_global.cs
```
  lcx committed Feb 04, 2021
  3a01c5dc Browse Files
- 二次绩效其他绩效数据保存 · 38d20192
  lcx committed Feb 04, 2021
  
  38d20192 Browse Files
03 Feb, 2021 3 commits
- report_global增删的接口完善 · f0136a39
  lcx committed Feb 03, 2021
  
  f0136a39 Browse Files
- report_blobal实体修改 · bb46a3e8
  lcx committed Feb 03, 2021
  
  bb46a3e8 Browse Files
- bug - 数据抽取时无法获取参数 · b45cc95f
  lcx committed Feb 03, 2021
  
  b45cc95f Browse Files
02 Feb, 2021 9 commits
- Merge branch 'v2020morge' into v2020morge-graphql · 8d04651f
```
# Conflicts:
#	performance/Performance.Api/Controllers/SecondAllotController.cs
#	performance/Performance.Api/wwwroot/Performance.EntityModels.xml
#	performance/Performance.EntityModels/Context/PerformanceDbContext.cs
```
  lcx committed Feb 02, 2021
  8d04651f Browse Files
- Merge branch 'v20201230yubei' into v2020morge · e940a7c2
```
# Conflicts:
#	performance/Performance.Api/Controllers/SecondAllotController.cs
#	performance/Performance.Api/wwwroot/Performance.DtoModels.xml
#	performance/Performance.Services/ComputeService.cs
```
  lcx committed Feb 02, 2021
  e940a7c2 Browse Files
- 人员判空 · 66d708ff
  lcx committed Feb 02, 2021
  
  66d708ff Browse Files
- 绩效数据导入his_importdata · 5726ad95
  lcx committed Feb 02, 2021
  
  5726ad95 Browse Files
- 二次分配管理绩效根据开关控制实发绩效 · f4c54d56
  ruyun.zhang@suvalue.com committed Feb 02, 2021
  
  f4c54d56 Browse Files
- 二次绩效，显示自定义工作量；抽取文件默认为上传的文件类型 · cfe78306
  lcx committed Feb 02, 2021
  
  cfe78306 Browse Files
- Merge branch 'v2020morge' into v2020morge-graphql · 6dcaa653
```
# Conflicts:
#	performance/Performance.Api/wwwroot/Performance.EntityModels.xml
#	performance/Performance.EntityModels/Context/PerformanceDbContext.cs
#	performance/Performance.EntityModels/Entity/report_global.cs
#	performance/Performance.Repository/Repository/PerforReportglobalRepository.cs
```
  lcx committed Feb 02, 2021
  6dcaa653 Browse Files
- bug - 二次绩效自定义工作量列头未带出 · 5494db62
  lcx committed Feb 02, 2021
  
  5494db62 Browse Files
- 添加实体report_global相关类 · 97511089
  lcx committed Feb 02, 2021
  
  97511089 Browse Files
01 Feb, 2021 1 commit
- 科室详情，医技组工作量取值条件更改为“医生组，医技组” · 25f99465
  lcx committed Feb 01, 2021
  
  25f99465 Browse Files
29 Jan, 2021 2 commits
- his_data添加字段HisDepartment、AccountingUnit · ba33e190
  lcx committed Jan 29, 2021
  
  ba33e190 Browse Files
- 上传文件生成报错，his_data添加字段Original · f5e90828
  lcx committed Jan 29, 2021
  
  f5e90828 Browse Files
28 Jan, 2021 8 commits
- 字段名称修改 · 35345a57
  lcx committed Jan 28, 2021
  
  35345a57 Browse Files
- Merge branch 'v2020morge' into v2020morge-graphql · f1d552fb
```
# Conflicts:
#	performance/Performance.Repository/Repository/PerforcollectdataRepository.cs
#	performance/Performance.Repository/Repository/PerforcollectpermissionRepository.cs
```
  lcx committed Jan 28, 2021
  f1d552fb Browse Files
- 修改类名称 · 0b525176
  lcx committed Jan 28, 2021
  
  0b525176 Browse Files
- Merge branch 'v2020morge' into v2020morge-graphql · f3ef48f6
```
# Conflicts:
#	performance/Performance.Services/CollectService.cs
#	performance/Performance.Services/ExtractExcelService/ExtractService.cs
```
  lcx committed Jan 28, 2021
  f3ef48f6 Browse Files
- url配置修改 · 8d482b7e
  lcx committed Jan 28, 2021
  
  8d482b7e Browse Files
- Merge branch '4.1write' into v2020morge · dd56fe37
  lcx committed Jan 28, 2021
  
  dd56fe37 Browse Files
- 提取数据时，4.1补充科室，5.x~6.x的核算单元和4.1中保持一致；录入数据时5.x~6.x没有数据时，默认带出4.1科室 · 93716191
  lcx committed Jan 28, 2021
  
  93716191 Browse Files
- 数据录入扩展保存类型 · 4d3c2019
  ruyun.zhang@suvalue.com committed Jan 28, 2021
  
  4d3c2019 Browse Files
27 Jan, 2021 2 commits
- 上传文件生成绩效 · 9603fdaf
  lcx committed Jan 27, 2021
  
  9603fdaf Browse Files
- 补全his_data字段 · 644878af
  lcx committed Jan 27, 2021
  
  644878af Browse Files