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

fix: 梅州三院修改采集逻辑

Browse Source
master
wyb 1 month ago
parent 965b27732b
commit d636479804
3 changed files with 98 additions and 11 deletions
Show Stats Download Patch File Download Diff File

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

@ -5,6 +5,7 @@ import com.docus.core.util.Func;
import com.docus.infrastructure.core.utils.TableJsonRead;
import com.docus.infrastructure.web.api.CommonResult;
import com.docus.infrastructure.web.api.ResultCode;
import com.docus.server.archive.entity.TBasic;
import com.docus.server.archive.mapper.TBasicMapper;
import com.docus.server.mzsy.entity.MzsyMectReportView;
import com.docus.server.mzsy.entity.MzsyReportDataView;
@ -13,15 +14,26 @@ import com.docus.server.mzsy.mapper.MzsyReportDataViewMapper;
import com.docus.server.mzsy.mapper.MzsyShoumaReportDataViewMapper;
import com.docus.server.rpc.DownPlatformService;
import com.docus.server.rpc.TaskDistributeService;
import com.docus.server.rpc.dto.*;
import com.docus.server.rpc.dto.ReportDownDto;
import com.docus.server.rpc.dto.ReportDownPatientDto;
import com.docus.server.rpc.dto.ReportDownScanFileDto;
import com.docus.server.rpc.dto.ReportDownTwoDto;
import com.docus.server.rpc.dto.ReportHospitalTwoDto;
import com.docus.server.rpc.dto.ReportPatientTwoDto;
import com.docus.server.rpc.dto.ReportTaskTwoDto;
import com.xxl.job.core.context.XxlJobHelper;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @author YongBin Wen
@ -64,8 +76,32 @@ public class MzsyReportCollectJob {
ReportHospitalTwoDto hospitalTwoDto = downTwoDto.getHospitals().get(0);
ReportPatientTwoDto reportPatientTwoDto = downTwoDto.getPatient();
String jzh = downTwoDto.getJzh();
String patientId = downTwoDto.getPatientId();
List<TBasic> basicList = tBasicMapper.getTbasicByPatientIds(Collections.singletonList(patientId));
TBasic tBasic = basicList.get(0);
List<MzsyReportDataView> mzsyReportDataViewList = new ArrayList<>();
List<MzsyReportDataView> mzsyReportDataViewListByJzh = reportDataViewMapper.findByPatJzhAndOtherCondition(jzh, extraCondition);
List<MzsyReportDataView> mzsyReportDataViewListByInpatNoTime = reportDataViewMapper.findByPatNoTimeAndOtherCondition(tBasic.getInpatientNo(), Func.formatDateTime(tBasic.getAdmissDate()), Func.formatDateTime(tBasic.getDisDate()), extraCondition);
Map<String, String> fileIdDistinct = new HashMap<>();
for (MzsyReportDataView mzsyReportDataView : mzsyReportDataViewListByJzh) {
mzsyReportDataViewList.add(mzsyReportDataView);
fileIdDistinct.put(mzsyReportDataView.getFfileId(), "0");
}
for (MzsyReportDataView mzsyReportDataView : mzsyReportDataViewListByInpatNoTime) {
if (fileIdDistinct.containsKey(mzsyReportDataView.getFfileId())) {
continue;
}
mzsyReportDataViewList.add(mzsyReportDataView);
fileIdDistinct.put(mzsyReportDataView.getFfileId(), "0");
}
mzsyReportDataViewList = mzsyReportDataViewList.stream()
.sorted(Comparator.comparing(MzsyReportDataView::getFpatModule)
.thenComparing(MzsyReportDataView::getFfileTime))
.collect(Collectors.toList());
List<MzsyReportDataView> mzsyReportDataViewList = reportDataViewMapper.findByPatJzhAndOtherCondition(jzh, extraCondition);
int size = mzsyReportDataViewList.size();
log.info("住院号：{}，住院次数：{},记账号：{} 采集视图数据：{} 条！数据：{}", reportPatientTwoDto.getInpatientNo(), hospitalTwoDto.getAdmissTimes(), jzh, size, Func.toJson(mzsyReportDataViewList));
if (size <= 0) {
@ -75,14 +111,14 @@ public class MzsyReportCollectJob {
JSONObject moduleAlisConfig = tableJsonRead.Read("data-config", "mzsy-module-alis", JSONObject.class);
ReportDownPatientDto patient = new ReportDownPatientDto();
patient.setPatientid(downTwoDto.getPatientId());
patient.setPatientid(patientId);
ReportDownDto reportDownDto = new ReportDownDto();
reportDownDto.setCollectorid(collectorId);
reportDownDto.setIp("");
reportDownDto.setPatient(patient);
int sort = 0;
tBasicMapper.invalidFileBySource(downTwoDto.getPatientId(),collectorId);
tBasicMapper.invalidFileBySource(patientId, collectorId);
for (MzsyReportDataView mzsyReportDataView : mzsyReportDataViewList) {
ReportDownScanFileDto reportDownScanFileDto = new ReportDownScanFileDto();
reportDownScanFileDto.setDownurl(mzsyReportDataView.getFfilePath());
@ -243,8 +279,28 @@ public class MzsyReportCollectJob {
public static void main(String[] args) {
TableJsonRead tableJsonRead = new TableJsonRead();
JSONObject moduleAlisConfig = tableJsonRead.Read("data-config", "mzsy-module-alis", JSONObject.class);
System.out.println(moduleAlisConfig);
MzsyReportDataView mzsyReportDataView1 = new MzsyReportDataView();
mzsyReportDataView1.setFfileTime(Func.parseDate("2025-11-13 01:01:02","yyyy-MM-dd HH:mm:ss"));
mzsyReportDataView1.setFpatModule("ct");
MzsyReportDataView mzsyReportDataView2 = new MzsyReportDataView();
mzsyReportDataView2.setFfileTime(Func.parseDate("2025-11-13 05:01:02","yyyy-MM-dd HH:mm:ss"));
mzsyReportDataView2.setFpatModule("ecg");
MzsyReportDataView mzsyReportDataView3 = new MzsyReportDataView();
mzsyReportDataView3.setFfileTime(Func.parseDate("2025-11-13 04:01:02","yyyy-MM-dd HH:mm:ss"));
mzsyReportDataView3.setFpatModule("ecg");
MzsyReportDataView mzsyReportDataView4 = new MzsyReportDataView();
mzsyReportDataView4.setFfileTime(Func.parseDate("2025-11-12 04:01:02","yyyy-MM-dd HH:mm:ss"));
mzsyReportDataView4.setFpatModule("ct");
List<MzsyReportDataView> mzsyReportDataViewList = new ArrayList<>();
mzsyReportDataViewList.add(mzsyReportDataView1);
mzsyReportDataViewList.add(mzsyReportDataView2);
mzsyReportDataViewList.add(mzsyReportDataView3);
mzsyReportDataViewList.add(mzsyReportDataView4);
System.out.println("排序前："+Func.toJson(mzsyReportDataViewList));
mzsyReportDataViewList = mzsyReportDataViewList.stream()
.sorted(Comparator.comparing(MzsyReportDataView::getFpatModule)
.thenComparing(MzsyReportDataView::getFfileTime))
.collect(Collectors.toList());
System.out.println("排序后："+Func.toJson(mzsyReportDataViewList));
}
}

12
src/main/java/com/docus/server/mzsy/mapper/MzsyReportDataViewMapper.java
Unescape Escape View File

@ -33,4 +33,16 @@ public interface MzsyReportDataViewMapper {
* @return 视图数据
*/
List<MzsyMectReportView> findByPatIdAndOtherCondition(@Param("patId") String patId, @Param("ext") String extCondition);
/**
* 根据患者住院号和住院时间和额外条件查询视图数据
*
* @param inpatientNo 病案号
* @param extCondition 额外条件
* @param admissDate 入院时间
* @param disDate 出院时间
* @return 视图数据
*/
List<MzsyReportDataView> findByPatNoTimeAndOtherCondition(@Param("inpatientNo") String inpatientNo, @Param("admissDate") String admissDate, @Param("disDate") String disDate, @Param("ext") String extCondition);
}

21
src/main/resources/mapper/MzsyReportDataViewMapper.xml
Unescape Escape View File

@ -22,7 +22,7 @@
<if test="ext != null and ext != ''">
${ext}
</if>
order by FPAT_MODULE asc,FFILE_AF_TIME asc,FFILE_TIME asc
</select>
<select id="findByPatIdAndOtherCondition" resultType="com.docus.server.mzsy.entity.MzsyMectReportView">
SELECT apply_id as applyId,
@ -38,4 +38,23 @@
</if>
order by SENDDATE asc
</select>
<select id="findByPatNoTimeAndOtherCondition" resultType="com.docus.server.mzsy.entity.MzsyReportDataView">
select
ZYH,
ZYCS,
FFILE_ID AS ffileId,
FFILE_NAME AS ffileName,
FFILE_AF_TIME AS ffileAfTime,
FFILE_TIME AS ffileTime,
FFILE_PATH AS ffilePath,
FPAT_JZH AS fpatJzh,
FPAT_MODULE AS fpatModule,
UPDATE_TIME AS updateTime
from dbo.V_REPORT_DATA
where ZYH=#{inpatientNo}
and FFILE_TIME between #{admissDate} and #{disDate}
<if test="ext != null and ext != ''">
${ext}
</if>
</select>
</mapper>

Write Preview
Loading…
Cancel
Save