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
Sunday 12 Mar 2017
6:07 下午

chenjiaru

解决jira问题：GDSRMYY-281 增加"灭菌区工作量统计报表"
Options
    • -0
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationAreaWorkLoadView.jsp
    • -2
    • +32
    /forgon-tools/src/main/java/com/forgon/tools/util/ForgonDateUtils.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManager.java
    • -1
    • +12
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +150
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationAreaWorkLoadView.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • -0
    • +57
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SterilizationAreaWorkLoadBean.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/sterilizationAreaWorkLoad.jasper
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -1
    • +6
    /forgon-core/src/main/java/com/forgon/systemsetting/service/HttpOptionManager.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +209
    /ssts-web/src/main/webapp/jasperRtp/sterilizationAreaWorkLoad.jrxml
  16. … 3 more files in changeset.
Saturday 11 Mar 2017
5:18 下午

shuyongfu

新增demo的项目及相关配置文件
Options
    • -0
    • +67
    /ssts-web/src/main/webapp/disinfectsystem/config/demo/config.js
    • -0
    • +139
    /ssts-web/src/main/resources/spring/projects/demo/applicationContext-demo.xml
    • -0
    • +22
    /ssts-web/src/main/resources/config/demo/mybatis/FindPatientInfoByTreatmentNumMapper.xml
  4. /ssts-web/src/main/webapp/disinfectsystem/config/demo/img
    • -0
    • +1
    /ssts-web/src/main/resources/jdbc.properties
    • -0
    • +6
    /ssts-web/src/main/resources/config/demo/writeBackInventoryConfig.json
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/config/demo/img/logo.jpg
    • -0
    • +23
    /ssts-web/src/main/resources/config/demo/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -0
    • +1315
    /ssts-web/src/main/webapp/disinfectsystem/config/demo/print/printConfig.js
  10. /ssts-web/src/main/resources/config/demo/mybatis
    • -0
    • +95
    /ssts-web/src/main/resources/config/demo/mybatis/syncFromHERP_Mapper.xml
  12. /ssts-web/src/main/webapp/disinfectsystem/config/demo/print
  13. /ssts-web/src/main/resources/spring/projects/demo
  14. /ssts-web/src/main/resources/config/demo
  15. /ssts-web/src/main/webapp/disinfectsystem/config/demo
  16. … 3 more files in changeset.
4:42 下午

jeffli

解决bug：HDQRMYY-19

申领单中包含（需回收）和（不需要回收）的物品时，此单未被回收的情况下，不需要回收的物品不能进行发货

Options
    • -2
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
Friday 10 Mar 2017
10:55 下午

chenjiaru

补上器械包定义（增删改）的测试用例
Options
    • -3
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -0
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • -0
    • +603
    /ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/toussedefinition/service/SaveOrUpdateTousseDefinitionTest.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -0
    • +2
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/basedatamanager/AllTests.xml
    • -2
    • +4
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
    • -0
    • +94
    /ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/toussedefinition/service/DeleteTousseDefinitionTest.java
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • -0
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/videomanager/service/VideoFileManager.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
10:09 下午

adairkang

SSTS-103 PDA使用记录模块登记异常包的提示不准确
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -1
    • +1
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
9:23 下午

jeffli

解决bug：

消毒物品退货价格不对

Options
    • -11
    • +62
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • -0
    • +83
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionUtils.java
7:21 下午

shuyongfu

解决jira问题:DGZYY-85 一键审核进入列表功能改进
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
4:28 下午

shuyongfu

解决jira问题:DGZYY-85 一键审核进入列表功能改进
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationView.js
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.7.0_4.7.1.sql
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp
    • -0
    • +18
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
    • -0
    • +27
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilisation/Sterilisation.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -0
    • +28
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/dwr/table/SterilisationTableManager.java
    • -0
    • +25
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationForm.js
4:06 下午

adairkang

ZSSXLRMYY-122 出库单打印格式的调整
Options
    • -6
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/print/printConfig.js
2:45 下午

zhonghaowen

修复器械包信息页面大字体显示不全
Options
    • -5
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp
    • -2
    • +80
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
2:36 下午

zengjc

质量监测报表查询速度的优化.
Options
    • -1
    • +17
    /forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
2:28 下午

shuyongfu

处理ZSYY-27 个人桌面增加自定义发货功能按钮,更换对应的图片文件
Options
    • binary
    /ssts-web/src/main/webapp/themes/portalPage/img/sterilizer_delivery.png
    • -1
    • +1
    /ssts-web/src/main/resources/systemset/portalPage.xml
