zhanjiang2.0
/
AcquisitionServer
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

下载完关闭流

Browse Source
master
linjj 1 year ago
parent 798d1e9560
commit 3f7ce59054
6 changed files with 117 additions and 80 deletions
Show Stats Download Patch File Download Diff File

18
AcquisitionServer.iml
Unescape Escape View File

@ -15,6 +15,17 @@
</sourceRoots>
</configuration>
</facet>
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<setting name="provider-name" value="Hibernate" />
<datasource-mapping>
<factory-entry name="AcquisitionServer" />
<factory-entry name="entityManagerFactory" />
</datasource-mapping>
<naming-strategy-map />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
@ -23,6 +34,8 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
<excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
@ -102,6 +115,9 @@
<orderEntry type="library" name="Maven: org.springframework:spring-orm:5.1.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.1.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.30" level="project" />
<orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.4" level="project" />
<orderEntry type="library" name="Maven: jaxen:jaxen:1.1-beta-11" level="project" />
<orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
@ -151,5 +167,7 @@
<orderEntry type="library" name="Maven: org.attoparser:attoparser:2.0.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.3.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.11" level="project" />
</component>
</module>

2
src/main/java/com/ann/entity/constant/AliasName.java
Unescape Escape View File

@ -81,5 +81,7 @@ public class AliasName {
public static final String OTHER_REPORT = "110";
public static final String NEW_PATHOLOGY_REPORT = "53";
}

7
src/main/java/com/ann/repository/ArchiveDetailRepository.java
Unescape Escape View File

@ -25,10 +25,17 @@ public interface ArchiveDetailRepository extends JpaRepository<ArchiveDetail, St
Integer countByMasterIDAndAssortIDAndSourceAndCheckReportId(String masterId, String AssortID, String source, String CheckReportId);
@Query("select count (o) from ArchiveDetail o where o.masterID = ?1 and o.checkReportId = ?2 and o.applyId=?3 and o.flag = 0")
Integer countByMasterIDAndAndCheckReportIdAndApplyId(String id,String checkReportId,String applyId);
public ArchiveDetail findByMasterIDAndAssortIDAndSourceAndApplyIdAndFlag(String masterId, String AssortID, String source, String applyId,String flag);
public ArchiveDetail findByMasterIDAndAssortIDAndSourceAndCheckReportIdAndFlag(String masterId, String AssortID, String source, String checkReportId,String flag);
public ArchiveDetail findByMasterIDAndAndCheckReportIdAndApplyId(String id,String checkReportId,String applyId);
@Query("select count (o) from ArchiveDetail o where o.masterID = ?1 and o.assortID = ?2 and o.title=?3 and o.flag = 0 ")
Integer countByMasterIDAndAssortIDAndTitleAndFlag(String masterId, String AssortID, String title);

3
src/main/java/com/ann/service/ArchiveDetailService.java
Unescape Escape View File

