Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js =================================================================== diff -u -r22403 -r23221 --- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 22403) +++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 23221) @@ -23,6 +23,25 @@ reviewBtnText = "审核并打印标签"; } + +var hidenReviewPatientName = true ; +var hidenReviewTreatmentNum = true; +var hidenReviewHospitalNum = true ; + +if(sstsConfig.showReviewPatientName){ + hidenReviewPatientName = false +} + +if(sstsConfig.showReviewTreatmentNum){ + hidenReviewTreatmentNum = false +} + +if(sstsConfig.showReviewHospitalNum){ + hidenReviewHospitalNum = false +} + + + //条码扫描模式(单个条码逐个扫描或首尾条码段扫描两种模式) var currentScanMode = "single"; if(sstsConfig.reviewPageScanMode && sstsConfig.reviewPageScanMode != null){ @@ -1025,6 +1044,9 @@ {header : "器械包名称",width : 150,dataIndex : 'tousseDefinition.name',renderer:showTousseInfoDiv,sortable:false}, {header : "器械包类型",width : 80,dataIndex : 'tousseDefinition.tousseType',hidden : true,sortable:false}, {header : "条码",width : 65,dataIndex : 'barcode',sortable:false}, + {header : "病人姓名",width : 65,dataIndex : 'patientName',sortable:false,hidden :hidenReviewPatientName}, + {header : "诊疗号",width : 65,dataIndex : 'treatmentNum',sortable:false,hidden:hidenReviewTreatmentNum}, + {header : "住院号",width : 65,dataIndex : 'hospitalNum',sortable:false,hidden:hidenReviewHospitalNum}, {header : "包装类型",width : 60,dataIndex : 'packageType',sortable:false}, {header : "是否加急",width : 60,dataIndex : 'isUrgentTousse',sortable:false, renderer : function(v, p, record) { if (v == '是') { @@ -1058,7 +1080,10 @@ {name : 'scanned'}, {name : 'isTimeout'}, {name : 'isUrgentTousse'}, - {name : 'haveUnSupplementMaterials'} + {name : 'haveUnSupplementMaterials'}, + {name : 'patientName'}, + {name : 'treatmentNum'}, + {name : 'hospitalNum'} ]; @@ -1174,8 +1199,14 @@ var content1 =" " + record.data['tousseDefinition.name'] +"" + record.data['packageType']+"" + isUrgent+"" + record.data['sterileStartDate']+""+""; var content2 =" " + record.data['operator'] +"" + record.data['operationTime']+"" + record.data['sterilingType']+"" + record.data['validUntil']+""+""; var title2 = ("

装配人

装配时间

灭菌程序

有效期至

"); + + var content3 =" " + record.data['patientName'] +"" + record.data['treatmentNum']+"" + record.data['hospitalNum']+""+""; + var title3 = ("

病人姓名

诊疗号

住院号

"); + + tableContent = (""); - tableContent += "" +content1+ title2 + content2 +"

器械包名称

包装类型

是否加急

灭菌开始时间


"; + tableContent += "" +content1+ title2 + content2 +"
"; + tableContent += "" +title3+ content3 +""; if(record.get("haveUnSupplementMaterials") == true){ DWREngine.setAsync(false); Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java =================================================================== diff -u -r22495 -r23221 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java (.../TousseInstanceTableManager.java) (revision 22495) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java (.../TousseInstanceTableManager.java) (revision 23221) @@ -46,6 +46,7 @@ import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse; import com.forgon.disinfectsystem.entity.idcardinstance.IDCardInstance; import com.forgon.disinfectsystem.entity.systemwarning.SystemWarningItemVO; +import com.forgon.disinfectsystem.entity.useRecord.UseRecord; import com.forgon.disinfectsystem.packing.service.PackingManager; import com.forgon.disinfectsystem.tousse.materialinstance.service.MaterialInstanceManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager; @@ -629,6 +630,14 @@ JSONObject obj = array.getJSONObject(i); boolean isTimeout = timeoutManager.isTimeouted(obj.getString("operationTime"), timeoutSetting); obj.put("isTimeout", isTimeout); + //查找病人相关字段 + UseRecord u = (UseRecord) objectDao.getByProperty(UseRecord.class.getSimpleName(), "id", obj.getLong("id")); + if(null == u){ + u = new UseRecord(); + } + obj.put("treatmentNum", u.getTreatmentNum()); + obj.put("hospitalNum", u.getHospitalNum()); + obj.put("patientName", u.getPatientName()); if(isTimeout){ jsonArray.add(obj); }else{ Index: ssts-web/src/main/webapp/disinfectsystem/config/szszyy/config.js =================================================================== diff -u -r22868 -r23221 --- ssts-web/src/main/webapp/disinfectsystem/config/szszyy/config.js (.../config.js) (revision 22868) +++ ssts-web/src/main/webapp/disinfectsystem/config/szszyy/config.js (.../config.js) (revision 23221) @@ -47,5 +47,12 @@ //添加回收申请单是否加载申领模板 isLoadApplyTemplateForAddRecycleRecord:true, //自定义入筐是否启用输入装载数量进行入筐操作 - enableCustomIntoBasketWithCustomAmount:true + enableCustomIntoBasketWithCustomAmount:true, + //审核页面是否需要显示“病人姓名”字段 + showReviewPatientName:true, + //审核页面是否需要显示“诊疗号”字段 + showReviewTreatmentNum:true, + //审核页面是否需要显示“住院号”字段 + showReviewHospitalNum:true + } \ No newline at end of file