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

任务记录就诊记录修改修改

Browse Source
This commit is contained in:
zhangheng 2024-08-01 15:00:08 +08:00
parent eed31e2698
commit d8a5b60d36
7 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskexecuterecord/PatientTaskExecuteRecordController.java
View File

@ -81,8 +81,8 @@ public class PatientTaskExecuteRecordController extends BaseController {
* 根据患者信息查询就诊记录
*/
@GetMapping("/selectVisitRecord")
public AjaxResult selectVisitRecord(Long id, Long patientId) {
return patientTaskExecuteRecordService.selectVisitRecord(id, patientId);
public AjaxResult selectVisitRecord(Long patientId) {
return patientTaskExecuteRecordService.selectVisitRecord(patientId);
}
/**

4
postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.java
View File

@ -72,8 +72,8 @@ public interface PatientTaskExecuteRecordMapper {
/**
* 根据患者信息查询就诊记录
*
* @param id id
* @param patientId id
* @return AjaxResult
*/
PatientTaskExecuteRecordVO selectVisitRecord(@Param("id") Long id, @Param("patientId") Long patientId);
PatientTaskExecuteRecordVO selectVisitRecord(@Param("patientId") Long patientId);
}

3
postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/IPatientTaskExecuteRecordService.java
View File

@ -64,11 +64,10 @@ public interface IPatientTaskExecuteRecordService {
/**
* 根据患者信息查询就诊记录
*
* @param id 记录id
* @param patientId 患者id
* @return AjaxResult
*/
AjaxResult selectVisitRecord(Long id, Long patientId);
AjaxResult selectVisitRecord(Long patientId);
/**
* 根据任务执行记录查询患者问卷信息

8
postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/impl/PatientTaskExecuteRecordServiceImpl.java
View File

@ -100,15 +100,15 @@ public class PatientTaskExecuteRecordServiceImpl implements IPatientTaskExecuteR
/**
* 根据患者信息查询就诊记录
*
* @param id id
* @param patientId id
* @return AjaxResult
*/
@Override
public AjaxResult selectVisitRecord(Long id, Long patientId) {
if (Objects.isNull(id) && Objects.isNull(patientId)){
public AjaxResult selectVisitRecord(Long patientId) {
if (Objects.isNull(patientId)) {
return AjaxResult.error("请选择要查询的信息！");
}
PatientTaskExecuteRecordVO patientTaskExecuteRecordVO = patientTaskExecuteRecordMapper.selectVisitRecord(id, patientId);
PatientTaskExecuteRecordVO patientTaskExecuteRecordVO = patientTaskExecuteRecordMapper.selectVisitRecord(patientId);
if (Objects.nonNull(patientTaskExecuteRecordVO) && Objects.nonNull(patientTaskExecuteRecordVO.getBirthDate())) {
patientTaskExecuteRecordVO.setAge(AgeUtil.getAgeMonth(patientTaskExecuteRecordVO.getBirthDate().toString()));
}

35
postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml
View File

@ -303,28 +303,19 @@
<select id="selectVisitRecord"
resultType="com.xinelu.manage.vo.patienttaskexecuterecord.PatientTaskExecuteRecordVO">
select
pvr.in_hospital_info,
pvr.out_hospital_info,
pvr.surgical_record,
ri.patient_name,
ri.patient_phone,
ri.family_member_phone,
ri.birth_date,
ri.card_no,
ri.sex,
ri.address
select pvr.in_hospital_info,
pvr.out_hospital_info,
pvr.surgical_record,
ri.patient_name,
ri.patient_phone,
ri.family_member_phone,
ri.birth_date,
ri.card_no,
ri.sex,
ri.address
FROM patient_info pi
LEFT JOIN patient_task_execute_record pter ON pi.id = pter.patient_id
LEFT JOIN patient_visit_record pvr ON pvr.id = pi.patient_visit_record_id
LEFT JOIN resident_info ri ON ri.id = pi.resident_id
<where>
<if test="id != null">
and pter.id = #{id}
</if>
<if test="patientId != null">
and pi.id = #{patientId}
</if>
</where>
LEFT JOIN patient_visit_record pvr ON pvr.id = pi.patient_visit_record_id
LEFT JOIN resident_info ri ON ri.id = pi.resident_id
where pi.id = #{patientId}
</select>
</mapper>

2
postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/homepage/MessageTabulationVO.java
View File

@ -62,4 +62,6 @@ public class MessageTabulationVO {
* 模版名称
*/
private String manageRouteNodeName;
private String nodeFinishDate;
}

1
postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml
View File

@ -158,6 +158,7 @@
IF(pter.id is NULL, 0, 1) sign,
pter.id patientTaskExecuteRecordId,
spmrn.task_node_type,
spmrn.node_finish_date,
CASE
WHEN spmrn.task_node_type = 'QUESTIONNAIRE_SCALE' THEN spmrn.questionnaire_name
WHEN spmrn.task_node_type = 'PROPAGANDA_ARTICLE' THEN spmrn.propaganda_title