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

Merge branch 'dev' of http://182.92.166.109:3000/xinyilu/PostDischargePatientManage into dev

Browse Source
This commit is contained in:
zhuangyuanke 2024-12-20 15:53:45 +08:00
commit 96cc8ffb27
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/UploadRobotPublishRecordDto.java
View File

@ -92,4 +92,9 @@ public class UploadRobotPublishRecordDto extends BaseEntity {
* 题目类型 * 题目类型
*/ */
private String questionType; private String questionType;
/**
* 电话拨通情况；SUCCESS：成功；FAILURE：失败；EXPIRED：超期自动作废（如超期一周）；NULL或空字符串：缺省值，表示未执行；
*/
private String phoneNodeExecuteResultStatus;
} }

2
postdischarge-manage/src/main/java/com/xinelu/manage/service/homepage/impl/SystemHomePageServiceImpl.java
View File

@ -166,7 +166,7 @@ public class SystemHomePageServiceImpl implements SystemHomePageService {
if (Objects.nonNull(patientAndNode.getDischargeTime())) { if (Objects.nonNull(patientAndNode.getDischargeTime())) {
localDate = patientAndNode.getDischargeTime().plusDays(patientAndNode.getRouteNodeDay()); localDate = patientAndNode.getDischargeTime().plusDays(patientAndNode.getRouteNodeDay());
} }
if (Objects.isNull(patientAndNode.getDischargeTime()) && Objects.nonNull(patientAndNode.getVisitDate())) { if (Objects.isNull(patientAndNode.getDischargeTime()) && Objects.nonNull(patientAndNode.getVisitDate()) && Objects.nonNull(patientAndNode.getRouteNodeDay())) {
localDate = patientAndNode.getVisitDate().plusDays(patientAndNode.getRouteNodeDay()); localDate = patientAndNode.getVisitDate().plusDays(patientAndNode.getRouteNodeDay());
} }
if (Objects.isNull(localDate)) { if (Objects.isNull(localDate)) {

4
postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java
View File

@ -553,7 +553,7 @@ public class PatientInfoServiceImpl implements IPatientInfoService {
PatientInfoImportMain patientInfoImportMainSn = new PatientInfoImportMain(); PatientInfoImportMain patientInfoImportMainSn = new PatientInfoImportMain();
patientInfoImportMainSn.setSn(sn); patientInfoImportMainSn.setSn(sn);
patientInfoImportMainSn.setImportStatus(ImportStatusEnum.FINISHED.getInfo()); patientInfoImportMainSn.setImportStatus(ImportStatusEnum.FINISHED.getInfo());
patientInfoImportMainMapper.updatePatientInfoImportMain(patientInfoImportMainSn); patientInfoImportMainMapper.updatePatientInfoImportMainImportStatus(patientInfoImportMainSn);
String msg = "已完成数据导入！导入成功" + patientInfoImportList.size() + "条记录，失败0条记录"; String msg = "已完成数据导入！导入成功" + patientInfoImportList.size() + "条记录，失败0条记录";
if (list.size() != patientInfoImportList.size()) { if (list.size() != patientInfoImportList.size()) {
int i = list.size() - patientInfoImportList.size(); int i = list.size() - patientInfoImportList.size();
@ -658,7 +658,7 @@ public class PatientInfoServiceImpl implements IPatientInfoService {
PatientInfoImportMain patientInfoImportMainSn = new PatientInfoImportMain(); PatientInfoImportMain patientInfoImportMainSn = new PatientInfoImportMain();
patientInfoImportMainSn.setSn(patientInfoImportVO.getSn()); patientInfoImportMainSn.setSn(patientInfoImportVO.getSn());
patientInfoImportMainSn.setImportStatus(ImportStatusEnum.FINISHED.getInfo()); patientInfoImportMainSn.setImportStatus(ImportStatusEnum.FINISHED.getInfo());
patientInfoImportMainMapper.updatePatientInfoImportMain(patientInfoImportMainSn); patientInfoImportMainMapper.updatePatientInfoImportMainImportStatus(patientInfoImportMainSn);
String msg = "已完成数据导入！导入成功" + patientInfoImports.size() + "条记录；失败0条记录"; String msg = "已完成数据导入！导入成功" + patientInfoImports.size() + "条记录；失败0条记录";
if (patientInfoImportVO.getCount() != patientInfoImports.size()) { if (patientInfoImportVO.getCount() != patientInfoImports.size()) {
int minus = patientInfoImportVO.getCount() - patientInfoImports.size(); int minus = patientInfoImportVO.getCount() - patientInfoImports.size();

3
postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml
View File

@ -1183,6 +1183,9 @@
<if test="taskExcuteType != null and taskExcuteType != ''"> <if test="taskExcuteType != null and taskExcuteType != ''">
and spmrn.task_excute_type = #{taskExcuteType} and spmrn.task_excute_type = #{taskExcuteType}
</if> </if>
<if test="phoneNodeExecuteResultStatus != null and phoneNodeExecuteResultStatus != ''">
and spmrn.phone_node_execute_result_status = #{phoneNodeExecuteResultStatus}
</if>
<if test="sn != null and sn != ''"> <if test="sn != null and sn != ''">
and spmrn.sn = #{sn} and spmrn.sn = #{sn}
</if> </if>