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

修改人工随访代办处理,修改根据id查询服务内容接口

Browse Source
This commit is contained in:
youxilong 2024-04-10 17:37:01 +08:00
parent be597c2af3
commit 909f311f51
11 changed files with 46 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
postdischarge-manage/src/main/java/com/xinelu/manage/dto/manualfollowup/ManualFollowUpDTO.java
View File

@ -89,5 +89,8 @@ public class ManualFollowUpDTO {
@ApiModelProperty(value = "主治医生姓名")
private String attendingPhysicianName;
@ApiModelProperty(value = "节点任务执行状态，已执行：EXECUTED，未执行：UNEXECUTED")
private String nodeExecuteStatus;
}

3
postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientquestionsubmitresult/PatientQuestionSubmitResultDTO.java
View File

@ -28,6 +28,9 @@ public class PatientQuestionSubmitResultDTO extends PatientQuestionSubmitResult
@ApiModelProperty(value = "任务处理信息")
private String routeHandleRemark;
@ApiModelProperty(value = "患者就诊记录基本信息表id")
private Long visitRecordId;
/**
* 患者问卷题目提交结果信息
*/

7
postdischarge-manage/src/main/java/com/xinelu/manage/dto/servicewaycontent/ServiceWayContentEditDTO.java
View File

@ -69,4 +69,11 @@ public class ServiceWayContentEditDTO {
@ApiModelProperty(value = "服务频次数字结束值")
@Excel(name = "服务频次数字结束值")
private Integer serviceFrequencyEnd;
/**
* 排序
*/
@ApiModelProperty(value = "排序")
@Excel(name = "排序")
private Integer serviceSort;
}

3
postdischarge-manage/src/main/java/com/xinelu/manage/service/servicewaycontent/impl/ServiceWayContentServiceImpl.java
View File

