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

business/base-service/src/main/java/com/yihu/jw/patient/dao/BasePatientDao.java

@@ -17,9 +17,6 @@ public interface BasePatientDao extends PagingAndSortingRepository<BasePatientDO
    BasePatientDO findByIdAndDel(String id, String del);
    BasePatientDO findByMobileAndDel(String mobile, String del);
    @Query("select id as id,idcard as idcard,name as name,case sex when 1 then '男' when 2 then '女' else '未知' end as sex,phone as phone,committeeName as committeeName,concat(provinceName,cityName,townName,streetName) as address from BasePatientDO where idcard like ?1")
    List<Map<String,Object>> findByIdcard(String idcard, Pageable pageable);

business/base-service/src/main/java/com/yihu/jw/patient/service/BasePatientService.java

@@ -182,11 +182,11 @@ public class BasePatientService<T, R extends CrudRepository> extends BaseJpaServ
     * @return
     */
    public BasePatientDO findByMobileAndDel(String mobile) throws Exception{
        BasePatientDO basePatientDO = basePatientDao.findByMobileAndDel(mobile,"1");
        if(basePatientDO==null){
        List<BasePatientDO> list = basePatientDao.findByMobileAndDel(mobile,"1");
        if(list.size()<=0){
            throw new Exception("not patient");
        }
        return basePatientDO;
        return list.get(0);
    }
}