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
Tuesday 19 Sep 2017
2:58 下午

adairkang

ZJYY-4 回收记录单页面增加保存并打印包内清点按钮
Options
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/action/BeCleanItemAction.java
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js
    • -0
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingMaterialsTest.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -1
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
    • -0
    • +34
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingPrintItem.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -0
    • +137
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingPrintData.java
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifiedItem.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +7
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • -3
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  16. … 4 more files in changeset.
2:13 下午

chenjiaru

解决jira问题：FSFY-4 手术室等离子灭菌炉不能自动完成灭菌
Options
    • -15
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java
10:26 上午

liuliben

解决器械包定义添加材料重复问题
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -7
    • +19
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
Monday 18 Sep 2017
6:46 下午

cherry

1.增加退货后发货场景

2.优化登录代码

Options
    • -14
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • -64
    • +80
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java
5:19 下午

liuliben

解决基础数据导入一次性物品重复问题
Options
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
3:22 下午

jeffli

广东省人民医院GDSRMYY-368

一次性物品发货时第一个批次库存不能满足发货计划，要做出语音提示

Options
    • -0
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
3:17 下午

jeffli

广东省人民医院GDSRMYY-367

一次性物品退货时如果物品的批次原数量为0系统则提示‘是否打印退货物品批次条码’

Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnDisposableGoodsByInvoicePlan.jsp
    • -1
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnDisposableGoodsByInvoicePlan.js
    • -4
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm_common.js
2:54 下午

jeffli

广东省人民医院GDSRMYY-367

一次性物品退货时如果物品的批次原数量为0系统则提示‘是否打印退货物品批次条码’

Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnDisposableGoodsByInvoicePlan.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnDisposableGoodsByInvoicePlan.jsp
2:05 下午

jeffli

广东省人民医院GDSRMYY-367

一次性物品退货时如果物品的批次原数量为0系统则提示‘是否打印退货物品批次条码’

Options
    • -1
    • +45
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
    • -0
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm_common.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.jsp
12:05 下午

jeffli

中山一院消毒供应项目ZSYY-137

聚合包装配界面增加打印张数

Options
    • -11
    • +17
    /ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
11:33 上午

chenjiaru

申请数量干预的功能，支持干预消毒物品的材料数量
Options
    • -1
    • +44
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
Sunday 17 Sep 2017
11:28 上午

jeffli

中山一院消毒供应项目ZSYY-137

聚合包装配界面增加打印张数

Options
    • -0
    • +14
    /ssts-web/src/main/webapp/js/extUtils.js
    • -13
    • +151
    /ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
Saturday 16 Sep 2017
9:25 上午

shuyongfu

过期器械包录使用记录的消息返回调整
Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
Thursday 14 Sep 2017
9:09 下午

liuliben

修改器械包添加材料，不允许同名称同规格的材料添加！
Options
    • -0
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
9:02 下午

shuyongfu

深圳南山人民医院科室人员、住院病人同步接口
Options
    • -0
    • +2
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsrmyy/FindPatientInfoByHospitalNumDaoImpl.java
    • -71
    • +76
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsrmyy/SyncOrgUnitAndUserDaoImpl.java
    • -8
    • +18
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsrmyy/DatasyncConstant.java
    • -9
    • +0
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsrmyy/WebServiceClientHelper.java
8:56 下午

shuyongfu

录使用记录扫描器械包增加失效期的验证
Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
5:58 下午

jeffli

解决发货状态bug
Options
    • -0
    • +11
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
5:50 下午

shuyongfu

移动护理接口数据格式统一调整
Options
    • -17
    • +23
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java
4:29 下午

shuyongfu

新增加器械包定义的初始化基础数据定义,修改相应的测试用例
Options
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionManagerTests.java
2:43 下午

adairkang

ZJYY-5 发货管理内打印的发货单格式不合适现场
Options
    • -7
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js
2:30 下午

adairkang

ZJYY-5 发货管理内打印的发货单格式不合适现场
Options
    • -32
    • +31
    /ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js
2:11 下午

adairkang

没有调用，删除
Options
    • -20
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
12:50 下午

yanweining

gyey:根据hl7记录患者入院信息
Options
    • -0
    • +162
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/gyey/PatientAdmissionInfo.java
    • -5
    • +117
    /ssts-webservice/src/main/java/com/goodwillcis/HL7V2ServiceImpl.java
    • -6
    • +17
    /ssts-web/src/main/resources/spring/projects/gyey/applicationContext-his-gyey.xml
    • -2
    • +2
    /ssts-webservice/src/main/java/com/goodwillcis/SysUserAndOrgServiceImpl.java
  5. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/gyey
    • -0
    • +10
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/gyey/PatientAdmissionInfoManager.java
    • -0
    • +13
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/gyey/PatientAdmissionInfoManagerImpl.java
    • -7
    • +15
    /ssts-web/src/main/resources/config/gyey/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -0
    • +294
    /forgon-tools/src/main/java/com/forgon/tools/HL7ToXmlConverter.java
    • -0
    • +20
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
  11. /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/gyey
    • -0
    • +18
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
11:40 上午

adairkang

外来器械合并到通用申请单，回收时的回收数量问题
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
11:16 上午

shuyongfu

解决器械包定义的材料清单不能录入一次性物品的问题
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • -0
    • +1
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBaseDataFromZipManagerImpl.java
10:53 上午

jeffli

广东省人民医院GDSRMYY-365

一次性物品申请单需要打印后才产生发货计划

Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
10:53 上午

jeffli

广东省人民医院GDSRMYY-365

一次性物品申请单需要打印后才产生发货计划

Options
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -0
    • +8
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
10:37 上午

adairkang

GDSRMYY-366 增加配置项：‘一次性物品申请单发货计划单条码配置’
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
Wednesday 13 Sep 2017
8:41 下午

chenjiaru

修改注释
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
8:29 下午

chenjiaru

解决jira问题： ZSYY-109 申请单部分终止功能改进
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js