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 18 May 2016
7:08 下午

wangyi

修复非临床科室的回收单有需要装配的消毒物品不允许保存；回写器械包月报增加材料丢失、报废
Options
    • -1
    • +2
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.1.5_4.1.6_oracle.sql
    • -2
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingerror/RecyclingError.java
    • -14
    • +22
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -0
    • +24
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryManagerImpl.java
    • -4
    • +10
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingdamagerecord/RecyclingDamageItem.java
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.1.5_4.1.6_sqlserver.sql
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -6
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/damageMaterialAdditionalForm.js
3:38 下午

shuyongfu

解决jira问题:广州复大肿瘤医院 GZFDZL-2 器械材料增加采购计划功能（如果能做到一次性物品采购计划里最好）

注:采购计划增加材料后，另起了一个菜单，从一次性物品管理那个菜单里挪了出来

Options
    • -0
    • +9
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • -0
    • +26
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GoodPurchaseItem.java
    • -0
    • +92
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -0
    • +60
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GoodPurchaseAction.java
    • -0
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManagerImpl.java
    • -2
    • +8
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +73
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GoodPurchaseTableManager.java
    • -55
    • +83
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.js
3:17 下午

zengjc

解决回收清点添加回收记录添加器械包,中文不能输入的问题.
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
2:15 下午

cherry

安卓版本更新
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.4.10_20160510.apk
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
11:48 上午

zengjc

修正oracle数据库的项目,召回信息查询不到器械包的问题.
Options
    • -2
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallRecordView.js
    • -0
    • +19
    /forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java
10:14 上午

zengjc

解决清点回收->添加回收记录->添加器械包操作时，键盘和触摸屏输入不能索搜到器械包的问题.
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
    • -1
    • +5
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
Tuesday 17 May 2016
6:12 下午

wangyi

修复回收单保存后把申请单的备注去掉了，修复删除回收物品后再次打开物品还在。
Options
    • -1
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -1
    • +0
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
4:35 下午

wangyi

材料、篮筐分类类型改为不是必填项
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js
3:49 下午

wangyi

修复报损点确认报错bug
Options
    • -2
    • +9
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -32
    • +23
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/action/QualityMonitoringAction.java
    • -5
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingdamagerecord/RecyclingDamageItem.java
12:03 下午

wangyi

一次性物品结算管理-“期初，期末”使用日历的样式进行选择日期--GZFDZL-14

Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/stocktakeView.jsp
    • -69
    • +52
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/stocktakeView.js
Monday 16 May 2016
7:35 下午

wangyi

修改回收单科室后申请单科室跟着变
Options
    • -0
    • +9
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -1
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
7:20 下午

wangyi

丢失、报损装配任务状态修改
Options
    • -29
    • +10
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
4:54 下午

shuyongfu

jira问题广州复大肿瘤医院GZFDZL-8 增加一次性物品（三类）报表的vo类
Options
    • -0
    • +79
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/GoodsAmountSummaryByGrade.java
4:21 下午

wangyi

回收报损bug修复
Options
    • -3
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingerror/RecyclingError.java
    • -8
    • +2
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingdamagerecord/action/RecyclingDamageRecordAction.java
    • -1
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingdamagerecord/service/RecyclingDamageRecordManager.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingdamagerecord/RecyclingDamageRecord.java
    • -8
    • +12
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
    • -27
    • +13
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingdamagerecord/service/RecyclingDamageRecordManagerImpl.java
    • -3
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingdamagerecord/RecyclingDamageItem.java
2:59 下午

wangyi

回收报损材料名称未拿到名称
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
2:16 下午

shuyongfu

解决jira问题:广州复大肿瘤医院GZFDZL-17

器械包定义-添加新定义时，包装类型选择棉布以外的包装类型，保存后会自动改变。包括任务组、是否整包清洗、大小等配置属性也有这种情况

Options
    • -11
    • +8
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -3
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -7
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
11:12 上午

wangyi

修复确认后装配任务状态为改变
Options
    • -5
    • +16
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Friday 13 May 2016
7:14 下午

