forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 64
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 64
Total Lines of Code (LoC): 4,800,943
Net change in LoC this week: 2,958

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 07 Jan 2019
1:35 上午

terrykwan

完成东莞妇幼清洗区工作量及不合格率报表的定制修改：DGSFYBJY-19
Options
    • -0
    • +25
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
    • -0
    • +300
    /ssts-web/src/main/webapp/disinfectsystem/config/dgfy/reports/washWorkloadReportView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/dgfy/menu/menuconfigure.js
    • -0
    • +154
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/wash/WashWorkloadBeanForDgfy.java
    • -0
    • +240
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java
  6. /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/wash
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/washWorkloadReportView.jsp
    • 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
    • -0
    • +85
    /ssts-web/src/main/webapp/disinfectsystem/config/dgfy/reports/washWorkloadReportView.jsp
Sunday 06 Jan 2019
3:44 下午

terrykwan

完成东莞妇幼的个性化报表：包装区工作量统计表修改：DGSFYBJY-20
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -0
    • +79
    /ssts-web/src/main/webapp/disinfectsystem/config/dgfy/reports/packingUnqualifieReportView.jsp
    • -5
    • +10
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/dgfy/menu/menuconfigure.js
    • -0
    • +261
    /ssts-web/src/main/webapp/disinfectsystem/config/dgfy/reports/packingUnqualifieReportView.js
    • -24
    • +119
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java
    • -0
    • +6
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/vo/ReportQueryParams.java
11:50 上午

terrykwan

完成东莞妇幼灭菌区工作量及不合率报表的定制：JIRA问题编号：DGSFYBJY-21
Options
    • 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
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/dgfy/menu/menuconfigure.js
    • binary
    /ssts-web/src/main/webapp/jasperRtp/disinfectionFractionDefective-dgfy.jasper
    • -0
    • +6
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • -0
    • +271
    /ssts-web/src/main/webapp/disinfectsystem/config/dgfy/reports/sterilizationWorkloadReportView.js
    • -2
    • +63
    /forgon-tools/src/main/java/com/forgon/tools/date/DateTools.java
    • -1
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java
    • -0
    • +224
    /ssts-web/src/main/webapp/jasperRtp/disinfectionFractionDefective-dgfy.jrxml
    • -12
    • +56
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
    • -0
    • +78
    /ssts-web/src/main/webapp/disinfectsystem/config/dgfy/reports/sterilizationWorkloadReportView.jsp
    • -8
    • +542
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java
    • -2
    • +2
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/WorkQualityCollectionReportImpl.java
11:47 上午

terrykwan

补充注释信息
Options
    • -2
    • +18
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/DisinfectionFractionDefectiveBean.java
11:44 上午

terrykwan

统一报表名称，修改引用js路径为相对路径
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationWorkloadReportView.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationWorkloadReportView.js
11:44 上午

terrykwan

统一报表名称，修改引用js路径为相对路径
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/packingUnqualifieReportView.jsp
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/packingUnqualifieReportView.js
10:33 上午

weizhenyu

灭菌炉分组下拉框，改了对齐的样式，以及代码的规范
Options
    • -20
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js
12:34 上午

weizhenyu

发货计划的固定条码和批次条码的判断
Options
    • -18
    • +18
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
Saturday 05 Jan 2019
4:12 下午

shuyongfu

处理jira问题:GZSZYY-29 新增高值耗材使用记录查看权限

1.一级供应室的用户可以查看所有科室使用记录

2.高值耗材处理科室的用户可以查看所有有录入高值耗材的使用记录

3.其它科室的用户,如果有查看所属科室所有使用记录的权限则可以查看所属科室的所有使用记录;否则只能查看本人录入的使用记录

Options
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp
    • -1
    • +12
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/dwr/table/UseRecordTableManager.java
3:06 下午

shuyongfu

解决Jira问题:SZSSKRMYY-13 使用记录，没有显示器械包的装配时间

因为使用记录的手术时间也是operationTime,所以此处更名为packTime以防冲突

Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
9:48 上午

terrykwan

暂时注释，解决同步后tomcat启动不成功的问题
Options
    • -4
    • +3
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
Friday 04 Jan 2019
8:37 下午

shuyongfu

解决Jira问题:SZSZLYY-5 器械包定义新增属性：发货依据【申请数量】【回收数量】
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
8:36 下午

shuyongfu

