Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java =================================================================== diff -u -r34712 -r34713 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java (.../InstrumentInstanceManagerImpl.java) (revision 34712) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java (.../InstrumentInstanceManagerImpl.java) (revision 34713) @@ -1606,6 +1606,8 @@ useRecordVo.setOperation(operation); useRecordVo.setDepartNameOfpatient(departNameOfpatient); useRecordVo.setTousseNameBarcode(StringTools.appendString(tousseName, "(" + barcode + ")")); + useRecordVo.setRowCount(rowCount); + useRecordVo.setPageCount(pageCount); useRecordVoList.add(useRecordVo); } JsonConfig config = new JsonConfig(); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/UseRecordVo.java =================================================================== diff -u -r34597 -r34713 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/UseRecordVo.java (.../UseRecordVo.java) (revision 34597) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/UseRecordVo.java (.../UseRecordVo.java) (revision 34713) @@ -38,6 +38,16 @@ * 手术名称 */ private String operation; + + /** + * 总记录数 + */ + private Integer rowCount; + + /** + * 总页数 + */ + private Integer pageCount; public Long getId() { return id; @@ -94,5 +104,21 @@ public void setOperation(String operation) { this.operation = operation; } + + public Integer getRowCount() { + return rowCount; + } + + public void setRowCount(Integer rowCount) { + this.rowCount = rowCount; + } + + public Integer getPageCount() { + return pageCount; + } + + public void setPageCount(Integer pageCount) { + this.pageCount = pageCount; + } }