Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionItemManagerImpl.java =================================================================== diff -u -r15160 -r15167 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionItemManagerImpl.java (.../TousseTransitionItemManagerImpl.java) (revision 15160) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionItemManagerImpl.java (.../TousseTransitionItemManagerImpl.java) (revision 15167) @@ -6,6 +6,7 @@ import net.sf.json.JSONObject; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; import com.forgon.disinfectsystem.entity.toussetransition.TousseTransitionItem; @@ -35,4 +36,18 @@ } return array; } + /** + * 获取交接记录的id + */ + public Long getTousseTranstitionRecordIdByBarcode(String barcode){ + if(StringUtils.isBlank(barcode)){ + return null; + } + List list = getByProperty("tousseBarcode", barcode); + if(CollectionUtils.isNotEmpty(list) && list.size() > 0){ + return list.get(0).getTousseTransitionRecordId(); + }else{ + return null; + } + } } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionItemManager.java =================================================================== diff -u -r15160 -r15167 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionItemManager.java (.../TousseTransitionItemManager.java) (revision 15160) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionItemManager.java (.../TousseTransitionItemManager.java) (revision 15167) @@ -18,4 +18,10 @@ * @return */ public JSONArray getJsonArray(TousseItem tousseItem); + /** + * 获取交接记录的id + * @param barcode + * @return + */ + public Long getTousseTranstitionRecordIdByBarcode(String barcode); } Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java =================================================================== diff -u -r14992 -r15167 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 14992) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 15167) @@ -69,6 +69,7 @@ import com.forgon.disinfectsystem.entity.sterilizationmanager.proxydisinfection.ProxyDisinfection; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; +import com.forgon.disinfectsystem.entity.toussetransition.TousseTransitionRecord; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord; import com.forgon.disinfectsystem.invoicemanager.service.InvoiceManager; import com.forgon.disinfectsystem.invoicemanager.service.MaterialInvoiceManager; @@ -78,6 +79,7 @@ import com.forgon.disinfectsystem.stockmanage.cssdstock.service.TousseStockManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; +import com.forgon.disinfectsystem.toussetransition.service.TousseTransitionRecordManager; import com.forgon.tools.MapTools; import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.StrutsResponseUtils; @@ -137,6 +139,11 @@ private BeCleanItemManager beCleanItemManager; private SupplyRoomConfigManager supplyRoomConfigManager; + + /** + * 器械包交接manager类 + */ + private TousseTransitionRecordManager tousseTransitionRecordManager; private GridManager gridManager; @@ -145,6 +152,11 @@ private ObjectDao objectDao; + public void setTousseTransitionRecordManager( + TousseTransitionRecordManager tousseTransitionRecordManager) { + this.tousseTransitionRecordManager = tousseTransitionRecordManager; + } + public void setBeCleanItemManager(BeCleanItemManager beCleanItemManager) { this.beCleanItemManager = beCleanItemManager; } @@ -794,10 +806,10 @@ SterilizationRecord sr = tousseInstance.getSterilizationRecord(objectDao); Invoice invoice = invoiceManager.getInvoiceByTousseInstanceId(id); + TousseTransitionRecord ttRecord = tousseTransitionRecordManager.getByTousseInstanceBarcode(tousseInstance.getBarcode()); JsonConfig config = new JsonConfig(); config.setExcludes(TousseInstance.filterProperties); config.setCycleDetectionStrategy(CycleDetectionStrategy.LENIENT); - JSONArray basketJsons = new JSONArray(); if(StringUtils.isNotBlank(tousseInstance.getClassifyBasketIds())){ String [] idArray = tousseInstance.getClassifyBasketIds().split(";"); @@ -823,12 +835,22 @@ } } } - +// if(ttRecord != null){ +// ttRecord.setHandover("小明"); +// ttRecord.setTakeover("小七"); +// ttRecord.setTransitionTime(new Date()); +// }else{ +// ttRecord = new TousseTransitionRecord(); +// ttRecord.setHandover("小明"); +// ttRecord.setTakeover("小七"); +// ttRecord.setTransitionTime(new Date()); +// } Map map = new HashMap(); map.put("success", true); map.put("tousseInstance", tousseInstance); map.put("invoice", invoice); map.put("washClassifyBaskets", basketJsons); + map.put("tousseTransitionRecord", ttRecord); if(sr != null){ map.put("sterilizationRecordID", sr.getId()); map.put("sterilizerRecordAmounts", sr.getSterilizerRecordAmount()); Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js =================================================================== diff -u -r14124 -r15167 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js (.../tousseInstanceInfoTab.js) (revision 14124) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js (.../tousseInstanceInfoTab.js) (revision 15167) @@ -16,7 +16,6 @@ function tousseInstanceInfoShow(id,tousseName,hidden){ var tabsItemArr = new Array(); - tabsItemArr.push({ title: '清洗记录', // layout : 'fit', @@ -581,6 +580,68 @@ })] }); + tabsItemArr.push({ + title: '预回收记录', + layout:'fit', + items:[new top.Ext.FormPanel({ + frame : true, + labelSeparator : '：', + bodyStyle : 'padding:5px 5px 0px 50px', + labelAlign : 'right', + items : [{ + layout : 'column', + autoHeight : true, + items : [{ + layout : 'form', + columnWidth : .5, + cls:'edit-part2-labelwidth', + items : [{ + id : 'takeover', + name : 'takeover', + xtype : 'textfield', + fieldLabel : '预回收人', + anchor : '100%', + readOnly : true, + cls : 'fieldReadOnlyNoRemove' + }] + },{ + layout : 'form', + columnWidth : .5, + cls:'edit-part2-labelwidth', + items : [{ + id : 'transitionTime', + name : 'transitionTime', + xtype : 'textfield', + fieldLabel : '预回收时间', + anchor : '100%', + readOnly : true, + cls : 'fieldReadOnlyNoRemove' + }] + },{ + layout : 'form', + columnWidth : .5, + cls:'edit-part2-labelwidth', + items : [{ + xtype : 'textfield', + id : 'handover', + name : 'handover', + fieldLabel : '临床科室确认人', + readOnly : true, + cls : 'fieldReadOnlyNoRemove', + allowBlank : true, + anchor : '100%' + }] + }] + }], + buttons : [{ + text : '取消', + handler : function() { + tousseInstanceWindow.close(); + } + }] + })] + }); + tabsItemArr.push({ title: '废弃记录', layout:'fit', @@ -661,7 +722,7 @@ id : 'tousseInstanceWin', layout : 'fit', title : '[' + tousseName + '] 追溯信息', - width : 580, + width : 600, border : false, modal : true, autoHeight : true, @@ -675,6 +736,8 @@ var result = Ext.decode(response.responseText); if (result != null && result != "null" && result.success) { var instance = result.tousseInstance; + // 预回收记录 + var rrRecord = result.tousseTransitionRecord; var basketJsons = result.washClassifyBaskets; for(var j = 0;j < basketJsons.length ; j++){ @@ -788,6 +851,18 @@ top.Ext.getCmp('receiptingTime').setValue(Ext.util.Format.date(new Date(instance.signedDate.time), 'Y-m-d H:i:s')); } } + if(rrRecord != null){ + if(rrRecord.transitionTime != null){ + var transitionTime = Ext.util.Format.date(new Date(rrRecord.transitionTime.time),'Y-m-d H:i:s'); + top.Ext.getCmp('transitionTime').setValue(transitionTime); + } + if(rrRecord.takeover != null){ + top.Ext.getCmp('takeover').setValue(rrRecord.takeover); + } + if(rrRecord.handover != null){ + top.Ext.getCmp('handover').setValue(rrRecord.handover); + } + } }else{ showResult('加载失败，请联系系统管理员。'); } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java =================================================================== diff -u -r15160 -r15167 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java (.../TousseTransitionRecordManagerImpl.java) (revision 15160) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java (.../TousseTransitionRecordManagerImpl.java) (revision 15167) @@ -1,5 +1,7 @@ package com.forgon.disinfectsystem.toussetransition.service; +import org.apache.commons.lang3.StringUtils; + import com.forgon.disinfectsystem.entity.toussetransition.TousseTransitionRecord; import com.forgon.tools.hibernate.BasePoManagerImpl; @@ -10,4 +12,33 @@ super(TousseTransitionRecord.class); } + private TousseTransitionItemManager tousseTransitionItemManager; + + + public TousseTransitionItemManager getTousseTransitionItemManager() { + return tousseTransitionItemManager; + } + + public void setTousseTransitionItemManager( + TousseTransitionItemManager tousseTransitionItemManager) { + this.tousseTransitionItemManager = tousseTransitionItemManager; + } + /** + * 通过器械包实例条码，获取交接记录 + */ + public TousseTransitionRecord getByTousseInstanceBarcode(String barcode){ + if(StringUtils.isBlank(barcode)){ + return null; + } + TousseTransitionRecord ttRecord = new TousseTransitionRecord(); + try{ + Long recordId = tousseTransitionItemManager.getTousseTranstitionRecordIdByBarcode(barcode); + ttRecord = get(recordId); + }catch(Exception ex){ + ex.printStackTrace(); + return null; + } + return ttRecord; + } + } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManager.java =================================================================== diff -u -r15160 -r15167 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManager.java (.../TousseTransitionRecordManager.java) (revision 15160) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManager.java (.../TousseTransitionRecordManager.java) (revision 15167) @@ -5,5 +5,10 @@ public interface TousseTransitionRecordManager extends BasePoManager { - + /** + * 通过器械包实例的条码，获取器械交接记录，一个器械包只有一条交接记录 + * @param barcode + * @return + */ + public TousseTransitionRecord getByTousseInstanceBarcode(String barcode); }