adairkang

东莞市东华医院
Options
    • -2
    • +2
    /ssts-web/src/main/resources/spring/projects/dgsdhyy/applicationContext-settlementWriteBack-gyey.xml
    • -0
    • +95
    /ssts-web/src/main/resources/spring/projects/dgsdhyy/applicationContext-his.xml
    • -0
    • +0
    /ssts-web/src/main/resources/spring/projects/dgsdhyy/applicationContext-his-gyey.xml
6:53 下午

shuyongfu

回收添加器械包时按处理科室查询器械包,改为从CssdHandleTousses表查询,不再按器械包定义里面的查询
Options
    • -3
    • +33
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
6:50 下午

wangyi

解决jasperreport导出Excel数字类型显示为文本类型--GZFDZL-3
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/jasperRtp/exportReport.jsp
6:33 下午

wangyi

增加注释说明
Options
    • -2
    • +8
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
6:11 下午

wangyi

丢失、报损格式化代码
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingerror/RecyclingError.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingdamagerecord/RecyclingDamageItem.java
    • -34
    • +29
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
5:59 下午

wangyi

回收丢失、报损改造
Options
    • -0
    • +5
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.1.5_4.1.6_sqlserver.sql
    • -3
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingBasketTests.java
    • -20
    • +49
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
    • -4
    • +0
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -7
    • +10
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/DeleteRecyclingRecordItemTests.java
    • -19
    • +19
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java
    • -12
    • +15
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java
    • -1
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/recyclingerror/vo/RecyclingErrorVo.java
    • -24
    • +69
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingerror/RecyclingError.java
    • -29
    • +40
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
    • -7
    • +8
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerTests.java
    • -4
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingWithAutoLoadToContainerTests.java
    • -3
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -66
    • +57
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
  16. … 20 more files in changeset.
5:47 下午

adairkang

no_comment
Options
  1. /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/config.js
  3. /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print
    • -0
    • +484
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js
5:46 下午

adairkang

no_comment
Options
  1. /ssts-web/src/main/resources/spring/projects/dgsdhyy
    • -0
    • +0
    /ssts-web/src/main/resources/spring/projects/dgsdhyy/applicationContext-settlementWriteBack-gyey.xml
    • -0
    • +0
    /ssts-web/src/main/resources/spring/projects/dgsdhyy/applicationContext-his-gyey.xml
    • -0
    • +-31
    /ssts-web/src/main/resources/spring/projects/dgsdhyy/timer.xml
5:45 下午

adairkang

no_comment
Options
  1. /ssts-web/src/main/resources/config/dgsdhyy
    • -0
    • +0
    /ssts-web/src/main/resources/config/dgsdhyy/dataSyncConfig.json
    • -0
    • +0
    /ssts-web/src/main/resources/config/dgsdhyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -0
    • +0
    /ssts-web/src/main/resources/config/dgsdhyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • -0
    • +0
    /ssts-web/src/main/resources/config/dgsdhyy/mybatis/SyncOrgUnitAndUserMapper.xml
  6. /ssts-web/src/main/resources/config/dgsdhyy/mybatis
5:27 下午

shuyongfu

消毒物品、外来器械、自定义器械包、外部代理灭菌、外来器械拆分小包等发货查询库存改为按名字查询,扣减库存时涉及多条goodsStock数据的数据扣减
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
5:25 下午

shuyongfu

消毒物品、外来器械、自定义器械包、外部代理灭菌、外来器械拆分小包等发货查询库存改为按名字查询,扣减库存时涉及多条goodsStock数据的数据扣减
Options
    • -2
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
5:15 下午

shuyongfu

消毒物品、外来器械、自定义器械包等发货查询库存改为按名字查询,扣减库存时涉及多条goodsStock数据的数据扣减
Options
    • -10
    • +46
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
5:09 下午

adairkang

已废弃的器械包，在添加灭菌记录时，不添加到灭菌记录中(ZSYKZX-15)
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
    • -1
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java