Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js =================================================================== diff -u -r22163 -r22179 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 22163) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 22179) @@ -232,6 +232,23 @@ } /** + * 渲染“灭菌交接状态”属性时触发的函数（响应中大附一提出的需求，做了灭菌交接记录的要显示“是”） + * @param v + * @param p + * @param record + * @param rowIndex + * @param columnIndex + * @param store + */ +function sterilizationTransitionFun(v, p, record, rowIndex, columnIndex, store){ + if (v) { + return "已交接"; + } else { + return ""; + } +} + +/** * 渲染“回收状态”属性时触发的函数，（响应中大附一提出的需求，使用标识牌的回收的，需要把上一个器械包实例的回收状态设置成“已回收”） * @param v * @param p @@ -278,6 +295,7 @@ {header : "条码",width : 70,dataIndex : 'barcode'}, {header : "标识牌条码",width : 70,dataIndex : 'idCardInstanceBarcode'}, {header : "状态",width : 80,dataIndex : 'status',renderer : statusFun}, + {header : "灭菌交接状态",width : 85,hidden: !sstsConfig.enableSterilizationTransition,dataIndex : 'sterilizationTransition',renderer : sterilizationTransitionFun}, {header : "回收状态",width : 80,dataIndex : 'recyclingStatus',sortable: false,renderer : recyclingStatusFun, hidden : !sstsConfig.enableRecyclingStatusOfTousseInstance}, {header : "使用次数",width : 70,dataIndex : 'useAmount',hidden : sstsConfig.disableIdCard}, {header : "标识牌编号",width : 70,dataIndex : 'idNumber',sortable: false,hidden : sstsConfig.disableIdCard}, @@ -328,6 +346,7 @@ {name : 'operator'}, {name : 'operationTime'}, {name : 'status'}, + {name : 'sterilizationTransition'}, {name : 'recyclingStatus'}, {name : 'useAmount'}, {name : 'idNumber'}, Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r22164 -r22179 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 22164) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 22179) @@ -3393,6 +3393,9 @@ instanceJSONObject.put("packerCode", tousseInstance.getOperatorCode()); //配包人编码 instanceJSONObject.put("reviewer", tousseInstance.getReviewer()); //审核人 instanceJSONObject.put("reviewerCode", tousseInstance.getReviewerCode()); //审核人编码 + String reviewTime = ForgonDateUtils.safelyFormatDate(tousseInstance.getReviewTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, ""); + instanceJSONObject.put("reviewTime", reviewTime); //审核时间 + instanceJSONObject.put("isUrgentTousse", tousseInstance.getIsUrgentTousse());//是否加急 } return instanceJSONObject; } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItemVO.java =================================================================== diff -u -r22164 -r22179 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItemVO.java (.../SterilizationTransitionItemVO.java) (revision 22164) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItemVO.java (.../SterilizationTransitionItemVO.java) (revision 22179) @@ -1,4 +1,7 @@ package com.forgon.disinfectsystem.entity.sterilizationTransition; + +import java.util.Date; + /** * 灭菌交接的明细的VO类型 * @author Chenjiaru 2018-01-21 @@ -49,6 +52,17 @@ * 审核人 */ private String reviewer; + + /** + * 审核时间（定义成字符串格式） + */ + private String reviewTime; + + /** + * 是否加急 + */ + private String isUrgentTousse; + public Long getId() { return id; @@ -121,5 +135,21 @@ public void setReviewer(String reviewer) { this.reviewer = reviewer; } + + public String getReviewTime() { + return reviewTime; + } + + public void setReviewTime(String reviewTime) { + this.reviewTime = reviewTime; + } + + public String getIsUrgentTousse() { + return isUrgentTousse; + } + + public void setIsUrgentTousse(String isUrgentTousse) { + this.isUrgentTousse = isUrgentTousse; + } } Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java =================================================================== diff -u -r22164 -r22179 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java (.../SterilizationTransitionManagerImpl.java) (revision 22164) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java (.../SterilizationTransitionManagerImpl.java) (revision 22179) @@ -15,6 +15,7 @@ import com.forgon.serialnumber.model.SerialNum; import com.forgon.serialnumber.service.SerialNumManager; import com.forgon.tools.hibernate.BasePoManagerImpl; +import com.forgon.tools.util.ForgonDateUtils; public class SterilizationTransitionManagerImpl extends BasePoManagerImpl implements @@ -78,6 +79,8 @@ item.setTousseInstanceBarcode(tousseInstanceBarcode); item.setTousseInstanceId(vo.getTousseInstanceId()); item.setTousseName(vo.getTousseName()); + item.setReviewTime(ForgonDateUtils.safelyParseDate(vo.getReviewTime())); + item.setIsUrgentTousse(vo.getIsUrgentTousse()); item.setSterilizationTransition(sterilizationTransition); newTousseInstanceIds.add(item.getTousseInstanceId()); sterilizationTransitionItemManager.save(item); Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java =================================================================== diff -u -r22164 -r22179 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java (.../SterilizationTransitionAction.java) (revision 22164) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java (.../SterilizationTransitionAction.java) (revision 22179) @@ -139,6 +139,8 @@ child.put("packer", item.getPacker()); child.put("reviewerCode", item.getReviewerCode()); child.put("reviewer", item.getReviewer()); + child.put("reviewTime", ForgonDateUtils.safelyFormatDate(item.getReviewTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); + child.put("isUrgentTousse", item.getIsUrgentTousse()); child.put("leaf", true); tousseDefinitionNode.optJSONArray("children").add(child); tousseDefinitionNode.put("amount", (tousseDefinitionNode.optInt("amount") + 1)); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java =================================================================== diff -u -r22164 -r22179 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 22164) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 22179) @@ -1511,7 +1511,7 @@ } public String getIsUrgentTousse() { - return isUrgentTousse; + return StringTools.defaultIfBlank(isUrgentTousse, Constants.STR_NO); } public void setIsUrgentTousse(String isUrgentTousse) { Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js =================================================================== diff -u -r22164 -r22179 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js (.../sterilizationTransitionForm.js) (revision 22164) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js (.../sterilizationTransitionForm.js) (revision 22179) @@ -26,6 +26,8 @@ {name: 'packer'}, //配包人 {name: 'reviewerCode'}, //审核人条码 {name: 'reviewer'}, //审核人 + {name: 'reviewTime'}, //审核时间 + {name: 'isUrgentTousse'}, //是否加急 {name: 'amount'} //数量 ]}); @@ -106,12 +108,16 @@ },{ header: '器械包名称',dataIndex: 'tousseName',xtype: 'treecolumn', width: 250,menuDisabled: true,sortable: false },{ - header: '条码',dataIndex: 'tousseInstanceBarcode', width: 100,menuDisabled: true,sortable: false + header: '条码',dataIndex: 'tousseInstanceBarcode', width: 80,menuDisabled: true,sortable: false },{ - header: '配包人',dataIndex: 'packer', width: 70,menuDisabled: true,sortable: false + header: '配包人',dataIndex: 'packer', width: 60,menuDisabled: true,sortable: false },{ - header: '审核人',dataIndex: 'reviewer', width: 70,menuDisabled: true,sortable: false + header: '审核人',dataIndex: 'reviewer', width: 60,menuDisabled: true,sortable: false },{ + header: '审核时间',dataIndex: 'reviewTime', width: 120,menuDisabled: true,sortable: false + },{ + header: '加急',dataIndex: 'isUrgentTousse', width: 70,menuDisabled: true,sortable: false + },{ header: '数量',dataIndex: 'amount', width: 70,menuDisabled: true,sortable: false },{ xtype:'actioncolumn',header: '操作',dataIndex: 'delete',width: 70,menuDisabled: true,sortable: false, @@ -127,7 +133,12 @@ //2、删除节点 node.remove(); Ext4.Array.remove(scannedBarcodeArr, record.get('tousseInstanceBarcode')); - //3、如果父节点没有子节点了也要删除 + + //3、数量减1 + var amount = isNaN(parentNode.get('amount')) ? 0 : parentNode.get('amount'); + parentNode.set('amount', --amount); + + //4、如果父节点没有子节点了也要删除 if (parentNode && !parentNode.hasChildNodes()) { parentNode.remove(); } @@ -234,6 +245,7 @@ if(result.success){ Ext4.getCmp('takeover').setValue(result.data.fullName); Ext4.getCmp('takeoverCode').setValue(result.data.name); + Ext4.getCmp('barcode').focus(); }else{ showResult('请扫描用户条码'); } @@ -352,6 +364,8 @@ packer: (leaf ? tousseInstance.packer : ''), reviewerCode: (leaf ? tousseInstance.reviewerCode : ''), reviewer: (leaf ? tousseInstance.reviewer : ''), + reviewTime: (leaf ? tousseInstance.reviewTime : ''), + isUrgentTousse: (leaf ? tousseInstance.isUrgentTousse : ''), amount: (leaf ? '' : 1), leaf: leaf, expanded: !leaf @@ -377,7 +391,9 @@ packerCode: node.get('packerCode'), packer: node.get('packer'), reviewerCode: node.get('reviewerCode'), - reviewer: node.get('reviewer') + reviewer: node.get('reviewer'), + reviewTime: node.get('reviewTime'), + isUrgentTousse: node.get('isUrgentTousse') }; items.push(item); }); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItem.java =================================================================== diff -u -r22160 -r22179 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItem.java (.../SterilizationTransitionItem.java) (revision 22160) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItem.java (.../SterilizationTransitionItem.java) (revision 22179) @@ -1,5 +1,6 @@ package com.forgon.disinfectsystem.entity.sterilizationTransition; +import java.util.Date; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; @@ -70,7 +71,17 @@ */ private String reviewer; + /** + * 审核时间 + */ + private Date reviewTime; + /** + * 是否加急 + */ + private String isUrgentTousse; + + @Id @GeneratedValue(strategy = GenerationType.AUTO) public Long getId() { @@ -155,5 +166,21 @@ public void setTousseName(String tousseName) { this.tousseName = tousseName; } + + public Date getReviewTime() { + return reviewTime; + } + + public void setReviewTime(Date reviewTime) { + this.reviewTime = reviewTime; + } + + public String getIsUrgentTousse() { + return isUrgentTousse; + } + + public void setIsUrgentTousse(String isUrgentTousse) { + this.isUrgentTousse = isUrgentTousse; + } }