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

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/WlyyPatientExpressageAddrService.java

@@ -84,14 +84,22 @@ public class WlyyPatientExpressageAddrService extends BaseJpaService<WlyyPatient
        boolean defaultAddrExist = patientExpressageAddrDao.existsByPatientAndIsDefault(patient,1);
        if(defaultAddrExist){
            List<WlyyPatientExpressageAddrDO> defaultAddrDOList = patientExpressageAddrDao.queryByPatientAndIsDefault(patient,1);
            WlyyPatientExpressageAddrDO defaultAddrDO = defaultAddrDOList.get(0);
            if(StringUtils.equals(addrDO.getId(),defaultAddrDO.getId())){
                return;
            if(defaultAddrDOList != null && defaultAddrDOList.size()>0){
                for (WlyyPatientExpressageAddrDO wlyyPatientExpressageAddrDO:defaultAddrDOList) {
                    wlyyPatientExpressageAddrDO.setIsDefault(0);
                    this.save(wlyyPatientExpressageAddrDO);
                }
//
//                WlyyPatientExpressageAddrDO defaultAddrDO = defaultAddrDOList.get(0);
//                if(StringUtils.equals(addrDO.getId(),defaultAddrDO.getId())){
//                    return;
//                }
//                defaultAddrDO.setIsDefault(0);
                addrDO.setIsDefault(1);
                this.save(addrDO);
            }
            defaultAddrDO.setIsDefault(0);
            addrDO.setIsDefault(1);
            this.save(defaultAddrDO);
            this.save(addrDO);
            return ;
        }
    }