diff --git a/pom.xml b/pom.xml
index 4c38c56..7ab3f7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,10 +3,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- org.springframework.boot
- spring-boot-starter-parent
- 2.5.6
-
+ com.docus
+ docus-bom
+ 1.0-SNAPSHOT
com.docus
docus-gdszy-report
@@ -32,6 +31,7 @@
spring-boot-starter
+
org.dom4j
dom4j
diff --git a/src/main/java/com/docus/bgts/DemoApplication.java b/src/main/java/com/docus/bgts/Application.java
similarity index 76%
rename from src/main/java/com/docus/bgts/DemoApplication.java
rename to src/main/java/com/docus/bgts/Application.java
index cc06d66..e693963 100644
--- a/src/main/java/com/docus/bgts/DemoApplication.java
+++ b/src/main/java/com/docus/bgts/Application.java
@@ -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);
}
}
diff --git a/src/main/java/com/docus/bgts/config/ThreadPoolConfig.java b/src/main/java/com/docus/bgts/config/ThreadPoolConfig.java
deleted file mode 100644
index 23bee0f..0000000
--- a/src/main/java/com/docus/bgts/config/ThreadPoolConfig.java
+++ /dev/null
@@ -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());
- }
-}
diff --git a/src/main/java/com/docus/bgts/emr/handler/EmrWebService.java b/src/main/java/com/docus/bgts/emr/handler/EmrWebService.java
index 83758bd..4fd959f 100644
--- a/src/main/java/com/docus/bgts/emr/handler/EmrWebService.java
+++ b/src/main/java/com/docus/bgts/emr/handler/EmrWebService.java
@@ -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 lines = null;
@@ -456,7 +447,7 @@ public class EmrWebService implements IEmrWebService {
}
- public String success() {
+ private String success() {
return "\n" +
"\t\n" +
"\t\t0\n" +
@@ -465,7 +456,7 @@ public class EmrWebService implements IEmrWebService {
"";
}
- public String failed(String msg) {
+ private String failed(String msg) {
return "\n" +
"\t\n" +
"\t\t1\n" +
diff --git a/src/main/java/com/docus/bgts/nursing/handler/NursingWebService.java b/src/main/java/com/docus/bgts/nursing/handler/NursingWebService.java
index 1d8fce6..cbb8ee6 100644
--- a/src/main/java/com/docus/bgts/nursing/handler/NursingWebService.java
+++ b/src/main/java/com/docus/bgts/nursing/handler/NursingWebService.java
@@ -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 lines = null;
@@ -430,7 +430,7 @@ public class NursingWebService implements INursingWebService {
}
- public String success() {
+ private String success() {
return "\n" +
"\t\n" +
"\t\t0\n" +
@@ -439,7 +439,7 @@ public class NursingWebService implements INursingWebService {
"";
}
- public String failed(String msg) {
+ private String failed(String msg) {
return "\n" +
"\t\n" +
"\t\t1\n" +
diff --git a/src/main/java/com/docus/bgts/wzh/service/AfCollectTaskServiceImpl.java b/src/main/java/com/docus/bgts/wzh/service/AfCollectTaskServiceImpl.java
index d61f431..c10ca13 100644
--- a/src/main/java/com/docus/bgts/wzh/service/AfCollectTaskServiceImpl.java
+++ b/src/main/java/com/docus/bgts/wzh/service/AfCollectTaskServiceImpl.java
@@ -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 implements IAfCollectTaskService {
- private final Logger log = LoggerFactory.getLogger(this.getClass());
@Autowired
AfCollectTaskMapper afCollectTaskMapper;
@Autowired
@@ -59,23 +58,23 @@ public class AfCollectTaskServiceImpl extends ServiceImpl 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 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 headMap = new HashMap();
headMap.put("Content-Type", "application/json");
@@ -260,20 +259,20 @@ public class AfCollectTaskServiceImpl extends ServiceImpl 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 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