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
Thursday 04 Jul 2019
11:14 上午

shuyongfu

解决Jira问题:

GZZYYFY-50 使用快速发货物品较多时加载慢，出现超时提示

GZZYYFY-50 使用快速发货物品较多时加载慢，出现超时提示

Options
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ExpressInvoiceInvoicePlanVo.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -20
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/invoice/expressInvoiceView.jsp
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/ExpressInvoiceManagerImpl.java
    • -2
    • +7
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryManagerImpl.java
    • -1
    • +9
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • -2
    • +36
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -1
    • +23
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDao.java
    • -3
    • +31
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • -0
    • +9
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ExpressInvoiceApplicationGoodsVo.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -268
    • +79
    /ssts-web/src/main/webapp/disinfectsystem/invoice/expressInvoiceForm.js
    • -0
    • +97
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ExpressInvoicePlanManager.java
  16. … 8 more files in changeset.
10:15 上午

shuyongfu

规范代码语法
Options
    • -3
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
9:53 上午

zc.li

删除多余代码
Options
  1. /com
  2. /com/forgon/disinfectsystem/basedatamanager/deviceinterface
  3. /com/forgon/disinfectsystem/basedatamanager
  4. /com/forgon/disinfectsystem
  5. /com/forgon
  6. /com/forgon/disinfectsystem/basedatamanager/deviceinterface/service
9:44 上午

shuyongfu

规范代码语法
Options
    • -1
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
9:36 上午

zc.li

属性重命名
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • -5
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java
9:35 上午

shuyongfu

增加注释
Options
    • -3
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
9:34 上午

shuyongfu

规范代码
Options
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
9:34 上午

shuyongfu

增加注释
Options
    • -1
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
Wednesday 03 Jul 2019
8:06 下午

zc.li

解决：XJJQZYY-85。使用器械流转科室必须使用手术仪器管理功能发货后才能登记使用记录。添加配置项：checkTousseLocatedInOperatingRoomWhenAddUseRecord。添加使用记录扫描物品条码时，判断该物品手术间或流转位置是否有值，都无值则提示"该物品未发货到手术间，无法录入使用记录"
Options
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
6:06 下午

zc.li

解决：GGSRMYY-93。1.

1.使用记录转换的申请单，回收时限制不能手工添加物品名称，不能扫描除了申请单物品以外的物品的标识牌条码添加物品； 2.使用记录转换的申请单，回收物品的数量不能超过申请的数量。配置项的中文名字：限制使用记录转换的申请单不能添加别的物品，英文名字：restrictAddOtherGoodsToApplicationFromUseRecord

设置为true，进行限制；没有配置或者设置为false，不限制；

Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -1
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js
11:34 上午

zc.li

完善：ASSZSXLYY-12。修复材料定义为空时，不合格数量未计入未设置的数量。
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
Tuesday 02 Jul 2019
8:05 下午

zc.li

项目转移
Options
    • -0
    • +49
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManager.java
  2. /com/forgon/disinfectsystem/basedatamanager/deviceinterface
  3. /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord/dwr
  4. /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord
    • -0
    • +89
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord/dwr/table/BorrowRecordTableManager.java
    • -0
    • +346
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java
  7. /com/forgon/disinfectsystem
    • -0
    • +470
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java
  9. /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord/service
  10. /com/forgon/disinfectsystem/basedatamanager/deviceinterface/service
  11. /com
  12. /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord/action
  13. /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord/dwr/table
  14. /com/forgon
  15. /com/forgon/disinfectsystem/basedatamanager
8:04 下午

zc.li

项目转移
Options
  1. /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord
    • -129
    • +0
    /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java
  3. /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/action
    • -322
    • +0
    /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java
  5. /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/service
    • -56
    • +0
    /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/dwr/table/BorrowRecordTableManager.java
  7. /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/dwr/table
  8. /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/dwr
    • -28
    • +0
    /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManager.java
7:29 下午

zc.li

解决：ASSZSXLYY-12。1.清洗区材料类型工作量统计报表部分不合格数据查询不出来的问题。原因ResultSet里嵌套使用ResultSet，里层ResultSet关闭资源后，外层ResultSet下个循环报错，导致数据查询不全。2.优化查询效率。
Options
    • -0
    • +6
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -5
    • +29
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
4:13 下午

zc.li

解决：ASSZDWY-44。质量监测项统计月报责任环节为空时，数据不按供应室分开的问题。
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
2:40 下午

zengyuan

深圳市肿瘤医院 SZSZLYY-26 科室器械包管理功能改造 修正提交
Options
    • -754
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/menu/menuconfigure1.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js
    • -3
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js
2:08 下午

