Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UrgentNeedGoodsProcessingCycle.java =================================================================== diff -u -r37224 -r38148 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UrgentNeedGoodsProcessingCycle.java (.../UrgentNeedGoodsProcessingCycle.java) (revision 37224) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UrgentNeedGoodsProcessingCycle.java (.../UrgentNeedGoodsProcessingCycle.java) (revision 38148) @@ -47,7 +47,7 @@ private Integer packingToSterilizationDuration; /** - * 灭菌分组 + * 灭菌方式 */ private String sterilerGroup = ""; @@ -94,6 +94,14 @@ * 清洗时长 */ private String washTime; + /** + * 使用记录录入时间 + */ + private String enteringDateStr; + /** + * 回收与使用间隔时长(分钟) + */ + private Long intervalBetweenRecyclingAndUse; public String getRecyclingDate() { return recyclingDate; } @@ -248,6 +256,22 @@ public void setWashTime(String washTime) { this.washTime = washTime; } + + public String getEnteringDateStr() { + return enteringDateStr; + } + + public void setEnteringDateStr(String enteringDateStr) { + this.enteringDateStr = enteringDateStr; + } + + public Long getIntervalBetweenRecyclingAndUse() { + return intervalBetweenRecyclingAndUse; + } + + public void setIntervalBetweenRecyclingAndUse( + Long intervalBetweenRecyclingAndUse) { + this.intervalBetweenRecyclingAndUse = intervalBetweenRecyclingAndUse; + } - } Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/UrgentNeedGoodsProcessingCycleHelper.java =================================================================== diff -u -r37241 -r38148 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/UrgentNeedGoodsProcessingCycleHelper.java (.../UrgentNeedGoodsProcessingCycleHelper.java) (revision 37241) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/UrgentNeedGoodsProcessingCycleHelper.java (.../UrgentNeedGoodsProcessingCycleHelper.java) (revision 38148) @@ -86,7 +86,7 @@ String sql = "select * from (select * from (" + //--1.使用记录转申请单后的预回收、回收、清洗交接、装配（全部装配+部分装配） - "select ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,ttr.transitionTime 预回收时间,rr.recyclingTime 回收时间,wtr.transitionTime 清洗交接时间,tit2.operationTime 装配时间,sr.startDate 灭菌开始时间,sr.endDate 灭菌结束时间,i.sendTime 发货时间," + + "select ur.enteringDate,ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,ttr.transitionTime 预回收时间,rr.recyclingTime 回收时间,wtr.transitionTime 清洗交接时间,tit2.operationTime 装配时间,sr.startDate 灭菌开始时间,sr.endDate 灭菌结束时间,i.sendTime 发货时间," + "ri.tousseName 物品名称,ri.urgentLevel 加急类型,sz.ownGroup 灭菌方式,b2.barcode 器械包条码,tit2.idCardInstanceBarcode 标识牌条码 " + washTimeFromRecyclingItemSql + "from RecyclingRecord rr " + @@ -101,6 +101,7 @@ "join WashTransitionItem wti on wti.tousseDefinitionId=ri.tousseDefinitionId and b.barcode=wti.tousseBarcode " + "join WashTransitionRecord wtr on wtr.id=wti.washTransitionRecordId " + "join TousseInstance tit2 on tit2.recyclingRecordId=rr.id and tit2.tousseDefinition_id=ri.tousseDefinitionId and tit2.lasttousseinstanceid = tit.id " + + " left join UseRecord ur on ur.id=tit2.useRecord_id "+ "left join Invoice i on i.id=tit2.invoice_id " + "join barcodeDevice b2 on tit2.id=b2.id " + "left join SterilizationRecord sr on tit2.sterilizationRecord_id=sr.id " + @@ -112,7 +113,7 @@ "union all " + //--2.使用记录转申请单后的预回收、回收、清洗交接 (排除装配的包实例数据) //--2.1 使用记录转申请单后的预回收、回收、清洗交接但还未装配的数据 - "select ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,ttr.transitionTime 预回收时间,rr.recyclingTime 回收时间,wtr.transitionTime 清洗交接时间,null 装配时间,null 灭菌开始时间,null 灭菌结束时间,null 发货时间," + + "select null enteringDate,ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,ttr.transitionTime 预回收时间,rr.recyclingTime 回收时间,wtr.transitionTime 清洗交接时间,null 装配时间,null 灭菌开始时间,null 灭菌结束时间,null 发货时间," + "ri.tousseName 物品名称,ri.urgentLevel 加急类型,null 灭菌方式,null 器械包条码,null 标识牌条码 " + washTimeFromRecyclingItemSql+ "from RecyclingRecord rr " + @@ -133,7 +134,7 @@ "and ri.id not in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " + "union all " + //--2.2使用记录转申请单后的预回收、回收、清洗交接、已经开始装配但未完全装配完的未装配部分的数据 - "select ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,ttr.transitionTime 预回收时间,rr.recyclingTime 回收时间,wtr.transitionTime 清洗交接时间,null 装配时间,null 灭菌开始时间,null 灭菌结束时间,null 发货时间," + + "select null enteringDate,ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,ttr.transitionTime 预回收时间,rr.recyclingTime 回收时间,wtr.transitionTime 清洗交接时间,null 装配时间,null 灭菌开始时间,null 灭菌结束时间,null 发货时间," + "ri.tousseName 物品名称,ri.urgentLevel 加急类型,null 灭菌方式,null 器械包条码,null 标识牌条码 " + washTimeFromRecyclingItemSql+ "from RecyclingRecord rr " + @@ -155,7 +156,7 @@ "and ri.id in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " + "union all " + //--3.使用记录转申请单后的预回收、回收、装配 (排除清洗交接的数据)（全部装配+部分装配） - "select ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,ttr.transitionTime 预回收时间,rr.recyclingTime 回收时间,null 清洗交接时间,tit2.operationTime 装配时间,sr.startDate 灭菌开始时间,sr.endDate 灭菌结束时间,i.sendTime 发货时间," + + "select ur.enteringDate,ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,ttr.transitionTime 预回收时间,rr.recyclingTime 回收时间,null 清洗交接时间,tit2.operationTime 装配时间,sr.startDate 灭菌开始时间,sr.endDate 灭菌结束时间,i.sendTime 发货时间," + "ri.tousseName 物品名称,ri.urgentLevel 加急类型,sz.ownGroup 灭菌方式,b2.barcode 器械包条码,tit2.idCardInstanceBarcode 标识牌条码 " + washTimeFromRecyclingItemSql+ "from RecyclingRecord rr " + @@ -168,6 +169,7 @@ "join TousseTransitionItem tti on tti.tousseItemId=ti.id and tti.tousseBarcode=b.barcode " + "join TousseTransitionRecord ttr on ttr.id=tti.tousseTransitionRecordId " + "join TousseInstance tit2 on tit2.recyclingRecordId=rr.id and tit2.tousseDefinition_id=ri.tousseDefinitionId and tit2.lasttousseinstanceid = tit.id " + + " left join UseRecord ur on ur.id=tit2.useRecord_id "+ "left join Invoice i on i.id=tit2.invoice_id " + "join barcodeDevice b2 on tit2.id=b2.id " + "left join SterilizationRecord sr on tit2.sterilizationRecord_id=sr.id " + @@ -180,7 +182,7 @@ "union all " + //--4.使用记录转申请单后的预回收、回收 (排除清洗交接与装配的包实例数据) //--4.1 使用记录转申请单后的预回收、回收、且未装配 - "select ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,ttr.transitionTime 预回收时间,rr.recyclingTime 回收时间,null 清洗交接时间,null 装配时间,null 灭菌开始时间,null 灭菌结束时间,null 发货时间," + + "select null enteringDate,ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,ttr.transitionTime 预回收时间,rr.recyclingTime 回收时间,null 清洗交接时间,null 装配时间,null 灭菌开始时间,null 灭菌结束时间,null 发货时间," + "ri.tousseName 物品名称,ri.urgentLevel 加急类型,null 灭菌方式,null 器械包条码,null 标识牌条码 " + washTimeFromRecyclingItemSql+ "from RecyclingRecord rr " + @@ -200,7 +202,7 @@ "and ri.id not in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " + "union all " + //--4.2 使用记录转申请单后的预回收、回收、已经开始装配但未完全装配完的未装配部分的数据 - "select ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,ttr.transitionTime 预回收时间,rr.recyclingTime 回收时间,null 清洗交接时间,null 装配时间,null 灭菌开始时间,null 灭菌结束时间,null 发货时间," + + "select null enteringDate,ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,ttr.transitionTime 预回收时间,rr.recyclingTime 回收时间,null 清洗交接时间,null 装配时间,null 灭菌开始时间,null 灭菌结束时间,null 发货时间," + "ri.tousseName 物品名称,ri.urgentLevel 加急类型,null 灭菌方式,null 器械包条码,null 标识牌条码 " + washTimeFromRecyclingItemSql+ "from RecyclingRecord rr " + @@ -221,7 +223,7 @@ "and ri.id in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " + "union all " + //--5.使用记录转申请单后的回收、清洗交接、装配 (排除预回收数据)（全部装配+部分装配） - "select ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,null 预回收时间,rr.recyclingTime 回收时间,wtr.transitionTime 清洗交接时间,tit2.operationTime 装配时间,sr.startDate 灭菌开始时间,sr.endDate 灭菌结束时间,i.sendTime 发货时间," + + "select ur.enteringDate,ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,null 预回收时间,rr.recyclingTime 回收时间,wtr.transitionTime 清洗交接时间,tit2.operationTime 装配时间,sr.startDate 灭菌开始时间,sr.endDate 灭菌结束时间,i.sendTime 发货时间," + "ri.tousseName 物品名称,ri.urgentLevel 加急类型,sz.ownGroup 灭菌方式,b2.barcode 器械包条码,tit2.idCardInstanceBarcode 标识牌条码 " + washTimeFromRecyclingItemSql+ "from RecyclingRecord rr " + @@ -234,6 +236,7 @@ "join WashTransitionItem wti on wti.tousseDefinitionId=ri.tousseDefinitionId and b.barcode=wti.tousseBarcode " + "join WashTransitionRecord wtr on wtr.id=wti.washTransitionRecordId " + "join TousseInstance tit2 on tit2.recyclingRecordId=rr.id and tit2.tousseDefinition_id=ri.tousseDefinitionId and tit2.lasttousseinstanceid=tit.id " + + " left join UseRecord ur on ur.id=tit2.useRecord_id "+ "left join Invoice i on i.id=tit2.invoice_id " + "join barcodeDevice b2 on tit2.id=b2.id " + "left join SterilizationRecord sr on tit2.sterilizationRecord_id=sr.id " + @@ -246,7 +249,7 @@ "union all " + //--6.使用记录转申请单后的回收、清洗交接 (排除预回收与装配的包实例数据) //--6.1 使用记录转申请单后的回收、清洗交接、且未装配 - "select ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,null 预回收时间,rr.recyclingTime 回收时间,wtr.transitionTime 清洗交接时间,null 装配时间,null 灭菌开始时间,null 灭菌结束时间,null 发货时间," + + "select null enteringDate,ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,null 预回收时间,rr.recyclingTime 回收时间,wtr.transitionTime 清洗交接时间,null 装配时间,null 灭菌开始时间,null 灭菌结束时间,null 发货时间," + "ri.tousseName 物品名称,ri.urgentLevel 加急类型,null 灭菌方式,null 器械包条码,null 标识牌条码 " + washTimeFromRecyclingItemSql+ "from RecyclingRecord rr " + @@ -266,7 +269,7 @@ "and ri.id not in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " + "union all " + //--6.2 使用记录转申请单后的回收、清洗交接、已经开始装配但未完全装配完的未装配部分的数据 - "select ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,null 预回收时间,rr.recyclingTime 回收时间,wtr.transitionTime 清洗交接时间,null 装配时间,null 灭菌开始时间,null 灭菌结束时间,null 发货时间," + + "select null enteringDate,ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,null 预回收时间,rr.recyclingTime 回收时间,wtr.transitionTime 清洗交接时间,null 装配时间,null 灭菌开始时间,null 灭菌结束时间,null 发货时间," + "ri.tousseName 物品名称,ri.urgentLevel 加急类型,null 灭菌方式,null 器械包条码,null 标识牌条码 " + washTimeFromRecyclingItemSql+ "from RecyclingRecord rr " + @@ -287,7 +290,7 @@ "and ri.id in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " + "union all " + //--7.使用记录转申请单后的回收、装配 (排除预回收与清洗交接数据)（全部装配+部分装配） - "select ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,null 预回收时间,rr.recyclingTime 回收时间,null 清洗交接时间,tit2.operationTime 装配时间,sr.startDate 灭菌开始时间,sr.endDate 灭菌结束时间,i.sendTime 发货时间," + + "select ur.enteringDate,ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,null 预回收时间,rr.recyclingTime 回收时间,null 清洗交接时间,tit2.operationTime 装配时间,sr.startDate 灭菌开始时间,sr.endDate 灭菌结束时间,i.sendTime 发货时间," + "ri.tousseName 物品名称,ri.urgentLevel 加急类型,sz.ownGroup 灭菌方式,b2.barcode 器械包条码,tit2.idCardInstanceBarcode 标识牌条码 " + washTimeFromRecyclingItemSql+ "from RecyclingRecord rr " + @@ -298,6 +301,7 @@ "join TousseDefinition td on td.id=tit.tousseDefinition_id " + "join barcodeDevice b on tit.id=b.id " + "join TousseInstance tit2 on tit2.recyclingRecordId=rr.id and tit2.tousseDefinition_id=ri.tousseDefinitionId and tit2.lasttousseinstanceid = tit.id " + + " left join UseRecord ur on ur.id=tit2.useRecord_id "+ "left join Invoice i on i.id=tit2.invoice_id " + "join barcodeDevice b2 on tit2.id=b2.id " + "left join SterilizationRecord sr on tit2.sterilizationRecord_id=sr.id " + @@ -311,7 +315,7 @@ "union all " + //--8.使用记录转申请单后的回收 (排除预回收、清洗交接与装配的包实例数据) //--8.1使用记录转申请单后的回收、查询未装配的数据 - "select ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,null 预回收时间,rr.recyclingTime 回收时间,null 清洗交接时间,null 装配时间,null 灭菌开始时间,null 灭菌结束时间,null 发货时间," + + "select null enteringDate,ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,null 预回收时间,rr.recyclingTime 回收时间,null 清洗交接时间,null 装配时间,null 灭菌开始时间,null 灭菌结束时间,null 发货时间," + "ri.tousseName 物品名称,ri.urgentLevel 加急类型,null 灭菌方式,null 器械包条码,null 标识牌条码 " + washTimeFromRecyclingItemSql+ "from RecyclingRecord rr " + @@ -330,7 +334,7 @@ "and ri.id not in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " + "union all " + //--8.2.使用记录转申请单后的回收、查询有装配但未装完的未装配部分的数据 - "select ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,null 预回收时间,rr.recyclingTime 回收时间,null 清洗交接时间,null 装配时间,null 灭菌开始时间,null 灭菌结束时间,null 发货时间," + + "select null enteringDate,ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,null 预回收时间,rr.recyclingTime 回收时间,null 清洗交接时间,null 装配时间,null 灭菌开始时间,null 灭菌结束时间,null 发货时间," + "ri.tousseName 物品名称,ri.urgentLevel 加急类型,null 灭菌方式,null 器械包条码,null 标识牌条码 " + washTimeFromRecyclingItemSql+ "from RecyclingRecord rr " + @@ -350,14 +354,15 @@ "and ri.id in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " + "union all " + //--9.手工添加回收(或添加申请单后的回收)后的回收、装配 (排除预回收数据、手工添加的不会做预回收,清洗交接没有意义) - "select ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,null 预回收时间,rr.recyclingTime 回收时间,null 清洗交接时间,tit2.operationTime 装配时间,sr.startDate 灭菌开始时间,sr.endDate 灭菌结束时间,i.sendTime 发货时间," + + "select ur.enteringDate,ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,null 预回收时间,rr.recyclingTime 回收时间,null 清洗交接时间,tit2.operationTime 装配时间,sr.startDate 灭菌开始时间,sr.endDate 灭菌结束时间,i.sendTime 发货时间," + "ri.tousseName 物品名称,ri.urgentLevel 加急类型,sz.ownGroup 灭菌方式,b2.barcode 器械包条码,tit2.idCardInstanceBarcode 标识牌条码 " + washTimeFromRecyclingItemSql+ "from RecyclingRecord rr " + "left join invoicePlan ip on ip.id=rr.recyclingApplication_id " + "join RecyclingItem ri on ri.recyclingRecord_id=rr.id " + "left join TousseItem ti on ti.recyclingApplication_ID=rr.recyclingApplication_id and ti.tousseDefinitionId=ri.tousseDefinitionId " + "join TousseInstance tit2 on tit2.recyclingRecordId=rr.id and tit2.tousseDefinition_id=ri.tousseDefinitionId and (tit2.sourceRecyclingItemId is null or tit2.sourceRecyclingItemId = ri.id) " + + " left join UseRecord ur on ur.id=tit2.useRecord_id "+ "join TousseDefinition td on td.id=tit2.tousseDefinition_id " + "left join Invoice i on i.id=tit2.invoice_id " + "join barcodeDevice b2 on tit2.id=b2.id " + @@ -371,7 +376,7 @@ "union all " + //--10.手工添加回收(或添加申请单后的回收)后的回收 (排除预回收、装配的包实例数据、手工添加的不会做预回收,清洗交接没有意义)（全部装配+部分装配） //--10.1.手工添加回收(或添加申请单后的回收)后的回收，未装配的数据 - "select ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,null 预回收时间,rr.recyclingTime 回收时间,null 清洗交接时间,null 装配时间,null 灭菌开始时间,null 灭菌结束时间,null 发货时间," + + "select null enteringDate,ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,null 预回收时间,rr.recyclingTime 回收时间,null 清洗交接时间,null 装配时间,null 灭菌开始时间,null 灭菌结束时间,null 发货时间," + "ri.tousseName 物品名称,ri.urgentLevel 加急类型,null 灭菌方式,null 器械包条码,null 标识牌条码 " + washTimeFromRecyclingItemSql+ "from RecyclingRecord rr " + @@ -387,7 +392,7 @@ "and ri.tousseDefinitionId not in (select tousseDefinition_id from TousseInstance where recyclingRecordId=rr.id and sourceRecyclingItemId is null) " + "union all " + //--10.2.手工添加回收(或添加申请单后的回收)后的回收，查询有装配但未装完的未装配部分的数据（） - "select ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,null 预回收时间,rr.recyclingTime 回收时间,null 清洗交接时间,null 装配时间,null 灭菌开始时间,null 灭菌结束时间,null 发货时间," + + "select null enteringDate,ip.serialNumber,rr.depart,td.tousseType,null parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,null 预回收时间,rr.recyclingTime 回收时间,null 清洗交接时间,null 装配时间,null 灭菌开始时间,null 灭菌结束时间,null 发货时间," + "ri.tousseName 物品名称,ri.urgentLevel 加急类型,null 灭菌方式,null 器械包条码,null 标识牌条码 " + washTimeFromRecyclingItemSql+ "from RecyclingRecord rr " + @@ -411,14 +416,15 @@ + " where ri.urgentAmount > 0 and (ti.isTerminated is null or ti.isTerminated<>1) " + " and td.tousseType='"+ TousseDefinition.PACKAGE_TYPE_SPLIT +"') " + "union all " - + " select ip.serialNumber,rr.depart,'"+ TousseDefinition.PACKAGE_TYPE_SPLIT +"' tousseType,tdc.name parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,null 预回收时间,rr.recyclingTime 回收时间,null 清洗交接时间,tit.operationTime 装配时间,sr.startDate 灭菌开始时间 " + + " select ur.enteringDate,ip.serialNumber,rr.depart,'"+ TousseDefinition.PACKAGE_TYPE_SPLIT +"' tousseType,tdc.name parentTousseName, ri.id,ri.urgentAmount,rr.orgUnitCoding,null 预回收时间,rr.recyclingTime 回收时间,null 清洗交接时间,tit.operationTime 装配时间,sr.startDate 灭菌开始时间 " + " ,sr.endDate 灭菌结束时间,i.sendTime 发货时间,tit.tousseName 物品名称,ri.urgentLevel 加急类型,sz.ownGroup 灭菌方式,b.barcode 器械包条码,null 标识牌条码 " + washTimeFromRecyclingItemSql + " from RecyclingRecord rr " + "left join invoicePlan ip on ip.id=rr.recyclingApplication_id " + " join RecyclingItem ri on ri.recyclingRecord_id=rr.id " + " join TousseInstance tit on tit.recyclingRecordId=rr.id join TousseDefinition td on td.id=tit.tousseDefinition_id " + " join TousseDefinition tdc on tdc.id=td.parentID join barcodeDevice b on tit.id=b.id " + + " left join UseRecord ur on ur.id=tit.useRecord_id " + " left join SterilizationRecord sr on sr.id=tit.sterilizationRecord_id " + " left join Sterilizer sz on sr.sterilizer_id=sz.id " + " left join invoice i on i.id=tit.invoice_id " @@ -458,6 +464,15 @@ } UrgentNeedGoodsProcessingCycle bean = new UrgentNeedGoodsProcessingCycle(); + Date enteringDate = result.getTimestamp("enteringDate"); + String enteringDateStr = ForgonDateUtils.safelyFormatDate(enteringDate, ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, ""); + if(StringUtils.isNotBlank(enteringDateStr)){ + bean.setEnteringDateStr(enteringDateStr.substring(11)); + } + if(enteringDate != null && recyclingDateTime != null){ + Long intervalBetweenRecyclingAndUse = (enteringDate.getTime() - recyclingDateTime.getTime())/1000/60; + bean.setIntervalBetweenRecyclingAndUse(intervalBetweenRecyclingAndUse); + } //计算总时长 if (recyclingDateTime != null && invoiceSendDateTime != null) { Long totalDuration = (invoiceSendDateTime.getTime() - recyclingDateTime.getTime())/1000/60;