Commits · 311288532df39217015798164c68539f14ffb087 · hubin / long-tern-care-service · GitLab

14 Mar, 2023 2 commits
- Merge remote-tracking branch 'origin/dev_20230309_66_69_70问题优化_zxl' into dev_ch_master · 31128853
  董天德 authored Mar 14, 2023
  
  31128853
- 评定报告录入-修改评定人员第二条数据和第一条重复 · ee7a1a48
  zengxiaoli@yeah.net authored Mar 14, 2023
```
评定任务分配-修改分配检索中的机构展示
```
  ee7a1a48
13 Mar, 2023 5 commits
- Merge remote-tracking branch 'origin/dev_20230309_66_69_70问题优化_zxl' into dev_ch_master · 055cf33a
  董天德 authored Mar 13, 2023
  
  055cf33a
- 评定报告录入新增-检索失能人员 · 6b7b2eb8
  zengxiaoli@yeah.net authored Mar 13, 2023
```
查询去掉只查询未录入的人员的控制
```
  6b7b2eb8
- 失能人员信息变更表新增医保统筹区字段 · 352227fd
  Zengxiaoli authored Mar 13, 2023
  
  352227fd
- Merge remote-tracking branch 'origin/dev_20230309_66_69_70问题优化_zxl' into dev_ch_master · 219ba721
  董天德 authored Mar 13, 2023
  
  219ba721
- Merge remote-tracking branch 'origin/uat_20230309_修改bug_mq' into dev_ch_master · 8f2c9925
  董天德 authored Mar 13, 2023
  
  8f2c9925
10 Mar, 2023 7 commits
- 问题67.68 · be14a154
  maqing authored Mar 10, 2023
  
  be14a154
- 评定报告录入提交问题修复 · e44dae79
  Zengxiaoli authored Mar 10, 2023
  
  e44dae79
- 修改登录 · 1276439d
  maqing authored Mar 10, 2023
  
  1276439d
- Merge branch 'uat_ch_master' into dev_ch_master · 7c5d5687
  zhangwanglin authored Mar 10, 2023
  
  7c5d5687
- 定时test · 38b7cff1
  zhangwanglin authored Mar 10, 2023
  
  38b7cff1
- 定时test · bd5f992a
  zhangwanglin authored Mar 10, 2023
  
  bd5f992a
- 定时test · 7f85d3ba
  zhangwanglin authored Mar 10, 2023
  
  7f85d3ba
09 Mar, 2023 5 commits
- 计划 · bef35c63
  zhangwanglin authored Mar 09, 2023
  
  bef35c63
- Merge branch 'dev_nursing_records_20230214' into dev_ch_master · abc68df9
  zhangwanglin authored Mar 09, 2023
  
  abc68df9
- 服务方案 · dfdf5288
  zhangwanglin authored Mar 09, 2023
  
  dfdf5288
- Merge branch 'dev_nursing_records_20230214' into dev_ch_master · 33aab16f
  zhangwanglin authored Mar 09, 2023
  
  33aab16f
- 结算权限控制 · 51e4721e
  zhangwanglin authored Mar 09, 2023
  
  51e4721e
08 Mar, 2023 5 commits
- 评估类型修改 · 196486a1
  董天德 authored Mar 08, 2023
  
  196486a1
- Merge remote-tracking branch 'origin/dev_20230308_服务参数配置删除_zxl' into dev_ch_master · 7209008c
  董天德 authored Mar 08, 2023
  
  7209008c
- 服务参数配置-服务方式定义列表加删除功能 · 19a952e5
  Zengxiaoli authored Mar 08, 2023
  
  19a952e5
- 结算 · ef57cbbb
  zhangwanglin authored Mar 08, 2023
  
  ef57cbbb
- Merge remote-tracking branch 'origin/dev_20230307_login_mq' into dev_ch_master · 050c0d71
  董天德 authored Mar 08, 2023
  
  050c0d71
07 Mar, 2023 5 commits
- 定时 · 9adf0859
  zhangwanglin authored Mar 07, 2023
  
  9adf0859
- Merge remote-tracking branch 'origin/dev_ch_master' into dev_nursing_records_20230214 · 09ad1eb1
  zhangwanglin authored Mar 07, 2023
  
  09ad1eb1
- 结算 · c09eff5e
  zhangwanglin authored Mar 07, 2023
  
  c09eff5e
- 获取token解密失败问题 · 9d7d1c65
  maqing authored Mar 07, 2023
  
  9d7d1c65
- 评定结果 · 41f81ace
  董天德 authored Mar 07, 2023
  
  41f81ace
06 Mar, 2023 11 commits
- Merge remote-tracking branch 'origin/uat_20230303_失能评定排序_mq' into dev_ch_master · 5b82c8d8
  董天德 authored Mar 06, 2023
  
  5b82c8d8
- Merge remote-tracking branch 'origin/dev_20230224_打卡_马庆' into dev_ch_master · d7551ddc
  董天德 authored Mar 06, 2023
  
  d7551ddc
- Merge branch 'uat_ch_master' into dev_ch_master · 2fe6aeb8
  董天德 authored Mar 06, 2023
  
  2fe6aeb8
- Merge remote-tracking branch 'origin/dev_20230306_评定报告录入及评定分配_zxl' into dev_ch_master · d917c161
  董天德 authored Mar 06, 2023
```
# Conflicts:
#	assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java
```
  d917c161
- 评定报告录入分页+只录入已分配失能人员 · 3d12c283
  Zengxiaoli authored Mar 06, 2023
  
  3d12c283
- 服务参数配置中的服务项目定义列表需要加机构权限控制 · dc18762d
  maqing authored Mar 06, 2023
  
  dc18762d
- Merge branch 'dev_ch_master' into uat_ch_master · ec2437fb
  董天德 authored Mar 06, 2023
  
  ec2437fb
- Merge remote-tracking branch 'origin/dev_20230224_fuwu_xuhd' into dev_ch_master · 883a6348
  董天德 authored Mar 06, 2023
```
# Conflicts:
#	assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java
```
  883a6348
- 护理人员管理页面点击查看打卡记录，打卡记录页面护理机构列的值显示错误，开始服马庆务时间和结束服务时间的值需转 · 24fe0d32
  maqing authored Mar 06, 2023
  
  24fe0d32
- 密码修改 · ae9c7eac
  “xuhd” authored Mar 06, 2023
  
  ae9c7eac
- Merge branch 'dev_ch_master' into uat_ch_master · a0a1ab2a
  董天德 authored Mar 06, 2023
  
  a0a1ab2a