Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r24105 -r24106 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 24105) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 24106) @@ -1794,8 +1794,8 @@ sterilizationColumnTreeColumnArray.push({header:'名称',width:120,dataIndex:'name'}); sterilizationColumnTreeColumnArray.push({header : '库存',dataIndex : 'stockAmount',width : 0, hidden:true}); sterilizationColumnTreeColumnArray.push({header : '今日审核',dataIndex : 'todayAmount',width : 0, hidden:true}); - sterilizationColumnTreeColumnArray.push({header : '灭菌方式',dataIndex : 'sterilingMode',width : 10/*, hidden:true*/}); - sterilizationColumnTreeColumnArray.push({header : '是否不追溯',dataIndex : 'unTraceable',width : 10/*, hidden:true*/}); + sterilizationColumnTreeColumnArray.push({header : '灭菌方式',dataIndex : 'sterilingMode',width : 60}); + sterilizationColumnTreeColumnArray.push({header : '是否不追溯',dataIndex : 'unTraceable',width : 10, hidden:true}); sterilizationColumnTreeColumnArray.push({header : '数量',dataIndex : 'amount',width : 50}); if (sstsConfig.haveSterilizerPosition) { sterilizationColumnTreeColumnArray.push({header:'位置',width:80,dataIndex:'position'}); @@ -2003,6 +2003,9 @@ header : '名称',width : 150,dataIndex : 'objName' }); pendingSterilizationColumnTreeColumnArray.push({ + header : '灭菌方式',width : 60,dataIndex : 'sterilingMode' + }); + pendingSterilizationColumnTreeColumnArray.push({ header : '数量',width : 45,dataIndex : 'objAmount' }); pendingSterilizationColumnTreeColumnArray.push({ Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r24103 -r24106 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 24103) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 24106) @@ -1265,7 +1265,7 @@ queryFixedBarcodeSql = ",(select barcode from "+ TousseInstance.class.getSimpleName() +" ti1 join "+ BarcodeDevice.class.getSimpleName() +" b1 on b1.id=ti1.id where ti1.tousseFixedBarcode=1 and ti1.tousseDefinition_id=tdAncestor.id and rownum <= 1) fixedBarcode "; } //1、普通器械包、消毒物品、敷料包 - String sql1 = "select distinct t.id id, t.depart depart, t.departCoding departCoding, t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType," + String sql1 = "select distinct t.id id, t.depart depart, t.departCoding departCoding, t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType, t.sterilingMode," + "t.orgUnitCoding, t.orgUnitName, t.foreignProxyItem_Id, t.proxyDisinfection_Id,t.reviewTime,t.isUrgentTousse,tdAncestor.isTraceable " + queryFixedBarcodeSql + "from tousseinstance t, barcodedevice b , cssdHandleTousses tt , TousseDefinition td , TousseDefinition tdAncestor " @@ -1289,7 +1289,7 @@ JSONObject foreignTousseHandleDepartAndTaskGroupJsonobject = supplyRoomConfig.getOneForeignTousseHandleDepartAndTaskGroupByDepartCode(AcegiHelper.getCurrentOrgUnitCode()); //2、外来器械包、外来器械拆分小包 if(foreignTousseHandleDepartAndTaskGroupJsonobject != null && StringTools.equals(taskGroup, foreignTousseHandleDepartAndTaskGroupJsonobject.optString("taskGroup"))){ - String sql2 = "select t.id id, t.depart depart, t.departCoding departCoding, t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType," + String sql2 = "select t.id id, t.depart depart, t.departCoding departCoding, t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType, t.sterilingMode," + "t.orgUnitCoding, t.orgUnitName, t.foreignProxyItem_Id, t.proxyDisinfection_Id,t.reviewTime,t.isUrgentTousse, '"+ Constants.STR_YES +"' isTraceable " + ",null fixedBarcode " + "from tousseinstance t, barcodedevice b , TousseDefinition td " @@ -1303,7 +1303,7 @@ //3、自定义器械包 if(taskGroup.equals(supplyRoomConfig.getCustomTousseDefaultTaskGroup())){ - String sql3 = "select t.id id, t.depart depart, t.departCoding departCoding,t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType," + String sql3 = "select t.id id, t.depart depart, t.departCoding departCoding,t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType, t.sterilingMode," + "t.orgUnitCoding, t.orgUnitName, t.foreignProxyItem_Id, t.proxyDisinfection_Id,t.reviewTime,t.isUrgentTousse , '"+ Constants.STR_YES +"' isTraceable " + ",null fixedBarcode " + "from tousseinstance t, barcodedevice b , TousseDefinition td " @@ -1316,7 +1316,7 @@ } //4、外部代理灭菌 - String sql4 = "select t.id id, t.depart depart, t.departCoding departCoding,t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType," + String sql4 = "select t.id id, t.depart depart, t.departCoding departCoding,t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType, t.sterilingMode," + "t.orgUnitCoding, t.orgUnitName, t.foreignProxyItem_Id, t.proxyDisinfection_Id,t.reviewTime,t.isUrgentTousse,tdAncestor.isTraceable " + ",null fixedBarcode " + "from tousseinstance t, barcodedevice b , TousseDefinition td , TousseDefinition tdAncestor " @@ -1328,7 +1328,7 @@ buildTousseSimpleVOs(vos, sql4); }else{ //2、外来器械包、外来器械拆分小包 - String sql2 = "select t.id id, t.depart depart, t.departCoding departCoding,t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType," + String sql2 = "select t.id id, t.depart depart, t.departCoding departCoding,t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType, t.sterilingMode," + "t.orgUnitCoding, t.orgUnitName, t.foreignProxyItem_Id, t.proxyDisinfection_Id,t.reviewTime,t.isUrgentTousse , '"+ Constants.STR_YES +"' isTraceable " + ",null fixedBarcode " + "from tousseinstance t, barcodedevice b , TousseDefinition td " @@ -1340,7 +1340,7 @@ buildTousseSimpleVOs(vos, sql2); //3、自定义器械包 - String sql3 = "select t.id id, t.depart depart, t.departCoding departCoding,t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType," + String sql3 = "select t.id id, t.depart depart, t.departCoding departCoding,t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType, t.sterilingMode," + "t.orgUnitCoding, t.orgUnitName, t.foreignProxyItem_Id, t.proxyDisinfection_Id,t.reviewTime,t.isUrgentTousse , '"+ Constants.STR_YES +"' isTraceable " + ",null fixedBarcode " + "from tousseinstance t, barcodedevice b , TousseDefinition td " @@ -1358,7 +1358,7 @@ } else if(dbConnection.isOracle()){ firstBarcodeSql = "(select barcode from TousseInstance ti1 join barcodeDevice b1 on b1.id=ti1.id where ti1.tousseFixedBarcode=1 and ti1.tousseDefinition_id=tdAncestor.id and rownum <= 1) fixedBarcode "; } - String sql4 = "select t.id id, t.depart depart, t.departCoding departCoding,t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType," + String sql4 = "select t.id id, t.depart depart, t.departCoding departCoding,t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType, t.sterilingMode," + "t.orgUnitCoding, t.orgUnitName, t.foreignProxyItem_Id, t.proxyDisinfection_Id,t.reviewTime,t.isUrgentTousse,tdAncestor.isTraceable," + firstBarcodeSql + "from tousseinstance t, barcodedevice b , TousseDefinition td , TousseDefinition tdAncestor " @@ -4591,6 +4591,7 @@ tousseInBasket.put("depart", vo.getDepart()); tousseInBasket.put("objName",objName ); + tousseInBasket.put("sterilingMode", vo.getSterilingMode()); tousseInBasket.put("objBarcode", vo.getBarcode()); tousseInBasket.put("objAmount", 1); tousseInBasket.put("reviewTime", vo.getReviewTime()); @@ -4655,6 +4656,7 @@ obj.put("objName", tousseOutsideBasket.getTousseName()); obj.put("objBarcode", tousseOutsideBasket.getBarcode()); obj.put("objAmount", tousseOutsideBasket.getAmount()); + obj.put("sterilingMode", tousseOutsideBasket.getSterilingMode()); Date date = ForgonDateUtils.safelyParseDate(tousseOutsideBasket.getReviewTime(), Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM); obj.put("reviewTime", ForgonDateUtils.safelyFormatDate(date,Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM,"")); obj.put("type", "TOUSSE"); @@ -5250,6 +5252,7 @@ ti.setBarcode(rs.getString("barcode")); ti.setDepart(rs.getString("depart")); ti.setTousseName(rs.getString("tousseName")); + ti.setSterilingMode(rs.getString("sterilingMode")); ti.setReviewTime(rs.getString("reviewTime")); ti.setAmount(rs.getInt("amount")); ti.setComboTousseInstanceId(rs.getLong("comboTousseInstanceId")); @@ -5277,7 +5280,7 @@ } else if(dbConnection.isOracle()){ firstBarcodeSql = "(select barcode from TousseInstance ti1 join barcodeDevice b1 on b1.id=ti1.id where ti1.tousseFixedBarcode=1 and ti1.tousseDefinition_id=tdancestor.id and rownum <= 1) "; } - String sql = "select * from ((select tdancestor.id,depart,ti.tousseName,ti.comboTousseInstanceId,ti.sterilingType," + String sql = "select * from ((select tdancestor.id,depart,ti.tousseName,ti.comboTousseInstanceId,ti.sterilingType,ti.sterilingMode," + "IsUrgentTousse,b.barcode,ti.reviewTime,1 amount from "+ TousseInstance.class.getSimpleName() +" ti join "+ BarcodeDevice.class.getSimpleName() +" b on b.id=ti.id " + "join "+ TousseDefinition.class.getSimpleName() +" td on ti.tousseDefinition_id=td.id join "+ TousseDefinition.class.getSimpleName() +" tdancestor on " + "td.ancestorID=tdancestor.id where tdancestor.isTraceable='"+ Constants.STR_YES +"' and ti.status='"+ TousseInstance.STATUS_REVIEWED +"' and ti.comboTousseInstanceId is null " @@ -5286,7 +5289,7 @@ + " union " - + "(select tdancestor.id ,null depart,tdancestor.name tousseName,null,null,null," + + "(select tdancestor.id ,null depart,tdancestor.name tousseName,null,null,null sterilingMode,null," + firstBarcodeSql + "barcode,null reviewTime,count(0) amount from "+ TousseInstance.class.getSimpleName() +" ti join "+ BarcodeDevice.class.getSimpleName() +" b on b.id=ti.id " + "join "+ TousseDefinition.class.getSimpleName() +" td on ti.tousseDefinition_id=td.id join "+ TousseDefinition.class.getSimpleName() +" tdancestor "