Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js =================================================================== diff -u -r15030 -r15036 --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js (.../printCustomDesign.js) (revision 15030) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js (.../printCustomDesign.js) (revision 15036) @@ -41,8 +41,10 @@ LODOP.SET_PRINT_STYLEA(item.name, 'Deleted', !item.checked); } } -function addOrRemove(add,vName,value) { +function addOrRemove(add,propName) { getLODOP2(); + var vName = 'obj.'+propName + var value = obj[propName]; if(add){ if(LODOP.GET_VALUE("ItemIsAdded", vName)){ LODOP.SET_PRINT_STYLEA(vName, 'Deleted', 0);// 恢复删除的项 @@ -152,10 +154,7 @@ }; function cancel() { - var href = WWWROOT - + '/disinfectsystem/labelTemplateDesign/labelTemplateView.jsp?id=' - + id; - location.href = href; + window.close(); } function saveConfig() { getProgram(); @@ -215,11 +214,81 @@ } }, { xtype : 'checkboxfield', - id: 'checkbox_operator', + id: 'cmp_name', + boxLabel : '包名称', + handler : function(checkbox,checked) { + addOrRemove(checked,'name'); + } + }, { + xtype : 'checkboxfield', + id: 'cmp_operator', boxLabel : '配包人', handler : function(checkbox,checked) { - addOrRemove(checked,'obj.operator',obj.operator); + addOrRemove(checked,'operator'); } + }, { + xtype : 'checkboxfield', + id: 'cmp_reviewer', + boxLabel : '审核人', + handler : function(checkbox,checked) { + addOrRemove(checked,'reviewer'); + } + }, { + xtype : 'checkboxfield', + id: 'cmp_sterilizationDate', + boxLabel : '灭菌日期', + handler : function(checkbox,checked) { + addOrRemove(checked,'sterilizationDate'); + } + }, { + xtype : 'checkboxfield', + id: 'cmp_validDate', + boxLabel : '失效日期', + handler : function(checkbox,checked) { + addOrRemove(checked,'validDate'); + } + }, { + xtype : 'checkboxfield', + id: 'cmp_sterilizer', + boxLabel : '炉号', + handler : function(checkbox,checked) { + addOrRemove(checked,'sterilizer'); + } + }, { + xtype : 'checkboxfield', + id: 'cmp_frequency', + boxLabel : '炉次', + handler : function(checkbox,checked) { + addOrRemove(checked,'frequency'); + } + }, { + xtype : 'checkboxfield', + id: 'cmp_hospitalName', + boxLabel : '医院名称', + handler : function(checkbox,checked) { + addOrRemove(checked,'hospitalName'); + } + }, { + xtype : 'checkboxfield', + id: 'cmp_patient', + boxLabel : '病人姓名', + handler : function(checkbox,checked) { + addOrRemove(checked,'patient'); + } + }, { + xtype : 'checkboxfield', + id: 'cmp_toolAmount', + boxLabel : '工具件数', + handler : function(checkbox,checked) { + addOrRemove(checked,'toolAmount'); + } + }, { + xtype : 'checkboxfield', + id: 'cmp_implantAmount', + boxLabel : '植入物件数', + handler : function(checkbox,checked) { + addOrRemove(checked,'implantAmount'); + } } ], buttons : [ { id : 'pre', @@ -257,19 +326,7 @@ hideMessageBox(true); var result = Ext4.JSON.decode(response.responseText); if (result.success && result.data) { - // top.Ext4.ComponentQuery.query("#configForm - // #id")[0].setValue(result.data.id); - // top.Ext4.ComponentQuery.query("#configForm - // #name")[0].setValue(result.data.name); currentConfig = result.data; - // top.Ext4.ComponentQuery.query("#configForm - // #width")[0].setValue(result.data.width); - // top.Ext4.ComponentQuery.query("#configForm - // #height")[0].setValue(result.data.height); - // top.Ext4.ComponentQuery.query("#configForm - // #description")[0].setValue(result.data.description); - // top.Ext4.ComponentQuery.query("#configForm - // #programCodes")[0].setValue(result.data.programCodes); DisplayDesign(); // restoreDesign(); } else { Index: ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManager.java =================================================================== diff -u -r15030 -r15036 --- ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManager.java (.../LabelTemplateManager.java) (revision 15030) +++ ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManager.java (.../LabelTemplateManager.java) (revision 15036) @@ -13,5 +13,9 @@ void delete(String[] ids); public void save(LabelTemplate labeTemplate); public void saveOrUpdateProgramCodes(String id, String programCodes); - public List getAll(); + public List getAllTemplate(); + public List getAllTemplateNames(); + public List getAllTemplateFullNames(); + public String getAllTemplateInfoJsonStr(); + } Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp =================================================================== diff -u -r15030 -r15036 --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp (.../printCustomDesign.jsp) (revision 15030) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp (.../printCustomDesign.jsp) (revision 15036) @@ -20,14 +20,14 @@ - - +
+
- + - + @@ -40,20 +40,7 @@
-包名称 -配包人 -审核人 -灭菌日期 -失效日期 -炉号 -炉次 -医院名称 -病人姓名 -工具件数 -植入物件数 -
-
生成模板
加载模板
Index: ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java =================================================================== diff -u -r15030 -r15036 --- ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java (.../LabelTemplateAction.java) (revision 15030) +++ ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java (.../LabelTemplateAction.java) (revision 15036) @@ -1,21 +1,34 @@ package com.forgon.disinfectsystem.labeltemplate.action; +import java.io.IOException; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; +import javax.servlet.http.HttpServletResponse; + +import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Namespace; import org.apache.struts2.convention.annotation.ParentPackage; + + + + +import com.forgon.disinfectsystem.entity.basedatamanager.tousseGroup.TousseGroup; import com.forgon.disinfectsystem.entity.labeltemplate.LabelTemplate; import com.forgon.disinfectsystem.labeltemplate.service.LabelTemplateManager; import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.StrutsResponseUtils; import com.forgon.tools.db.DatabaseUtil; +import com.google.gson.Gson; import com.opensymphony.xwork2.ModelDriven; import com.opensymphony.xwork2.Preparable; @@ -95,7 +108,47 @@ } } } + // 获取所有的模板名字 + public void getAllTemplateNames(){ + JSONArray nameJSONArray = new JSONArray(); + List nameList = labelTemplateManager.getAllTemplateNames(); + if(!CollectionUtils.isEmpty(nameList)){ + nameJSONArray = JSONArray.fromObject(nameList); + } + StrutsResponseUtils.output(nameJSONArray); + } + + public void getAllTemplatesJSONArray(){ + JSONArray templateJSONArray = new JSONArray(); + List templateList = labelTemplateManager.getAllTemplate(); + if(!CollectionUtils.isEmpty(templateList)){ + templateJSONArray = JSONArray.fromObject(templateList); + } + StrutsResponseUtils.output(templateJSONArray); + } + private void addName(JSONArray array,String name){ + JSONObject obj = new JSONObject(); + obj.put("name", name); + array.add(obj); + } + public void getAllBarcodePaperType(){ + JSONArray array = new JSONArray(); + List nameList = labelTemplateManager.getAllTemplateFullNames(); + if(nameList!=null){ + for (String name : nameList) { + addName(array, name); + } + } + addName(array, "加大标签"); + addName(array, "大标签"); + addName(array, "中标签"); + addName(array, "中标签2"); + addName(array, "小标签"); + addName(array, "小标签2"); + + StrutsResponseUtils.output(array); + } @Override public void prepare() throws Exception { iniInfo(); Index: ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java =================================================================== diff -u -r15030 -r15036 --- ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java (.../LabelTemplateManagerImpl.java) (revision 15030) +++ ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java (.../LabelTemplateManagerImpl.java) (revision 15036) @@ -2,6 +2,10 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.collections4.CollectionUtils; + +import net.sf.json.JSONArray; + import com.forgon.disinfectsystem.entity.labeltemplate.LabelTemplate; import com.forgon.tools.hibernate.ObjectDao; /** @@ -48,7 +52,28 @@ @SuppressWarnings("unchecked") @Override - public List getAll() { + public List getAllTemplate() { return objectDao.findBySql(LabelTemplate.class.getSimpleName(), " where 1=1"); } + + public List getAllTemplateNames(){ + String sql = String.format("select po.name from %s po", LabelTemplate.class.getSimpleName()); + List names = objectDao.findByHql(sql); + return names; + } + + public List getAllTemplateFullNames(){ + String sql = String.format("select po.fullName from %s po", LabelTemplate.class.getSimpleName()); + List names = objectDao.findByHql(sql); + return names; + } + + public String getAllTemplateInfoJsonStr(){ + JSONArray templateJSONArray = new JSONArray(); + List templateList = getAllTemplate(); + if(!CollectionUtils.isEmpty(templateList)){ + templateJSONArray = JSONArray.fromObject(templateList); + } + return templateJSONArray.toString(); + } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/labeltemplate/LabelTemplate.java =================================================================== diff -u -r15010 -r15036 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/labeltemplate/LabelTemplate.java (.../LabelTemplate.java) (revision 15010) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/labeltemplate/LabelTemplate.java (.../LabelTemplate.java) (revision 15036) @@ -12,20 +12,23 @@ /** * 标签模板定义，有用户自定义包外标签的格式，可定义多个模板，每个器械包可在器械包定义中设置标签所使用的模板 - * @author Terry 2016年9月16日 23:13:50 + * + * @author Terry 2016年9月16日 23:13:50 * */ @Entity @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) public class LabelTemplate { - + + public final static String TEMPLATE_NAME_PREFIX = "模板-"; private Long id; - + /** * 标签的名字 */ private String name; + private String fullName; /** * 标签的描述信息 */ @@ -39,50 +42,81 @@ */ private String height; /** - * 标签格式的程序代码 + * 标签格式的程序代码,lodop生成的模板代码 */ private String programCodes; - + /** + * 模板信息 + */ + private String templateInfo; + @Id @GeneratedValue(strategy = GenerationType.AUTO) public Long getId() { return id; } + public void setId(Long id) { this.id = id; } + + @Column(unique = true) public String getName() { return name; } + public void setName(String name) { this.name = name; } + + public String getFullName() { + return TEMPLATE_NAME_PREFIX + name; + } + + public void setFullName(String fullName) { + this.fullName = fullName; + } + public String getDescription() { return description; } + public void setDescription(String description) { this.description = description; } + public String getWidth() { return width; } + public void setWidth(String width) { this.width = width; } + public String getHeight() { return height; } + public void setHeight(String height) { this.height = height; } - + @Lob - @Column(length = 30000) public String getProgramCodes() { return programCodes; } + public void setProgramCodes(String programCodes) { this.programCodes = programCodes; } - + + @Lob + public String getTemplateInfo() { + return templateInfo; + } + + public void setTemplateInfo(String templateInfo) { + this.templateInfo = templateInfo; + } + } Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateView.js =================================================================== diff -u -r15022 -r15036 --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateView.js (.../labelTemplateView.js) (revision 15022) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateView.js (.../labelTemplateView.js) (revision 15036) @@ -11,7 +11,9 @@ // 打印设计 function printCustomDesign(id){ var href = WWWROOT+'/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp?id='+id; - location.href = href; +// location.href = href; + // 全屏窗口 + top.printDesignWindow = openFullSizeWindowWithName(href,null,"printDesignWindow"); } Ext.onReady(function() { Ext.QuickTips.init();