Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordRecyclingDelayView.js =================================================================== diff -u -r41284 -r41286 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordRecyclingDelayView.js (.../useRecordRecyclingDelayView.js) (revision 41284) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordRecyclingDelayView.js (.../useRecordRecyclingDelayView.js) (revision 41286) @@ -281,18 +281,20 @@ '', '', '', - '', + '', + '', '', - '', - '', - '', - '', - '', + '', + '', + '', + '', + '', '', '', '', '', '', + '', '', '', '', Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/modules/recyclingdelay/model/TousseInstanceInfo.java =================================================================== diff -u -r41245 -r41286 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/modules/recyclingdelay/model/TousseInstanceInfo.java (.../TousseInstanceInfo.java) (revision 41245) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/modules/recyclingdelay/model/TousseInstanceInfo.java (.../TousseInstanceInfo.java) (revision 41286) @@ -4,6 +4,10 @@ import java.util.Objects; public class TousseInstanceInfo { + /** + * 科室名称 + */ + private String depart; private Long useRecordId; /** * 手术间,也叫室间 @@ -45,8 +49,9 @@ public TousseInstanceInfo() { } - public TousseInstanceInfo(Long useRecordId, String operationRoom, String operation, String patientName, + public TousseInstanceInfo(String depart, Long useRecordId, String operationRoom, String operation, String patientName, String circuitNurse, String tousseName, String barcode, String status, Date recyclingTime, Date enteringDate) { + this.depart = depart; this.useRecordId = useRecordId; this.operationRoom = operationRoom; this.operation = operation; @@ -59,6 +64,14 @@ this.enteringDate = enteringDate; } + public String getDepart() { + return depart; + } + + public void setDepart(String depart) { + this.depart = depart; + } + public Long getUseRecordId() { return useRecordId; } Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/modules/recyclingdelay/handler/UseRecordRecyclingDelayHandlerImpl.java =================================================================== diff -u -r41285 -r41286 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/modules/recyclingdelay/handler/UseRecordRecyclingDelayHandlerImpl.java (.../UseRecordRecyclingDelayHandlerImpl.java) (revision 41285) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/modules/recyclingdelay/handler/UseRecordRecyclingDelayHandlerImpl.java (.../UseRecordRecyclingDelayHandlerImpl.java) (revision 41286) @@ -83,7 +83,7 @@ String cur30MinAgoStr = dateQueryAdapter.dateConverAdapter2(ForgonDateUtils.safelyFormatDate(current30MinutesAgo, ForgonDateUtils.DATE_FORMAT_YYYYMMDDHHMMSS, ""), fmt); - String sql = "select ti.tousseName, ti.status, ti.useRecord_id useRecordId, bd.barcode, ur.operationRoom, ur.operation, ur.patientName, ur.circuitNurse, ur.enteringDate, rr.recyclingTime from " + String sql = "select ur.depart, ti.tousseName, ti.status, ti.useRecord_id useRecordId, bd.barcode, ur.operationRoom, ur.operation, ur.patientName, ur.circuitNurse, ur.enteringDate, rr.recyclingTime from " + TousseInstance.class.getSimpleName()+" ti join "+TousseDefinition.class.getSimpleName()+" td on td.id = ti.tousseDefinition_id join " + BarcodeDevice.class.getSimpleName()+" bd on bd.id = ti.id left join "+ RecyclingItem.class.getSimpleName()+" ri on ri.id = ti.recyclingItemId left join " + RecyclingRecord.class.getSimpleName()+" rr on rr.id = ri.recyclingRecord_id join " @@ -101,7 +101,7 @@ sql += " and ti.tousseName = '" + tousseName.trim() + "'"; } if(StringUtils.hasText(departCode)) { - sql += " and ti.departCoding = '" + departCode.trim() + "'"; + sql += " and ur.departCoding = '" + departCode.trim() + "'"; } return jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(TousseInstanceInfo.class)); } Index: ssts-reports/src/test/java/com/forgon/disinfectsystem/reportforms/modules/recyclingdelay/handler/UseRecordRecyclingDelayHandlerFindTousseInstancesTest.java =================================================================== diff -u -r41285 -r41286 --- ssts-reports/src/test/java/com/forgon/disinfectsystem/reportforms/modules/recyclingdelay/handler/UseRecordRecyclingDelayHandlerFindTousseInstancesTest.java (.../UseRecordRecyclingDelayHandlerFindTousseInstancesTest.java) (revision 41285) +++ ssts-reports/src/test/java/com/forgon/disinfectsystem/reportforms/modules/recyclingdelay/handler/UseRecordRecyclingDelayHandlerFindTousseInstancesTest.java (.../UseRecordRecyclingDelayHandlerFindTousseInstancesTest.java) (revision 41286) @@ -91,7 +91,7 @@ assertTrue(sql.contains("ti.tousseName = '包1'")); assertTrue(sql.contains("datetime_diff_condition or rr.recyclingTime is null")); assertTrue(sql.contains("ur.enteringDate between TO_DATE('2023-01-01 00:00:00', 'YYYY-MM-DD HH24:MI:SS') and TO_DATE('2023-01-31 23:59:59', 'YYYY-MM-DD HH24:MI:SS')")); - assertTrue(sql.contains("ti.departCoding = '01'")); + assertTrue(sql.contains("ur.departCoding = '01'")); } /**
器械包名称科室器械包名称器械包条码手术名称手术间病人姓名巡回护士状态手术名称手术间病人姓名巡回护士状态
{depart}{tousseName}{barcode}{operation}