docus-collector
/
docus-gdszy-report
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复依赖管理版本

Browse Source
master
wyb 4 weeks ago
parent 004b4b84ed
commit cfb99f1638
6 changed files with 78 additions and 112 deletions
Show Stats Download Patch File Download Diff File

8
pom.xml
Unescape Escape View File

@ -3,10 +3,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.6</version>
<relativePath/> <!-- lookup parent from repository -->
<groupId>com.docus</groupId>
<artifactId>docus-bom</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<groupId>com.docus</groupId>
<artifactId>docus-gdszy-report</artifactId>
@ -32,6 +31,7 @@
<artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>

9
src/main/java/com/docus/bgts/DemoApplication.java → src/main/java/com/docus/bgts/Application.java
Unescape Escape View File

@ -9,11 +9,14 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.scheduling.annotation.EnableScheduling;
/**
* @author wyb
*/
@EnableScheduling
@SpringBootApplication
public class DemoApplication {
@SpringBootApplication(scanBasePackages = {"com.docus"})
public class Application {
public static void main(String[] args) {
System.setProperty("javax.xml.parsers.DocumentBuilderFactory", "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl");
SpringApplication.run(DemoApplication.class, args);
SpringApplication.run(Application.class, args);
}
}

27
src/main/java/com/docus/bgts/config/ThreadPoolConfig.java
Unescape Escape View File

@ -1,27 +0,0 @@
//
// Source code recreated from a .class file by IntelliJ IDEA
// (powered by FernFlower decompiler)
//
package com.docus.bgts.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
@Configuration
public class ThreadPoolConfig {
@Bean
public ThreadPoolExecutor threadPoolExecutor() {
return new ThreadPoolExecutor(Runtime.getRuntime().availableProcessors(),
(int) ((double) Runtime.getRuntime().availableProcessors() * 2),
60L, TimeUnit.SECONDS,
new LinkedBlockingQueue<>(200),
Executors.defaultThreadFactory(),
new ThreadPoolExecutor.CallerRunsPolicy());
}
}

21
src/main/java/com/docus/bgts/emr/handler/EmrWebService.java
Unescape Escape View File

@ -27,9 +27,6 @@ import com.docus.bgts.utils.XmlUtils;
import com.docus.bgts.wzh.entity.CanlcelDto;
import com.docus.bgts.wzh.entity.ZdAssort;
import com.docus.bgts.wzh.facade.IAfCollectTaskService;
import com.docus.bgts.wzh.mapper.TBasicExtendMapper;
import com.docus.bgts.wzh.mapper.TBasicMapper;
import com.docus.bgts.wzh.mapper.TScanAssortMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.dom4j.Document;
@ -71,12 +68,6 @@ public class EmrWebService implements IEmrWebService {
IAfCollectTaskService afCollectTaskService;
@Autowired
DownPlatformService downPlatformService;
@Autowired
TBasicMapper tBasicMapper;
@Autowired
TBasicExtendMapper tBasicExtendMapper;
@Autowired
TScanAssortMapper tScanAssortMapper;
@Resource
private ThreadPoolExecutor threadPoolExecutor;
@ -126,11 +117,11 @@ public class EmrWebService implements IEmrWebService {
reportDownDto.setScanfiles(scanFileDtoList);
// 作废该来源的文件
int cancelCount = this.afCollectTaskService.cancelTsaByPatientIdAndSource(patientId, collectorId);
int cancelCount = afCollectTaskService.cancelTsaByPatientIdAndSource(patientId, collectorId);
log.info("作废患者 {} 份文件，主键：{},来源：{}", cancelCount, patientId, collectorId);
afCollectTaskService.insertTask(reportDownDto);
this.afCollectTaskService.updateDoctorSubmitTime(reportDownDto, emrInfo.getSubmitTime(), emrInfo.getRecSubName());
this.afCollectTaskService.insertDoctorState(reportDownDto, emrInfo.getSubmitTime());
afCollectTaskService.updateDoctorSubmitTime(reportDownDto, emrInfo.getSubmitTime(), emrInfo.getRecSubName());
afCollectTaskService.insertDoctorState(reportDownDto, emrInfo.getSubmitTime());
CommonResult commonResult = downPlatformService.report(reportDownDto);
if (commonResult.getCode().equals(ResultCode.FAILED.getCode())) {
@ -420,7 +411,7 @@ public class EmrWebService implements IEmrWebService {
return assortId;
}
public static void depdf() {
private static void depdf() {
Path path = Paths.get("D:\\pdf.txt");
Stream<String> lines = null;
@ -456,7 +447,7 @@ public class EmrWebService implements IEmrWebService {
}
public String success() {
private String success() {
return "<Response>\n" +
"\t<RetInfo>\n" +
"\t\t<RetCode>0</RetCode>\n" +
@ -465,7 +456,7 @@ public class EmrWebService implements IEmrWebService {
"</Response>";
}
public String failed(String msg) {
private String failed(String msg) {
return "<Response>\n" +
"\t<RetInfo>\n" +
"\t\t<RetCode>1</RetCode>\n" +

6
src/main/java/com/docus/bgts/nursing/handler/NursingWebService.java
Unescape Escape View File

@ -394,7 +394,7 @@ public class NursingWebService implements INursingWebService {
return assortId;
}
public static void depdf() {
private static void depdf() {
Path path = Paths.get("D:\\pdf.txt");
Stream<String> lines = null;
@ -430,7 +430,7 @@ public class NursingWebService implements INursingWebService {
}
public String success() {
private String success() {
return "<Response>\n" +
"\t<RetInfo>\n" +
"\t\t<RetCode>0</RetCode>\n" +
@ -439,7 +439,7 @@ public class NursingWebService implements INursingWebService {
"</Response>";
}
public String failed(String msg) {
private String failed(String msg) {
return "<Response>\n" +
"\t<RetInfo>\n" +
"\t\t<RetCode>1</RetCode>\n" +

119
src/main/java/com/docus/bgts/wzh/service/AfCollectTaskServiceImpl.java
Unescape Escape View File

@ -27,9 +27,8 @@ import com.docus.bgts.wzh.mapper.AfInterfaceCollectMapper;
import com.docus.bgts.wzh.mapper.AfInterfaceCollectSubMapper;
import com.docus.bgts.wzh.mapper.TBasicExtendMapper;
import com.docus.bgts.wzh.mapper.TBasicMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -44,8 +43,8 @@ import java.util.function.Function;
import java.util.stream.Collectors;
@Service
@Slf4j
public class AfCollectTaskServiceImpl extends ServiceImpl<AfCollectTaskMapper, AfCollectTask> implements IAfCollectTaskService {
private final Logger log = LoggerFactory.getLogger(this.getClass());
@Autowired
AfCollectTaskMapper afCollectTaskMapper;
@Autowired
@ -59,23 +58,23 @@ public class AfCollectTaskServiceImpl extends ServiceImpl<AfCollectTaskMapper, A
@Override
public String getpatientIdByJzh(String jzh) {
String patientId = this.afCollectTaskMapper.getpatientIdByJzh(jzh);
String patientId = afCollectTaskMapper.getpatientIdByJzh(jzh);
return patientId;
}
@Override
public String getpatientIdBysealId(String sealId) {
return this.afCollectTaskMapper.getPatientIdBysealId(sealId);
return afCollectTaskMapper.getPatientIdBysealId(sealId);
}
@Override
public String getNameByPatientId(String patientId) {
return this.afCollectTaskMapper.selectNameByPatientId(patientId);
return afCollectTaskMapper.selectNameByPatientId(patientId);
}
@Override
public String getOutpatientIdByJzhel(String jzh) {
return this.afCollectTaskMapper.selectPatientByjzh(jzh);
return afCollectTaskMapper.selectPatientByjzh(jzh);
}
@Override
@ -117,10 +116,10 @@ public class AfCollectTaskServiceImpl extends ServiceImpl<AfCollectTaskMapper, A
@Override
public void insertSeal(ReportDownDto reportDownDto) {
if (((ReportDownScanFileDto) reportDownDto.getScanfiles().get(0)).getFiletype() == 1) {
this.log.info("新增封存任务表初始数据：" + reportDownDto);
log.info("新增封存任务表初始数据：" + reportDownDto);
}
String patientId = this.getpatientIdBysealId(reportDownDto.getPatient().getSealId());
String patientId = getpatientIdBysealId(reportDownDto.getPatient().getSealId());
if (StringUtils.isBlank(patientId)) {
throw new RuntimeException("操作的病案信息不存在");
} else {
@ -131,7 +130,7 @@ public class AfCollectTaskServiceImpl extends ServiceImpl<AfCollectTaskMapper, A
for (ReportDownScanFileDto scanfile : scanfiles) {
long l = System.currentTimeMillis();
AfCollectTask afCollectTask = (AfCollectTask) this.afCollectTaskMapper.selectOne((Wrapper) ((QueryWrapper) (new QueryWrapper()).eq("C1", scanfile.getSerialnum())).eq("sysflag", reportDownDto.getCollectorid()));
AfCollectTask afCollectTask = (AfCollectTask) afCollectTaskMapper.selectOne((Wrapper) ((QueryWrapper) (new QueryWrapper()).eq("C1", scanfile.getSerialnum())).eq("sysflag", reportDownDto.getCollectorid()));
if (afCollectTask != null && afCollectTask.getId() != null) {
afCollectTask.setPatientId(patientId);
afCollectTask.setSysflag(reportDownDto.getCollectorid());
@ -140,7 +139,7 @@ public class AfCollectTaskServiceImpl extends ServiceImpl<AfCollectTaskMapper, A
afCollectTask.setC1(scanfile.getSerialnum());
afCollectTask.setC2(scanfile.getFiletitle());
afCollectTask.setC3(reportDownDto.getPatient().getJzh());
save = this.afCollectTaskMapper.updateById(afCollectTask);
save = afCollectTaskMapper.updateById(afCollectTask);
} else {
afCollectTask = new AfCollectTask();
afCollectTask.setPatientId(patientId);
@ -150,16 +149,16 @@ public class AfCollectTaskServiceImpl extends ServiceImpl<AfCollectTaskMapper, A
afCollectTask.setC1(scanfile.getSerialnum());
afCollectTask.setC2(scanfile.getFiletitle());
afCollectTask.setC3(reportDownDto.getPatient().getJzh());
save = this.afCollectTaskMapper.insert(afCollectTask);
save = afCollectTaskMapper.insert(afCollectTask);
}
if (save <= 0) {
this.log.info("封存任务表操作出错");
log.info("封存任务表操作出错");
throw new RuntimeException("封存插入病案任务表数据出错");
}
if (afCollectTask.getId() == null) {
this.log.info("封存插入任务id为空！");
log.info("封存插入任务id为空！");
throw new RuntimeException("封存插入任务id为空");
}
@ -172,19 +171,19 @@ public class AfCollectTaskServiceImpl extends ServiceImpl<AfCollectTaskMapper, A
@Override
public void updateInterfaceCollect(String collectSubId, int state) {
AfInterfaceCollectSub afInterfaceCollectSub = (AfInterfaceCollectSub) this.afInterfaceCollectSubMapper.selectById(collectSubId);
AfInterfaceCollectSub afInterfaceCollectSub = (AfInterfaceCollectSub) afInterfaceCollectSubMapper.selectById(collectSubId);
if (afInterfaceCollectSub == null) {
throw new RuntimeException("afInterfaceCollectSub表数据为空");
} else {
afInterfaceCollectSub.setState(state);
int i = this.afInterfaceCollectSubMapper.updateById(afInterfaceCollectSub);
int i = afInterfaceCollectSubMapper.updateById(afInterfaceCollectSub);
if (i <= 0) {
throw new RuntimeException("记录任务数时出错");
} else {
if (state == 1) {
AfInterfaceCollect afInterfaceCollect = (AfInterfaceCollect) this.afInterfaceCollectMapper.selectById(afInterfaceCollectSub.getAfInterfaceCollectId());
AfInterfaceCollect afInterfaceCollect = (AfInterfaceCollect) afInterfaceCollectMapper.selectById(afInterfaceCollectSub.getAfInterfaceCollectId());
afInterfaceCollect.setCompleteCount(afInterfaceCollect.getCompleteCount() + 1);
i = this.afInterfaceCollectMapper.updateById(afInterfaceCollect);
i = afInterfaceCollectMapper.updateById(afInterfaceCollect);
if (i <= 0) {
throw new RuntimeException("记录任务数时出错");
}
@ -196,57 +195,57 @@ public class AfCollectTaskServiceImpl extends ServiceImpl<AfCollectTaskMapper, A
@Override
public List<String> listJZHByDate(String date1, String date2) {
return this.afCollectTaskMapper.listJZHByDate(date1, date2);
return afCollectTaskMapper.listJZHByDate(date1, date2);
}
@Override
public void invokeRepoalFile(CanlcelDto canlcelDto) throws Exception {
Map<String, Object> headMap = new HashMap();
headMap.put("Content-Type", "application/json");
this.log.info("开始文件撤回操作：" + canlcelDto);
log.info("开始文件撤回操作：" + canlcelDto);
String post = HttpUtils.post(String.valueOf(FileUtils.getJsonByName(Codes.REPOAL.getMessage())), headMap, (Map) JSON.parseObject(JSON.toJSONString(canlcelDto), Map.class));
Map resMap = (Map) JSON.parseObject(post, Map.class);
if (String.valueOf(resMap.get("code")).equals("500")) {
this.log.error(String.valueOf(resMap.get("msg")));
log.error(String.valueOf(resMap.get("msg")));
throw new RuntimeException(String.valueOf(resMap.get("msg")));
}
}
@Override
public String selectJzh(String inPatientNo, String examApplyDate) {
return this.afCollectTaskMapper.selectJzh(inPatientNo, examApplyDate);
return afCollectTaskMapper.selectJzh(inPatientNo, examApplyDate);
}
@Override
public String getAssortIdByAssortId(String assortId) {
return this.afCollectTaskMapper.getAssortIdByAssortId(assortId);
return afCollectTaskMapper.getAssortIdByAssortId(assortId);
}
@Override
public String getAssortIdByAssortName(String assortId) {
return this.afCollectTaskMapper.getAssortIdByAssortName(assortId);
return afCollectTaskMapper.getAssortIdByAssortName(assortId);
}
@Override
public void insertZdAssort(ZdAssort zdAssort) {
this.afCollectTaskMapper.insertZdAssort(zdAssort);
afCollectTaskMapper.insertZdAssort(zdAssort);
}
@Override
public int cancelTsaByPatientIdAndSource(String patientId, String assortId) {
return this.afCollectTaskMapper.cancelTsaByPatientIdAndSource(patientId, assortId);
return afCollectTaskMapper.cancelTsaByPatientIdAndSource(patientId, assortId);
}
@Override
public int updateNurseSubmitTime(ReportDownDto reportDownDto, String nurseSubmitTime, String nurseSubmitName) {
String patientId = this.getpatientIdByJzh(reportDownDto.getPatient().getJzh());
TBasicExtend tBasicExtend = this.tBasicExtendMapper.selectByPatientId(patientId);
String patientId = getpatientIdByJzh(reportDownDto.getPatient().getJzh());
TBasicExtend tBasicExtend = tBasicExtendMapper.selectByPatientId(patientId);
int update = 0;
try {
if (null != tBasicExtend) {
tBasicExtend.setNurseSubmitTime(new Date());
update = this.tBasicExtendMapper.updatenurseSubmitTime(tBasicExtend);
update = tBasicExtendMapper.updatenurseSubmitTime(tBasicExtend);
if (null != patientId && null != tBasicExtend.getNurseSubmitTime()) {
Map<String, Object> headMap = new HashMap();
headMap.put("Content-Type", "application/json");
@ -260,20 +259,20 @@ public class AfCollectTaskServiceImpl extends ServiceImpl<AfCollectTaskMapper, A
Map resMap = (Map) JSON.parseObject(post, Map.class);
long l7 = System.currentTimeMillis();
if (String.valueOf(resMap.get("code")).equals("500")) {
this.log.info("调用示踪接口出错！" + String.valueOf(resMap.get("msg")));
log.info("调用示踪接口出错！" + String.valueOf(resMap.get("msg")));
} else {
this.log.info("调用示踪接口返回值为--" + resMap);
log.info("调用示踪接口返回值为--" + resMap);
}
}
} else {
TBasicExtend tBasicExtend1 = new TBasicExtend();
tBasicExtend1.setPatientId(patientId);
tBasicExtend1.setNurseSubmitTime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).parse(nurseSubmitTime));
update = this.tBasicExtendMapper.insert(tBasicExtend1);
update = tBasicExtendMapper.insert(tBasicExtend1);
}
} catch (Exception e) {
e.printStackTrace();
this.log.error(e.getMessage());
log.error(e.getMessage());
}
return update;
@ -281,17 +280,17 @@ public class AfCollectTaskServiceImpl extends ServiceImpl<AfCollectTaskMapper, A
@Override
public int updateDoctorSubmitTime(ReportDownDto reportDownDto, String doctorSubmitTime, String doctorSubmitName) {
String patientId = this.getpatientIdByJzh(reportDownDto.getPatient().getJzh());
TBasicExtend tBasicExtend = this.tBasicExtendMapper.selectByPatientId(patientId);
String patientId = getpatientIdByJzh(reportDownDto.getPatient().getJzh());
TBasicExtend tBasicExtend = tBasicExtendMapper.selectByPatientId(patientId);
int update = 0;
this.log.info("医生提交方法------");
log.info("医生提交方法------");
try {
SimpleDateFormat simple = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date submitTime = simple.parse(doctorSubmitTime);
if (null != tBasicExtend) {
tBasicExtend.setDoctorSubmitTime(submitTime);
update = this.tBasicExtendMapper.updateDoctorSubmitTime(tBasicExtend);
update = tBasicExtendMapper.updateDoctorSubmitTime(tBasicExtend);
try {
if (null != patientId && null != tBasicExtend.getDoctorSubmitTime()) {
@ -306,30 +305,30 @@ public class AfCollectTaskServiceImpl extends ServiceImpl<AfCollectTaskMapper, A
long l = System.currentTimeMillis();
String post = HttpUtils.postSubmit("http://192.9.100.171:9102/basic/tlog/saveLog?nodeCode=again_submit&userName=" + doctorSubmitName + "&name=" + doctorSubmitName, headMap, params);
long l1 = System.currentTimeMillis();
this.log.info("调用示踪接口耗时{}", l1 - l);
log.info("调用示踪接口耗时{}", l1 - l);
Map resMap = (Map) JSON.parseObject(post, Map.class);
long l7 = System.currentTimeMillis();
if (String.valueOf(resMap.get("code")).equals("500")) {
this.log.info("调用示踪接口出错！" + resMap);
log.info("调用示踪接口出错！" + resMap);
throw new RuntimeException(String.valueOf(resMap.get("msg")));
}
this.log.info("调用示踪接口返回----" + resMap);
log.info("调用示踪接口返回----" + resMap);
} else {
this.log.info("未调用示踪接口-----");
log.info("未调用示踪接口-----");
}
} catch (Exception e) {
this.log.error(e.getMessage());
log.error(e.getMessage());
}
} else {
TBasicExtend tBasicExtend1 = new TBasicExtend();
tBasicExtend1.setPatientId(patientId);
tBasicExtend1.setDoctorSubmitTime(submitTime);
update = this.tBasicExtendMapper.insert(tBasicExtend1);
update = tBasicExtendMapper.insert(tBasicExtend1);
}
} catch (Exception e) {
e.printStackTrace();
this.log.error(e.getMessage());
log.error(e.getMessage());
}
return update;
@ -337,25 +336,25 @@ public class AfCollectTaskServiceImpl extends ServiceImpl<AfCollectTaskMapper, A
@Override
public void insertNurseState(ReportDownDto reportDownDto, String nurseSubmitTime) {
TBasic tBasic = this.tBasicMapper.selectByjzh(reportDownDto.getPatient().getJzh());
TBasic tBasic = tBasicMapper.selectByjzh(reportDownDto.getPatient().getJzh());
if (null == tBasic) {
throw new RuntimeException("操作的病案信息不存在");
} else {
if (null != nurseSubmitTime && !"".equals(nurseSubmitTime)) {
tBasic.setNurseState(1);
int update = this.tBasicMapper.update(tBasic);
int update = tBasicMapper.update(tBasic);
if (update > 0) {
this.log.info("护士提交状态修改成功！");
log.info("护士提交状态修改成功！");
} else {
this.log.info("护士提交状态修改失败！");
log.info("护士提交状态修改失败！");
}
} else {
tBasic.setNurseState(0);
int update = this.tBasicMapper.update(tBasic);
int update = tBasicMapper.update(tBasic);
if (update > 0) {
this.log.info("护士提交状态修改成功！");
log.info("护士提交状态修改成功！");
} else {
this.log.info("护士提交状态修改失败！");
log.info("护士提交状态修改失败！");
}
}
@ -364,25 +363,25 @@ public class AfCollectTaskServiceImpl extends ServiceImpl<AfCollectTaskMapper, A
@Override
public void insertDoctorState(ReportDownDto reportDownDto, String doctorSubmitTime) {
TBasic tBasic = this.tBasicMapper.selectByjzh(reportDownDto.getPatient().getJzh());
TBasic tBasic = tBasicMapper.selectByjzh(reportDownDto.getPatient().getJzh());
if (null == tBasic) {
throw new RuntimeException("操作的病案信息不存在");
} else {
if (null != doctorSubmitTime && !"".equals(doctorSubmitTime)) {
tBasic.setDoctorState(1);
int update = this.tBasicMapper.update(tBasic);
int update = tBasicMapper.update(tBasic);
if (update > 0) {
this.log.info("医生提交状态修改成功！");
log.info("医生提交状态修改成功！");
} else {
this.log.info("医生提交状态修改失败！");
log.info("医生提交状态修改失败！");
}
} else {
tBasic.setDoctorState(0);
int update = this.tBasicMapper.update(tBasic);
int update = tBasicMapper.update(tBasic);
if (update > 0) {
this.log.info("医生提交状态修改成功！");
log.info("医生提交状态修改成功！");
} else {
this.log.info("医生提交状态修改失败！");
log.info("医生提交状态修改失败！");
}
}
@ -391,11 +390,11 @@ public class AfCollectTaskServiceImpl extends ServiceImpl<AfCollectTaskMapper, A
@Override
public TBasic selectDisDateIsNull(String inPatientNo) {
return this.afCollectTaskMapper.selectDisDateIsNull(inPatientNo);
return afCollectTaskMapper.selectDisDateIsNull(inPatientNo);
}
@Override
public String selectDisDateIsNullJzh(String inPatientNo, String examApplyDate) {
return this.afCollectTaskMapper.selectDisDateIsNullJzh(inPatientNo, examApplyDate);
return afCollectTaskMapper.selectDisDateIsNullJzh(inPatientNo, examApplyDate);
}
}

Write Preview
Loading…
Cancel
Save