Commits · 7a705b272057e171a6e2378b5821967b688b514e · hubin / long-tern-care-service

28 Feb, 2023 4 commits
- Merge branch 'dev_nursing_records_20230214' into dev_ch_master · 7a705b27
  zhangwanglin authored Feb 28, 2023
  
  7a705b27
- 结算 · 0b8de90a
  zhangwanglin authored Feb 28, 2023
  
  0b8de90a
- Merge remote-tracking branch 'origin/dev_ch_master' into dev_ch_master · 4bcf4c27
  董天德 authored Feb 28, 2023
  
  4bcf4c27
- 评定机构去掉必录项 · 497ea688
  董天德 authored Feb 28, 2023
  
  497ea688
27 Feb, 2023 9 commits
- Merge remote-tracking branch 'origin/dev_20230224_fuwu_xuhd' into dev_ch_master · fcca4ac6
  zhangwanglin authored Feb 27, 2023
  
  fcca4ac6
- Merge remote-tracking branch 'origin/dev_20230214fwcs_huli_xuhd' into dev_ch_master · af81788a
  zhangwanglin authored Feb 27, 2023
  
  af81788a
- 定时任务 · 53b3350e
  zhangwanglin authored Feb 27, 2023
  
  53b3350e
- 问题80、复评申请列表复评审核页面，审核通过时，备注不必录。审核不通过时，备注必录。 · ad406c6e
  “xuhd” authored Feb 27, 2023
  
  ad406c6e
- 结算提交 · c5a7d765
  zhangwanglin authored Feb 27, 2023
  
  c5a7d765
- 评定报告录入新增页面失能等级下拉框数据进行排序 · 6c8cc6cc
  董天德 authored Feb 27, 2023
  
  6c8cc6cc
- 问题83、护理机构添加后默认加载48项配置,服务方案查询中服务方案配置默认显示48项选择 · 93a37664
  “xuhd” authored Feb 27, 2023
  
  93a37664
- Merge remote-tracking branch 'origin/dev_ch_master' into dev_nursing_records_20230214 · 2f490131
  zhangwanglin authored Feb 27, 2023
  
  2f490131
- 结算代码提交 · 10047a2c
  zhangwanglin authored Feb 27, 2023
  
  10047a2c
23 Feb, 2023 3 commits
- Merge remote-tracking branch 'origin/dev_20230221_pdlr_xuhd' into dev_ch_master · e51b7e07
  董天德 authored Feb 23, 2023
  
  e51b7e07
- 问题62、新增：评定结论公示送达日期（评定送达后才能机构才能录入人员信息） · 5c383711
  “xuhd” authored Feb 23, 2023
```
     评定报告录入：
     增加公示开始日期 ，公示完成日期 （待公示，公示中，公示完成）
```
  5c383711
- 问题62、新增：评定结论公示送达日期（评定送达后才能机构才能录入人员信息） · 128e24e9
  “xuhd” authored Feb 23, 2023
```
     评定报告录入：
     增加公示开始日期 ，公示完成日期 （待公示，公示中，公示完成）
```
  128e24e9
21 Feb, 2023 3 commits
- Merge remote-tracking branch 'origin/dev_20230210_dtd' into dev_ch_master · 59546b82
  董天德 authored Feb 21, 2023
  
  59546b82
- 修改公共资源ROLE_1角色不拦截 · 75dc02bb
  maqing authored Feb 21, 2023
  
  75dc02bb
- 意向服务机构权限放开 · b145c897
  maqing authored Feb 21, 2023
  
  b145c897
20 Feb, 2023 10 commits
- Merge remote-tracking branch 'origin/dev_20230210_dtd' into dev_ch_master · 254054bb
  董天德 authored Feb 20, 2023
  
  254054bb
- 权限修改-是否拦截和新增和修改用户刷新redis · 9b1cd79d
  maqing authored Feb 20, 2023
  
  9b1cd79d
- Merge remote-tracking branch 'origin/dev_nursing_records_20230214' into dev_ch_master · af07442b
  董天德 authored Feb 20, 2023
```
# Conflicts:
#	account/account-service/src/main/resources/mapper/ChDisabAccountsDetailMapper.xml
```
  af07442b
- Merge remote-tracking branch 'origin/dev_nursing_records_20230214' into dev_ch_master · 7392734e
  董天德 authored Feb 20, 2023
```
# Conflicts:
#	account/account-service/src/main/resources/mapper/ChDisabAccountsDetailMapper.xml
```
  7392734e
- Merge remote-tracking branch 'origin/dev_ch_master' into dev_nursing_records_20230214 · 8428183f
  zhangwanglin authored Feb 20, 2023
  
  8428183f
- Merge remote-tracking branch 'origin/master' into dev_nursing_records_20230214 · cc0bf2da
  zhangwanglin authored Feb 20, 2023
```
# Conflicts:
#	account/account-service/src/main/resources/mapper/ChDisabAccountsDetailMapper.xml
```
  cc0bf2da
- 结算代码提交 · a559fd3b
  zhangwanglin authored Feb 20, 2023
  
  a559fd3b
- 修改机构和护理机构为null的报错 · c80f0408
  maqing authored Feb 20, 2023
  
  c80f0408
- Merge remote-tracking branch 'origin/dev_20230214fwcs_huli_xuhd' into dev_ch_master · b44bd151
  董天德 authored Feb 20, 2023
  
  b44bd151
- Merge branch 'dev_20230210_dtd' into dev_20230130_mast · 415c5929
  董天德 authored Feb 20, 2023
  
  415c5929
17 Feb, 2023 4 commits
- 启动优化 · e6c4ee2e
  maqing authored Feb 17, 2023
  
  e6c4ee2e
- 用户管理-机构权限 · b91156fc
  maqing authored Feb 17, 2023
  
  b91156fc
- Merge branch 'master' into dev_20230130_mast · 81bc7af3
  董天德 authored Feb 17, 2023
  
  81bc7af3
- Merge branch 'master' into dev_20230210_dtd · 7b623153
  maqing authored Feb 17, 2023
```
# Conflicts:
#	gateway-service/src/main/java/com/hungraim/ltc/gateway/config/ResourceServerConfig.java
#	gateway-service/src/main/java/com/hungraim/ltc/gateway/security/AuthorizationManager.java
```
  7b623153
16 Feb, 2023 4 commits
- 垂直越权 · 899b5a46
  maqing authored Feb 16, 2023
  
  899b5a46
- 垂直越权 · f05cb559
  maqing authored Feb 16, 2023
  
  f05cb559
- 1、添加失能人员是否首次申请 · 60750bac
  “xuhd” authored Feb 16, 2023
```
2、点击终止计划时，需要填写终止计划原因
```
  60750bac
- 问题96、疾病诊断新增维护 · d1c8429d
  “xuhd” authored Feb 16, 2023
  
  d1c8429d
15 Feb, 2023 3 commits
- 垂直越权 · addacedb
  maqing authored Feb 15, 2023
  
  addacedb
- 删除CH_DEV. · 9153e277
  董天德 authored Feb 15, 2023
  
  9153e277
- 问题96、疾病诊断新增维护 · 284a83e7
  “xuhd” authored Feb 15, 2023
  
  284a83e7