Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
long-tern-care-service
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hubin
long-tern-care-service
Commits
81ecfabd
Commit
81ecfabd
authored
Feb 06, 2023
by
maqing
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into dev_20230205_mq
parents
1fb3f5ec
808e421d
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
4 deletions
+14
-4
DisableController.java
...n/java/com/hungraim/ltc/controller/DisableController.java
+2
-2
SrvOrganController.java
.../java/com/hungraim/ltc/controller/SrvOrganController.java
+2
-2
DisableServiceImpl.java
...ava/com/hungraim/ltc/service/impl/DisableServiceImpl.java
+5
-0
DisableUpdateDetailVO.java
...m/hungraim/ltc/pojo/vo/disable/DisableUpdateDetailVO.java
+5
-0
No files found.
apply/apply-service/src/main/java/com/hungraim/ltc/controller/DisableController.java
View file @
81ecfabd
...
...
@@ -394,8 +394,8 @@ public class DisableController {
*/
@PostMapping
(
"/addOrUpdateDisInfoChange"
)
public
Result
addOrUpdateDisInfoChange
(
DisableUpdateDetailVO
disableUpdateDetailVO
)
{
//StrUtil.isBlank(disableUpdateDetailVO.getAcptStreet()) ||
if
(
null
==
disableUpdateDetailVO
.
getDisabInfoId
()
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getOrganId
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getDistrictProvince
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getDistrictCity
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getDistrictArea
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getRealName
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getCertifNum
())
||
null
==
disableUpdateDetailVO
.
getBirthday
()
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getGender
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getTel
())
||
null
==
disableUpdateDetailVO
.
getRegist
()
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAcptProvincial
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAcptCity
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAcptArea
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAcptDetail
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAcptSrvProvincial
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAcptSrvCity
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAcptSrvArea
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAcptSrvAddress
())
||
null
==
disableUpdateDetailVO
.
getAcptSrvType
()
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAddressProvincial
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAddressCity
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAddressArea
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAddressStreet
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAddressDetail
())
||
null
==
disableUpdateDetailVO
.
getAddressType
()
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getChangeReason
()))
{
//StrUtil.isBlank(disableUpdateDetailVO.getAcptStreet()) ||
StrUtil.isBlank(disableUpdateDetailVO.getAddressStreet()) || null == disableUpdateDetailVO.getRegist() ||
if
(
null
==
disableUpdateDetailVO
.
getDisabInfoId
()
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getOrganId
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getDistrictProvince
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getDistrictCity
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getDistrictArea
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getRealName
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getCertifNum
())
||
null
==
disableUpdateDetailVO
.
getBirthday
()
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getGender
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getTel
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAcptProvincial
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAcptCity
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAcptArea
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAcptDetail
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAcptSrvProvincial
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAcptSrvCity
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAcptSrvArea
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAcptSrvAddress
())
||
null
==
disableUpdateDetailVO
.
getAcptSrvType
()
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAddressProvincial
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAddressCity
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAddressArea
())
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getAddressDetail
())
||
null
==
disableUpdateDetailVO
.
getAddressType
()
||
StrUtil
.
isBlank
(
disableUpdateDetailVO
.
getChangeReason
()))
{
return
Result
.
failed
(
ResultCode
.
REQUEST_PARAM_ERROR
);
}
return
disableService
.
addOrUpdateDisInfoChange
(
disableUpdateDetailVO
);
...
...
apply/apply-service/src/main/java/com/hungraim/ltc/controller/SrvOrganController.java
View file @
81ecfabd
...
...
@@ -111,8 +111,8 @@ public class SrvOrganController {
*/
@PostMapping
(
"/updateSrvOrgan"
)
public
Result
updateSrvOrgan
(
SrvOrganVo
srvOrganVo
)
{
//StrUtil.isBlank(srvOrganVo.getPermitId()) ||
if
(
null
==
srvOrganVo
.
getSrvOrganId
()
||
StrUtil
.
isBlank
(
srvOrganVo
.
getOrganId
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getDistrictProvincial
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getDistrictCity
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getDistrictArea
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getAcptProvincial
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getAcptCity
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getAcptArea
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getAcptStreet
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getAcptStreet
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getBankDistrictProvincial
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getBankDistrictCity
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getSrvOrganName
())
||
null
==
srvOrganVo
.
getOrganTypeId
()
||
null
==
srvOrganVo
.
getLevelCode
()
||
StrUtil
.
isBlank
(
srvOrganVo
.
getLinkName
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getLinkTel
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getSrvType
())
||
null
==
srvOrganVo
.
getBunk
()
||
StrUtil
.
isBlank
(
srvOrganVo
.
getUnifiedSocialCreditCode
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getSrvType
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getAccName
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getBankAccCode
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getBankAccName
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getBankNo
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getBankDistrictWebsite
())
||
null
==
srvOrganVo
.
getCardType
()
||
null
==
srvOrganVo
.
getFileDataList
()
||
srvOrganVo
.
getFileDataList
().
size
()
<
3
)
{
//StrUtil.isBlank(srvOrganVo.getPermitId()) ||
null == srvOrganVo.getLevelCode() || null == srvOrganVo.getBunk() ||
if
(
null
==
srvOrganVo
.
getSrvOrganId
()
||
StrUtil
.
isBlank
(
srvOrganVo
.
getOrganId
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getDistrictProvincial
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getDistrictCity
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getDistrictArea
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getAcptProvincial
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getAcptCity
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getAcptArea
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getAcptStreet
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getAcptStreet
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getBankDistrictProvincial
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getBankDistrictCity
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getSrvOrganName
())
||
null
==
srvOrganVo
.
getOrganTypeId
()
||
StrUtil
.
isBlank
(
srvOrganVo
.
getLinkName
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getLinkTel
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getSrvType
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getUnifiedSocialCreditCode
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getSrvType
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getAccName
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getBankAccCode
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getBankAccName
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getBankNo
())
||
StrUtil
.
isBlank
(
srvOrganVo
.
getBankDistrictWebsite
())
||
null
==
srvOrganVo
.
getCardType
()
||
null
==
srvOrganVo
.
getFileDataList
()
||
srvOrganVo
.
getFileDataList
().
size
()
<
3
)
{
return
Result
.
failed
(
ResultCode
.
REQUEST_PARAM_ERROR
);
}
// 参数校验通过,调用service修改护理机构
...
...
apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/DisableServiceImpl.java
View file @
81ecfabd
...
...
@@ -160,6 +160,10 @@ public class DisableServiceImpl implements DisableService {
// 审核信息置空
disableUpdateDetailVo
.
setCheckName
(
""
);
disableUpdateDetailVo
.
setCheckRemark
(
""
);
//医保统筹区
ChDisableApply
chDisableApply
=
disableApplyMapper
.
selectById
(
chDisableInfo
.
getApplyId
());
disableUpdateDetailVo
.
setMedicalArea
(
chDisableApply
.
getMedicalArea
());
// try {
// // TODO 需要确认信息表的附件类型
// Result<List<ChFndAttach>> listResult = attachFeignService.selectAttachs(Long.valueOf(disabInfoId), AttachType.DISABLE.getUploadType());
...
...
@@ -245,6 +249,7 @@ public class DisableServiceImpl implements DisableService {
//添加失能人员信息
ChDisableInfo
chDisableInfo
=
new
ChDisableInfo
();
BeanUtil
.
copyProperties
(
chDisableApply
,
chDisableInfo
);
chDisableInfo
.
setOperDistrictProvincial
(
chDisableApply
.
getOperDistrictProvince
());
disableInfoMapper
.
insert
(
chDisableInfo
);
//添加失能评定信息
ChAprTask
chAprTask
=
new
ChAprTask
();
...
...
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableUpdateDetailVO.java
View file @
81ecfabd
...
...
@@ -109,4 +109,9 @@ public class DisableUpdateDetailVO {
// 附件列表
private
List
<
ChFndAttach
>
fileDataList
;
/**
*医保统筹区
*/
private
String
medicalArea
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment