xinyilu/PostDischargePatientManage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并冲突

Browse Source
This commit is contained in:
haown 2024-03-19 09:17:23 +08:00
parent 49d0133211
commit 410f5a8b07
2 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java
View File

@ -5,7 +5,6 @@ import com.xinelu.common.constant.NodeTypeConstants;
import com.xinelu.common.constant.VisitTypeConstants;
import com.xinelu.common.core.domain.AjaxResult;
import com.xinelu.common.exception.ServiceException;
import com.xinelu.common.utils.DateUtils;
import com.xinelu.common.utils.SecurityUtils;
import com.xinelu.common.utils.StringUtils;
import com.xinelu.common.utils.bean.BeanUtils;
@ -24,6 +23,7 @@ import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper;
import com.xinelu.manage.mapper.patientvisitrecord.PatientVisitRecordMapper;
import com.xinelu.manage.service.patientvisitrecord.IPatientVisitRecordService;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
@ -85,7 +85,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
@Override
public int insertPatientVisitRecord(PatientVisitRecord patientVisitRecord) {
patientVisitRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
patientVisitRecord.setCreateTime(DateUtils.getNowDate());
patientVisitRecord.setCreateTime(LocalDateTime.now());
return patientVisitRecordMapper.insertPatientVisitRecord(patientVisitRecord);
}
@ -106,22 +106,6 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
patientVisitRecordMapper.insertPatientVisitRecord(patientVisitRecord);
return 0;
}
@Override public int saveRecord(PatientVisitRecordSaveDto saveDto) {
PatientVisitRecord patientVisitRecord = new PatientVisitRecord();
// 查询患者信息
PatientInfo patientInfo = patientMapper.selectPatientInfoById(saveDto.getPatientId());
BeanUtils.copyBeanProp(patientVisitRecord, patientInfo);
patientMapper.updatePatientInfo(patientInfo);
BeanUtils.copyBeanProp(patientVisitRecord, saveDto);
patientVisitRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
patientVisitRecord.setCreateTime(DateUtils.getNowDate());
// 住院时间，出院时间-入院时间
LocalDate admissionTime = saveDto.getAdmissionTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
LocalDate dischargeTime = saveDto.getDischargeTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
long daysBetween = ChronoUnit.DAYS.between(admissionTime, dischargeTime);
patientVisitRecord.setHospitalizationDays((int) daysBetween + 1);
return patientVisitRecordMapper.insertPatientVisitRecord(patientVisitRecord);
}
/**
* 修改患者就诊记录基本信息
@ -184,7 +168,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
for (PatientVisitRecordImportDto item : importDataList) {
PatientVisitRecord patientVisitRecord = new PatientVisitRecord();
BeanUtils.copyProperties(item, patientVisitRecord);
patientVisitRecord.setCreateTime(DateUtils.getNowDate());
patientVisitRecord.setCreateTime(LocalDateTime.now());
patientVisitRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
switch (patientType) {
// 在院患者

26
postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java
View File

@ -4,7 +4,6 @@ import com.xinelu.common.constant.PaymentStatusConstants;
import com.xinelu.common.constant.SignRecordServiceStatusConstants;
import com.xinelu.common.constant.TaskCreateTypeConstant;
import com.xinelu.common.exception.ServiceException;
import com.xinelu.common.utils.DateUtils;
import com.xinelu.common.utils.SecurityUtils;
import com.xinelu.common.utils.StringUtils;
import com.xinelu.common.utils.bean.BeanUtils;
@ -25,6 +24,8 @@ import com.xinelu.manage.dto.signpatientrecord.SignPatientStatusDto;
import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper;
import com.xinelu.manage.mapper.servicepackage.ServicePackageMapper;
import com.xinelu.manage.mapper.signpatientinformed.SignPatientInformedMapper;
import com.xinelu.manage.mapper.signpatientmanageroute.SignPatientManageRouteMapper;
import com.xinelu.manage.mapper.signpatientmanageroutenode.SignPatientManageRouteNodeMapper;
import com.xinelu.manage.mapper.signpatientpackage.SignPatientPackageMapper;
import com.xinelu.manage.mapper.signpatientpackagehardware.SignPatientPackageHardwareMapper;
import com.xinelu.manage.mapper.signpatientrecord.SignPatientRecordMapper;
@ -34,6 +35,7 @@ import com.xinelu.manage.service.signpatientrecord.ISignPatientRecordService;
import com.xinelu.manage.vo.signpatientrecord.SignPatientInfoVo;
import com.xinelu.manage.vo.signpatientrecord.SignPatientListVo;
import com.xinelu.manage.vo.signpatientrecord.SignPatientRecordVo;
import java.time.LocalDateTime;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@ -65,6 +67,16 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService {
private SignPatientPackageHardwareMapper signPatientPackageHardwareMapper;
@Resource
private SignPatientInformedMapper signPatientInformedMapper;
@Resource
private ServicePackageMapper servicePackageMapper;
@Resource
private SpecialDiseaseRouteMapper specialDiseaseRouteMapper;
@Resource
private SignPatientManageRouteMapper signPatientManageRouteMapper;
@Resource
private SpecialDiseaseNodeMapper specialDiseaseNodeMapper;
@Resource
private SignPatientManageRouteNodeMapper manageRouteNodeMapper;
@Override public List<SignPatientListVo> selectList(SignPatientListDto signPatientRecord) {
return signPatientRecordMapper.selectList(signPatientRecord);
@ -109,10 +121,10 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService {
signPatientRecord.setServiceStatus(SignRecordServiceStatusConstants.SERVICE_CENTER);
signPatientRecord.setDelFlag(0);
signPatientRecord.setPaymentStatus(PaymentStatusConstants.UNPAID_FEES);
signPatientRecord.setSignTime(DateUtils.getNowDate());
signPatientRecord.setSignTime(LocalDateTime.now());
signPatientRecord.setSignStatus(SignRecordServiceStatusConstants.IN_SIGN);
signPatientRecord.setPrice(signPatientPackageDto.getPackagePrice());
signPatientRecord.setCreateTime(DateUtils.getNowDate());
signPatientRecord.setCreateTime(LocalDateTime.now());
signPatientRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
// 保存签约记录
int flag = signPatientRecordMapper.insert(signPatientRecord);
@ -121,7 +133,7 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService {
patient.setSignPatientRecordId(signPatientRecord.getId());
patient.setSignStatus(SignRecordServiceStatusConstants.IN_SIGN);
patient.setServiceStatus(SignRecordServiceStatusConstants.SERVICE_CENTER);
patient.setSignTime(DateUtils.getNowDate());
patient.setSignTime(LocalDateTime.now());
patientInfoMapper.updatePatientInfo(patient);
if (flag > 0) {
// 保存签约服务包信息
@ -134,7 +146,7 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService {
signPatientPackage.setSignPatientRecordId(signPatientRecord.getId());
signPatientPackage.setPatientId(signPatientRecord.getPatientId());
signPatientPackage.setPackagePaymentStatus(PaymentStatusConstants.UNPAID_FEES);
signPatientPackage.setCreateTime(DateUtils.getNowDate());
signPatientPackage.setCreateTime(LocalDateTime.now());
signPatientPackage.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
signPatientPackage.setId(null);
signPatientPackageMapper.insertSignPatientPackage(signPatientPackage);
@ -147,7 +159,7 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService {
signPatientManageRoute.setSignPatientRecordId(signPatientRecord.getId());
signPatientManageRoute.setRouteId(specialDiseaseRoute.getId());
signPatientManageRoute.setTaskCreateType(TaskCreateTypeConstant.MANUAL_MATCHE);
signPatientManageRoute.setCreateTime(DateUtils.getNowDate());
signPatientManageRoute.setCreateTime(LocalDateTime.now());
signPatientManageRoute.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
signPatientManageRouteMapper.insertSignPatientManageRoute(signPatientManageRoute);
// 保存管理节点
@ -161,7 +173,7 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService {
SignPatientManageRouteNode manageRouteNode = new SignPatientManageRouteNode();
BeanUtils.copyBeanProp(manageRouteNode, node);
manageRouteNode.setManageRouteId(body.getRouteId());
manageRouteNode.setCreateTime(DateUtils.getNowDate());
manageRouteNode.setCreateTime(LocalDateTime.now());
manageRouteNode.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
return manageRouteNode;
}).collect(Collectors.toList());