Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js =================================================================== diff -u -r25475 -r25790 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 25475) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 25790) @@ -1478,7 +1478,133 @@ allowBlank : false, triggerAction : 'all' }] - } + },{ + layout:'form', + labelWidth : fontSize == 12 ? 180 : 220, + labelAlign:"right", + columnWidth: .25, + items:[{ + xtype : 'combo', + fieldLabel : '自定义器械包默认包装类型', + id : 'ctDefaultPackageType', + name : 'ctDefaultPackageType', + valueField : 'typeName', + displayField : 'typeName', + store : packageTypeStore, + forceSelection : true, + listWidth:150, + allowBlank : true, + editable : false, + triggerAction : 'all', + anchor : '100%' + }] + },{ + layout:'form', + labelWidth : 180, + columnWidth: .25, + items:[{ + xtype : 'combo', + fieldLabel : '自定义器械包默认灭菌程序', + id : 'ctDefaultSterilingMethod', + name : 'ctDefaultSterilingMethod', + valueField : 'typeName', + displayField : 'typeName', + store : sterilingTypeStore, + forceSelection : true, + listWidth:150, + allowBlank : true, + editable : false, + triggerAction : 'all', + anchor : '100%' + }] + }, { + layout:'form', + labelWidth : 180, + columnWidth: .25, + items:[{ + xtype : 'combo', + fieldLabel : '自定义器械包是否审核', + id : 'customTousseNeedReview', + name : 'customTousseNeedReview', + valueField : 'value', + displayField : 'value', + store : new Ext.data.SimpleStore({ + fields : ['value'], + data : [['是'],['否']] + }), + mode : 'local', + editable : false, + forceSelection : true, + allowBlank : false, + triggerAction : 'all', + anchor : '100%' + }] + },{ + layout:'form', + labelWidth : 180, + columnWidth: .25, + items:[{ + xtype : 'combo', + fieldLabel : '自定义器械包打印标签', + id : 'ctBarcodePaperType', + name : 'ctBarcodePaperType', + valueField : 'name', + displayField : 'name', + store:barcodePaperTypeStore, + editable : false, + forceSelection : true, + editable :false, + allowBlank : false, + triggerAction : 'all', + anchor : '100%' + }] + }, { + layout:'form', + labelWidth : 180, + columnWidth: .25, + items:[{ + xtype : 'combo', + fieldLabel : '自定义器械包是否回收', + id : 'customTousseNeedRecycle', + name : 'customTousseNeedRecycle', + valueField : 'value', + displayField : 'value', + store : new Ext.data.SimpleStore({ + fields : ['value'], + data : [['是'],['否']] + }), + mode : 'local', + editable : false, + forceSelection : true, + allowBlank : false, + triggerAction : 'all', + anchor : '100%' + }] + },{ + columnWidth : .25, + layout : 'form', + labelWidth : 180, + labelAlign:"right", + items:[{ + xtype : 'combo', + fieldLabel : '自定义器械包打印科室来源', + id : 'ctPrintOrgSource', + name : 'ctPrintOrgSource', + valueField : 'value', + displayField : 'value', + store : new Ext.data.SimpleStore( { + fields : [ 'value'], + data : [['资产归属'],['回收科室'],['无']] + }), + editable : false, + forceSelection : true, + allowBlank : false, + value : '无', + mode : 'local', + triggerAction : 'all', + anchor : '100%' + }] + } ] },{ xtype : "fieldset", @@ -2647,6 +2773,12 @@ var unitName = Ext.getCmp("unitName").getValue(); var basketLoadeTousseAmount = Ext.getCmp("basketLoadeTousseAmount").getValue(); var customTousseDefaultTaskGroup = Ext.getCmp("customTousseDefaultTaskGroup").getValue(); + var ctDefaultPackageType = Ext.getCmp("ctDefaultPackageType").getValue();//自定义器械包默认类型 + var customTousseNeedReview = Ext.getCmp("customTousseNeedReview").getValue();//自定义器械包是否审核 + var ctDefaultSterilingMethod = Ext.getCmp("ctDefaultSterilingMethod").getValue();//自定义器械包默认灭菌程序 + var ctBarcodePaperType = Ext.getCmp("ctBarcodePaperType").getValue();//自定义器械包打印标签 + var ctPrintOrgSource = Ext.getCmp("ctPrintOrgSource").getValue();//自定义器械包打印科室来源 + var customTousseNeedRecycle = Ext.getCmp("customTousseNeedRecycle").getValue();//自定义器械包是否回收 var fTHandleDepartAndTaskGroup = Ext.getCmp("fTHandleDepartAndTaskGroup").getValue(); var ftDefaultSterilingMethod = Ext.getCmp("ftDefaultSterilingMethod").getValue(); @@ -2703,6 +2835,12 @@ expensiveGoodsPaperType : expensiveGoodsPaperType,// basketLoadeTousseAmount : basketLoadeTousseAmount,// customTousseDefaultTaskGroup : customTousseDefaultTaskGroup,// + ctDefaultPackageType : ctDefaultPackageType,//自定义器械包默认类型 + customTousseNeedReview : customTousseNeedReview,//自定义器械包是否审核 + ctDefaultSterilingMethod : ctDefaultSterilingMethod,//自定义器械包默认灭菌程序 + ctBarcodePaperType : ctBarcodePaperType,//自定义器械包默认打印标签 + ctPrintOrgSource : ctPrintOrgSource,//自定义器械包打印科室来源 + customTousseNeedRecycle : customTousseNeedRecycle,//自定义器械包是否回收 customToussePrice : customToussePrice,// dayStartTime : dayStartTime,// disposableGoodsExpTime : disposableGoodsExpTime,// @@ -2806,6 +2944,24 @@ if(supplyRoomConfig.customTousseDefaultTaskGroup != null) { Ext.getCmp('customTousseDefaultTaskGroup').setValue(supplyRoomConfig.customTousseDefaultTaskGroup); } + if(supplyRoomConfig.ctDefaultPackageType != null) {//自定义器械包默认类型 + Ext.getCmp('ctDefaultPackageType').setValue(supplyRoomConfig.ctDefaultPackageType); + } + if(supplyRoomConfig.customTousseNeedReview != null) {//自定义器械包是否审核 + Ext.getCmp('customTousseNeedReview').setValue(supplyRoomConfig.customTousseNeedReview); + } + if(supplyRoomConfig.ctDefaultSterilingMethod != null) {//自定义器械包默认灭菌程序 + Ext.getCmp('ctDefaultSterilingMethod').setValue(supplyRoomConfig.ctDefaultSterilingMethod); + } + if(supplyRoomConfig.ctBarcodePaperType != null) {//自定义器械包打印标签 + Ext.getCmp('ctBarcodePaperType').setValue(supplyRoomConfig.ctBarcodePaperType); + } + if(supplyRoomConfig.ctPrintOrgSource != null) {//自定义器械包打印科室来源 + Ext.getCmp('ctPrintOrgSource').setValue(supplyRoomConfig.ctPrintOrgSource); + } + if(supplyRoomConfig.customTousseNeedRecycle != null) {//自定义器械包是否回收 + Ext.getCmp('customTousseNeedRecycle').setValue(supplyRoomConfig.customTousseNeedRecycle); + } if(supplyRoomConfig.invoiceOrigin!=null){ Ext.getCmp('invoiceOrigin').setValue(supplyRoomConfig.invoiceOrigin); } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java =================================================================== diff -u -r24172 -r25790 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java (.../SupplyRoomConfig.java) (revision 24172) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java (.../SupplyRoomConfig.java) (revision 25790) @@ -82,6 +82,36 @@ private String customTousseDefaultTaskGroup;// 自定义器械包默认装配组 + /** + * 自定义器械包默认类型 + */ + private String ctDefaultPackageType; + + /** + * 自定义器械包是否审核 + */ + private String customTousseNeedReview; + + /** + * 自定义器械包是否回收 + */ + private String customTousseNeedRecycle; + + /** + * 自定义器械包默认灭菌程序 + */ + private String ctDefaultSterilingMethod; + + /** + * 自定义器械包打印标签 + */ + private String ctBarcodePaperType; + + /** + * 自定义器械包打印科室来源 + */ + private String ctPrintOrgSource; + private String ftDefaultSterilingMethod; //外来器械默认的灭菌程序 private String ftDefaultPackageType; //外来器械默认的包装类型 @@ -815,6 +845,54 @@ this.fTHandleDepartAndTaskGroup = fTHandleDepartAndTaskGroup; } + public String getCtDefaultPackageType() { + return ctDefaultPackageType; + } + + public void setCtDefaultPackageType(String ctDefaultPackageType) { + this.ctDefaultPackageType = ctDefaultPackageType; + } + + public String getCtDefaultSterilingMethod() { + return ctDefaultSterilingMethod; + } + + public void setCtDefaultSterilingMethod(String ctDefaultSterilingMethod) { + this.ctDefaultSterilingMethod = ctDefaultSterilingMethod; + } + + public String getCustomTousseNeedReview() { + return customTousseNeedReview; + } + + public void setCustomTousseNeedReview(String customTousseNeedReview) { + this.customTousseNeedReview = customTousseNeedReview; + } + + public String getCtBarcodePaperType() { + return ctBarcodePaperType; + } + + public void setCtBarcodePaperType(String ctBarcodePaperType) { + this.ctBarcodePaperType = ctBarcodePaperType; + } + + public String getCtPrintOrgSource() { + return ctPrintOrgSource; + } + + public void setCtPrintOrgSource(String ctPrintOrgSource) { + this.ctPrintOrgSource = ctPrintOrgSource; + } + + public String getCustomTousseNeedRecycle() { + return customTousseNeedRecycle; + } + + public void setCustomTousseNeedRecycle(String customTousseNeedRecycle) { + this.customTousseNeedRecycle = customTousseNeedRecycle; + } + /** * 获取外来器械包处理科室及任务组json数组 * @return Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java =================================================================== diff -u -r23878 -r25790 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java (.../SupplyRoomConfigAction.java) (revision 23878) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java (.../SupplyRoomConfigAction.java) (revision 25790) @@ -152,6 +152,12 @@ */ private String ftPrintOrgSource = TousseDefinition.PRINGORGSOURCE_NONE; private String ftPrintAmountSource = TousseDefinition.PRINTAMOUNTSOURCE_ALL_FOREIGNTOUSSE; + + /** + * 自定义器械包打印科室来源 + * 有资产归属、回收科室、无三个选择可选,对应之前的是否打印科室字段是和否 + */ + private String ctPrintOrgSource = TousseDefinition.PRINGORGSOURCE_NONE; /** * 打印份数，默认为1 @@ -801,12 +807,6 @@ rc.setWarningUntil(now.getTime()); objectDao.saveOrUpdate(rc); } - if (!customTousseDefaultTaskGroup.equals(supplyRoomConfig - .getCustomTousseDefaultTaskGroup())) { - updateCustomTousseTaskGroup(customTousseDefaultTaskGroup); - } - supplyRoomConfig - .setCustomTousseDefaultTaskGroup(customTousseDefaultTaskGroup); if(StringUtils.isBlank(basketLoadeTousseAmount)){ basketLoadeTousseAmount = "0"; } @@ -904,8 +904,6 @@ } else { supplyRoomConfig.setTimingSignInvoiceTime(null); } - String isCustomTousseCleanEntirely = rq.getParameter("isCustomTousseCleanEntirely"); - supplyRoomConfig.setIsCustomTousseCleanEntirely(isCustomTousseCleanEntirely); supplyRoomConfig.setForeignTousseCleanedEntirely(rq.getParameter("foreignTousseCleanedEntirely")); String foreignTousseNeedReview = StrutsParamUtils.getPraramValue("foreignTousseNeedReview", Constants.STR_YES); supplyRoomConfig.setForeignTousseNeedReview(foreignTousseNeedReview); @@ -938,6 +936,35 @@ objectDao.executeUpdate(setContainerSql); objectDao.executeUpdate(setContainerSql2); + /****自定义器械包配置****/ + //1)自定义器械包默认装配组 + if (!customTousseDefaultTaskGroup.equals(supplyRoomConfig.getCustomTousseDefaultTaskGroup())) { + updateCustomTousseTaskGroup(customTousseDefaultTaskGroup); + } + supplyRoomConfig.setCustomTousseDefaultTaskGroup(customTousseDefaultTaskGroup); + //2)自定义器械包默认包装类型 + String ctDefaultPackageType = rq.getParameter("ctDefaultPackageType"); + supplyRoomConfig.setCtDefaultPackageType(ctDefaultPackageType); + //3)自定义器械包是否审核 + String customTousseNeedReview = StrutsParamUtils.getPraramValue("customTousseNeedReview", Constants.STR_NO); + supplyRoomConfig.setCustomTousseNeedReview(customTousseNeedReview); + // 同步修改自定义器械包的是否审核属性 + { + String sql = String.format("update %s set isReview='%s' where tousseType in('%s')", TousseDefinition.class.getSimpleName(),customTousseNeedReview,TousseDefinition.PACKAGE_TYPE_CUSTOM); + objectDao.executeUpdate(sql); + } + //4)自定义器械包默认灭菌程序 + String ctDefaultSterilingMethod = rq.getParameter("ctDefaultSterilingMethod"); + supplyRoomConfig.setCtDefaultSterilingMethod(ctDefaultSterilingMethod); + //5)自定义器械包打印标签 + String ctBarcodePaperType = StrutsParamUtils.getPraramValue("ctBarcodePaperType", BARCODEPAPERTYPE_BIG); + supplyRoomConfig.setCtBarcodePaperType(ctBarcodePaperType); + //6)自定义器械包打印科室来源 + supplyRoomConfig.setCtPrintOrgSource(ctPrintOrgSource); + //7)自定义器械包是否回收 + String customTousseNeedRecycle = StrutsParamUtils.getPraramValue("customTousseNeedRecycle", Constants.STR_NO); + supplyRoomConfig.setCustomTousseNeedRecycle(customTousseNeedRecycle); + /************/ supplyRoomConfigManager.save(supplyRoomConfig); @@ -1826,5 +1853,13 @@ public void setFTHandleDepartAndTaskGroup(String fTHandleDepartAndTaskGroup) { this.fTHandleDepartAndTaskGroup = fTHandleDepartAndTaskGroup; } + + public String getCtPrintOrgSource() { + return ctPrintOrgSource; + } + + public void setCtPrintOrgSource(String ctPrintOrgSource) { + this.ctPrintOrgSource = ctPrintOrgSource; + } }