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 07 Sep 2016
7:03 下午

adairkang

修改计算消毒物品单价的方法，以适应整包和拆包申请
Options
    • -1
    • +6
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
6:55 下午

wangyi

外来器械提前归还改进
Options
    • -21
    • +19
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java
    • -26
    • +28
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
6:55 下午

shuyongfu

解决jira问题:

GDSRMYY-139 借物管理界面去掉“类型”、“备注”列,增加“物品简要”列字段

Options
    • -17
    • +15
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
6:43 下午

shuyongfu

解决jira问题:

GDSRMYY-139 借物管理界面去掉“类型”、“备注”列,增加“物品简要”列字段

Options
    • -29
    • +21
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
    • -0
    • +24
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
6:25 下午

adairkang

一次性物品小计价格为0的处理
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
5:40 下午

wangyi

修复回收消毒物品切换篮筐未生成包包定义bug
Options
    • -0
    • +3
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
5:34 下午

adairkang

拆包申请的物品,金额错误
Options
    • -23
    • +23
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
5:31 下午

shuyongfu

解决jira问题:

GDSRMYY-139 借物管理界面去掉“类型”、“备注”列,增加“物品简要”列字段

Options
    • -2
    • +17
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
4:40 下午

zengjc

在审核和灭菌装载页面添加鼠标移至器械包，显示器械包信息，解决jira问题广州复大肿瘤医院GZFDZL-72.
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingView.jsp
    • -2
    • +49
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
    • -2
    • +40
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
4:13 下午

shuyongfu

解决jira问题:

GDSRMYY-139 借物管理界面去掉“类型”、“备注”列,增加“物品简要”列字段

Options
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
4:10 下午

zhonghaowen

解决ZSSXLRMYY-66:召回信息 如果有修改开始时间和截至时间 就必须再次点击 搜索器械包
Options
    • -2
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallRecordView.js
3:58 下午

shuyongfu

解决jira问题:

GDSRMYY-139 借物管理界面去掉“类型”、“备注”列,增加“物品简要”列字段

Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js
    • -0
    • +36
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
2:49 下午

wangyi

修复扫描标识牌包外标签可以不扫标识牌条码保存问题
Options
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
2:40 下午

jeffli

一次性物品条码入库，增加描述信息
Options
    • -0
    • +25
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/barcodeinformation/service/BarcodeInformationManagerImpl.java
    • -1
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/barcodeinformation/BarcodeInformation.java
2:39 下午

jeffli

一次性物品条码入库，增加打印功能
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • -0
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/barcodeInformation/barcodeInformation.jsp
2:36 下午

jeffli

一次性物品条码入库，增加描述信息
Options
    • -4
    • +42
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/barcodeInformation/barcodeInformation.js
2:28 下午

adairkang

ZSSXLRMYY-68(外部编码搜索物品改进)

ZSSXLRMYY-65(消毒物品的价格是材料的消毒价格之和)

Options
    • -2
    • +2
    /forgon-core/src/main/java/com/forgon/security/tools/Util.java
    • -4
    • +8
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -3
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
2:13 下午

wangyi

清洗触摸屏增加时间重叠验证；清洗机内是否提供扫描的清洗程序验证
Options
    • -2
    • +48
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js
    • -4
    • +12
    /ssts-web/src/main/webapp/jasperRtp/materialTypeWorkloadReport.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/materialTypeWorkloadReport.jasper
    • -0
    • +2
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • -5
    • +33
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • -0
    • +14
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -3
    • +5
    /ssts-web/src/main/webapp/jasperRtp/washWorkloadReport.jrxml
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp
    • -2
    • +4
    /ssts-web/src/main/webapp/jasperRtp/mainWashWorkloadReprot.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/mainWashWorkloadReprot.jasper
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/washWorkloadReport.jasper
1:43 下午

jeffli

录入一次性物品入库条码时，名称不允许为空
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/barcodeInformation/godownEntryForm.js
1:37 下午

zhonghaowen

除了借物单其他申请单发货状态如果是已发货则不能终止
Options
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
11:09 上午

zhonghaowen

除了发货单其他申请单发货状态如果是已发货则不能终止
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js
    • -0
    • +4
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
11:04 上午

adairkang

中大复一的小标签2打印,不使用表格线
Options
    • -1
    • +61
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
10:43 上午

jeffli

删除装配任务时增加删除原因
Options
    • -1
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • -3
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTaskTests.java
    • -1
    • +1
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java
    • -1
    • +1
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/DeleteRecyclingRecordItemTests.java
12:22 上午

shuyongfu

番禺中医院增加隐藏科室与人员同步按钮的配置
Options
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/config.js
Tuesday 06 Sep 2016
5:42 下午

shuyongfu

增加对申请备注的字段进行双引号替换,防止返回前端的json数据中含有嵌套的引号导致js脚本报错
Options
    • -1
    • +1
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
4:45 下午

shuyongfu

小榄隐藏科室与人员同步按钮
Options
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js
4:42 下午

adairkang

中大附一调整字体大小
Options
    • -8
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
4:28 下午

jeffli

一次性物品条码入库

广州复大肿瘤医院GZFDZL-75

Options
    • -0
    • +140
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/barcodeinformation/action/BarcodeInformationAction.java
    • -0
    • +61
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/barcodeInformation/barcodeInformation.jsp
    • -0
    • +4
    /ssts-web/src/main/webapp/WEB-INF/dwr.xml
    • -0
    • +168
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/barcodeInformation/barcodeInformation.js
  5. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/barcodeinformation/dwr/table
  6. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/barcodeinformation
    • -0
    • +243
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/barcodeInformation/godownEntryForm.js
    • -0
    • +37
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
  9. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/barcodeinformation/action
    • -0
    • +1
    /forgon-core/src/main/java/com/forgon/directory/model/BarcodeDevice.java
    • -0
    • +7
    /forgon-tools/src/main/java/com/forgon/tools/StrutsResponseUtils.java
  12. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/barcodeinformation/service
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
  14. /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/barcodeInformation
    • -1
    • +13
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
  16. … 7 more files in changeset.
4:26 下午

shuyongfu

包定义名称修改联动修改清洗记录的包名称及新增包定义时如果类型为器械包、消毒物品或敷料包时才联动新增供应室处理器械包配置
Options
    • -1
    • +3
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -2
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
4:25 下午

shuyongfu

清洗记录相关字段加上注释
Options
    • -0
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifiedItem.java