解决Jira问题:SZSZLYY-5 器械包定义新增属性：发货依据【申请数量】【回收数量】
Options
    • -0
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java
    • -0
    • +2
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -1
    • +19
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java
    • -0
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • -0
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -0
    • +2
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/operationSchedule/service/OperationScheduleManagerImpl.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -0
    • +4
    /ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
    • -0
    • +4
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
    • -0
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
    • -0
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/InvoicePlanManagerTests.java
    • -0
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDAAssembleSendGoodsInvoiceManagerTests.java
    • -0
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/controller/CustomRecyclingApplicationController.java
    • -0
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestDisinfectGoodsInvoiceWithDiffAncestorTousseDefinition.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -0
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForComboFormTests.java
6:43 下午

yanweining

新疆军区总医院：新增美雅洁清洗机接口
Options
    • -0
    • +13
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -0
    • +45
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/MeiYaJieDataManagerImpl.java
    • -0
    • +22
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceDataByCommunicationManager.java
    • -0
    • +294
    /forgon-core/src/main/java/com/forgon/device/ModbusControllerManager.java
5:34 下午

weizhenyu

东莞市妇幼保健院DGSFYBJY-22

灭菌情况报表修改

Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgfy/config.js
5:33 下午

weizhenyu

东莞市妇幼保健院DGSFYBJY-22

灭菌情况报表修改

Options
    • -18
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.jsp
4:28 下午

weizhenyu

发货计划扫码对一次性物品和批次条码的判断
Options
    • -38
    • +46
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
2:18 下午

shuyongfu

解决Jira问题:

GZZYYFY-15 一次性物品增加固定条码使用功能

XJJQZYY-15 手术室的一次性物品库存管理

Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
11:01 上午

yanweining

修改表名RepeatSyncOperationSerialNumberInfo 为 RepeatSyncOperationNumber 防止表名超过30个字符导致orcale报错
Options
    • -6
    • +6
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
    • -76
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/operationreservation/RepeatSyncOperationSerialNumberInfo.java
    • -0
    • +76
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/operationreservation/RepeatSyncOperationNumber.java
10:55 上午

shuyongfu

解决Jira问题:

GZZYYFY-15 一次性物品增加固定条码使用功能

XJJQZYY-15 手术室的一次性物品库存管理

Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
8:54 上午

terrykwan

解决oracle下查询语句不兼容，导致工作质量持续收集统计报表无法显示的问题
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java
12:09 上午

terrykwan

解决贵港人民医院定制的核算月报数据与明细核算月报不一致的问题
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
Thursday 03 Jan 2019
11:50 下午

zc.li

解决IP绑定科室后，换IP登录后，科室切换了，但科室所属的任务组没有切换的问题。番禺区中医院项目售后问题编号：ASSPYQZYY-16
Options
    • -2
    • +2
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
7:34 下午

jeffli

解决bug

扫描固定条码发货，一次性物品明细记的不是批次条码

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
6:26 下午

shuyongfu

处理jira问题:ASSGGSRMYY-5 召回器械包时出现条码无效
Options
    • -3
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallRecordViewForDepart.js
5:41 下午

weizhenyu

东莞市妇幼保健院DGSFYBJY-22 灭菌情况报表修改
Options
    • -10
    • +86
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js
5:02 下午

shuyongfu

解决Jira问题:

GZZYYFY-15 一次性物品增加固定条码使用功能

XJJQZYY-15 手术室的一次性物品库存管理

Options
    • -3
    • +7
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • -12
    • +32
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordActionBase.java
    • -4
    • +53
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseDiposableGoodsItem.java
    • -1
    • +1
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/CommonHerpPathManagerImpl.java
    • -1
    • +1
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/ljsrmyy/HerpPathManagerImpl.java
    • -1
    • +1
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/zsly/HerpPathManagerImpl.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java
    • -1
    • +1
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/zsykzx/HerpPathManagerImpl.java
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -2
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/toussetransition/service/TousseTransitionModelTestsBase.java
    • -0
    • +83
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/ItemOfUseDisposableGoodsItem.java
    • -2
    • +2
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java
10:00 上午

jeffli

新疆军区总医院XJJQZYY-8

清洗机接口

Options
    • -4
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java
    • -9
    • +66
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js
    • too large
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.js
9:56 上午

jeffli

支持10位条码
Options
    • -2
    • +1
    /ssts-web/src/main/webapp/logon.jsp
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
9:52 上午

jeffli

深圳市肿瘤医院SZSZLYY-5

器械包定义新增属性：发货依据【申请数量】【回收数量】

Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java