Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp =================================================================== diff -u -r15211 -r17770 --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp (.../printCustomDesign.jsp) (revision 15211) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp (.../printCustomDesign.jsp) (revision 17770) @@ -19,6 +19,7 @@ Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js =================================================================== diff -u -r17473 -r17770 --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js (.../printCustomDesign.js) (revision 17473) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js (.../printCustomDesign.js) (revision 17770) @@ -146,6 +146,17 @@ LODOP.ADD_PRINT_LINE('5mm','0mm','5mm',currentConfig.width,0,1); LODOP.SET_PRINT_STYLEA(0, "ItemName", "expiryDate180DaysIndicatrix"); } +function insertUrgentImage(){ + var url = WWWROOT+'/disinfectsystem/config/'+profile+'/img/urgent.jpg'; +// alert(url) +// LODOP.ADD_PRINT_IMAGE('0mm','0mm','10mm','10mm','

'); + LODOP.ADD_PRINT_IMAGE('0mm','0mm','10mm','10mm',url); + LODOP.SET_PRINT_STYLEA(0, "ItemName", "urgentImage"); +} +function insertUrgentText(){ + LODOP.ADD_PRINT_TEXTA('urgentText', '2mm', '2mm', '10mm', '6mm', '急'); +} + function insertTableToLodop(tableConfig){ // alert(tableConfig) if(tableConfig == null){ @@ -414,6 +425,19 @@ handler : function() { insertExpiryDate180DaysIndicatrix(); } + },{ + xtype : 'button', + text : '插入加急图片', + hidden: true, + handler : function() { + insertUrgentImage(); + } + },{ + xtype : 'button', + text : '插入加急文本', + handler : function() { + insertUrgentText(); + } }] },{ xtype:'fieldset', @@ -1130,7 +1154,6 @@ } Ext4.onReady(function() { Ext4.QuickTips.init(); - loadConfigAndInitDesign(); }); Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r17585 -r17770 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 17585) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 17770) @@ -817,7 +817,7 @@ toolAndImplantAmount.optInt("toolAmount"), toolAndImplantAmount.optInt("implantAmount"),department, td.getPrintOrgSource(),idCardDefinitionUseAmount,objectDao,td.getBarcodePaperType(),tousseInstance.getWashOperator(),tousseInstance.getWashOperatorCode(), - tousseInstance.getWeight(),td.getPrintAmount(),BooleanUtils.toBooleanDefaultIfNull(tousseInstance.getHaveUnSupplementMaterials(), false)); + tousseInstance.getWeight(),td.getPrintAmount(),BooleanUtils.toBooleanDefaultIfNull(tousseInstance.getHaveUnSupplementMaterials(), false),tousseInstance.getIsUrgentTousse()); // 特殊单的包实例处理 if(tousseInstance.getForeignProxyItem_id() != null){ ForeignProxyDisinfection foreignProxyDisinfection = tousseInstance.getForeignProxyDisinfection(objectDao); @@ -968,6 +968,7 @@ obj.put("weight", tousseInstance.getWeight()); //是否打印科室及科室名称 obj.put("printOrgSource", td.getPrintOrgSource()); + obj.put("isUrgentTousse", tousseInstance.getIsUrgentTousse()); obj.put("haveUnSupplementMaterials", tousseInstance.getHaveUnSupplementMaterials()); //根据器械包的申请单编号或回收单编号查询出所属申请部门 String department = TousseInstanceUtils.getTousseInstanceDepartForPrint(tousseInstance); @@ -2182,7 +2183,7 @@ toolAndImplantAmount.optInt("toolAmount"), toolAndImplantAmount.optInt("implantAmount"),TousseInstanceUtils.getTousseInstanceDepartForPrint(tousseInstance) , td.getPrintOrgSource(), idCardDefinitionUseAmount,objectDao,td.getBarcodePaperType(),tousseInstance.getWashOperator(),tousseInstance.getWashOperatorCode(), - tousseInstance.getWeight(),1,BooleanUtils.toBooleanDefaultIfNull(tousseInstance.getHaveUnSupplementMaterials(), false));// TODO 需要确认审核后打印，是否也支持打印多份 + tousseInstance.getWeight(),1,BooleanUtils.toBooleanDefaultIfNull(tousseInstance.getHaveUnSupplementMaterials(), false),tousseInstance.getIsUrgentTousse());// TODO 需要确认审核后打印，是否也支持打印多份 toussesArray.add(obj); JSONObject logObj = new JSONObject(); JSONUtil.addLogProperty(logObj, "tousseInstanceId", tousseInstance.getId()); @@ -2633,6 +2634,7 @@ tousse.put("washOperatorCode", tousseInstance.getWashOperatorCode()); tousse.put("weight", tousseWeight); tousse.put("printAmount", td.getPrintAmount()); + tousse.put("isUrgentTousse", tousseInstance.getIsUrgentTousse()); } } @@ -3589,7 +3591,7 @@ tousse.optInt("toolAmount"), tousse.optInt("implantAmount"),tousse.optString("department"), td.getPrintOrgSource(),0L,objectDao,td.getBarcodePaperType(),tousse.optString("washOperator"),tousse.optString("washOperatorCode"), - tousse.optString("weight"),tousse.optInt("printAmount"),false); + tousse.optString("weight"),tousse.optInt("printAmount"),false,tousse.optString("isUrgentTousse")); toussesArray.add(obj); @@ -3651,7 +3653,7 @@ toolAndImplantAmount.optInt("toolAmount"), toolAndImplantAmount.optInt("implantAmount"),TousseInstanceUtils.getTousseInstanceDepartForPrint(tousse), td.getPrintOrgSource(),idCardDefinitionUseAmount,objectDao,td.getBarcodePaperType(),tousse.getWashOperator(),tousse.getWashOperatorCode(), - tousse.getWeight(),td.getPrintAmount(),BooleanUtils.toBooleanDefaultIfNull(tousse.getHaveUnSupplementMaterials(), false)); + tousse.getWeight(),td.getPrintAmount(),BooleanUtils.toBooleanDefaultIfNull(tousse.getHaveUnSupplementMaterials(), false),tousse.getIsUrgentTousse()); toussesArray.add(obj); } @@ -5635,7 +5637,7 @@ ti.getOperationTime(), false, false, true, isReview, isTraceable, td.getIsBigPackage(), "", null, 0l, "", 0, 0, "", TousseDefinition.PRINGORGSOURCE_NONE, 0l, objectDao, td.getBarcodePaperType(), "", "", - "", td.getPrintAmount(),BooleanUtils.toBooleanDefaultIfNull(ti.getHaveUnSupplementMaterials(), false)); + "", td.getPrintAmount(),BooleanUtils.toBooleanDefaultIfNull(ti.getHaveUnSupplementMaterials(), false),ti.getIsUrgentTousse()); } private JSONObject getTousseDefinitionPrintJsonForComboTousse( Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js =================================================================== diff -u -r17589 -r17770 --- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 17589) +++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 17770) @@ -110,6 +110,7 @@ {name : 'assistant'}, {name : 'weight'}, {name : 'applicantDepart'}, + {name : 'isUrgentTousse'}, {name : 'haveUnSupplementMaterials'} ] }), Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java =================================================================== diff -u -r17645 -r17770 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 17645) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 17770) @@ -1030,7 +1030,7 @@ int implantAmount, String department, String printOrgSource, Long idCardDefinitionUseAmount, ObjectDao objectDao, String barcodePaperType, String washOperator, - String washOperatorCode, String weight, int printAmount,boolean haveUnSupplementMaterials) { + String washOperatorCode, String weight, int printAmount,boolean haveUnSupplementMaterials,String isUrgentTousse) { JSONObject obj = new JSONObject(); obj.put("tousseName", tousseName); // 名称 obj.put("tousseDefinition", tdJson); @@ -1048,6 +1048,7 @@ obj.put("printExpirationDate", isDisinfectionGoodsPrintExpirationDate); obj.put("isPrint", isPrint); obj.put("isReview", isReview); + obj.put("isUrgentTousse", isUrgentTousse); obj.put("printOrgSource", printOrgSource);//新增器械包打印科室 if(StringUtils.isNotBlank(department)){