forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 59
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 59
Total Lines of Code (LoC): 4,711,364
Net change in LoC this week: 3,161

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
 

Most active committers (90 days)

loading
loading

Subversion Details

1 property
  • svn:global-ignores = .gradle .settings bin build rebel.xml
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Wednesday 15 Feb 2017
4:25 下午

zengjc

解决jira问题: ZSYY-16,质量监测、定期监测监测范围增加按灭菌炉记录，当监测范围为‘灭菌炉记录’时，选择时间和炉号，就可以选择相关炉次，质量监测列表、定期监测列表添加灭菌炉号和炉次显示。
Options
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoringconfig/QualityMonitoringDefinition.java
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.js
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -2
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoringInstance.java
    • -1
    • +20
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.jsp
    • -4
    • +22
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java
    • -0
    • +124
    /ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
    • -2
    • +169
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
    • -0
    • +7
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
4:23 下午

cherry

更新PDA版本为4.5.32 支持自定义发货选择科室
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.30_20170121.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.32_20170214.apk
10:24 上午

adairkang

ZSWY-64 物品签收时,如果扫描某个物品有错误信息提示时,需要回到屏幕手工关掉信息,操作比较麻烦
Options
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp
Tuesday 14 Feb 2017
10:48 下午

terrykwan

修改为Jenkins工作区的路径
Options
    • -1
    • +1
    /forgon-tools/src/main/java/com/forgon/tools/util/PathUtils.java
8:21 下午

adairkang

材料入库单的删除
Options
    • -2
    • +5
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManager.java
    • -9
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java
    • -9
    • +3
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/action/MaterialEntryAction.java
    • -0
    • +39
    /ssts-web/src/test/java/test/forgon/disinfectsystem/material/service/MaterialEntryManagerTests.java
    • -1
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManager.java
    • -5
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
5:30 下午

adairkang

ZSWY-61 核算月报，如果有器械丢失或报废，同一个科室显示2行结果
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:14 下午

wangyi

修复质量监测停用功能问题
Options
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/customform/formdefinitionView.js
2:39 下午

jeffli

解决： DYSYY-20

自定义标签中，把一维码条码和条码号分开

Options
    • -0
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
2:05 下午

zengjc

去掉调试的提示.
Options
    • -1
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js
1:01 下午

adairkang

JMSRMYY-27 科室申领页面鼠标移上去的单据视图显示时间增加

借物单管理、发货管理、审核、科室申领、灭菌装载、清洗消毒界面，弹出提示筐不自动消失

Options
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
11:44 上午

adairkang

DYSYY-21 PDA端自定义发货，发货科室增加选择项
Options
    • -1
    • +24
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
    • -0
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
10:59 上午

zengjc

添加包装区工作量不合格率月包的注释.
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -1
    • +7
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
Monday 13 Feb 2017
11:16 下午

terrykwan

暂时更改路径，测试Bamboo编译
Options
    • -1
    • +1
    /forgon-tools/src/main/java/com/forgon/tools/util/PathUtils.java
7:08 下午

wangyi

完成 DGZYY-77改进，清洗工作量分器械包数量和材料数量两列
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -0
    • +10
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseWorkLoadVO.java
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifiedItem.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jasper
    • -19
    • +53
    /ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jrxml
6:12 下午

zengjc

解决jira问题：ZSYY-17,修复包装去、灭菌区有些表头文字过长，显示不全的问题，包装区工作量及不合格率月报表中的统计指标去掉“消毒物品不合格”，目前只有中大附一配置.
Options
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/packingUnqualifieReportView.js
    • -1
    • +1
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -4
    • +4
    /ssts-web/src/main/webapp/jasperRtp/packingUnqualifieReport.jrxml
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -4
    • +4
    /ssts-web/src/main/webapp/jasperRtp/disinfectionFractionDefective.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/disinfectionFractionDefective.jasper
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/packingUnqualifieReportView.jsp
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • binary
    /ssts-web/src/main/webapp/jasperRtp/packingUnqualifieReport.jasper
6:00 下午

chenjiaru

解决jira问题：GZFDZL-94 使用记录录入明细报表增加字段
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
5:20 下午

chenjiaru

解决jira问题：GZFDZL-94使用记录录入明细报表增加字段
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/useRecordItemViewSub.jasper
    • -273
    • +297
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js
    • -14
    • +28
    /ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jrxml
    • -1
    • +40
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UseRecordEnteringTousse.java
    • -4
    • +41
    /ssts-web/src/main/webapp/jasperRtp/useRecordItemViewSub.jrxml
    • -16
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.jsp
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -5
    • +6
    /forgon-core/src/main/java/com/forgon/directory/action/UserAction.java
4:53 下午

adairkang

重构代码
Options
    • -7
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
4:23 下午

adairkang

材料入库功能完善
Options
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManager.java
    • -2
    • +2
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
    • -6
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/material/service/MaterialEntryManagerTests.java
    • -1
    • +22
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/action/MaterialEntryAction.java
    • -3
    • +6
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
    • -9
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialOutView.js
3:58 下午

shuyongfu

贵阳市第二人民医院使用记录按疹疗号查询病人的功能没有开放,对应dao的bean配置注释掉
Options
    • -2
    • +2
    /ssts-web/src/main/resources/spring/projects/gysdermyy/applicationContext-his.xml
3:55 下午

shuyongfu

灭菌装载、审核及灭菌时扫描首尾篮筐时增加过滤,聚合包内的包实例不用显示
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/service/BarcodeManagerImpl.java
3:45 下午

shuyongfu

灭菌装载、审核及灭菌时扫描首尾篮筐时增加过滤,聚合包内的包实例不用显示
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/service/BarcodeManagerImpl.java
3:25 下午

wangyi

修复重新打印聚合包时，修改包装类型后普通器械包没跟着修改
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -14
    • +12
    /forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java
2:41 下午

shuyongfu

灭菌装载、审核及灭菌时扫描首尾篮筐时增加过滤,聚合包内的包实例不用显示
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
12:01 下午

zengjc

修复jira问题:ZSYY-15,质量监测和定期监测的监测范围为无时，加了配置相关表单是否显示器械包信息，目前只有中山附一进行配置.
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.jsp
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • -14
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
11:20 上午

zengjc

解决jira问题:ZSYY-15,定期检测与质量检测 检测范围选无时,不显示器械包和材料的信息.
Options
    • -0
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
    • -4
    • +63
    /ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
10:58 上午

shuyongfu

使用记录删除时,使用的聚合包实例的状态逻辑修改,且对应的器械包使用记录中间表的数据也相应删除
Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -4
    • +18
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
10:10 上午

shuyongfu

解决使用记录旧数据追加扫描聚合包时保存出错的问题
Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
9:52 上午

adairkang

由于升级脚本有使用mergePrint字段,如果旧版本数据库，没有这个字段,会使升级脚本处理出错。重新打开。代码中已经不再使用此字段
Options
    • -8
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/printinvoiceconfig/PrintInvoiceConfig.java
9:34 上午

adairkang

ZSSZYY-95 器械包标签内容出现混乱
Options
    • -0
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java