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

1、签收接口更改平台服务地址；

Browse Source 
2、调整电子病历新老数据接口下载方式，以及文件命名方式；
master
leijx 5 years ago
parent 6a1ad84010
commit 95c46d1673
8 changed files with 40 additions and 48 deletions
Show Stats Download Patch File Download Diff File

10
src/main/java/com/ann/controller/TestController.java
Unescape Escape View File

@ -99,11 +99,11 @@ public class TestController {
return "我是测试ftp的~~~~";
}
@RequestMapping("/deleteDetail")
public String deleteDetail() throws Exception{
archiveDetailService.delete();
return "成功";
}
// @RequestMapping("/deleteDetail")
// public String deleteDetail() throws Exception{
// archiveDetailService.delete();
// return "成功";
// }
@ResponseBody
@RequestMapping("/test")

2
src/main/java/com/ann/entity/filing/ArchiveDetail.java
Unescape Escape View File

@ -61,6 +61,7 @@ public class ArchiveDetail {
this.applyId = applyId;
}
// 普通下载
public ArchiveDetail(String masterID, Date upLoadDateTime, String assortID, String source, String applyId, String title,Integer i) {
this.masterID = masterID;
this.upLoadDateTime = upLoadDateTime;
@ -70,6 +71,7 @@ public class ArchiveDetail {
this.title = title;
}
//扫描下载
public ArchiveDetail(String masterID, Date upLoadDateTime, String assortID, String source, String applyId, String pdfPath) {
this.masterID = masterID;
this.upLoadDateTime = upLoadDateTime;

4
src/main/java/com/ann/entity/filing/dto/MessageDto.java
Unescape Escape View File

@ -51,6 +51,10 @@ public class MessageDto<T> {
// 2019-11-28 新增三级标题
private String detailType;
//20200609 0是老数据 1是新数据
private String isOld;
public MessageDto() {
}

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

@ -14,7 +14,6 @@ public interface ArchiveDetailService {
public void delete(String id) throws Exception;
public void delete() throws Exception;
public ArchiveDetail isExit(String id, String type, String source, String applyId) throws Exception;

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

@ -35,18 +35,6 @@ public class ArchiveDetailServiceImpl implements ArchiveDetailService {
archiveDetailRepository.deleteById(id);
}
@Override
public void delete() throws Exception {
List<ArchiveDetail1> all = archiveDetail1Repository.findAllHaha();
int i = 0;
for (ArchiveDetail1 a : all) {
if (a.getPdfPath() != null) {
i = FileUtils.deleteImageFile1(new File(a.getPdfPath()), i);
}
}
System.out.println("一共有:" + all.size());
System.out.println("一共删除:" + i);
}
@Override
public ArchiveDetail isExit(String id, String type, String source, String applyId) throws Exception {

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

@ -46,18 +46,15 @@ public class QueueService {
ArchiveDetail archiveDetail = null;
try {
// 解析内容
String contentJson = messageSubordinate.getContentJson();
MessageLog messageLog = JSON.parseObject(contentJson, MessageLog.class);
MessageLog messageLog = JSON.parseObject(messageSubordinate.getContentJson(), MessageLog.class);
if (messageLog != null) {
String outJson = messageLog.getOutJson();
if (outJson != null) {
MessageDto messageDto = JSON.parseObject(outJson, MessageDto.class);
if (messageDto.getSource().equals(InterfaceName.NURSE_DATA) && messageDto.getReportAddress().endsWith(".jpg")
|| messageDto.getSource().equals(InterfaceName.NURSE_DATA) && messageDto.getReportAddress().endsWith(".JPG") ) { // 护理记录
if (messageDto.getSource().equals(InterfaceName.NURSE_DATA) && (messageDto.getReportAddress().endsWith(".jpg")
|| messageDto.getReportAddress().endsWith(".JPG") )){
messageSubordinate.setRemark("住院号:" + messageDto.getInpNo() + "pdf路径为空（可能出现下载问题）。。。");
} else {
// 根据这里的值 去找table5
ArchiveMaster archiveMaster = archiveMasterService.findByInpNoAndVisitIdAndIsValid(messageDto.getInpNo(), messageDto.getVisitId());
if (archiveMaster != null) {
if(!Objects.equals(messageDto.getType(),AliasName.PATHOLOGY_REPORT)){
@ -72,20 +69,8 @@ public class QueueService {
String address = messageDto.getReportAddress();
if (address != null && (!address.equals(""))) {
//------------------------------------------时间改成java8新特性的localDate
//医生 护理单独做处理
if(messageDto.getSource().equals(InterfaceName.NURSE_DATA) || messageDto.getSource().equals(InterfaceName.DOCTOR_DATA)){
if(messageDto.getSource().equals(InterfaceName.NURSE_DATA)){
if(archiveMaster.getEmrNurseCmt() == null || archiveMaster.getEmrNurseCmt().equals("")){
archiveMaster.setEmrNurseCmt("提交");
archiveMasterService.save(archiveMaster);
}
}else{
if(archiveMaster.getEmrDoctorCmt() == null || archiveMaster.getEmrDoctorCmt().equals("")){
archiveMaster.setEmrDoctorCmt("提交");
archiveMasterService.save(archiveMaster);
}
}
// 如果是老数据
if(Objects.equals(messageDto.getIsOld(),"0")){
archiveDetail = new ArchiveDetail(archiveMaster.getId(), new Date(), messageDto.getType(), messageDto.getSource(), messageDto.getApplyId(),messageDto.getDetailType(),1);
archiveDetailService.save(archiveDetail);
}else{
@ -99,21 +84,35 @@ public class QueueService {
}
String pdfPath = null;
String emrPath = "";
//判断是否是电子病历
if (messageDto.getSource().equals(InterfaceName.NURSE_DATA)) { // 护理记录
String a = address.substring(0, address.indexOf(".pdf"));
if(messageDto.getSource().equals(InterfaceName.NURSE_DATA)){
//医生 护理单独做处理
if(archiveMaster.getEmrNurseCmt() == null){
archiveMaster.setEmrNurseCmt("提交");
archiveMasterService.save(archiveMaster);
}
String a = "";
if(messageDto.getApplyId().lastIndexOf("_") != -1){
a = messageDto.getApplyId().substring(0, messageDto.getApplyId().indexOf(".pdf"));
}else{
a = address.substring(0, address.lastIndexOf("_"));
}
emrPath = messageDto.getType() + "~" + (a.substring(a.lastIndexOf("_") + 1, a.length())) + "~";
//emrPath = (messageDto.getApplyId().substring(0, messageDto.getApplyId().indexOf(".pdf"))) + "~" + (a.substring(a.lastIndexOf("_") + 1, a.length())) + "~";
} else if (messageDto.getSource().equals(InterfaceName.DOCTOR_DATA)) { // 护理记录
if (messageDto.getCaptionDateTime() != null && (!messageDto.getCaptionDateTime().equals(""))) {
emrPath = messageDto.getType() + "~" + messageDto.getCaptionDateTime() + "~";
} else if(messageDto.getSource().equals(InterfaceName.DOCTOR_DATA)){
//护士 护理单独做处理
if(archiveMaster.getEmrDoctorCmt() == null){
archiveMaster.setEmrDoctorCmt("提交");
archiveMasterService.save(archiveMaster);
}
emrPath = messageDto.getType() + "~" + messageDto.getCaptionDateTime() + "~";
}else{
// 20200518 给重症系统的文件排序
if(messageDto.getType().equals(AliasName.ICU_REPORT)){
emrPath = messageDto.getDetailType() + "~" + messageDto.getCaptionDateTime() + "~";
}
}
File pdfFile = FileUtils.createFile("pdfs", messageDto.getInpNo(), messageDto.getVisitId(), archiveDetail.getId(), emrPath);
if (pdfFile != null) {
if (address.endsWith(".pdf") || address.endsWith(".PDF")) {

2
src/main/java/com/ann/utils/DownloadUtils.java
Unescape Escape View File

@ -44,7 +44,7 @@ public class DownloadUtils {
url = new URL(s1 +URLEncoder.encode(s2, "utf-8"));
// url = new URL(urlStr);
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
HttpURLConnection conn = (HttpURLConnection)url.openConnection();
//设置超时间为5秒
conn.setConnectTimeout(5 * 1000);
//防止屏蔽程序抓取而返回403错误

2
src/main/java/com/ann/utils/WebServiceUtils.java
Unescape Escape View File

@ -23,7 +23,7 @@ public class WebServiceUtils {
public static Object[] connectEMR(String content) throws Exception {
JaxWsDynamicClientFactory dcf = JaxWsDynamicClientFactory.newInstance();
Client client = dcf.createClient("http://10.6.0.151:8089/SignWebService.asmx?wsdl");
Client client = dcf.createClient("http://10.6.0.170/csp/jhip/JHIP.MRA.BS.MedicalRecordsQueryBS.cls?wsdl");
Object[] objects = new Object[0];
try {
// invoke("方法名",参数1,参数2,参数3....);

Write Preview
Loading…
Cancel
Save