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
Friday 13 May 2016
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
5:02 下午

shuyongfu

篮筐中的已废弃的器械包进入灭菌时,状态不能变成灭菌中
Options
    • -2
    • +6
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
3:15 下午

adairkang

明细核算月报导出表格缺少列的问题
Options
    • -10
    • +10
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jasper
3:09 下午

adairkang

明细核算月报导出表格缺少列的问题
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jasper
3:04 下午

adairkang

no_comment
Options
    • -8
    • +8
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jrxml
    • -13
    • +13
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jasper
12:01 下午

jeffli

解决bug：

oracle数据库加载装配任务报错

Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
11:47 上午

shuyongfu

审核页面扫条码未加载出对应器械包的问题处理
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/dwr/table/BarcodeTableManager.java
11:40 上午

adairkang

一次性物品的定义中添加是否在标签中打印的属性，默认为是

器械包、消毒物品的打印中，一次性物品的打印都按这个属性来处理

Options
    • -0
    • +3
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.jsp
    • -11
    • +17
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • -0
    • +32
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
    • -5
    • +22
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
11:32 上午

adairkang

一次性物品修改名称后的处理
Options
    • -2
    • +6
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
11:28 上午

shuyongfu

审核页面待审核任务列表数据未查出来数据的问题处理
Options
    • -1
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java
11:05 上午

shuyongfu

添加灭菌单，查看今天待灭菌的物品未显示的问题处理
Options
    • -3
    • +3
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
Thursday 12 May 2016
6:39 下午

jeffli

解决bug：

某些旧数据库升级时报错，找不到MaterialCheckRecord的date列

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.1.4_4.1.5_sqlserver.sql
6:22 下午

jeffli

解决bug：

某些旧数据库升级时报错，找不到MaterialCheckRecord的date列

Options
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.1.4_4.1.5_sqlserver.sql
6:06 下午

shuyongfu

1.器械包信息的处理科室过滤条件调整,去掉按包定义的处理科室的条件

2.使用记录转申请单的细节问题修复

Options
    • -2
    • +4
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
6:02 下午

jeffli

解决bug：

补充标识牌时，打印之后，点保存时，提示入库单明细数据不能为空。

Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
5:43 下午

zengjc

可以配置灭菌完成是否有最小时间限制.
Options
    • -0
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java
    • -16
    • +49
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
5:31 下午

adairkang

一次性物品定义的库存中是否供应室物品的常量使用Constants中定义的值
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.jsp
    • -5
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsStock.java
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp
    • -5
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
5:13 下午

shuyongfu

之前装配任务的处理科室取值为包的处理科室,现4.1改为取单的处理科室
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
5:00 下午

zengjc

广东省医定时处理灭菌炉清洗机接口数据.
Options
    • -0
    • +1
    /ssts-web/src/main/resources/spring/projects/gdsy/timer.xml
4:46 下午

zengjc

1.升级前执行脚本，添加一次性物品实例表删除外键.

2.升级后执行脚本，增加替换一级供应室和一级供应室仓库的说明.

Options
    • -2
    • +4
    /ssts-web/src/main/webapp/dataUpdater/4.0升级4.1脚本/服务器启动之前执行的脚本.txt
    • -1
    • +1
    /ssts-web/src/main/webapp/dataUpdater/4.0升级4.1脚本/服务器启动之后执行的脚本.txt
3:32 下午

shuyongfu

之前装配任务的处理科室取值为包的处理科室,现4.1改为取单的处理科室
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -2
    • +47
    /ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java
2:59 下午

jeffli

解决bug：

补充标识牌时，打印之后，点保存时，提示入库单明细数据不能为空。

Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
2:49 下午

shuyongfu

之前装配任务的处理科室取值为包的处理科室,现4.1改为取单的处理科室
Options
    • -1
    • +3
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java