Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r17127 -r17159
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 17127)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 17159)
@@ -11621,14 +11621,15 @@
String sql =
"select "
- + "t.id tousseNameId,t.tousseName tousseName,td.supplierName supplierName,m.materialName materialName,md.isImplant isImplant,"
+ + "t.id tousseNameId,t.tousseName tousseName,bd.barcode tousseDarcode,td.supplierName supplierName,m.materialName materialName,md.isImplant isImplant,"
+ "s.ownGroup ownGroup,s.name name,sr.sterilizationType sterilizationType,sr.frequency frequency,sr.startDate startDate,sr.endDate endDate,sr.sterilizationUser sterilizationUser,sr.status status,"
+ "sr.biologicalMonitoringStartDate biologicalMonitoringStartDate,sr.biologicalMonitoringEndDate biologicalMonitoringEndDate,sr.biologyResult biologyResult,sr.monitorUser monitorUser,sr.monitorChecker monitorChecker,"
+ "ur.enteringDate enteringDate,ur.depart depart,ur.patientName patientName,ur.hospitalNum hospitalNum,ur.operator operator,"
+ "t.invoiceSendTime invoiceSendTime,t.isRoutine isRoutine,t.invoiceSender sender "
+ "from "
+ "TousseInstance t "
+ + "inner join barcodeDevice bd on bd.id=t.id "
+ "inner join TousseDefinition td on td.id=t.tousseDefinition_id "
+ "inner join MaterialInstance m on m.tousse_id=td.id "
+ "inner join MaterialDefinition md on md.id=m.materialDefinition_id "
@@ -11650,6 +11651,7 @@
Long tousseNameId = result.getLong("tousseNameId");
String tousseName = StringTools.defaultString(result.getString("tousseName"));
+ String tousseDarcode = StringTools.defaultString(result.getString("tousseDarcode"));
String supplierName = StringTools.defaultString(result.getString("supplierName"));
String materialName = StringTools.defaultString(result.getString("materialName"));
String isImplant = StringTools.defaultString(result.getString("isImplant"));
@@ -11683,18 +11685,17 @@
vo.setTousseNameId(tousseNameId);
vo.setTousseName(tousseName);
+ vo.setTousseDarcode(tousseDarcode);
vo.setSupplier(supplierName);
vo.setImplantName(materialName);
vo.setIsImplant("√");
-
vo.setUseTime(enteringDate);
vo.setUseDepartment(depart);
vo.setPatientName(patientName);
vo.setAdmissionNumber(hospitalNum);
vo.setRegistrar(operator);
-
vo.setSterilizationType(ownGroup);
vo.setSterilizationBatchNumber(name + "-" + frequency);
vo.setSterilizationProcedure(sterilizationProcedure);
Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseSterilizationMonitorAndDelivery.jasper
===================================================================
diff -u -r17114 -r17159
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseSterilizationMonitorAndDeliveryVO.java
===================================================================
diff -u -r17114 -r17159
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseSterilizationMonitorAndDeliveryVO.java (.../ForeignTousseSterilizationMonitorAndDeliveryVO.java) (revision 17114)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseSterilizationMonitorAndDeliveryVO.java (.../ForeignTousseSterilizationMonitorAndDeliveryVO.java) (revision 17159)
@@ -5,7 +5,7 @@
/**
* 2016-10-18
* @author Chenjiaru
- * 外来器械包的植入物和植入型器械灭菌监测及发放报表的javabean
+ * 含植入物器械包灭菌监测及发放情况报表的javabean
*
*/
@@ -27,10 +27,14 @@
private String isImplant;
/**
- * 器械包名称（针对外来器械包的）
+ * 器械包名称
*/
private String tousseName;
+ /**
+ * 器械包条码
+ */
+ private String tousseDarcode;
/**
* 供应商
@@ -43,8 +47,6 @@
private String implantName;
-
-
//下面五个为使用记录
/**
@@ -73,13 +75,11 @@
private String registrar;
-
/**
* 灭菌类型（也是我们系统说的灭菌组）
*/
private String sterilizationType;
-
/**
* 灭菌批次号（即：灭菌炉名称-炉次）
*/
@@ -141,8 +141,6 @@
private String sterilizationAndBiologicalResult;
-
-
/**
* 是否常规发货
*/
@@ -159,9 +157,6 @@
private String invoiceSendTime;
-
-
-
public String getSterilizationEndDateStr() {
return sterilizationEndDateStr;
}
@@ -381,6 +376,12 @@
this.biologicalMonitoringStartDate = biologicalMonitoringStartDate;
}
+ public String getTousseDarcode() {
+ return tousseDarcode;
+ }
+
+ public void setTousseDarcode(String tousseDarcode) {
+ this.tousseDarcode = tousseDarcode;
+ }
-
}
Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseSterilizationMonitorAndDelivery.jrxml
===================================================================
diff -u -r17114 -r17159
--- ssts-web/src/main/webapp/jasperRtp/foreignTousseSterilizationMonitorAndDelivery.jrxml (.../foreignTousseSterilizationMonitorAndDelivery.jrxml) (revision 17114)
+++ ssts-web/src/main/webapp/jasperRtp/foreignTousseSterilizationMonitorAndDelivery.jrxml (.../foreignTousseSterilizationMonitorAndDelivery.jrxml) (revision 17159)
@@ -86,6 +86,9 @@
+
+
+
@@ -122,6 +125,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -219,6 +236,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -673,6 +716,9 @@
+
+
+
@@ -821,8 +867,7 @@
-
+
@@ -1066,6 +1111,15 @@
+
+
+
+
+
+
+
+
+