linjj
/
emr_record_czry
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化2.0标准版代码

Browse Source
master
Godblessyou 9 months ago
parent e54b90a930
commit 5817404f72
10 changed files with 77 additions and 93 deletions
Show Stats Download Patch File Download Diff File

49
src/main/java/com/emr/controller/FontShowRecordController.java
Unescape Escape View File

@ -1097,4 +1097,53 @@ public class FontShowRecordController {
}
return "recordManage/commomSearch/showRecord174";
}
/*@RequestMapping("sendFileManage")
public String sendFileManage(String patientId, Model model, HttpServletRequest request) throws Exception {
//创建连接工厂
JAXDynamicClientFactory dcf = JAXDynamicClientFactory.newInstance();
//创建客户端
Object[] objects = new Object[0];
Client client = null;
try {
//http://172.16.60.202:9083/HtMongoDBWebServiceInterface/services/Manage?wsdl
client = dcf.createClient("http://172.16.60.202:9083/HtMongoDBWebServiceInterface/services/Manage?wsdl");
// 构造 XML 参数字符串
String xmlParam = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<DOCINFO>\n" +
" <reportTypeCode>Js</reportTypeCode>\n" +
" <reportTypeName>嘉时采集资料</reportTypeName>\n" +
" <reportTypeSubCode>17.1</reportTypeSubCode>\n" +
" <reportTypeSubName>费用结算清单</reportTypeSubName>\n" +
" <empi>患者EMPI</empi>\n" +
" <pid>患者PID</pid>\n" +
" <ipid>患者ID</ipid>\n" +
" <pno>患者住院号、门诊号</pno>\n" +
" <reportSource>报告来源</reportSource>\n" +
" <fileSn>文档流水号（唯一）</fileSn>\n" +
" <fileName>报告名称、文档名称（唯一）</fileName>\n" +
" <reportContent>报告PDF转base64</reportContent>\n" +
" <reportManageType>报告处理类型（CRUD）</reportManageType>\n" +
" <needCount>应传报告数</needCount>\n" +
" <realCount>实传报告数</realCount>\n" +
" <applySns>关联申请单号</applySns>\n" +
" <reportTime>报告时间（不是上传时间、当前时间）</reportTime>\n" +
"<reportOrdinal>排序码<//reportOrdinal>\n" +
"< relOutRecSn></ relOutRecSn>\n" +
"</DOCINFO>";
// 调用 WebService 方法，并传递 XML 参数
Object[] response = client.invoke("reportFileManage", xmlParam);
// 处理返回结果
System.out.println("Response: " + response[0]);
} catch (Exception e) {
e.printStackTrace();
} finally {
if (null != client) {
client.destroy();
}
}
}*/
}

6
src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
Unescape Escape View File

