";
- tableHtml += "";
- tableHtml += ""+name+"";
-// tableHtml += "
";
- tableHtml += " | ";
- tableHtml += "
";
-
- tableHtml += "";
- tableHtml += "| 灭菌: | ";
- tableHtml += ""+sterilizationDate+" | ";
- tableHtml += "装配员: | ";
- tableHtml += ""+operator+" | ";
- tableHtml += "
";
-
- tableHtml += "";
- tableHtml += "| 失效: | ";
- tableHtml += ""+validDate+" | ";
- tableHtml += "审核员: | ";
- tableHtml += ""+reviewer+" | ";
- tableHtml += "
";
-
- tableHtml += "";
- tableHtml += "| "+total+" | ";
- tableHtml += "
";
-
- var patientInfo = '住院号:'+hospitalNumber+' 病人:'+patient+' 床位:'+bedNumber+'
';
- tableHtml += "";
- tableHtml += "| "+patientInfo+" | ";
- tableHtml += "
";
-
- var patientAreaInfo = '科室:'+ascriptionDepartment;
- tableHtml += "";
- tableHtml += "| "+patientAreaInfo+" | ";
- tableHtml += "
";
-
- /*tableHtml += "";
- tableHtml += "| 病人: | ";
- tableHtml += ""+foreignPackageObjectArray[2]+" | ";
- tableHtml += "住院号: | ";
- tableHtml += ""+foreignPackageObjectArray[0]+" | ";
- tableHtml += "
";*/
-
- var sterilizerStr = "";
- if(sterilizer == null || sterilizer.length == 0){
- sterilizerStr = ""+hospitalName+" | ";
- }else{
- var str = "【"+sterilizer + "】第" + frequency +"炉";
- sterilizerStr = ""+str+" | ";
- }
- tableHtml += "";
- tableHtml += sterilizerStr;
- tableHtml += "";
- tableHtml += "![](" + WWWROOT + "/disinfectSystem/printBarcodeAction!printBarcodeImage.do?barcode=" + barcode + ") ";
- tableHtml += ""+barcode;
- tableHtml += " |
";
-
- tableHtml += "";
- tableHtml += "| ";
- tableHtml += "";
- tableHtml += ""+barcode;
- tableHtml += " | ";
- tableHtml += "";
- tableHtml += "";
- tableHtml += ""+barcode;
- tableHtml += " | ";
- tableHtml += "
";
- tableHtml += "
";
- LODOP.ADD_PRINT_HTM(0,0,"100%","100%",""+tableHtml+"");
- LODOP.SET_PRINT_MODE("PRINT_PAGE_PERCENT","Full-Page");
-}
var foreignProxyDisinfectionLabelConfig = {
+ customPrint:printForeignProxyDisinfectionLabel_dgsdhyy,
// 可带表格线的table定义
table : {
rules : 'rows',
- style : 'width: 50mm; height: 30mm',
+ style : 'width: 60mm; height: 40mm',
cellspacing : '0',
cellpadding : '0',
position : [0,"0mm","100%","100%"],
@@ -987,22 +1408,66 @@
]
},
{height : "", tds : [
- { label : "灭菌程序:", dataIndex : 'sterilingType', colspan: 4, style : "font-size:12px;text-align:center;height:5mm"}
+ { label : "灭菌1:", dataIndex : 'sterilizationDate', colspan: 2, style : "font-size:11px; text-align:left;height:5mm;width:29mm"},
+ { label : "灭菌程序:", dataIndex : 'sterilingType', colspan: 2, style : "font-size:12px;text-align:left;height:5mm"}
]
},
{height : "", tds : [
- { label : "灭菌:", dataIndex : 'sterilizationDate', colspan: 2, style : "font-size:11px; text-align:center;height:5mm;width:24mm"},
- { label : "失效:", dataIndex : 'validDate', colspan: 2, length: 10, style : "font-size:11px; text-align:center;width:24mm"}
+ { label : "失效:", dataIndex : 'validDate', colspan: 2, length: 10, style : "font-size:11px; text-align:left;width:29mm"},
+ { label : "审核:", dataIndex : 'applicant', colspan: 2, style : "font-size:12px;text-align:left;height:5mm"}
]
},
{height : "", tds : [
- { label : "", dataIndex : 'barcode', colspan: 4, style : "font-size:10px;text-align:center"}
+ { label : "", dataIndex : 'barcode', colspan: 4, style : "font-size:10px;text-align:center;vertical-align:top"}
]
}
]
}
}
+function printForeignProxyDisinfectionLabel_dgsdhyy(obj){
+ doGetLodop();
+
+ // 划线
+ if(obj.markTousse){
+ LODOP.ADD_PRINT_LINE('9mm','0mm','9mm','50mm',0,1);
+ LODOP.ADD_PRINT_LINE('18mm','0mm','18mm','50mm',0,1);
+ }
+ // 设置默认字体
+ setDefaultFontNameSizeBold('宋体',12,1);
+ // 默认条码属性
+ LODOP.SET_PRINT_STYLE('ShowBarText', true);
+ LODOP.SET_PRINT_STYLE('FontSize', 6);
+ LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true);
+ // 包名
+ var fontSize = getFontSizeByStr(obj.name,[
+ {maxLen:10,fontSize:10},
+ {maxLen:20,fontSize:6},
+ {maxLen:1000,fontSize:4}
+ ]);
+ LODOP.ADD_PRINT_TEXT("1mm","0mm","RightMargin:0mm","5mm", obj.name);
+ setFontSizeBold(fontSize,1);// 设置字体
+ setAlignment('center');// 对齐
+ // 科室
+ fontSize = getFontSizeByStr(obj.depart,[
+ {maxLen:10,fontSize:10},
+ {maxLen:20,fontSize:6},
+ {maxLen:1000,fontSize:4}
+ ]);
+ LODOP.ADD_PRINT_TEXT("5mm","0mm","RightMargin:0mm","9mm", obj.depart);
+ setFontSizeBold(fontSize,1);// 设置字体
+ setAlignment('center');// 对齐
+
+ LODOP.ADD_PRINT_TEXT("10mm","1mm","30mm","5mm", "灭菌:"+obj.sterilizationDate);
+ setFontSizeBold(8,0);// 设置字体
+ LODOP.ADD_PRINT_TEXT("10mm","25mm","34mm","5mm", "灭菌程序:"+obj.sterilingType);
+ setFontSizeBold(8,0);// 设置字体
+ LODOP.ADD_PRINT_TEXT("15mm","1mm","30mm","5mm", "失效:"+obj.validDate);
+ setFontSizeBold(8,0);// 设置字体
+ LODOP.ADD_PRINT_TEXT("15mm","25mm","34mm","5mm", "审核:"+obj.applicant);
+ setFontSizeBold(8,0);// 设置字体
+ LODOP.ADD_PRINT_BARCODE("19mm","10mm","30mm","10mm","128Auto", obj.barcode);// 条码1
+}
var foreignTousseAppliationPrintConfig = {
isPrintTousse : true,
isPrintDisinfectGoods : false,
@@ -1018,45 +1483,38 @@
rowsPerPage : 20,
headerContent : [
// 标题
- {label : "江门市人民医院", dataIndex : '', fontSize : 10, position : ["10","4%","90%",5]},
- {label : "外来器械接收单", dataIndex : 'header', fontSize : 17, position : ["30","15%","99%",22]},
+ {label : "江门市人民医院外来器械接收单", dataIndex : 'header', fontSize : 17, position : ["30","8%","99%",22]},
{label : "姓名：", dataIndex : 'patient', fontSize : 11, position : ["90","4%","90%",5]},
- {label : "性别：", dataIndex : 'patientSex', fontSize : 11, position : ["90","80mm","90%",5]},
- {label : "年龄：", dataIndex : 'patientAge', fontSize : 11, position : ["90","130mm","90%",5]},
-
- {label : "床号：", dataIndex : 'bedNumber', fontSize : 11, position : ["120","4%","90%",5]},
- {label : "住院号：", dataIndex : 'hospitalNumber', fontSize : 11, position : ["120","80mm","90%",5]},
+ {label : "住院号：", dataIndex : 'hospitalNumber', fontSize : 11, position : ["90","80mm","90%",5]},
- {label : "单号：", dataIndex : 'serialNum', fontSize : 11, position : ["150","4%","90%",10]},
- {label : "申请科室：", dataIndex : 'depart', fontSize : 11, position : ["150","80mm","90%",5]},
- {label : "结算科室：", dataIndex : 'settleAccountsDepart', fontSize : 11, position : ["150","130mm","90%",10]},
+ {label : "单号：", dataIndex : 'serialNum', fontSize : 11, position : ["120","4%","90%",10]},
+ {label : "申请科室：", dataIndex : 'depart', fontSize : 11, position : ["120","80mm","90%",5]},
+ {label : "结算科室：", dataIndex : 'settleAccountsDepart', fontSize : 11, position : ["120","130mm","90%",10]},
- {label : "申请人：", dataIndex : 'applicant', fontSize : 11, position : ["180","4%","90%",10]},
- {label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["180","80mm","90%",10]},
+ {label : "申请人：", dataIndex : 'applicant', fontSize : 11, position : ["150","4%","90%",10]},
+ {label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["150","80mm","90%",10]},
- {label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["210","4%","90%",5]},
+ {label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["180","4%","90%",5]},
- {label : "手术名称：", dataIndex : 'surgery', fontSize : 11, position : ["280","4%","90%",10]},
- {label : "手术医生：", dataIndex : 'doctor', fontSize : 11, position : ["320","4%","90%",10]},
- {label : "手术时间：", dataIndex : 'operationTime', fontSize : 11, position : ["360","4%","90%",10]},
+ {label : "手术名称：", dataIndex : 'surgery', fontSize : 11, position : ["250","4%","90%",10]},
+ {label : "手术医生：", dataIndex : 'doctor', fontSize : 11, position : ["290","4%","90%",10]},
+ {label : "手术时间：", dataIndex : 'operationTime', fontSize : 11, position : ["330","4%","90%",10]},
- {label : "手术器械清单：", dataIndex : '', fontSize : 11, position : ["400","4%","90%",10]},
+ {label : "手术器械清单：", dataIndex : '', fontSize : 11, position : ["370","4%","90%",10]},
- {label : "清洗注意事项：", dataIndex : '', fontSize : 11, position : ["680","4%","90%",5]},
- {label : "灭菌方式：", dataIndex : '', fontSize : 11, position : ["720","4%","90%",5]},
- {label : "公司名称：", dataIndex : 'supplierName', fontSize : 11, position : ["760","4%","90%",5]},
- {label : "联系方式：", dataIndex : '', fontSize : 11, position : ["800","4%","90%",5]},
- {label : "送包日期及时间：", dataIndex : '', fontSize : 11, position : ["840","4%","90%",5]},
- {label : "送包者签名：", dataIndex : '', fontSize : 11, position : ["880","4%","90%",5]},
- {label : "回收者签名：", dataIndex : '', fontSize : 11, position : ["920","4%","90%",5]}
+ {label : "公司名称：", dataIndex : 'supplierName', fontSize : 11, position : ["680","4%","90%",5]},
+ {label : "联系方式：", dataIndex : '', fontSize : 11, position : ["720","4%","90%",5]},
+ {label : "送包日期及时间：", dataIndex : '', fontSize : 11, position : ["760","4%","90%",5]},
+ {label : "送包者签名：", dataIndex : '', fontSize : 11, position : ["800","4%","90%",5]},
+ {label : "回收者签名：", dataIndex : '', fontSize : 11, position : ["840","4%","90%",5]}
],
goodsTable :{
rowHeight : 25,
- position : ["430","8%","170mm","1000"],
+ position : ["400","8%","170mm","1000"],
content : [
{header : "序号", dataIndex : 'serialNumber', width : 60, align : 'center', fontSize : 11},
{header : "名称", dataIndex : 'goodsName', width : 300, align : 'left', fontSize : 11},
@@ -1082,7 +1540,13 @@
var printConfig = {
//发货计划单
invoicePlan : invoicePlanPrintConfig,
- batchPrintInvoices: batchPrintInvoicesConfig,
+ batchPrintInvoices:batchPrintInvoicesConfig,
+ // 批量打印发货单(器械包),如果没有配置,则跟batchPrintInvoices一样
+ //batchPrintInvoice_Tousse:batchPrintInvoicesConfig,
+ // 批量打印发货单(一次性物品),如果没有配置,则跟batchPrintInvoices一样
+ batchPrintInvoice_disposable:batchPrintInvoicesConfig_disposable,
+ // 批量打印发货单(消毒物品),如果没有配置,则跟batchPrintInvoices一样
+ //batchPrintInvoice_disinfect:batchPrintInvoicesConfig,
batchPrintMaterialInvoices:batchPrintMaterialInvoicesConfig,
// 发货单（通用发货单）
invoiceCombo : invoiceComboPrintConfig,
@@ -1112,9 +1576,9 @@
// 小标签:50x30规格
smallLabel : smallLabelConfig,
// 中标签:80x60规格
- //middleLable : middleLableConfig,
+ middleLable : middleLableConfig,
+ middleLable2 : middleLable2Config,
foreignTousseMiddleLable:foreignTousseMiddleLableConfig,// 外来器械中标签
- foreignTousseLargeLabel: foreignTousseLargeLabelConfig,// 外来器械大标签
// 大标签:100x80规格
largeLabel : exLargeLabelConfig,
// 加大标签:100x100规格
@@ -1134,5 +1598,7 @@
//调拨入库单
appropriationInList : appropriationInListConfig,
//调拨出库单
- appropriationOutList : appropriationOutListConfig
-};
\ No newline at end of file
+ appropriationOutList : appropriationOutListConfig,
+ //借还记录
+ borrowRecord:borrowRecordConfig
+};
Index: ssts-web/src/main/resources/config/jmrmyy/dataSyncConfig.json
===================================================================
diff -u -r12905 -r15312
--- ssts-web/src/main/resources/config/jmrmyy/dataSyncConfig.json (.../dataSyncConfig.json) (revision 12905)
+++ ssts-web/src/main/resources/config/jmrmyy/dataSyncConfig.json (.../dataSyncConfig.json) (revision 15312)
@@ -1,15 +1,15 @@
-{
+{
"同步组织机构":{
"默认父节点的编码" : "0",
"更新交集数据" : true,
- "移除差集数据" : false
+ "移除差集数据" : true
},
"同步用户":{
"默认父节点的编码" : "0",
"更新交集数据" : true,
"移除差集数据" : false,
"默认角色ID":[
- "ROLE_1_0"
+ "ROLE_01_0"
]
}
}
\ No newline at end of file