Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r16547 -r16638 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 16547) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 16638) @@ -2762,7 +2762,8 @@ String reviewer, String reviewerCode,String sterileUserName,String sterileUserCode, String sterilingType,String sterilizer, String frequency, String stock, JSONArray splitPackages,TousseDefinition td, PackingRecord packingRecord, String washBasket,ForeignTousseApplication foreignTousseApplication,String orgUnitCoding, - String orgUnitName, Date packingDate,String tousseWeight,PackingTask currentPackingTask,Map idToWashRecordMap,Map idToRecyclingRecordMap) { + String orgUnitName, Date packingDate,String tousseWeight,PackingTask currentPackingTask,Map idToWashRecordMap, + Map idToRecyclingRecordMap,Date sterileStartTime) { // 外来器械拆包后价格从系统参数拿 SupplyRoomConfig config = supplyRoomConfigManager @@ -2778,13 +2779,9 @@ JSONArray materialsArray = tousse.optJSONArray("materialsJsonArray"); String bigPackage = tousse.optString("bigPackage"); String packageType = tousse.optString("packingType"); - int toolAmount = tousse.optInt("toolAmount"); - int implantAmount = tousse.optInt("implantAmount"); Date validUntil = null; Date warningUntil = null; - Date sterileStartTime = new Date(); - // 失效期和预警期计算 JSONObject expirationObj = expirationDateInfoManager .getExpirationDate(sterileStartTime.getTime() + "", packageType); @@ -2823,8 +2820,6 @@ double fluctuationPrice = supplyRoomConfigManager .getTousseFluctuationPrice(foreignTprice); - String status = TousseInstance.STATUS_PACKED; - String tousseType = td.getTousseType(); boolean isUnTraceableTousse = false; @@ -3675,7 +3670,7 @@ packingSplitPackages(operator, operatorCode, reviewer, reviewerCode,sterileUserName, sterileUserCode, sterilingType, sterilizerName, sterileFrequency, stock,splits, td,packingRecord, washBasket,foreignTousseApplication, orgUnitCoding,orgUnitName, - packingDate,tousseWeight, currentPackingTask,idToWashRecordMap,idToRecyclingRecordMap); + packingDate,tousseWeight, currentPackingTask,idToWashRecordMap,idToRecyclingRecordMap,sterileStartTime); currentPackingTaskAsList = packingTasks; } else { Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js =================================================================== diff -u -r16369 -r16638 --- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 16369) +++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 16638) @@ -665,7 +665,25 @@ value : 1, readOnly :true, anchor : '80%' - }], + },{ + columnWidth :.33, + xtype : 'datefield', + fieldLabel : '灭菌日期', + componentCls:'formItemMgn', + labelWidth:70, + labelAlign:'right', + id : 'sterileDate2', + name : 'sterileDate', + hidden : sstsConfig.printLabelWhenReviewing, + emptyText : '默认为今天', + inputAttrTpl: " data-qtip='空白表示灭菌日期为今天' ", + editable : false, + altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', + selectOnFocus :true, + format : 'Y-m-d', + allowBlank : true, + anchor : '90%' + }], buttons : [{ text : packingBtnText, handler : function() { @@ -744,7 +762,10 @@ var sterilizer = top.Ext4.getCmp("sterilizer2").getValue(); var frequency = top.Ext4.getCmp("frequency2").getValue(); - var sterileDate = new Date(); //灭菌日期默认为当天 + var sterileDate = top.Ext4.getCmp('sterileDate2').getValue(); + if(isUndefinedOrNullOrEmpty(sterileDate)){ + sterileDate = new Date(); + } var params = { taskIds: ids,