@ -1702,7 +1702,7 @@ public class TemplateSearchController {
//批量添加打印记录
printOrDownLoadInfoService.SimpleInsert(scanPathVos, typeId, Short.valueOf("1"));
//调用湘雅附二病历复印打印状态同步接口
this.MedicalPrintSyncPrintStatusAction(patientIds , printDate);
//this.MedicalPrintSyncPrintStatusAction(patientIds , printDate);
}
} catch (Exception e) {
ExceptionPrintUtil.printException(e);
@ -1719,7 +1719,7 @@ public class TemplateSearchController {
JAXDynamicClientFactory dcf = JAXDynamicClientFactory.newInstance();
//创建客户端
Object[] objects;
Client client = dcf.createClient("http://172.16.198.250:13023/openapi/health");
Client client = dcf.createClient("http://172.16.198.250:13023/services/ws"); // http://172.16.198.250:13023/services/ws http://172.16.198.250:13023/openapi/health
//合作方密钥
String partnerKey = "53fd4f5ff132528e2e071baeeb3f99a2";
@ -1753,7 +1753,7 @@ public class TemplateSearchController {
// 1、创建document对象
Document document = DocumentHelper.createDocument();
// 2、创建根节点rss
Element requestElement = document.addElement("Request");
Element requestElement = document.addElement("request");
requestElement.addElement("serviceCode").setText("MedicalPrintSyncPrintStatusAction");
requestElement.addElement("partnerId").setText("XYEYYHIS");
requestElement.addElement("timeStamp").setText(printDate);

4
src/main/java/com/emr/dao/Zd_AssortMapper.java
Unescape Escape View File

@ -44,8 +44,8 @@ public interface Zd_AssortMapper {
/**
* 根据分类名称查询分类对象
* @param assortName
* @param patientId
* @return
*/
Zd_Assort getZdAssortByName(@Param("assortName") String assortName);
Zd_Assort getZdAssortByName(@Param("patientId") String patientId);
}

4
src/main/java/com/emr/service/CommomService.java
Unescape Escape View File

@ -1245,8 +1245,6 @@ public class CommomService {
//定义导出异常病案号，出院日期实体对象
ExportInpVo exportInpVo = null;
Zd_Assort zd_assort = zd_assortMapper.getZdAssortByName("费用");
if (pdfNameList != null && pdfNameList.size() > 0) {
//病案号
String inpatientNo = "";
@ -1289,6 +1287,8 @@ public class CommomService {
//pdf转jpg图片生成到指定路徑
List<String> picNameList = Pdf2ImgUtil.pdfToPic(saveFileName, pdfName, "jpg", commomVo.getFilePath());
Zd_Assort zd_assort = zd_assortMapper.getZdAssortByName(commomVo.getPatientId());
if (picNameList != null && picNameList.size() > 0) {
List<T_Scan_Assort> insertList = new ArrayList<>();
T_Scan_Assort t_scan_assort;

3
src/main/java/com/emr/util/img2PdfUtil.java
Unescape Escape View File

@ -478,6 +478,9 @@ public class img2PdfUtil {
img.setAlignment(Image.ALIGN_CENTER);
img.scalePercent(percent);
// 新增页面
document.newPage(); // 新增页面
//添加图像
document.add(img);
if (bufferedImage != null){

2
src/main/resources/config/config.properties
Unescape Escape View File

@ -45,7 +45,7 @@ applyApproveFlag =0
#//?????
initialization =0
export_pdf_hospital_info = \u5e7f\u4e1c\u7701\u005f\u6e5b\u6c5f\u5e02\u005f\u9042\u6eaa\u53bf\u4eba\u6c11\u533b\u9662
export_pdf_hospital_info = \u5e7f\u4e1c\u7701\u005f\u5e7f\u5dde\u5e02\u5929\u6cb3\u533a\u4eba\u6c11\u533b\u9662
#\u5e7f\u4e1c\u7701\u005f\u6e5b\u6c5f\u5e02\u005f\u9042\u6eaa\u53bf\u4eba\u6c11\u533b\u9662 ??
#\u5e7f\u4e1c\u7701\u005f\u5e7f\u5dde\u5e02\u5929\u6cb3\u533a\u4eba\u6c11\u533b\u9662 ??

5
src/main/resources/mapper/Zd_AssortMapper.xml
Unescape Escape View File

@ -157,6 +157,9 @@
select * from emr_type
</select>
<select id="getZdAssortByName" resultType="com.emr.entity.Zd_Assort">
select * from zd_assort t where t.assort_name like '%${assortName}%'
select top 1 b.* from t_scan_assort a join
(
select * from zd_assort where assort_name like '%费用%'
) b on a.assort_id = b.assort_id where a.patient_id = #{patientId}
</select>
</mapper>

30
src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js
Unescape Escape View File

@ -361,36 +361,6 @@ function getSql() {
if(!isEmpty(dataSource)){
if(dataSource == 6){
name = 'data_source';
whereNames += "len(commomtable.inpatient_no) > 10 AND ";
}else{
name = 'data_source';

49
src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js
Unescape Escape View File

@ -147,55 +147,6 @@ function onloadPdfMethod() {
//加载pdf按钮功能
function onloadPdf(scanPages, sources) {
/*var batchSize = 10; // 每批处理10个PDF文件
var scanPagesArray = scanPages.split(',');
var sourcesArray = sources.split(',');
var totalFiles = scanPagesArray.length;
var batches = Math.ceil(totalFiles / batchSize);
function processBatch(batchIndex){
var start = batchIndex * batchSize;
var end = Math.min(start + batchSize, totalFiles);
var batchScanPages = scanPagesArray.slice(start, end) + "";
var batchSources = sourcesArray.slice(start, end) + "";
$("#iframeLoad").val("");
$("#printPicLoaded").val("");
var patientId = $("#patientId").val();
//根目录字段识别名称
var flag = parent.$("#flag").val();
$.ajax({
type: 'post',
url: path + "/commom/showRecordContentBlood",
data: {
patientId: patientId,
scanPages: batchScanPages,
flag: flag,
sources: batchSources,
batchIndex: batchIndex
},
datType: 'json',
success: function (data) {
if (data.code == 0) {
var str = path + "/commom/getRecordContentBlood?patientId=" + patientId + "&batchIndex=" + batchIndex;
if (sources.includes("99") ||sources.includes("服务") ||sources.includes("null")||sources.includes("pacs")||sources.includes("扫描上传")) {
$("#iframe1").attr("src", path + "/static/pdfjs/web/viewer.html?file=" + encodeURIComponent(str))
} else {
$("#iframe1").attr("src", path + "/static/pdfjs/web/viewer2.html?file=" + encodeURIComponent(str))
var rootPaths = parent.$("#rootPaths").val();
var print = $("#print").val();
if (print == 1) {
selectPrintPic(patientId, rootPaths, scanPages, sources);
}
}
}
}
})
}
// 处理每个批次
for (var i = 0; i < batches; i++) {
processBatch(i);
}*/
$("#iframeLoad").val("");
$("#printPicLoaded").val("");
var patientId = $("#patientId").val();

18
src/main/webapp/static/pdfjs/web/viewer2.html
Unescape Escape View File

@ -97,6 +97,16 @@ http://sourceforge.net/adobe/cmap/wiki/License/
opacity: 1;
}
.a4-image {
display: block;
width: 90vw;
height: auto;
max-height: 90vh;
object-fit: contain;
margin: 10px auto;
page-break-after: auto;
}
/* 设置打印时的样式 */
@media print {
body {
@ -113,10 +123,9 @@ http://sourceforge.net/adobe/cmap/wiki/License/
}
.a4-image {
max-width: 100%; /* 图像最大宽度为容器宽度 */
max-height: 100%; /* 图像最大高度为容器高度 */
height: auto; /* 保持图像比例 */
width: auto; /* 保持图像比例 */
width: 850px !important;
height: 1190px !important;
page-break-after: always;
}
}
@ -490,7 +499,6 @@ http://sourceforge.net/adobe/cmap/wiki/License/
height: 100%;
width: 100%;
z-index: 9999999;
display: block;
text-align: center;
background-color: rgba(0, 0, 0, 0.5);

Write Preview
Loading…
Cancel
Save