Merge branch 'dev' of yeshijie/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/patient/PatientReservationDao.java

@@ -34,4 +34,7 @@ public interface PatientReservationDao extends PagingAndSortingRepository<Patien
	@Query(value = "select a.* from wlyy_patient_reservation a where a.patient = ?1 and a.canceler=?2 and a.canceler_time>?3 and a.status ='0' order by a.canceler_time DESC limit 1",nativeQuery = true)
	PatientReservation findByPatientAndCancelerAndCancelTime(String patient,String canceler,String cancelerTime);
	//根据患者医获取近三个月的已取消的预约记录
	@Query("select a from PatientReservation a where a.patient = ?1 and a.startTime between ?2 and ?3 and a.status = 0 order by a.czrq desc")
	List<PatientReservation> findByPatientAndStartTime(String patientCode, String strStart, String strEnd);
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/reservation/PatientReservationService.java

@@ -107,11 +107,13 @@ public class PatientReservationService extends BaseService {
            obj.setStatus(0);
            String patient = obj.getPatient();
            SignFamily signFamily = signFamilyDao.findByPatient(patient);//得到患者的签约信息
            DoctorTeamMember doctorTeamMember = doctorTeamDoctor.findMemberByTeamAndCode(signFamily.getTeamCode(), doctor);//得到服务团队的医生信息
            obj.setCanceler(doctorTeamMember.getMemberCode());
            obj.setCancelerName(doctorTeamMember.getName());
            obj.setCancelerType(doctorTeamMember.getType());
            obj.setCancelerTime(DateUtil.dateToStrLong(new Date()));
            DoctorTeamMember doctorTeamMember = doctorTeamDoctor.findMemberCodeAndTeam(signFamily.getTeamCode(), doctor);//得到服务团队的医生信息
            if(doctorTeamMember!=null){
                obj.setCancelerName(doctorTeamMember.getName());
                obj.setCancelerType(doctorTeamMember.getType());
                obj.setCancelerTime(DateUtil.dateToStrLong(new Date()));
            }
            obj.setCanceler(doctor);
            patientReservationDao.save(obj);
        }
    }

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/guahao/GuahaoXMService.java

@@ -978,6 +978,12 @@ public class GuahaoXMService implements IGuahaoService {
            }
        }
        //根据患者医保卡获取近三个月的已取消的预约记录
        List<PatientReservation> list = patientReservationDao.findByPatientAndStartTime(patientCode,strStart,strEnd);
        if(list.size()>0){
            patientRegList.addAll(list);
        }
        //保存http日志
        logService.saveHttpLog(true,REG_LIST,content,method,null,msgBody,res,null,"2");