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

和并二院修改

Browse Source
This commit is contained in:
zhangheng 2026-03-17 15:58:59 +08:00
parent 71711b2b9d
commit 83c28dd507
2 changed files with 14 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1243,12 +1243,13 @@
</select> </select>
<select id="questionnaireTaskStatistics" <select id="questionnaireTaskStatistics"
resultType="com.xinelu.manage.vo.statistics.QuestionnaireTaskStatisticsVo" resultType="com.xinelu.manage.vo.statistics.QuestionnaireTaskStatisticsVo">
resultMap="QuestionnaireTaskStatisticsVoResult">
select select
qi.create_time, qi.create_time,
qi.questionnaire_name, qi.questionnaire_name,
spmrn.id manageRouteNodeId,
spmrn.question_info_id, spmrn.question_info_id,
pqsjr.question_submit_result_id questionSubmitResultId,
pqsjr.question_subject_id, pqsjr.question_subject_id,
pqsjr.question_number, pqsjr.question_number,
pqsjr.question_type, pqsjr.question_type,
@ -1257,39 +1258,7 @@
pqor.question_subject_option_id questionSubjectOptionId, pqor.question_subject_option_id questionSubjectOptionId,
pqor.option_name, pqor.option_name,
pqor.option_sort, pqor.option_sort,
( pqor.option_choose_sign
SELECT
count( f.option_choose_sign = 0 OR NULL )
FROM
sign_patient_manage_route_node a
LEFT JOIN sign_patient_manage_route b ON b.id = a.manage_route_id
LEFT JOIN patient_info c ON b.patient_id = c.id
LEFT JOIN patient_question_submit_result d ON a.id = d.manage_route_node_id
LEFT JOIN patient_question_subject_result e ON d.id = e.question_submit_result_id
LEFT JOIN patient_question_option_result f ON e.id = f.question_subject_result_id
WHERE
c.del_flag = 0
AND a.question_info_id = spmrn.question_info_id
AND e.question_subject_id = pqsjr.question_subject_id
AND f.question_subject_option_id = pqor.question_subject_option_id
<if test="taskStartTime != null"><!-- 开始时间检索 -->
AND date_format(a.node_finish_date,'%y%m%d') &gt;= date_format(#{taskStartTime},'%y%m%d')
</if>
<if test="taskEndTime != null"><!-- 结束时间检索 -->
AND date_format(a.node_finish_date,'%y%m%d') &lt;= date_format(#{taskEndTime},'%y%m%d')
</if>
<if test="visitStartTime != null and visitEndTime != null">
and( (date_format(c.visit_date, '%y%m%d') >= date_format(#{visitStartTime}, '%y%m%d')
and date_format(c.visit_date, '%y%m%d') &lt;= date_format(#{visitEndTime}, '%y%m%d'))
or (date_format(c.discharge_time,'%y%m%d') >= date_format(#{visitStartTime}, '%y%m%d') and
date_format(c.discharge_time,'%y%m%d') &lt;= date_format(#{visitEndTime}, '%y%m%d')))
</if>
) choiceNumber,
(
SELECT count( 1 ) FROM sign_patient_manage_route_node a
LEFT JOIN patient_question_submit_result d ON a.id = d.manage_route_node_id
WHERE a.question_info_id = spmrn.question_info_id
) total
from sign_patient_manage_route_node spmrn from sign_patient_manage_route_node spmrn
left join question_info qi on spmrn.question_info_id = qi.id left join question_info qi on spmrn.question_info_id = qi.id
left join sign_patient_manage_route spmr on spmr.id = spmrn.manage_route_id left join sign_patient_manage_route spmr on spmr.id = spmrn.manage_route_id

13
postdischarge-quartz/src/main/java/com/xinelu/quartz/task/UploadRobotPublishTask.java
View File

@ -161,10 +161,17 @@ public class UploadRobotPublishTask {
if (StringUtils.isBlank(taskId)) { if (StringUtils.isBlank(taskId)) {
Long aLong = patientInfoImportMainMapper.selectHospitalAgencyId(sn); Long aLong = patientInfoImportMainMapper.selectHospitalAgencyId(sn);
DialTime dialTime = patientInfoImportMainMapper.selectDialTimeById(aLong); DialTime dialTime = patientInfoImportMainMapper.selectDialTimeById(aLong);
LocalTime localStartTime = LocalTime.parse(dialTime.getDialStartTime()); LocalTime localStartTime = null;
LocalTime localEndTime = LocalTime.parse(dialTime.getDialEndTime()); LocalTime localEndTime = null;
LocalTime dateStartTime; LocalTime dateStartTime;
LocalTime dateEndTime; LocalTime dateEndTime;
if (Objects.nonNull(dialTime)) {
localStartTime = LocalTime.parse(dialTime.getDialStartTime());
localEndTime = LocalTime.parse(dialTime.getDialEndTime());
} else {
localStartTime = LocalTime.parse("08:00");
localEndTime = LocalTime.parse("19:00");
}
List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType(Constants.DIAL_TIME); List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType(Constants.DIAL_TIME);
if (CollectionUtils.isEmpty(sysDictDataList) || sysDictDataList.size() != 2) { if (CollectionUtils.isEmpty(sysDictDataList) || sysDictDataList.size() != 2) {
dateStartTime = LocalTime.parse("08:00"); dateStartTime = LocalTime.parse("08:00");
@ -173,7 +180,7 @@ public class UploadRobotPublishTask {
dateStartTime = LocalTime.parse(sysDictDataList.get(0).getDictValue()); dateStartTime = LocalTime.parse(sysDictDataList.get(0).getDictValue());
dateEndTime = LocalTime.parse(sysDictDataList.get(1).getDictValue()); dateEndTime = LocalTime.parse(sysDictDataList.get(1).getDictValue());
} }
if (dateStartTime.isAfter(localStartTime) ) { if (dateStartTime.isAfter(localStartTime)) {
localStartTime = dateStartTime; localStartTime = dateStartTime;
} }
if (dateEndTime.isBefore(localEndTime)) { if (dateEndTime.isBefore(localEndTime)) {