zengjc in forgon-ssts-v4.1.0

About

551 commits
  • Committer is not mapped to a user
  • First commit: 11 May 2016
  • Last commit: 26 September 2017
Last Week All Time
Commits: 0 551
Files changed: 0 26,654
Change in LOC: 0 214,478

Line History

Line Count Graph
Line Count Graph

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 
Tuesday 26 Sep 2017
6:18 下午

zengjc

修复定期监测只有材料时，输入数量保存不了的问题.
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
Monday 25 Sep 2017
7:12 下午

zengjc

修复质量监测所属科室过长，保存出错的问题.
Options
    • -1
    • +1
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java
4:03 下午

zengjc

鼠标移进清洗记录的时候，标识牌篮筐的条码显示为器械包条码。
Options
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
2:55 下午

zengjc

修复清洗扫描标识牌时，扫描标识牌删除，再扫描待清洗篮筐的节点不删除的问题，修复扫描标识牌保存清洗记录，打开显示篮筐条码的问题.
Options
    • -0
    • +26
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -4
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
Friday 22 Sep 2017
8:25 下午

zengjc

修复清洗扫描标识牌时候，提示篮筐第0次清洗的问题.
Options
    • -0
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
5:24 下午

zengjc

清洗界面直接扫描标识牌条码功能的完善。
Options
    • -8
    • +22
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • -0
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
    • -0
    • +25
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • -0
    • +1
    /build.gradle
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/dwr/table/BarcodeTableManager.java
Tuesday 19 Sep 2017
6:39 下午

zengjc

清洗机灭菌炉洁定接口的开发的完成， 目前只有中六进行配置.
Options
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java
    • -0
    • +18
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsly/config.js
    • -0
    • +598
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java
    • -0
    • +10
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java
    • -0
    • +1
    /ssts-web/src/main/resources/spring/projects/zsly/timer.xml
Wednesday 13 Sep 2017
5:53 下午

zengjc

修复jira问题DGZYY-128，器械清洗工作量及不合格率月报，外来器械二次清洗总数统计不对的问题。
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
Friday 01 Sep 2017
5:51 下午

zengjc

解决jira问题GDSRMYY-363，满意度调查表的自定义单选项一行显示一项，避免字太多而出现的折叠换行问题.
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableWinCustomForm.js
3:51 下午

zengjc

解决jira问题SZNSRMYY-6，一次性物品入库单，导入excel模板格式增加物资编码列。
Options
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/diposable.xls
11:57 上午

zengjc

提交清洗扫描标识牌，带出绑定的篮筐的处理.
Options
    • -0
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/dwr/table/BarcodeTableManager.java
Thursday 31 Aug 2017
8:21 下午

zengjc

解决jira问题SZSZYY-2，修复自定义表单数据保存后，列表查看不到的问题.
Options
    • -0
    • +1
    /ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/forminstance/service/FormInstanceManagerImpl.java
4:43 下午

zengjc

jira问题DGZYY-118，灭菌质量监测报表添加‘灭菌炉分组’过滤.
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -6
    • +42
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizerQuality.js
    • -0
    • +16
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
3:20 下午

zengjc

修复没有灭菌记录的包扫条码录质量监测报错的问题.
Options
    • -1
    • +3
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java
Monday 28 Aug 2017
3:04 下午

zengjc

解决jira问题HZSRMYY-28,器械包的导入导出添加‘是否限制发货科室’列.
Options
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataTest.xls
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • -1
    • +6
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
Friday 25 Aug 2017
8:09 下午

zengjc

解决jira问题HDQRMYY-34，修正清洗区工作量及不合格率月报的统计方法，解决清洗区工作量及不合格率月报与器械包工作量统计报表、员工工作量统计报表的清洗材料总数不一致的问题.
Options
    • -1
    • +3
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/CrossTableBean.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
Thursday 24 Aug 2017
8:00 下午

zengjc

灭菌质量检测统计报表根据查询科室过滤数据、灭菌记录没有包时，在包的数据里面显示灭菌员，质量监测结果有多条分行显示，明细报表的灭菌时间用灭菌开始时间.
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReportTotal.jasper
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReportTotal.jrxml
Wednesday 23 Aug 2017
7:56 下午

zengjc

解决jira问题DGZYY-118，新增‘灭菌物品质量监测统计报表’，目前只有东莞中医院配置.
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +226
    /ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReportTotal.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReportTotal.jasper
    • -0
    • +41
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SterilizerQualiyBean_Child.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -1
    • +2
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
    • -0
    • +49
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizerQuality.jsp
    • -0
    • +317
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizerQuality.js
    • binary
    /ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReport.jasper
    • -0
    • +81
    /ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReport_child.jrxml
    • -0
    • +162
    /ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReport.jrxml
    • -0
    • +3
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java
    • -1
    • +6
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReport_child.jasper
    • -0
    • +93
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SterilizerQualiyBean.java
7:43 下午

zengjc

质量监测范围是'无'时，加载材料，隐藏器械包.
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
Tuesday 22 Aug 2017
3:17 下午

zengjc

清洗记录的干预，在action的处理移到mannager类里面.
Options
    • -0
    • +18
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -15
    • +8
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • -0
    • +6
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
2:00 下午

zengjc

清洗记录保存的所有代码从action转移到manager里面，防止提示保存失败，缺实际保存成功某些属性的问题.
Options
    • -0
    • +6
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • -0
    • +123
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -101
    • +3
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
Monday 21 Aug 2017
6:48 下午

zengjc

修复启动清洗顺序时，手工清洗后，修改清洗机，能保存没有手工清洗篮筐的问题。
Options
    • -2
    • +3
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • -2
    • +7
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
3:45 下午

zengjc

添加注释，清洗机是否手工清洗机属性说明.
Options
    • -1
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/rinser/Rinser.java
2:31 下午

zengjc

解决jira问题DGZYY-116，添加清洗篮筐机洗之前，要先用手工清洗机清洗，其中判断清洗机是否手工清洗机，可以对清洗机进行配置，目前只有东莞中医院进行配置.
Options
    • -2
    • +18
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
    • -0
    • +61
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -0
    • +5
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
    • -0
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/rinser/Rinser.java
    • -0
    • +7
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • -2
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js
    • -1
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js
Thursday 17 Aug 2017
6:33 下午

zengjc

质量监测报表，修复查询没有数据时，也显示的问题.
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
5:00 下午

zengjc

解决jira问题GDSRMYY-346,修复第二次导入基础数据时页面会跳到登录页的问题.
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/importBasedata.jsp
12:03 下午

zengjc

解决jira问题CDSLQYQYYY-20,质量监测没有录材料和包数据，在质量监测报表可以查出来。
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
Tuesday 15 Aug 2017
4:22 下午

zengjc

中大附一，提交定时处理接口数据的文件.
Options
    • -0
    • +14
    /ssts-web/src/main/resources/spring/projects/zsyy/timer.xml
Friday 11 Aug 2017
2:08 下午

zengjc

年度消毒供应中心统计报表，列宽加长.
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/yearWorkloadReport2.jasper
    • -2
    • +2
    /ssts-web/src/main/webapp/jasperRtp/yearWorkloadReport2.jrxml
11:11 上午

zengjc

修复东莞中医院，年度消毒工作中心统计报表辅料包和辅料包材料统计不对的问题.
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java