diff --git a/src/main/java/com/syjiaer/clinic/server/entity/patient/PatientRegistration.java b/src/main/java/com/syjiaer/clinic/server/entity/patient/PatientRegistration.java index 2e0ad30..8e25d82 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/patient/PatientRegistration.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/patient/PatientRegistration.java @@ -5,21 +5,20 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; /** *
* 挂号表 *
* * @author NiuZiYuan - * @since 2025-04-30 + * @since 2025-05-23 */ @Getter @Setter @@ -93,4 +92,7 @@ public class PatientRegistration implements Serializable { @ApiModelProperty("流水号") private String fstNo; + + @ApiModelProperty("挂号时间") + private LocalDateTime appointmentTime; } diff --git a/src/main/java/com/syjiaer/clinic/server/entity/patient/dto/RegistrationSaveDto.java b/src/main/java/com/syjiaer/clinic/server/entity/patient/dto/RegistrationSaveDto.java index 31d8594..b5e828f 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/patient/dto/RegistrationSaveDto.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/patient/dto/RegistrationSaveDto.java @@ -79,4 +79,6 @@ public class RegistrationSaveDto { @ApiModelProperty("医保余额") private BigDecimal insuBalance; + @ApiModelProperty("预约时间") + private String appointmentTime; } diff --git a/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java b/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java index e839228..c7948e2 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java @@ -37,6 +37,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.List; /** @@ -79,6 +80,20 @@ public class PatientRegistrationService extends BaseService { throw new MessageException("证件号码不能为空"); } + LocalDateTime appointmentTime=null; + if(registrationParam.getAppointmentTime()!=null &&!registrationParam.getAppointmentTime().isEmpty()){ + try{ + appointmentTime = LocalDateTime.parse(registrationParam.getAppointmentTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")); + } + catch (Exception e){ + appointmentTime=LocalDateTime.now(); + } + + } + + if(appointmentTime==null||appointmentTime.isBefore(LocalDateTime.now())){ + appointmentTime=LocalDateTime.now(); + } LocalDateTime now = LocalDateTime.now(); String fstNo = StringUtil.getCode("FSN"); @@ -100,6 +115,7 @@ public class PatientRegistrationService extends BaseService { BeanUtils.copyProperties(registrationParam, registration); registration.setFstNo(fstNo); registration.setRegistrationMoney(new BigDecimal("0")); + registration.setAppointmentTime(appointmentTime); registration.setCreateDatetime(now); registration.setStatus(1); OrganizationMember docker = organizationMemberMapper.selectById(registration.getOrganizationDoctorId());