forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 67
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 67
Total Lines of Code (LoC): 4,801,740
Net change in LoC this week: 2,371

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
Tuesday 22 Aug 2017
2:04 下午

shuyongfu

新增佛山妇幼科室、人员及病人webservice接口相关代码
Options
    • -0
    • +119
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/fsfy/WebServiceClientHelper.java
    • -0
    • +91
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/fsfy/FindPatientInfoByHospitalNumDaoImpl.java
    • -0
    • +82
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/fsfy/FindPatientInfoByTreatmentNumDaoImpl.java
    • -43
    • +3
    /ssts-web/src/main/resources/spring/projects/fsfy/applicationContext-his-fsfy.xml
    • -0
    • +135
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/fsfy/SyncOrgUnitAndUserDaoImpl.java
    • -0
    • +70
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/fsfy/DatasyncConstant.java
    • -55
    • +0
    /ssts-web/src/main/resources/spring/projects/fsfy/timer.xml
  8. /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/fsfy
  9. /ssts-web/src/main/resources/config/fsfy/mybatis
    • -22
    • +0
    /ssts-web/src/main/resources/config/fsfy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • -37
    • +0
    /ssts-web/src/main/resources/config/fsfy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -28
    • +0
    /ssts-web/src/main/resources/config/fsfy/mybatis/SyncOrgUnitAndUserMapper.xml
2:00 下午

zengjc

清洗记录保存的所有代码从action转移到manager里面，防止提示保存失败，缺实际保存成功某些属性的问题.
Options
    • -0
    • +123
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -101
    • +3
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • -0
    • +6
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
1:50 下午

adairkang

重构
Options
    • -8
    • +2
    /ssts-toussereturndisinfect/src/main/java/com/forgon/disinfectsystem/tousseReturnDisinfectRecord/action/TousseReturnDisinfectRecordAction.java
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -5
    • +5
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/mobilenursing/common/service/MobileNursingWebServiceImpl.java
    • -1
    • +4
    /ssts-toussereturndisinfect/src/main/java/com/forgon/disinfectsystem/tousseReturnDisinfectRecord/service/TousseReturnDisinfectRecordManagerImpl.java
    • -1
    • +1
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -6
    • +1
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
    • -2
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
    • -8
    • +9
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/ScanBasketInvoiceTests.java
    • -2
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java
    • -23
    • +7
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -9
    • +33
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceProduceParam.jsp
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -4
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
    • -1
    • +2
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java
    • -3
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
11:33 上午

adairkang

DGZYY-114 打印回收清单增加申请单备注内容
Options
    • -0
    • +38
    /ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js
    • -0
    • +30
    /forgon-tools/src/main/java/com/forgon/tools/json/JsonIncludePropertyFilter.java
    • -0
    • +17
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -0
    • +7
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -0
    • +6
    /forgon-tools/src/main/java/com/forgon/tools/json/DateJsonValueProcessor.java
11:23 上午

shuyongfu

新增深圳南山区人民医院病人接口相关代码
Options
    • -0
    • +50
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsrmyy/DatasyncConstant.java
    • -0
    • +134
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsrmyy/SyncOrgUnitAndUserDaoImpl.java
    • -0
    • +80
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsrmyy/FindPatientInfoByTreatmentNumDaoImpl.java
    • -0
    • +88
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsrmyy/FindPatientInfoByHospitalNumDaoImpl.java
    • -35
    • +0
    /ssts-web/src/main/resources/config/sznsrmyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • -28
    • +0
    /ssts-web/src/main/resources/config/sznsrmyy/mybatis/SyncOrgUnitAndUserMapper.xml
  7. /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsrmyy
    • -44
    • +0
    /ssts-web/src/main/resources/config/sznsrmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -0
    • +68
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsrmyy/WebServiceClientHelper.java
    • -2
    • +33
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • -44
    • +6
    /ssts-web/src/main/resources/spring/projects/sznsrmyy/applicationContext-his.xml
10:08 上午

adairkang

sterile调用idcard中的方法，没有添加依赖
Options
    • -0
    • +1
    /build.gradle
9:21 上午

jeffli

ZSYY-117

外来器械小标签格式调整

Options
    • -0
    • +75
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
9:21 上午

jeffli

FSFY-1