@ -94,6 +94,7 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService {
serviceFrequency.setServiceFrequencyEnd(serviceWayContentAddDTO.getServiceFrequencyEnd());
serviceFrequency.setCreateBy(username);
serviceFrequency.setCreateTime(LocalDateTime.now());
serviceFrequency.setServiceSort(serviceWayContentAddDTO.getServiceSort());
if (serviceWayContentMapper.insertServiceWayContent(serviceFrequency) <= 0) {
throw new ServiceException("新增服务频次失败");
}
@ -119,6 +120,7 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService {
serviceFrequency.setCreateBy(username);
serviceFrequency.setCreateTime(LocalDateTime.now());
serviceFrequency.setServiceSort(serviceWayContentAddDTO.getServiceSort());
serviceFrequency.setServiceSort(serviceWayContentAddDTO.getServiceSort());
if (serviceWayContentMapper.insertServiceWayContent(serviceFrequency) <= 0) {
throw new ServiceException("新增服务频次失败");
}
@ -192,6 +194,7 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService {
currentFrequency.setServiceFrequencyText(serviceWayContentEditDTO.getServiceFrequencyText());
currentFrequency.setServiceFrequencyStart(serviceWayContentEditDTO.getServiceFrequencyStart());
currentFrequency.setServiceFrequencyEnd(serviceWayContentEditDTO.getServiceFrequencyEnd());
currentFrequency.setServiceSort(serviceWayContentEditDTO.getServiceSort());
currentFrequency.setUpdateBy(username);
currentFrequency.setUpdateTime(LocalDateTime.now());

6
postdischarge-manage/src/main/java/com/xinelu/manage/vo/manualfollowup/ManualFollowUpVO.java
View File

@ -114,5 +114,11 @@ public class ManualFollowUpVO {
@ApiModelProperty(value = "模板id")
private String templateId;
@ApiModelProperty(value = "节点任务执行状态，已执行：EXECUTED，未执行：UNEXECUTED")
private String nodeExecuteStatus;
@ApiModelProperty(value = "任务执行记录id")
private Long taskExecuteRecordId;
}

5
postdischarge-manage/src/main/java/com/xinelu/manage/vo/servicefrequency/ServiceFrequencyVO.java
View File

@ -48,4 +48,9 @@ public class ServiceFrequencyVO {
@ApiModelProperty(value = "服务频次数字结束值")
@Excel(name = "服务频次数字结束值")
private Integer serviceFrequencyEnd;
@ApiModelProperty(value = "服务频次排序")
private Integer serviceFrequencySort;
}

3
postdischarge-manage/src/main/java/com/xinelu/manage/vo/servicewaycontent/ServiceWayContentAndFrequencyVO.java
View File

@ -67,4 +67,7 @@ public class ServiceWayContentAndFrequencyVO {
@ApiModelProperty(value = "服务频次数字结束值")
@Excel(name = "服务频次数字结束值")
private Integer serviceFrequencyEnd;
@ApiModelProperty(value = "服务频次排序")
private Integer serviceFrequencySort;
}

1
postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml
View File

@ -77,6 +77,7 @@
#{fieldMark}
</if>
</where>
order by create_time DESC
</select>
<select id="selectLabelFieldContentById" parameterType="Long"

1
postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml
View File

@ -57,6 +57,7 @@
#{fieldRemark}
</if>
</where>
order by create_time DESC
</select>

7
postdischarge-manage/src/main/resources/mapper/manage/servicewaycontent/ServiceWayContentMapper.xml
View File

@ -35,6 +35,7 @@
<result column="service_frequency_text" property="serviceFrequencyText"/>
<result column="service_frequency_start" property="serviceFrequencyStart"/>
<result column="service_frequency_end" property="serviceFrequencyEnd"/>
<result column="serviceFrequencySort" property="serviceFrequencySort"/>
</collection>
</resultMap>
@ -155,7 +156,8 @@
swc2.service_frequency_type,
swc2.service_frequency_text,
swc2.service_frequency_start,
swc2.service_frequency_end
swc2.service_frequency_end,
swc2.service_sort AS 'serviceFrequencySort'
FROM service_way_content swc1
JOIN service_way_content swc2 on swc1.id = swc2.service_content_id
<where>
@ -185,7 +187,8 @@
swc1.service_frequency_type,
swc1.service_frequency_text,
swc1.service_frequency_start,
swc1.service_frequency_end
swc1.service_frequency_end,
swc1.service_sort AS 'serviceFrequencySort'
FROM service_way_content swc1
LEFT JOIN service_way_content swc2 ON swc1.service_content_id = swc2.id
WHERE swc1.service_type = 'SERVICE_FREQUENCY'

12
postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml
View File

@ -318,6 +318,7 @@
WHEN spmr.suit_range = 'OUTPATIENT_SERVICE_DISCHARGE' AND pi.visit_date IS NOT NULL THEN 'OUTPATIENT_SERVICE'
WHEN spmr.suit_range = 'OUTPATIENT_SERVICE_DISCHARGE' AND pi.discharge_time IS NOT NULL THEN 'DISCHARGE'
END AS 'suitRange',
pter.id AS 'taskExecuteRecordId',
pter.execute_time AS 'executeTime',
spmr.id AS 'manageRouteId',
spmrn.id AS 'manageRouteNodeId',
@ -330,10 +331,11 @@
WHEN spmrn.task_type = 'ARTIFICIAL_FOLLOW_UP' THEN spmrn.follow_template_name
END AS 'templateName',
CASE
WHEN spmrn.task_type = 'PHONE_OUTBOUND' THEN spmrn.phone_template_id
WHEN spmrn.task_type = 'PHONE_OUTBOUND' THEN spmrn.phone_id
WHEN spmrn.task_type = 'QUESTIONNAIRE_SCALE' THEN spmrn.question_info_id
WHEN spmrn.task_type = 'ARTIFICIAL_FOLLOW_UP' THEN spmrn.follow_template_id
END AS 'templateId'
END AS 'templateId',
spmrn.node_execute_status
FROM
sign_patient_manage_route spmr
LEFT JOIN sign_patient_manage_route_node spmrn ON spmr.id = spmrn.manage_route_id
@ -342,7 +344,7 @@
LEFT JOIN patient_visit_record pvr ON pi.patient_visit_record_id = pvr.id
<where>
pi.del_flag = '0' AND spmr.task_create_type = 'MANUAL_CREATE'
AND spmrn.node_execute_status = 'UNEXECUTED'
AND spmrn.route_check_status = 'AGREE'
AND spmrn.task_type in ('PHONE_OUTBOUND','QUESTIONNAIRE_SCALE','ARTIFICIAL_FOLLOW_UP')
<if test="patientName != null and patientName != ''">
AND pi.patient_name LIKE concat('%', #{patientName}, '%')
@ -404,7 +406,11 @@
<if test="attendingPhysicianName != null and attendingPhysicianName != ''">
AND pi.attending_physician_name LIKE concat('%',#{attendingPhysicianName}, '%')
</if>
<if test="nodeExecuteStatus != null ">
AND spmrn.node_execute_status = #{nodeExecuteStatus}
</if>
</where>
order by spmr.create_time DESC
</select>
<select id="selectFollowPatientInfo"