Merge branch 'dev' of liuwenbin/wlyy2.0 into dev

svr/svr-patient/src/main/java/com/yihu/jw/patient/dao/myFamily/PatientFamilyMemberDao.java

@@ -39,5 +39,9 @@ public interface PatientFamilyMemberDao extends PagingAndSortingRepository<BaseP
    @Query("update BasePatientFamilyMemberDO m set m.del = ?1 where m.id=?2 ")
    int updateDelById(Integer del,String id);
    @Modifying
    @Query("update BasePatientFamilyMemberDO m set m.del = ?1 where m.patient=?2 and m.familyMember=?3 ")
    int updateDelByPatientAndFamilyMember(Integer del,String patient,String familyPatientId);
    BasePatientFamilyMemberDO findByPatientAndFamilyMemberAndDel(String patient,String familyMember,Integer del);
}

svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/myFamily/MyFamilyEndpoint.java

@@ -228,10 +228,13 @@ public class MyFamilyEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = PatientRequestMapping.MyFamily.cancelBindFamily)
    @ApiOperation(value = "解除绑定家人")
    public Envelop cancelBindFamily(
            @ApiParam(name = "familyMemberId", value = "familyMemberId", required = true)
            @RequestParam(value = "familyMemberId",required = true) String familyMemberId) throws Exception {
            @ApiParam(name = "patientId", value = "申请人patient的Id", required = true)
            @RequestParam(value = "patientId",required = true) String patientId,
            @ApiParam(name = "familyPatientId", value = "家人patient的id", required = true)
            @RequestParam(value = "familyPatientId",required = true) String familyPatientId) throws Exception {
        try{
            myFamilyService.cancelBindFamily(familyMemberId);
            myFamilyService.cancelBindFamily(patientId,familyPatientId);
            myFamilyService.cancelBindFamily(familyPatientId,patientId);
            return success();
        }catch (Exception e){
            e.printStackTrace();

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/myFamily/MyFamilyService.java

@@ -107,7 +107,7 @@ public class MyFamilyService {
            }
        }
        //生成社保卡号
        if(!StringUtils.isEmpty(principalNum)){
        if(!StringUtils.isEmpty(principalNum)&&!patientMedicareCardService.existsByCodeAndDel(principalNum)){
            PatientMedicareCardDO medicareCardDO = new PatientMedicareCardDO();
            medicareCardDO.setCode(principalNum);
            medicareCardDO.setParentType(PatientMedicareCardDO.ParentType.CareCard.getType());
@@ -186,13 +186,28 @@ public class MyFamilyService {
     */
    public Map<String,Object> signBindFamily( String patient, String familyMobile, Integer platform,Integer familyBindRole,Integer isAdult,
                                              String familyName,String principalNum,String idcard) throws Exception{
        //判断身份证号和社保卡号重复问题
        if(patientService.existsByIdcard(idcard)){
            throw new Exception("填写身份证已存在！");
        }
        if(patientMedicareCardService.existsByCodeAndDel(principalNum)){
            throw new Exception("填写社保卡号已存在！");
        BasePatientDO familyPatient2 = patientService.findByMobileAndDel(familyMobile);
        if(familyPatient2!=null){
            if(!idcard.equals(familyPatient2.getIdcard())){
                throw new Exception("填写身份证有误！");
            }
            if(!StringUtils.isEmpty(principalNum)){
                PatientMedicareCardDO card = patientMedicareCardService.findByTypeAndPatientCodeAndDel(PatientMedicareCardDO.Type.MedicareCard.getType(),familyPatient2.getId(),"1");
                if(card!=null&&!principalNum.equals(card.getCode())){
                    throw new Exception("填写社保卡号有误！");
                }
            }
        }else{
            //判断身份证号和社保卡号重复问题
            if(patientService.existsByIdcard(idcard)){
                throw new Exception("填写身份证已存在！");
            }
            if(patientMedicareCardService.existsByCodeAndDel(principalNum)){
                throw new Exception("填写社保卡号已存在！");
            }
        }
        if(isAdult==1){
            Map<String,Object> p = bindingMyFamily(patient, familyMobile, platform,familyBindRole,familyName,principalNum,idcard);
@@ -322,6 +337,9 @@ public class MyFamilyService {
     */
    @Transactional(rollbackFor = Exception.class)
    public Map<String,Object> scanQRcodeConfirmApply(Integer status,String applyPatient,String familyPatient,Integer familyBindRole,Integer isAuthorize)throws Exception{
        if(applyPatient.equals(familyPatient)){
            throw new Exception("非家人操作！");
        }
        Map<String,Object> map = new HashedMap();
        if(status==3){
            BasePatientFamilyMemberDO patientFamilyMember = new BasePatientFamilyMemberDO();
@@ -612,12 +630,12 @@ public class MyFamilyService {
    /**
     * 解除绑定
     * @param familyMemberId
     * @param patient
     * @throws Exception
     */
    @Transactional(rollbackFor = Exception.class)
    public void cancelBindFamily(String familyMemberId) throws Exception{
        int i = patientFamilyMemberService.cancelBindFamily(familyMemberId);
    public void cancelBindFamily(String patient,String familyPatientId) throws Exception{
        int i = patientFamilyMemberService.cancelBindFamily(patient,familyPatientId);
        if(i<0){
            throw new Exception("update data failur !");
        }

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/myFamily/PatientFamilyMemberService.java

@@ -52,8 +52,8 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
        return patientFamilyMemberDao.getByPatientAndFamilyMember(patient);
    }
    public Integer cancelBindFamily(String id){
        return patientFamilyMemberDao.updateDelById(0,id);
    public Integer cancelBindFamily(String patient,String familyPatientId){
        return patientFamilyMemberDao.updateDelByPatientAndFamilyMember(0,patient,familyPatientId);
    }
    public Integer updateAuthorizeById(Integer isAuthorize,String id){