2:10 下午

shuyongfu

手术预约管理和手术预约发货增加配置项
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
10:52 上午

jeffli

新功能：JMSRMYY-29

消毒物品退货功能

Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -2
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
    • -36
    • +45
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • -0
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -5
    • +25
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -0
    • +3
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
10:25 上午

zhonghaowen

ZSYY-27:修改桌面的灭菌员图标
Options
    • binary
    /ssts-web/src/main/webapp/themes/portalPage/img/customInvoiceForm.png
    • binary
    /ssts-web/src/main/webapp/themes/portalPage/img/customInvoiceForm.jpg
    • -1
    • +1
    /ssts-web/src/main/resources/systemset/portalPage.xml
Thursday 09 Mar 2017
6:42 下午

shuyongfu

中大附一手术预约接口调整
Options
    • -0
    • +1
    /ssts-webservice/src/main/java/net/gzsums/www/esb/MessageServiceSoapImpl.java
    • -2
    • +2
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/operationSchedule/service/OperationScheduleManagerImpl.java
6:00 下午

zhonghaowen

解决ZSYY-27:个人桌面增加自定义发货功能按钮
Options
    • -0
    • +5
    /ssts-web/src/main/webapp/homepage/portalPage.js
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/portalPage.xml
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
5:51 下午

shuyongfu

解决jira问题:ZSYY-19 手术预约管理列表内容调整

1.手术预约管理列表增加改动：1、隐藏图中没有勾选的列；2、预约单排序改成列名“手术台次”正序为主。

2.手术预约推送的数据暂不写备注

Options
    • -1
    • +1
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/operationSchedule/service/OperationScheduleManagerImpl.java
    • -7
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js
5:27 下午

cherry

增加成都市龙泉驿区第一人民医院的配置
Options
    • -0
    • +27
    /ssts-web/src/main/resources/config/cdlqyq1yy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -0
    • +53
    /ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js
    • -0
    • +1604
    /ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/print/printConfig.js
  4. /ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/print
  5. /ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy
    • -0
    • +35
    /ssts-web/src/main/resources/config/cdlqyq1yy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
  7. /ssts-web/src/main/resources/config/cdlqyq1yy
    • -0
    • +90
    /ssts-web/src/main/resources/spring/projects/cdlqyq1yy/applicationContext-his.xml
  9. /ssts-web/src/main/resources/spring/projects/cdlqyq1yy
    • -0
    • +15
    /ssts-web/src/main/resources/config/cdlqyq1yy/dataSyncConfig.json
    • -0
    • +28
    /ssts-web/src/main/resources/config/cdlqyq1yy/mybatis/SyncOrgUnitAndUserMapper.xml
  12. /ssts-web/src/main/resources/config/cdlqyq1yy/mybatis
5:04 下午

shuyongfu

陈国强发回来新的回收清单打印配置文件
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/recyclingDetailPrintConfig.js
4:34 下午

adairkang

手术预约打印表格调左一点
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
4:32 下午

zhonghaowen

修复科室申领提示不能添加同一物品的问题
Options
    • -4
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsAppHelper.js
4:09 下午

adairkang

ZSYY-26 手术预约管理增加打印功能
Options
    • -1
    • +18
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java
    • -0
    • +62
    /ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • -0
    • +56
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/vo/OperationReservationVo.java
  5. /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/vo
    • -0
    • +33
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
    • -1
    • +25
    /ssts-web/src/main/webapp/js/common.js
    • -0
    • +3
    /forgon-tools/src/main/java/com/forgon/tools/StrutsResponseUtils.java
    • -0
    • +6
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManager.java
3:07 下午

shuyongfu

解决连接新数据库启动系统时,登录失败的问题
Options
    • -10
    • +22
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
2:15 下午

zhonghaowen

修改器械包信息弹窗大小
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
11:42 上午

wangyi

修复快速回收页面篮筐上限未限制住问题
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
10:44 上午

chenguina

PDA 版本更新至4.5.38 （添加灭菌记录列表，单独添加的器械包，可以配置默认展开）
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.38_20170309.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.36_20170303.apk
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
10:27 上午

zhonghaowen

修改材料盘点管理弹窗窗口大小
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js
10:13 上午

zhonghaowen

修改一次性物品盘点管理弹窗大小
Options
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js
9:58 上午

shuyongfu

解决jira问题:DYSYY-25 与HIS系统在PC端的对接

目前已经整合到通用的模块,现惠州和德阳采用url传递登录名的方式实现单点登录

Options
    • -0
    • +24
    /ssts-client-misc/.project