导入患者,设置就诊类型属性
This commit is contained in:
parent
daf40d5b71
commit
5c61708437
@ -89,6 +89,16 @@ public class PatientInfoImport extends BaseEntity {
|
||||
@Excel(name = "诊断")
|
||||
private String mainDiagnosis;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 患者类型
|
||||
*/
|
||||
@ApiModelProperty(value = "患者类型")
|
||||
@Excel(name = "患者类型")
|
||||
private String patientType;
|
||||
|
||||
|
||||
/**
|
||||
* 患者电话
|
||||
*/
|
||||
|
||||
@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSON;
|
||||
import com.alibaba.fastjson2.JSONArray;
|
||||
import com.alibaba.fastjson2.JSONObject;
|
||||
import com.aliyuncs.exceptions.ClientException;
|
||||
import com.sun.media.jfxmedia.logging.Logger;
|
||||
import com.xinelu.common.config.AliYunSmsTwoConfig;
|
||||
import com.xinelu.common.config.SystemBusinessConfig;
|
||||
import com.xinelu.common.constant.*;
|
||||
|
||||
@ -7,6 +7,7 @@ import com.xinelu.common.core.domain.AjaxResult;
|
||||
import com.xinelu.common.core.domain.entity.SysUser;
|
||||
import com.xinelu.common.enums.ImportStatusEnum;
|
||||
import com.xinelu.common.enums.PatientSourceEnum;
|
||||
import com.xinelu.common.enums.PatientTypeEnum;
|
||||
import com.xinelu.common.exception.ServiceException;
|
||||
import com.xinelu.common.utils.BaseUtil;
|
||||
import com.xinelu.common.utils.SecurityUtils;
|
||||
@ -507,6 +508,8 @@ public class PatientInfoServiceImpl implements IPatientInfoService {
|
||||
}
|
||||
//endregion
|
||||
|
||||
//设置为门诊患者
|
||||
patientInfoImportList.forEach(item -> item.setPatientType(PatientTypeEnum.OUTPATIENT.getInfo()));
|
||||
//新增患者表
|
||||
int i = patientInfoMapper.insertPatientInfoList(patientInfoImportList);
|
||||
if (i <= 0) {
|
||||
@ -633,6 +636,8 @@ public class PatientInfoServiceImpl implements IPatientInfoService {
|
||||
return AjaxResult.error("已完成数据导入!导入成功0条记录;失败" + patientInfoImportVO.getCount() + "条记录。");
|
||||
}
|
||||
patientInfoImports.forEach(item -> item.setResidentId(item.getId()));
|
||||
//设置为门诊患者
|
||||
patientInfoImports.forEach(item -> item.setPatientType(PatientTypeEnum.OUTPATIENT.getInfo()));
|
||||
//新增患者表
|
||||
int i = patientInfoMapper.insertPatientInfoList(patientInfoImports);
|
||||
if (i <= 0) {
|
||||
|
||||
@ -892,6 +892,7 @@
|
||||
card_no,
|
||||
age,
|
||||
main_diagnosis,
|
||||
patient_type,
|
||||
patient_phone,
|
||||
department_id,
|
||||
department_name,
|
||||
@ -912,6 +913,7 @@
|
||||
#{PatientInfoImport.cardNo},
|
||||
#{PatientInfoImport.age},
|
||||
#{PatientInfoImport.mainDiagnosis},
|
||||
#{PatientInfoImport.patientType},
|
||||
#{PatientInfoImport.patientPhone},
|
||||
#{PatientInfoImport.departmentId},
|
||||
#{PatientInfoImport.departmentName},
|
||||
|
||||
@ -31,6 +31,7 @@ import com.xinelu.manage.vo.labelfieldcontent.LabelFieldInfoContentVo;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
@ -108,7 +109,10 @@ public class UploadRobotPublishTask {
|
||||
}
|
||||
//只处理 流水号不为空的
|
||||
if (node.getSn() != null &&
|
||||
node.getScriptInfoId() != null && (executeTime.toLocalDate().isBefore(LocalDate.now()) || executeTime.toLocalDate().isEqual(LocalDate.now()))) {
|
||||
//精确到秒
|
||||
node.getScriptInfoId() != null && (executeTime.isBefore(LocalDateTime.now()) || executeTime.isEqual(LocalDateTime.now()))) {
|
||||
//精确到天
|
||||
// node.getScriptInfoId() != null && (executeTime.toLocalDate().isBefore(LocalDate.now()) || executeTime.toLocalDate().isEqual(LocalDate.now()))) {
|
||||
executeNodeList.add(node);
|
||||
}
|
||||
});
|
||||
@ -278,7 +282,10 @@ public class UploadRobotPublishTask {
|
||||
PatientVisitRecord patientVisitRecord = patientVisitRecordMapper.selectPatientVisitRecordById(signPatientRecord.getPatientVisitRecordId());
|
||||
executeTime = signPatientManageRouteNodeService.getExecuteTime(node.getExecuteTime(), node.getRouteNodeName(), node.getRouteNodeDay(), patientVisitRecord);
|
||||
}
|
||||
if (node.getScriptInfoId() != null && (executeTime.toLocalDate().isBefore(LocalDate.now()) || executeTime.toLocalDate().isEqual(LocalDate.now()))) {
|
||||
//精确到天
|
||||
// if (node.getScriptInfoId() != null && (executeTime.toLocalDate().isBefore(LocalDate.now()) || executeTime.toLocalDate().isEqual(LocalDate.now()))) {
|
||||
//精确到秒
|
||||
if (node.getScriptInfoId() != null && (executeTime.isBefore(LocalDateTime.now()) || executeTime.isEqual(LocalDateTime.now()))) {
|
||||
executeNodeList.add(node);
|
||||
}
|
||||
});
|
||||
|
||||
Loading…
Reference in New Issue
Block a user