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 20 Oct 2017
8:23 下午

adairkang

JMKQYY-4 回收清洗优化，清洗筐只有装配完成才能回收，做成默认配置，增加 东莞计生中心、东莞东华、德阳市人民医院、广东省第二中医院、广东省医、广西中医药附一、贵阳市第二人民医院、广州番禺区中医院、广州中医药附三、惠州市中心人民医院、江门市人民医院、深圳南山妇幼、深圳南山人民医院、珠江医院 配置为可以回收
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dysyy/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gd2zyy/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/sznsrmyy/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/sznsfy/config.js
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/dgjszx/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gysdermyy/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/jmszxyy/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/config.js
5:13 下午

chenguina

PDA版本自动升级到4.5.90
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.90_20171020_4.1.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.88_20170819_4.1.apk
5:08 下午

yanweining

ZSYY-171:一次性物品数据和HRP系统同步

Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -8
    • +26
    /ssts-web/src/main/webapp/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -0
    • +27
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -2
    • +43
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
    • -1
    • +10
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dwr/InventoryTableManager.java
    • -2
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • -16
    • +129
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
    • -0
    • +7
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
4:20 下午

shuyongfu

巫劲锋发回来的清远市人民医院现场配置文件
Options
    • -18
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/print/printConfig.js
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js
4:12 下午

adairkang

JMKQYY-4 回收清洗优化，清洗筐只有装配完成才能回收，做成默认配置，增加 龙泉驿区、佛山妇幼、小榄、中山眼科、丽江市人民医院 配置为可以回收
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/ljsrmyy/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/fsfy/config.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js
3:54 下午

liuliben

修改方法名称
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManager.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
3:01 下午

chenjiaru

解决jira问题：JMKQYY-11 申请物品检索界面优化
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -4
    • +5
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
12:49 下午

chenjiaru

解决jira问题： GDSRMYY-373 一次性物品部分发货后，未发货的物品需要能修改数量
Options
    • -49
    • +109
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
11:06 上午

adairkang

JMKQYY-4 回收清洗优化，清洗筐只有装配完成才能回收，做成默认配置，成都五冶、东莞市中医院、广州复大肿瘤、花都区人民医院、清远市人民医院、中大复一配置为可以回收
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/cdswyyy/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js
    • -1
    • +1
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/hdqrmyy/config.js
10:41 上午

liuliben

解决：德阳添加清洗时提示该篮筐内部分物品已装配并打印标签，不能再次清洗的问题。清洗时获取的未清洗篮筐改为获取未清洗未装配任务的篮筐
Options
    • -2
    • +3
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
    • -0
    • +23
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManager.java
9:52 上午

cherry

增加还物单扫描篮筐后的对话框点击
Options
    • -1
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
Thursday 19 Oct 2017
10:37 下午

adairkang

JMKQYY-4 回收清洗优化
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/jmkqyy/config.js
    • -0
    • +37
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordComparator.java
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/container/Container.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -0
    • +39
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -0
    • +38
    /forgon-tools/src/main/java/com/forgon/tools/compare/DateComparator.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -0
    • +14
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
10:00 下午

chenjiaru

解决jira问题： GDSRMYY-373 一次性物品部分发货后，未发货的物品需要能修改数量
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -2
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -8
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • -0
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
6:20 下午

cherry

1.优化代码

2.增加召回的场景

Options
    • -1
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java
    • -19
    • +20
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Reject.java
    • -7
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Sign.java
    • -2
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java
    • -1
    • +13
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • -2
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Consume.java
    • -0
    • +115
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recall.java
    • -2
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java
5:48 下午

adairkang

JMKQYY-7 用户条码优化
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • -0
    • +1
    /ssts-web/src/main/webapp/systemmanage/userFormExt.jsp
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/jmkqyy/config.js
5:11 下午

shuyongfu

回收扫描篮筐条码的action方法返回的篮筐状态与前台所取的篮筐状态属性不一致的调整
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
11:52 上午

adairkang

装配扫描标识牌加载丢失报损信息
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
11:15 上午

shuyongfu

器械包库存页面对校正库存按钮增加权限控制
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.js
12:14 上午

shuyongfu

解决jira问题:QYSRMYY-8 器械包库存
Options
    • -4
    • +27
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java
    • -1
    • +18
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.js
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -0
    • +8
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManager.java
    • -0
    • +14
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • -0
    • +38
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -0
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -9
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp
12:09 上午

shuyongfu

增加新日志模块常量定义及保存日志方法单独弄到一个事务里
Options
    • -3
    • +24
    /forgon-core/src/main/java/com/forgon/log/service/LogManagerImpl.java
    • -0
    • +1
    /forgon-core/src/main/java/com/forgon/log/model/Log.java
Wednesday 18 Oct 2017
7:05 下午

jeffli

广东省人民医院GDSRMYY-375

无菌物品发货语音提示

Options
    • -0
    • +19
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
    • -10
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
7:04 下午

jeffli

广东省人民医院GDSRMYY-375

无菌物品发货语音提示

Options
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -0
    • +4
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -0
    • +19
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
    • -0
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java
    • -1
    • +12
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
5:57 下午

chenjiaru

解决jira问题： GDSRMYY-390 在申领模版中直接填写数量申请，对应的绑定申请的物品没有被申领
Options
    • -5
    • +5
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • -1
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -9
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindHandler.js
4:59 下午

adairkang

FSFY-3 审核打印标签的界面优化问题
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
4:12 下午

jeffli

解决清远中标签bug：

打印科室来源设置成无，还是会打印科室

Options
    • -3
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/print/printConfig.js
3:11 下午

adairkang

ZSYY-134 手工添加回收没有使用记录登记的丢失报损信息
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
11:28 上午

liuliben

修改触模屏清洗样式
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/washformstyle.css
10:39 上午

cherry

增加广州市中医院的配置
Options
    • -0
    • +16
    /ssts-web/src/main/resources/config/gzszyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • -0
    • +40
    /ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js
  3. /ssts-web/src/main/resources/spring/projects/gzszyy
  4. /ssts-web/src/main/resources/config/gzszyy
  5. /ssts-web/src/main/resources/config/gzszyy/mybatis
  6. /ssts-web/src/main/webapp/disinfectsystem/config/gzszyy
    • -0
    • +22
    /ssts-web/src/main/resources/config/gzszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -0
    • +106
    /ssts-web/src/main/resources/spring/projects/gzszyy/HIS.xml
    • -0
    • +1042
    /ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js
    • -0
    • +22
    /ssts-web/src/main/resources/config/gzszyy/mybatis/SyncOrgUnitAndUserMapper.xml
    • -0
    • +75
    /ssts-web/src/main/resources/spring/projects/gzszyy/timer.xml
    • -0
    • +15
    /ssts-web/src/main/resources/config/gzszyy/dataSyncConfig.json
  13. /ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print
10:03 上午

jeffli

广东省人民医院GDSRMYY-374

一次性物品退货时，可退货数量需是未转换系数的数量

Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
9:29 上午

jeffli

广东省人民医院GDSRMYY-374

一次性物品退货时，可退货数量需是未转换系数的数量

Options
    • -2
    • +10
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
    • -1
    • +2
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java