佛山妇幼保健院

Options
    • -0
    • +23
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/dwr/table/ForeignProxyDisinfectionTableManager.java
    • -4
    • +6
    /ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/util/IDCardInstanceUtils.java
9:20 上午

jeffli

重构代码
Options
    • -9
    • +20
    /ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/action/SatisfactionSurveyTableAction.java
Monday 21 Aug 2017
8:53 下午

shuyongfu

注释更正
Options
    • -1
    • +1
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsdhyy/FindPatientInfoByTreatmentNumDaoImpl.java
6:48 下午

zengjc

修复启动清洗顺序时，手工清洗后，修改清洗机，能保存没有手工清洗篮筐的问题。
Options
    • -2
    • +7
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -2
    • +3
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
6:26 下午

adairkang

DGZYY-116 清洗记录增加限制,保存以后再打开也需要验证。可能打开后再添加篮筐
Options
    • -3
    • +4
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
6:25 下午

liuliben

代码格式修改
Options
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java
    • -1
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
    • -3
    • +1
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
5:57 下午

chenjiaru

解决jira问题：DGZYY-120 科室申请增加提示和限制
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • -0
    • +26
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
    • -2
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • -9
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
5:52 下午

shuyongfu

解决jira问题:SZNSRMYY-5 HIS接口开发与移动护理系统的使用记录页面嵌入

增加对这个嵌入jsp及相关请求资源的放行

Options
    • -0
    • +2
    /ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-standard.xml.back
    • -0
    • +2
    /ssts-web/src/main/resources/spring/security/applicationContext-acegi-security.xml
4:40 下午

adairkang

DGZYY-116 清洗记录增加限制
Options
    • -15
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js
4:26 下午

adairkang

DGZYY-116 清洗记录增加限制
Options
    • -12
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • -4
    • +4
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
    • -15
    • +6
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -1
    • +1
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
3:45 下午

zengjc

添加注释，清洗机是否手工清洗机属性说明.
Options
    • -1
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/rinser/Rinser.java
3:04 下午

liuliben

修改获取供应商方法
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManager.java
    • -6
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
    • -1
    • +1
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
2:31 下午

zengjc

解决jira问题DGZYY-116，添加清洗篮筐机洗之前，要先用手工清洗机清洗，其中判断清洗机是否手工清洗机，可以对清洗机进行配置，目前只有东莞中医院进行配置.
Options
    • -0
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/rinser/Rinser.java
    • -0
    • +5
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
    • -2
    • +18
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • -0
    • +7
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • -0
    • +61
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -1
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
    • -2
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js
12:11 下午

shuyongfu

解决jira问题:DGDHYY-108 系统告警优化
Options
    • -0
    • +6
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
    • -1
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp
    • -5
    • +44
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js
11:45 上午

liuliben

材料同步退库按供应商和价格退库修改
Options
    • -2
    • +8
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java
    • -2
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
    • -1
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManager.java
    • -1
    • +1
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
Saturday 19 Aug 2017
8:10 下午

chenjiaru

解决jira问题：ZSYY-113 一次性物品申请单录单界面调整
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • -87
    • +61
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
7:53 下午

adairkang

测试用例的异常直接上抛
Options
    • -6
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/MaterialSupplementTests.java
10:26 上午

jeffli

SZNSRMYY-4

外来器械包，装配拆分页面显示该器械所属病人、供应商、住院号

Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -3
    • +51
    /ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
    • -0
    • +10
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskVo.java
    • -0
    • +10
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java
    • -0
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
Friday 18 Aug 2017
9:49 下午

chenjiaru

提交注释代码
Options
    • -0
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
9:20 下午

adairkang

PDA使用记录扫描包实例，将包定义的类型传回到PDA,在聚合包不能快速回收限制中有用
Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
6:55 下午

liuliben

同步退库：增加材料退库时本地物品库存按同供应商同价格获取
Options
    • -0
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java
    • -0
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManager.java
    • -1
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
    • -4
    • +7
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
6:17 下午

chenjiaru

隐藏“回收申请单”的库存列
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
6:04 下午

shuyongfu

解决jira问题:CDSLQYQYYY-25 不追溯器械包扫描功能增强(pda与pc使用记录增加对固定条码扫描的支持)
Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java