@ -19,6 +19,9 @@ public interface ArchiveDetailService {
public ArchiveDetail isExitCheckReportId(String id, String type, String source, String checkReportId) throws Exception;
public ArchiveDetail isExitCheckReportIdAndApplyId(String id,String checkReportId,String applyId) throws Exception;
public Integer countByMasterIDAndAssortIDAndTitleAndFlag(String masterId, String AssortID, String title) throws Exception;
// public String getTypeNotExits(List<String> type, String masterId);

9
src/main/java/com/ann/service/impl/ArchiveDetailServiceImpl.java
Unescape Escape View File

@ -46,6 +46,15 @@ public class ArchiveDetailServiceImpl implements ArchiveDetailService {
return null;
}
@Override
public ArchiveDetail isExitCheckReportIdAndApplyId(String id,String checkReportId,String applyId) throws Exception {
if (archiveDetailRepository.countByMasterIDAndAndCheckReportIdAndApplyId(id, checkReportId, applyId) > 0)
return archiveDetailRepository.findByMasterIDAndAndCheckReportIdAndApplyId(id, checkReportId, applyId);
return null;
}
@Override
public Integer countByMasterIDAndAssortIDAndTitleAndFlag(String masterId, String AssortID,String title) throws Exception {
return archiveDetailRepository.countByMasterIDAndAssortIDAndTitleAndFlag(masterId, AssortID, title);

34
src/main/java/com/ann/service/impl/QueueService.java
Unescape Escape View File

@ -47,6 +47,7 @@ public class QueueService {
ArchiveDetailService archiveDetailService;
@Autowired
MessageService messageService;
//---------------------定时器
public void doSomething(List<MessageSubordinate> all) throws Exception {
if (all.size() > 0) {
@ -84,26 +85,21 @@ public class QueueService {
messageSubordinateService.save(messageSubordinate);
continue;
}
/**2021-4-25 等超声补传完 去掉*/
/**2021-4-25 等心电图补传完 去掉*/
if (Objects.equals(messageDto.getType(), AliasName.EKG_REPORT) && archiveMaster.getArchiveState().equals("已归档")) {
messageSubordinate.setStatus(3);
messageSubordinateService.save(messageSubordinate);
continue;
}
/**2021-4-25 等心电图补传完 去掉*/
if (!Objects.equals(messageDto.getType(), AliasName.PATHOLOGY_REPORT)
/**2021-1-26 等lis程序升级 去掉*/
&& !Objects.equals(messageDto.getType(), AliasName.INSPECTION_REPORT)
/**2021-1-26 等lis程序升级 去掉*/
/**2021-4-25 等超声补传完 去掉*/
&& !Objects.equals(messageDto.getType(), AliasName.ULTRASONIC_REPORT)
/**2021-4-25 等超声补传完 去掉*/
/**2021-4-25 等心电图补传完 去掉*/
&& !Objects.equals(messageDto.getType(), AliasName.EKG_REPORT)
/**2021-4-25 等心电图补传完 去掉*/
&& !Objects.equals(messageDto.getType(), AliasName.NEW_PATHOLOGY_REPORT)
&& (archiveMaster.getArchiveState().equals("初审") || archiveMaster.getArchiveState().equals("已归档"))
) {
messageSubordinate.setStatus(3);
@ -169,6 +165,20 @@ public class QueueService {
messageSubordinateService.save(messageSubordinate);
continue;
}
}
//如果是新病历报告单独处理
if (Objects.equals(messageDto.getType(), AliasName.NEW_PATHOLOGY_REPORT)) {
//获取报告单号|申请单号 如果存在更新不存在新增
String checkReportId = messageDto.getCheckReportId();
String applyId = messageDto.getApplyId();
archiveDetail = archiveDetailService.isExitCheckReportIdAndApplyId(archiveMaster.getId(), checkReportId, applyId);
if (archiveDetail == null) {
archiveDetail = new ArchiveDetail(archiveMaster.getId(), date, "52", messageDto.getSource(), messageDto.getApplyId(), checkReportId,messageDto.getDetailType());
archiveDetailService.save(archiveDetail);
}else {
//更新时间
archiveDetail.setUpLoadDateTime(date);
}
} else {
//非PACS
// 查询库中是否存在 如果存在就更新
@ -210,14 +220,6 @@ public class QueueService {
}
String tempPageNum = "";
// if (messageDto.getApplyId().lastIndexOf("_") != -1 ) {
//apply_id 000562390700_1_000562390700_0_1_JHR06.00.02_34_2.pdf
// if(archiveMaster.getInpNo().lastIndexOf("_") != -1){
// }
// tempPageNum = messageDto.getApplyId().substring(0, messageDto.getApplyId().indexOf(".pdf"));
// }else{
// address ftp://10.6.0.155/2020-08-04/000562390700_1_000562390700_0_1_JHR06.00.02_34_2_0.pdf
tempPageNum = address.substring(0, address.lastIndexOf("_"));
// }
tempPageNum = tempPageNum.substring(tempPageNum.lastIndexOf("_") + 1, tempPageNum.length());
@ -289,11 +291,8 @@ public class QueueService {
}
}
} else if (address.contains("http")) {//新心电以http协议传
logger.error("类型为：" + messageDto.getType());
if (Objects.equals(messageDto.getType(), AliasName.PETCT_REPORT)) {
HttpDownloader httpDownloader = new HttpDownloader(null);
logger.error("核医学下载地址为URL：" + address);
logger.error("核医学下载文件名：" + address);
httpDownloader.downLoadFromUrl(address, pdfFile.getName(), pdfFile.getParent());
pdfPath = pdfFile.getAbsolutePath();
} else {
@ -390,7 +389,6 @@ public class QueueService {
}
public void doSomethingByHIS() {
try {
while (true) {

Write Preview
Loading…
Cancel
Save