diff --git a/src/main/java/com/cjy/back/ybsjAppointment/dao/YbsjyAppointmentRecordMapper.xml b/src/main/java/com/cjy/back/ybsjAppointment/dao/YbsjyAppointmentRecordMapper.xml index 26a0d67..3021fb6 100644 --- a/src/main/java/com/cjy/back/ybsjAppointment/dao/YbsjyAppointmentRecordMapper.xml +++ b/src/main/java/com/cjy/back/ybsjAppointment/dao/YbsjyAppointmentRecordMapper.xml @@ -593,5 +593,6 @@ select start_time,end_time from ybsj_appointment_time_info where id =#{id} + and del_flag = 0; diff --git a/src/main/java/com/cjy/back/ybsjAppointment/entity/vo/AppointmentTeamData.java b/src/main/java/com/cjy/back/ybsjAppointment/entity/vo/AppointmentTeamData.java index a8920e1..0fad20d 100644 --- a/src/main/java/com/cjy/back/ybsjAppointment/entity/vo/AppointmentTeamData.java +++ b/src/main/java/com/cjy/back/ybsjAppointment/entity/vo/AppointmentTeamData.java @@ -69,6 +69,16 @@ public class AppointmentTeamData */ private String appointmentNumber; + private String visitTypes; + + public String getVisitTypes() { + return visitTypes; + } + + public void setVisitTypes(String visitTypes) { + this.visitTypes = visitTypes; + } + public String getReservationCode() { return reservationCode; } diff --git a/src/main/java/com/cjy/back/ybsjAppointment/entity/vo/SynchronousDataVO.java b/src/main/java/com/cjy/back/ybsjAppointment/entity/vo/SynchronousDataVO.java index 460c62e..da72c08 100644 --- a/src/main/java/com/cjy/back/ybsjAppointment/entity/vo/SynchronousDataVO.java +++ b/src/main/java/com/cjy/back/ybsjAppointment/entity/vo/SynchronousDataVO.java @@ -90,6 +90,15 @@ public class SynchronousDataVO { private Long organCode; private Long appointmentPeopleId; private String externalId; + private String visitTypes; + + public String getVisitTypes() { + return visitTypes; + } + + public void setVisitTypes(String visitTypes) { + this.visitTypes = visitTypes; + } public Long getAppointmentPeopleId() { return appointmentPeopleId; diff --git a/src/main/java/com/cjy/back/ybsjAppointment/service/impl/YbsjyAppointmentSettingServiceImpl.java b/src/main/java/com/cjy/back/ybsjAppointment/service/impl/YbsjyAppointmentSettingServiceImpl.java index 2f74aba..7e14c9d 100644 --- a/src/main/java/com/cjy/back/ybsjAppointment/service/impl/YbsjyAppointmentSettingServiceImpl.java +++ b/src/main/java/com/cjy/back/ybsjAppointment/service/impl/YbsjyAppointmentSettingServiceImpl.java @@ -439,6 +439,7 @@ public class YbsjyAppointmentSettingServiceImpl implements YbsjyAppointmentSetti if (!person.getPhone().isEmpty()) { syncData.setAppointmentPeoplePhone(Encryption.encrypt(person.getPhone(), rule)); } + syncData.setVisitTypes(ybsjyAppointmentSettingMapper.getVsitingPlace(vo.getVisitTypes()).get("visitingPlace").toString()); syncData.setCertificateType(person.getDocumentsType() + ""); syncData.setDocumentsNumber(person.getDocumentsNumber()); syncData.setState("0"); @@ -563,6 +564,7 @@ public class YbsjyAppointmentSettingServiceImpl implements YbsjyAppointmentSetti appointmentTeamData.setAppointmentPeoplePhone(Encryption.decrypt(reservationNowVO.getAppointmentPersonList().get(0).getPhone(), rule)); appointmentTeamData.setAppointmentNumber(appointmentFormVO.getAppointmentNumber()); appointmentTeamData.setReservationCode(reservationNowVO.getAppointmentPersonList().get(0).getReservationCode()); + appointmentTeamData.setVisitTypes(ybsjyAppointmentSettingMapper.getVsitingPlace(reservationNowVO.getVisitTypes()).get("visitingPlace").toString()); //预约人数 appointmentTeamData.setAppointmentPeopleCount(String.valueOf(reservationNowVO.getSubmissionType() == 1 ? reservationNowVO.getAppointmentPersonList().size() : reservationNowVO.getAppointmentCount()));