Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/unUseTousseInstanceView.jsp
===================================================================
diff -u -r41209 -r41226
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/unUseTousseInstanceView.jsp (.../unUseTousseInstanceView.jsp) (revision 41209)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/unUseTousseInstanceView.jsp (.../unUseTousseInstanceView.jsp) (revision 41226)
@@ -51,7 +51,7 @@
-未使用器械包统计报表
+未录入使用记录器械包报表
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js
===================================================================
diff -u -r41107 -r41226
--- ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js (.../config.js) (revision 41107)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js (.../config.js) (revision 41226)
@@ -265,7 +265,9 @@
//OCR服务器地址
OCRServerAddress: 'http://192.168.2.229:5000',
//启用第三方标识牌条码功能
- enbaleThirdPartyIdCard:true
+ enbaleThirdPartyIdCard:true,
+ // 是否启用未录入使用记录器械包报表 ZSYKEQ-26
+ enableUnusedTousseInstanceReport: true
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/unusetousseinstance/handler/UnusedTousseInstanceHandler.java
===================================================================
diff -u -r41225 -r41226
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/unusetousseinstance/handler/UnusedTousseInstanceHandler.java (.../UnusedTousseInstanceHandler.java) (revision 41225)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/unusetousseinstance/handler/UnusedTousseInstanceHandler.java (.../UnusedTousseInstanceHandler.java) (revision 41226)
@@ -61,7 +61,7 @@
return vo;
}).collect(Collectors.toList());
parameterMap.put("summary", summary);
- parameterMap.put("title","未使用器械包统计报表(" + startDay + "至" + endDay + ")");
+ parameterMap.put("title","未录入使用记录器械包报表(" + startDay + "至" + endDay + ")");
return vos;
}
Index: ssts-reports/src/test/java/com/forgon/disinfectsystem/jasperreports/unusetousseinstance/handler/UnusedTousseInstanceHandlerHandleTest.java
===================================================================
diff -u -r41207 -r41226
--- ssts-reports/src/test/java/com/forgon/disinfectsystem/jasperreports/unusetousseinstance/handler/UnusedTousseInstanceHandlerHandleTest.java (.../UnusedTousseInstanceHandlerHandleTest.java) (revision 41207)
+++ ssts-reports/src/test/java/com/forgon/disinfectsystem/jasperreports/unusetousseinstance/handler/UnusedTousseInstanceHandlerHandleTest.java (.../UnusedTousseInstanceHandlerHandleTest.java) (revision 41226)
@@ -130,7 +130,7 @@
assertEquals(1, vo.getList().size());
assertTrue(paramMap.containsKey("summary"));
assertEquals("缝合包x2、钳子x1、止血带x1", paramMap.get("summary"));
- assertEquals("未使用器械包统计报表(2023-01-01 00:00:00至2023-01-31 23:59:59)", paramMap.get("title"));
+ assertEquals("未录入使用记录器械包报表(2023-01-01 00:00:00至2023-01-31 23:59:59)", paramMap.get("title"));
verify(jdbcTemplate, data -> {
String sql = data.getAllInvocations().get(0).getArgument(0);
System.out.println(sql);
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/unUseTousseInstanceView.js
===================================================================
diff -u -r41209 -r41226
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/unUseTousseInstanceView.js (.../unUseTousseInstanceView.js) (revision 41209)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/unUseTousseInstanceView.js (.../unUseTousseInstanceView.js) (revision 41226)
@@ -1,4 +1,4 @@
-var entityName = "未使用器械包统计报表";
+var entityName = "未录入使用记录器械包报表";
var grid;
var myMask;
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r41104 -r41226
--- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 41104)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 41226)
@@ -763,6 +763,7 @@
{hidden :!sstsConfig.enableUseRecordByPatientDept,text:"使用记录物品汇总表(病人所在科室)",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :!sstsConfig.enableUseRecordByChiefSurgeonDoctorsAccountingDepartment || SSTS_USERECORD_TypeForDoctorAccountDepart ,text:"使用记录物品分类汇总表(主刀医生核算科室)",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordTypeForDoctorAccountingDepartView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :!sstsConfig.enableUseRecordByChiefSurgeonDoctorsAccountingDepartment || SSTS_USERECORD_SumForDoctorAccountDepart,text:"使用记录物品汇总表(主刀医生核算科室)",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordForDoctorAccountingDepartView.jsp',hrefTarget:linkTarget,leaf:true},
+ {hidden :!sstsConfig.enableUnusedTousseInstanceReport || SSTS_USERECORD_Item,text:"未录入使用记录器械包报表",href:WWWROOT+'/disinfectsystem/reportforms/unUseTousseInstanceView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_WashingMachineStoveUseCountReport,text:"清洗机使用次数统计报表",href:WWWROOT+'/disinfectsystem/reportforms/washingMachineStoveUseCountView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_SterilizingStoveUseCountReport,text:"灭菌炉使用次数统计报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizingStoveUseCountView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_TousseWorkLoadTotalReport,text:(sstsConfig.tousseWorkLoadName ? sstsConfig.tousseWorkLoadName : "器械包工作量统计报表"),href:WWWROOT+'/disinfectsystem/reportforms/tousseWorkLoadView.jsp',hrefTarget:linkTarget,leaf:true},