clinic-v2
/
server
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: clinic-v2:6f346bd48fb16fe1f52306a9357ff44eeb9524b6
Branches Tags
clinic-v2:master
clinic-v2:fea_tongmingxuan_xinjiangbushu
..
compare: clinic-v2:5c934538a434521551fedb9070eb34ebba8bdea6
Branches Tags
clinic-v2:fea_tongmingxuan_xinjiangbushu
clinic-v2:master

No commits in common. "6f346bd48fb16fe1f52306a9357ff44eeb9524b6" and "5c934538a434521551fedb9070eb34ebba8bdea6" have entirely different histories.
6f346bd48f ... 5c934538a4

5 changed files with 16 additions and 71 deletions
Show Stats Expand all files Collapse all files

2
src/main/java/com/syjiaer/clinic/server/controller/patient/RegistrationController.java
View File

@ -123,7 +123,7 @@ public class RegistrationController extends BaseController {
@RequestMapping("/getListByType")
public Result<Page<PatientRegistration>> getListByType() {
RegistrationQuery query = parmsUtil.getObject("query", RegistrationQuery.class);
return success(patientRegistrationService.getListByType(query));
return success(patientRegistrationService.getPageByType(query));
}
/**

17
src/main/java/com/syjiaer/clinic/server/entity/patient/PatientRegistration.java
View File

@ -1,25 +1,25 @@
package com.syjiaer.clinic.server.entity.patient;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
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;
/**
* <p>
* 挂号表
* </p>
*
* @author NiuZiYuan
* @since 2025-05-23
* @since 2025-04-30
*/
@Getter
@Setter
@ -93,11 +93,4 @@ public class PatientRegistration implements Serializable {
@ApiModelProperty("流水号")
private String fstNo;
@ApiModelProperty("挂号时间")
private LocalDateTime appointmentTime;
@ApiModelProperty("是否预约")
@TableField(exist = false)
private Boolean isAppointment;
}

2
src/main/java/com/syjiaer/clinic/server/entity/patient/dto/RegistrationSaveDto.java
View File

@ -79,6 +79,4 @@ public class RegistrationSaveDto {
@ApiModelProperty("医保余额")
private BigDecimal insuBalance;
@ApiModelProperty("预约时间")
private String appointmentTime;
}

54
src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java
View File

@ -37,8 +37,6 @@ 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.ArrayList;
import java.util.List;
/**
@ -81,20 +79,6 @@ 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");
@ -116,7 +100,6 @@ 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());
@ -256,38 +239,15 @@ public class PatientRegistrationService extends BaseService {
* 根据查询条件查询挂号信息
* @param query 查询条件
*/
public Page<PatientRegistration> getListByType(RegistrationQuery query) {
public Page<PatientRegistration> getPageByType(RegistrationQuery query) {
ManagerUser user = getManagerUser();
List<PatientRegistration> Beforlist = patientRegistrationMapper.selectList(getQueryWrapper(query, user,true));
List<PatientRegistration> Afterlist = patientRegistrationMapper.selectList(getQueryWrapper(query, user,false));
List<PatientRegistration> list = new ArrayList<>();
list.addAll(Beforlist);
list.addAll(Afterlist);
list.forEach((regis)->{
LocalDateTime appointmentTime = regis.getAppointmentTime();
if (appointmentTime.isBefore(LocalDateTime.now())) {
regis.setIsAppointment(false);
} else {
regis.setIsAppointment(true);
}
});
Page<PatientRegistration> page = new Page<>();
page.setList(list);
page.setTotal_count(10000);
page.setTotal_page(1);
return page;
}
private QueryWrapper getQueryWrapper(RegistrationQuery query, ManagerUser user,boolean isBefore){
QueryWrapper<PatientRegistration> regisQuery = new QueryWrapper<>();
ManagerUser dbUser = managerUserMapper.selectById(user.getId());
OrganizationMember member= null;
if (dbUser != null && dbUser.getOrganizationMemberId() != null){
member = organizationMemberMapper.selectById(dbUser.getOrganizationMemberId());
}
QueryWrapper<PatientRegistration> regisQuery = new QueryWrapper<>();
regisQuery.eq("del_flag", 0);
if (member != null && member.getRole() == 1){
regisQuery.eq("organization_doctor_id", member.getId());
@ -311,14 +271,8 @@ public class PatientRegistrationService extends BaseService {
if (query.getEndTime() != null) {
regisQuery.le("appointment_time", query.getEndTime());
}
if(isBefore){
regisQuery.le("appointment_time", LocalDateTime.now());
regisQuery.orderByDesc("appointment_time");
}else{
regisQuery.ge("appointment_time", LocalDateTime.now());
regisQuery.orderByAsc("appointment_time");
}
return regisQuery;
return pageHelper(query.getPageNum(), query.getPageSize(), regisQuery, patientRegistrationMapper, "appointment_time", false);
}
/**

12
src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java
View File

@ -202,8 +202,8 @@ public class StatisticsService extends BaseService {
TipCountVo tipCountVo = new TipCountVo();
RegistrationStatusEnum registrationStatusEnum = RegistrationStatusEnum.waiting;
QueryWrapper<PatientRegistration> registrationWrapper = new QueryWrapper<>();
registrationWrapper.lt("appointment_time", endTime);
registrationWrapper.ge("appointment_time", beginTime);
registrationWrapper.lt("create_datetime", endTime);
registrationWrapper.ge("create_datetime", beginTime);
registrationWrapper.eq("status", registrationStatusEnum.getStatus());
registrationWrapper.eq("del_flag",0);
if (member != null && member.getRole() == 1){
@ -213,8 +213,8 @@ public class StatisticsService extends BaseService {
registrationStatusEnum = RegistrationStatusEnum.inProgress;
registrationWrapper = new QueryWrapper<>();
registrationWrapper.lt("appointment_time", endTime);
registrationWrapper.ge("appointment_time", beginTime);
registrationWrapper.lt("create_datetime", endTime);
registrationWrapper.ge("create_datetime", beginTime);
registrationWrapper.eq("status", registrationStatusEnum.getStatus());
registrationWrapper.eq("del_flag",0);
if (member != null && member.getRole() == 1){
@ -224,8 +224,8 @@ public class StatisticsService extends BaseService {
registrationStatusEnum = RegistrationStatusEnum.complete;
registrationWrapper = new QueryWrapper<>();
registrationWrapper.lt("appointment_time", endTime);
registrationWrapper.ge("appointment_time", beginTime);
registrationWrapper.lt("create_datetime", endTime);
registrationWrapper.ge("create_datetime", beginTime);
registrationWrapper.eq("status", registrationStatusEnum.getStatus());
registrationWrapper.eq("del_flag",0);
if (member != null && member.getRole() == 1){