zc.li

注释添加与代码优化
Options
    • -14
    • +4
    /ssts-stockmanage/src/main/java/com/forgon/disinfectsystem/stockmanage/departmentstock/action/DepartmentStockAction.java
    • -1
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
10:44 上午

zengyuan

深圳市肿瘤医院 SZSZLYY-26 科室器械包管理功能改造
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/menu/menuconfigure.js
    • -10
    • +230
    /ssts-web/src/main/webapp/disinfectsystem/departmentStock/departmentStockInputView.js
    • -4
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/departmentStock/departmentStockInputForm.js
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/portalPage.xml
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/menu/menuconfigure.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/szszlyy/menu/menuconfigure.js
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +5
    /ssts-web/src/main/webapp/homepage/portalPage.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/menu/menuconfigure.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/szszlyy/config.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/dgfy/menu/menuconfigure.js
    • -1
    • +16
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • -0
    • +24
    /ssts-web/src/main/webapp/disinfectsystem/departmentStock/departmentStockInputView.jsp
    • -1
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js
  16. … 3 more files in changeset.
Monday 01 Jul 2019
8:42 下午

zc.li

解决：SZSZLYY-26。科室器械包管理功能改造
Options
    • -1
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -1
    • +9
    /ssts-stockmanage/src/main/java/com/forgon/disinfectsystem/stockmanage/departmentstock/dwr/table/DepartmentStockTableManager.java
    • -2
    • +9
    /ssts-stockmanage/src/main/java/com/forgon/disinfectsystem/stockmanage/departmentstock/service/DepartmentStockManagerImpl.java
    • -12
    • +29
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/borrowrecord/BorrowRecord.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -1
    • +26
    /ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java
    • -0
    • +25
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • -2
    • +3
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -2
    • +32
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -2
    • +17
    /ssts-stockmanage/src/main/java/com/forgon/disinfectsystem/stockmanage/departmentstock/action/DepartmentStockAction.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -2
    • +122
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/departmentstock/DepartmentStock.java
    • -0
    • +8
    /ssts-stockmanage/src/main/java/com/forgon/disinfectsystem/stockmanage/departmentstock/service/DepartmentStockManager.java
8:31 下午

zc.li

注释修改
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java
2:39 下午

zc.li

解决有时装配任务查询有重复，导致页面显示多个装配任务的问题。比如有时装配任务只有A，会查询两个A出来在页面显示成两条装配任务。
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
Friday 28 Jun 2019
7:47 下午

shuyongfu

BJCYLYY-1 pda上增加科室申领模块
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.77_20190628_v4_1_release.apk
    • -1
    • +1
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
Thursday 27 Jun 2019
5:28 下午

jason

解决jira问题：广东省中医院 GDSZYY-9 外来器械申请单接口
Options
    • -0
    • +35
    /ssts-web/src/main/resources/spring/projects/gdszyy/timer.xml
    • -0
    • +1
    /build.gradle
  3. /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gdszyy
    • -1
    • +6
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManager.java
    • -0
    • +36
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gdszyy/DatasyncConstant.java
    • too large
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • -0
    • +328
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gdszyy/SyncForeignTousseApplicationDaoImpl.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -0
    • +6
    /ssts-web/src/main/resources/spring/projects/gdszyy/HIS.xml
    • -0
    • +30
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/SyncForeignTousseApplicationDao.java
10:29 上午

shuyongfu

BJCYLYY-4 PDA上增加借物管理
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.77_20190626_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/yunfei1.1.1045.apk
Wednesday 26 Jun 2019
3:13 下午

zc.li

pda借物管理后台代码修改
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
Tuesday 25 Jun 2019
9:52 上午

yuandongxiao

selenium代码提交：解决一级供应室灭菌完成后找不到退出系统按钮的问题
Options
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java
Monday 24 Jun 2019
5:51 下午

zengyuan

解决首页图标太多的时候看不到图标的问题，改完以后，有滚动条，可以看到图标了
Options
    • -1
    • +2
    /ssts-web/src/main/webapp/homepage/portalPage.jsp
    • -19
    • +36
    /ssts-web/src/main/webapp/homepage/portalPage.js
5:13 下午

jason

no_comment
Options
    • -1
    • +4
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
Friday 21 Jun 2019
5:34 下午

yuandongxiao

selenium代码提交：改善发货以及使用记录部分代码
Options
    • -0
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
    • -1
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/UserRecord.java
    • -0
    • +14
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java
4:58 下午

yk

北京垂杨柳医院发布包
Options
    • -1
    • +1
    /build.gradle