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

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

@@ -13,7 +13,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
public interface PatientApplyLogDao extends PagingAndSortingRepository<PatientApplyLog, String>, JpaSpecificationExecutor<PatientApplyLog> {
    @Modifying
    @Query("update PatientApplyLog t set t.remindType = ?1 where t.id=?2 ")
    @Query("update PatientApplyLog t set t.remindType = ?1,t.status=2 where t.id=?2 ")
    int updateRemindTypeById(Integer remindType, Integer id);
    PatientApplyLog findById(Integer id);

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

@@ -265,7 +265,7 @@ public class MyFamilyService {
            map.put("principalNum","");//社保卡号
        }
        map.put("mobile",basePatientDO.getMobile());//手机号码
        if(StringUtils.isEmpty(packageId)){
        if(!StringUtils.isEmpty(packageId)){
            if(packageService.findPatientSignExist(patient,packageId)){
                map.put("isPackage",1);
            }else{
@@ -310,10 +310,10 @@ public class MyFamilyService {
    }
    public void myFamilyBindList(String patient) throws Exception{
        List<Map<String,Object>> resultList = new LinkedList<>();
        //已绑定的
        List<BasePatientFamilyMemberDO> bindList = patientFamilyMemberService.getByPatientAndFamilyMember(patient);
        BasePatientDO patientDO = patientService.findByIdAndDel(patient);//绑定人
        List<Map<String,Object>> resultList = new ArrayList<>();
        for(BasePatientFamilyMemberDO one:bindList){
            Map<String,Object> map = new HashedMap();
            if(patient.equals(one.getPatient())){
@@ -341,8 +341,34 @@ public class MyFamilyService {
            resultList.add(map);
        }
        //已邀请的
//        patientApplyLogService.
        List<Map<String, Object>> validList = patientApplyLogService.findValidByPatient(patient);
        for(Map<String, Object> one:validList){
            Map<String,Object> map = new HashedMap();
            BasePatientDO familyMember = patientService.findByIdAndDel(one.get("family_member_code")+"");
            map.put("photo",familyMember.getPhoto());//头像
            map.put("name",familyMember.getName());//姓名
            map.put("roleName",role.get(Integer.valueOf(one.get("family_bind_role")+"")+1));//角色名称
            map.put("mobile",familyMember.getMobile());//手机号码
            //有效期
            Date failurTime = (Date)one.get("failure_time");
            Long l = failurTime.getTime()-System.currentTimeMillis();
            Long day24 = 1000*60*60*24L;
            map.put("day",l/day24);
            map.put("patientApplyId",one.get("id"));
            map.put("patientId",familyMember.getId());
            map.put("type",2);
            resultList.add(map);
        }
        //已取消的
        List<Map<String, Object>> invalidList = patientApplyLogService.findInvalidByPatient(patient);
        for(Map<String, Object> one:invalidList){
            Map<String,Object> map = new HashedMap();
            BasePatientDO familyMember = patientService.findByIdAndDel(one.get("family_member_code")+"");
            map.put("photo",familyMember.getPhoto());//头像
            map.put("name",familyMember.getName());//姓名
            map.put("roleName",role.get(Integer.valueOf(one.get("family_bind_role")+"")+1));//角色名称
            map.put("mobile",familyMember.getMobile());//手机号码
        }
    }
    /**
@@ -442,4 +468,10 @@ public class MyFamilyService {
        return relationTrans;
    }
//    public String getStatusName(Integer status){
//        switch (){
//            case
//        }
//    }
}

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

@@ -46,15 +46,15 @@ public class PatientApplyLogService extends BaseJpaService<PatientApplyLog, Pati
        return  patientApplyLogDao.updateStatusById(status,patientApplyLogId);
    }
    //invalid 无效 valid 有效
    //valid 有效
    public List<Map<String, Object>> findValidByPatient(String patient){
        String sql = "select l.* from patient_apply_for_log l where l.create_user='"+patient+"' and l.del=1 and l.status in (1,2) and l.failure_time>="+ DateUtil.dateToStr(new Date(),"yyyy-MM-dd HH:mm:ss");
        return jdbcTemplate.queryForList(sql);
    }
    //invalid 无效 valid 有效
    //invalid 无效
    public List<Map<String, Object>> findInvalidByPatient(String patient){
        String sql = "select l.* from patient_apply_for_log l where l.create_user='"+patient+"' and l.del=1 and (l.status in (4,5) or (l.failure_time>='"+ DateUtil.dateToStr(new Date(),"yyyy-MM-dd HH:mm:ss")+"' and l.status in (1,2)))";
        String sql = "select l.* from patient_apply_for_log l where l.create_user='"+patient+"' and l.del=1 and (l.status in (4,5) or (l.failure_time>='"+ DateUtil.dateToStr(new Date(),"yyyy-MM-dd HH:mm:ss")+"' and l.status in (1,2))) limit0,10";
        return jdbcTemplate.queryForList(sql);
    }
}