From 0602173040069c41d985cf4309300caae88202f7 Mon Sep 17 00:00:00 2001 From: WenYongbin <1977763549@qq.com> Date: Mon, 2 Mar 2026 10:19:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A2=85=E5=B7=9E=E4=B8=89=E9=99=A2?= =?UTF-8?q?=E9=87=87=E9=9B=86=E5=88=A4=E6=96=AD=E5=BF=83=E9=87=8C=E9=87=8F?= =?UTF-8?q?=E8=A1=A8=E6=8A=A5=E5=91=8A=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD?= =?UTF-8?q?=EF=BC=8C=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/mzsy/job/MzsyReportCollectJob.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/docus/server/mzsy/job/MzsyReportCollectJob.java b/src/main/java/com/docus/server/mzsy/job/MzsyReportCollectJob.java index 97f4ab7..d200ac3 100644 --- a/src/main/java/com/docus/server/mzsy/job/MzsyReportCollectJob.java +++ b/src/main/java/com/docus/server/mzsy/job/MzsyReportCollectJob.java @@ -98,12 +98,10 @@ public class MzsyReportCollectJob { mzsyReportDataViewList.add(mzsyReportDataView); fileIdDistinct.put(mzsyReportDataView.getFfileId(), "0"); } - Date xinLiStartDateTime=Func.parseDate("2025-04-01 00:00:00", DateUtil.PATTERN_DATETIME); + // Date xinLiStartDateTime = Func.parseDate("2025-04-01 00:00:00", DateUtil.PATTERN_DATETIME); mzsyReportDataViewList = mzsyReportDataViewList.stream() // 如果是心里量表，并且报告时间小于标记时间（不为心里量表或者报告时间不小于目标时间） 则不采集，医院扫描上传 - .filter(view -> - !"心理量表".equals(view.getFpatModule()) || !view.getFfileTime().before(xinLiStartDateTime) - ) + // .filter(view -> !"心理量表".equals(view.getFpatModule()) || !view.getFfileTime().before(xinLiStartDateTime)) .sorted(Comparator.comparing(MzsyReportDataView::getFpatModule) .thenComparing(MzsyReportDataView::getFfileTime)) .collect(Collectors.toList()); @@ -117,15 +115,13 @@ public class MzsyReportCollectJob { // 验证心理量表签名情况 for (MzsyReportDataView reportDataView : mzsyReportDataViewList) { if ("心理量表".equals(reportDataView.getFpatModule()) && Func.isBlank(reportDataView.getReportDoctor())) { - tBasicMapper.updateTaskRemarkById(task.getTaskId(),"心理量表存在未签名报告！"); - log.warn("住院号：{}，住院次数：{},记账号：{} 采集视图数据,心理量表:{} 未签名！",reportPatientTwoDto.getInpatientNo(), hospitalTwoDto.getAdmissTimes(), jzh,reportDataView.getFfileName()); + tBasicMapper.updateTaskRemarkById(task.getTaskId(), "心理量表存在未签名报告！"); + log.warn("住院号：{}，住院次数：{},记账号：{} 采集视图数据,心理量表:{} 未签名！", reportPatientTwoDto.getInpatientNo(), hospitalTwoDto.getAdmissTimes(), jzh, reportDataView.getFfileName()); return; } } - - TableJsonRead tableJsonRead = new TableJsonRead(); JSONObject moduleAlisConfig = tableJsonRead.Read("data-config", "mzsy-module-alis", JSONObject.class); @@ -298,10 +294,10 @@ public class MzsyReportCollectJob { public static void main(String[] args) { - Date xinLiStartDateTime=Func.parseDate("2025-04-01 00:00:00", DateUtil.PATTERN_DATETIME); - Date fileTime=Func.parseDate("2025-04-01 00:00:00", DateUtil.PATTERN_DATETIME); - Date fileTime2=Func.parseDate("2025-04-02 00:00:00", DateUtil.PATTERN_DATETIME); - Date fileTime3=Func.parseDate("2025-03-01 00:00:00", DateUtil.PATTERN_DATETIME); + Date xinLiStartDateTime = Func.parseDate("2025-04-01 00:00:00", DateUtil.PATTERN_DATETIME); + Date fileTime = Func.parseDate("2025-04-01 00:00:00", DateUtil.PATTERN_DATETIME); + Date fileTime2 = Func.parseDate("2025-04-02 00:00:00", DateUtil.PATTERN_DATETIME); + Date fileTime3 = Func.parseDate("2025-03-01 00:00:00", DateUtil.PATTERN_DATETIME); System.out.println(fileTime.before(xinLiStartDateTime)); System.out.println(fileTime2.before(xinLiStartDateTime)); System.out.println(fileTime3.before(xinLiStartDateTime));