Merge remote-tracking branch 'origin/master'

apply/apply-service/src/main/java/com/hungraim/ltc/controller/DisableController.java

@@ -344,16 +344,20 @@ public class DisableController {
         if (StringUtils.isBlank(chDisableApply.getTel())) {
             return Result.failed("手机号不能为空!");
         }
-//        if (chDisableApply.getRegist() == null) {
-//            return Result.failed("所在户籍不能为空!");
-//        }
-        if (StringUtils.isBlank(chDisableApply.getAcptProvincial()) || StringUtils.isBlank(chDisableApply.getAcptCity()) || StringUtils.isBlank(chDisableApply.getAcptArea())  || StringUtils.isBlank(chDisableApply.getAcptAddress())) {
+        /*if (chDisableApply.getRegist() == null) {
+            return Result.failed("所在户籍不能为空!");
+        }*/
+
+        //StringUtils.isBlank(chDisableApply.getAcptStreet()) ||
+        if (StringUtils.isBlank(chDisableApply.getAcptProvincial()) || StringUtils.isBlank(chDisableApply.getAcptCity()) || StringUtils.isBlank(chDisableApply.getAcptArea()) ||  StringUtils.isBlank(chDisableApply.getAcptAddress())) {
             return Result.failed("接受评定地址不能为空!");
         }
+        //|| StringUtils.isBlank(chDisableApply.getAcptSrvStreet())
         if (StringUtils.isBlank(chDisableApply.getAcptSrvProvincial()) || StringUtils.isBlank(chDisableApply.getAcptSrvCity()) || StringUtils.isBlank(chDisableApply.getAcptSrvArea())  || StringUtils.isBlank(chDisableApply.getAcptSrvAddress())) {
             return Result.failed("接受服务地址不能为空!");
         }
-        if (StringUtils.isBlank(chDisableApply.getAdressDistrictProvincial()) || StringUtils.isBlank(chDisableApply.getAdressDistrictCity()) || StringUtils.isBlank(chDisableApply.getAdressDistrictCode()) || StringUtils.isBlank(chDisableApply.getAdressDetail())) {
+        //|| StringUtils.isBlank(chDisableApply.getStreet())
+        if (StringUtils.isBlank(chDisableApply.getAdressDistrictProvincial()) || StringUtils.isBlank(chDisableApply.getAdressDistrictCity()) || StringUtils.isBlank(chDisableApply.getAdressDistrictCode())  || StringUtils.isBlank(chDisableApply.getAdressDetail())) {
             return Result.failed("现住址不能为空!");
         }
 

apply/apply-service/src/main/java/com/hungraim/ltc/controller/SrvOrganController.java

@@ -90,7 +90,8 @@ public class SrvOrganController {
      */
     @PostMapping("/srvOrgan")
     public Result saveSrvOrgan(SrvOrganVo srvOrganVo) {
-        if (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()) || StrUtil.isBlank(srvOrganVo.getPermitId()) || 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) {
+        //null == srvOrganVo.getLevelCode() ||  null == srvOrganVo.getBunk() ||
+        if (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()) || StrUtil.isBlank(srvOrganVo.getPermitId()) || 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添加护理机构

assessment/assessment-service/src/main/resources/mapper/ChDisableEvaluateMapper.xml

@@ -238,6 +238,7 @@
         LEFT JOIN ch_apr_organ organ ON emp.apr_organ_id = organ.apr_organ_id
         LEFT JOIN ch_srv_organ srvOrgan ON organ.organ_id = srvOrgan.srv_organ_id
         <where>
+            and organ.STATUS = 0
             <if test="provincial != null and provincial != ''">
                 and (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) = #{provincial}
             </if>

governance/src/main/java/com/hungraim/ltc/governance/controller/AprOrganController.java

@@ -63,7 +63,8 @@ public class AprOrganController {
         if (null == organId) {
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
-        List<ChAprOrgan> list = aprOrganService.list(new LambdaQueryWrapper<ChAprOrgan>().eq(ChAprOrgan::getOrganId, organId));
+        String status = "0";//有效
+        List<ChAprOrgan> list = aprOrganService.list(new LambdaQueryWrapper<ChAprOrgan>().eq(ChAprOrgan::getOrganId, organId).eq(ChAprOrgan::getStatus, status));
         return Result.success(list);
     }
 
@@ -279,10 +280,12 @@ public class AprOrganController {
         if (StringUtils.isBlank(chAprEmp.getTel())) {//评定人员手机号码
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
-        if (null == chAprEmp.getAprempTypeIdF() || null == chAprEmp.getAprempTypeIdS()) {//评定人员资质id
+        //null == chAprEmp.getAprempTypeIdF() ||
+        if (null == chAprEmp.getAprempTypeIdS()) {//评定人员资质id
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
-        if (StringUtils.isBlank(chAprEmp.getAprempTypeNameF()) || StringUtils.isBlank(chAprEmp.getAprempTypeNameS())) {//评定人员资质
+        //StringUtils.isBlank(chAprEmp.getAprempTypeNameF()) ||
+        if ( StringUtils.isBlank(chAprEmp.getAprempTypeNameS())) {//评定人员资质
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
         if (chAprEmp.getEmpType() == null) {//评定人员类型