docus-collector
/
docus-collect-file-data
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 梅州三院采集判断心里量表报告时间判断，取消

Browse Source
master
WenYongbin 2 months ago
parent e6664c318d
commit 0602173040
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File

20
src/main/java/com/docus/server/mzsy/job/MzsyReportCollectJob.java
Unescape Escape View File

@ -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));

Write Preview
Loading…
Cancel
Save