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
Monday 13 Feb 2017
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
Sunday 12 Feb 2017
6:11 下午

chenjiaru

在器械包信息列表那里完善聚合包的一些追溯信息的显示
Options
    • -0
    • +9
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
    • -5
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussemaintain/tousseMaintainView.js
    • -0
    • +7
    /forgon-tools/src/main/java/com/forgon/tools/util/ForgonDateUtils.java
    • -113
    • +115
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -3
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryrecordView.js
    • -3
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/materialCheckView.js
    • -0
    • +53
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -9
    • +41
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -762
    • +879
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
    • -5
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.js
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js
Friday 10 Feb 2017
7:32 下午

wangyi

质量监测、定期监测、自定义表单增加停用功能
Options
    • -2
    • +64
    /ssts-web/src/main/webapp/disinfectsystem/customform/formdefinitionView.js
    • -2
    • +67
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js
    • -0
    • +7
    /ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManager.java
    • -0
    • +16
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/customform/formdefinition/FormDefinition.java
    • -3
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoringconfig/QualityMonitoringDefinition.java
    • -11
    • +25
    /ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManagerImpl.java
    • -0
    • +1
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManagerImpl.java
    • -0
    • +15
    /ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/action/FormDefinitionAction.java
7:31 下午

shuyongfu

聚合包使用记录功能的实现代码
Options
    • -0
    • +4
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
5:03 下午

shuyongfu

聚合包使用记录功能的实现代码及测试用例代码
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
  2. /ssts-web/src/test/resources/test/forgon/disinfectsystem/useRecord
    • -1
    • +42
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -0
    • +379
    /ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java
    • -0
    • +9
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/useRecord/AllTests.xml
    • -0
    • +4
    /ssts-stockmanage/src/main/java/com/forgon/disinfectsystem/stockmanage/departmentstock/service/DepartmentStockManagerImpl.java
  8. /ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord
    • -0
    • +1
    /ssts-web/src/test/resources/test/forgon/AllTests.xml
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
4:19 下午

wangyi

修复聚合包内普通器械包装配任务有丢失报损不补充不让装配；修复未清洗不让装配聚合包问题，质量监测暂时不能录入聚合包
Options
    • -21
    • +72
    /ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
    • -58
    • +56
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/action/QualityMonitoringDefinitionAction.java
    • -1
    • +68
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
3:57 下午

zhonghaowen

修复聚合包第二次选择任务组时脚本报错
Options
    • -4
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js
3:30 下午

zengjc

解决jira问题：DGZYY-73,完成年度消毒供应中心指标工作量统计报表的修改，目前东莞中医院用自己特殊的配置报表.
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.jsp
    • -1
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js
    • -0
    • +7
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/yearWorkloadReport2.jasper
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
    • -2
    • +2
    /ssts-web/src/main/webapp/jasperRtp/yearWorkloadReport2.jrxml
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
2:16 下午

chenjiaru

对统计“器械包工作量”的一些的报表做了一点小改造，此次提交没有关联jira上的问题
Options
    • -6
    • +28
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • -90
    • +108
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceAmountContrastChartView.js
    • -83
    • +67
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseDeliverDetailView.js
    • -41
    • +116
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setGoodsOption.js
    • -3
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseDeliverStatisticsView.jsp
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -3
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/apparatusInfusionisTypeView.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/yearUserWorkloadReportView.jsp
    • binary
    /ssts-web/src/main/webapp/jasperRtp/tousseDeliverStatistics.jasper
    • -6
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseDeliverDetailView.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -10
    • +8
    /ssts-web/src/main/webapp/jasperRtp/tousseDeliverStatistics.jrxml
  16. … 11 more files in changeset.
11:41 上午

shuyongfu

待召回信息列表:聚合包内的普通包实例应该过滤掉不显示出来
Options
    • -0
    • +5
    /ssts-web/src/main/java/com/forgon/disinfectsystem/recall/action/RecallRecordAction.java
10:59 上午

jeffli

解决：GDSRMYY-247

消毒物品没有按照标签类型设置的格式打印标签

仅限于自定义标签，修改后，只对修改后申请的包起作用

Options
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
10:33 上午

shuyongfu

调整科室干预的模板文件
Options
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/interfere/orgUnit/sameOrgUnitTemplate.xls
10:29 上午

shuyongfu

调整科室干预的模板文件
Options
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/interfere/orgUnit/sameOrgUnitTemplate.xls
9:52 上午

shuyongfu

调整回收申请单表(RecyclingApplication)的tousseBarcodes字段长度,由默认长度255调整为2000
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.6.2_4.6.3_oracle.sql
9:37 上午

shuyongfu

聚合包实例可录入多条使用记录的中间表
Options
    • -0
    • +125
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstanceUseRecord.java