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 14 Mar 2017
8:16 下午

zengjc

解决jira问题：GDSRMYY-282,增加'器械包次日下送率'统计报表，目前只有广东省医进行配置.
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/MorrowSendReportView.jasper
    • -0
    • +158
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseMorrowSend.js
    • -0
    • +232
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setTousseGroupOption.js
    • -0
    • +8
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +46
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseMorrowSendBean.java
    • -0
    • +193
    /ssts-web/src/main/webapp/jasperRtp/MorrowSendReportView.jrxml
    • -1
    • +2
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -0
    • +59
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseMorrowSend.jsp
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setDepartmentOption.js
    • -0
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/reportoption/GoodsOption.java
7:52 下午

shuyongfu

解决jira问题:DGDHYY-99 消毒物品价格的优化修改
Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
6:32 下午

adairkang

GDSRMYY-283 自定义装配第一次装配完后灭菌日期与装配数量需要回复默认
Options
    • -2
    • +18
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
    • -3
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/config/ljsrmyy/config.js
    • -3
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/config/sznsrmyy/config.js
    • -2
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/config/dysyy/config.js
    • -3
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js
6:30 下午

shuyongfu

解决jira问题:DGDHYY-99 消毒物品价格的优化修改
Options
    • -0
    • +16
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.7.1_4.7.2_sqlserver.sql
    • -0
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
    • -0
    • +17
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.7.1_4.7.2_oracle.sql
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -5
    • +68
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
6:25 下午

jeffli

包定义是否发货，去掉注释
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
6:19 下午

adairkang

器械包实际负载组合统计报表修改显示名称
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOverLoad.js
4:36 下午

adairkang

DYSYY-29 PDA自定义发货页面的优化
Options
    • -1
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
    • -1
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
3:56 下午

jeffli

发货计划测试用例
Options
    • -0
    • +166
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoicePlanManagerTest.java
3:55 下午

jeffli

解决：GZFDZL-101

器械包属性增加一个“标识牌自动废弃”属性。

Options
    • -1
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcardinstance/IDCardInstance.java
    • -0
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionUtils.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -1
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • -1
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
3:47 下午

shuyongfu

审核页面,config.js增加配置项:灭菌程序为"无"的器械包是否不能一键审核,true为不能一键审核,false表示可以一键审核,默认时为true
Options
    • -1
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/config.js
    • -15
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
11:04 上午

adairkang

HDQRMYY-20 pda添加新的使用记录时，如果住院号已经登记过有旧使用记录，会把已登记的器械包连带出来
Options
    • -0
    • +7
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManager.java
    • -12
    • +14
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordToJson.java
    • -0
    • +8
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
Monday 13 Mar 2017
10:54 下午

chenjiaru

补上器械材料定义那一块的测试用例
Options
    • -32
    • +5
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
    • -1
    • +1
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/material/AllTests.xml
    • -6
    • +32
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java
    • -0
    • +6
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • -11
    • +46
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
    • -0
    • +191
    /ssts-web/src/test/java/test/forgon/disinfectsystem/material/service/MterialDefinitionManagerTest.java
    • -22
    • +16
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js
    • -99
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/material/service/UpdateMterialIsImplantPropertyTest.java
6:51 下午

jeffli

增加判空处理
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
5:58 下午

jeffli

解决bug：HDQRMYY-19

申领单中包含（需回收）和（不需要回收）的物品时，此单未被回收的情况下，不需要回收的物品不能进行发货

Options
    • -5
    • +8
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
5:40 下午

zhonghaowen

修改聚合包信息页面，支持大号字体
Options
    • -6
    • +30
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.jsp
4:59 下午

jeffli

解决bug：HDQRMYY-19

申领单中包含（需回收）和（不需要回收）的物品时，此单未被回收的情况下，不需要回收的物品不能进行发货

Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • -0
    • +31
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -0
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemUtils.java
    • -0
    • +366
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoicePlanManagerTest.java
4:15 下午

chenguina

PDA 版本更新到4.5.40
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.38_20170309.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.40_20170313.apk
2:58 下午

zhonghaowen

新建或者修改申请单时,如果申请项有不需要回收的物品且是否终止不为true时,则申请单的includeInvoiceItems设置为1
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
2:54 下午

shuyongfu

科室干预模板文件调整
Options
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/interfere/orgUnit/sameOrgUnitTemplate.xls
2:34 下午

jeffli

还原过滤发货计划的sql，过滤掉待回收状态的单。
Options
    • -2
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
12:37 下午

chenjiaru

修复删除包定义删除不了的bug
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
11:36 上午

zhonghaowen

优化器械包删除判断逻辑
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -2
    • +3
    /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/action/TousseDefinitionAction.java
11:11 上午

shuyongfu

中大五院config.js设置配置项,隐藏同步入库单的几个菜单页面
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js
11:06 上午

jeffli

解决bug：

退货多个消毒物品时，会丢失部分物品

Options
    • -1
    • +3
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -0
    • +1
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
12:08 上午

shuyongfu

解决测试用例代码编译报错的问题
Options
    • -7
    • +7
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/TousseIntoBasketRestrictionsTests.java
Sunday 12 Mar 2017
11:02 下午

wangyi

完成：ZSYY-28，装配扫篮筐自动获取标识牌条码装配
Options
    • -2
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
    • -0
    • +15
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • -0
    • +10
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • -6
    • +118
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -0
    • +5
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • -0
    • +10
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskVo.java
    • -9
    • +16
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -2
    • +2
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
    • -0
    • +16
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
8:06 下午

shuyongfu

新增demo的项目及相关配置文件
Options
    • -6
    • +6
    /ssts-web/src/main/resources/spring/projects/demo/applicationContext-demo.xml
6:07 下午

chenjiaru

解决jira问题：GDSRMYY-281 增加"灭菌区工作量统计报表"
Options
    • -0
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationAreaWorkLoadView.jsp
    • -2
    • +32
    /forgon-tools/src/main/java/com/forgon/tools/util/ForgonDateUtils.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManager.java
    • -1
    • +12
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +150
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationAreaWorkLoadView.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • -0
    • +57
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SterilizationAreaWorkLoadBean.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/sterilizationAreaWorkLoad.jasper
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -1
    • +6
    /forgon-core/src/main/java/com/forgon/systemsetting/service/HttpOptionManager.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +209
    /ssts-web/src/main/webapp/jasperRtp/sterilizationAreaWorkLoad.jrxml
  16. … 3 more files in changeset.
Saturday 11 Mar 2017
5:18 下午

shuyongfu

新增demo的项目及相关配置文件
Options
    • -0
    • +67
    /ssts-web/src/main/webapp/disinfectsystem/config/demo/config.js
    • -0
    • +139
    /ssts-web/src/main/resources/spring/projects/demo/applicationContext-demo.xml
    • -0
    • +22
    /ssts-web/src/main/resources/config/demo/mybatis/FindPatientInfoByTreatmentNumMapper.xml
  4. /ssts-web/src/main/webapp/disinfectsystem/config/demo/img
    • -0
    • +1
    /ssts-web/src/main/resources/jdbc.properties
    • -0
    • +6
    /ssts-web/src/main/resources/config/demo/writeBackInventoryConfig.json
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/config/demo/img/logo.jpg
    • -0
    • +23
    /ssts-web/src/main/resources/config/demo/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -0
    • +1315
    /ssts-web/src/main/webapp/disinfectsystem/config/demo/print/printConfig.js
  10. /ssts-web/src/main/resources/config/demo/mybatis
    • -0
    • +95
    /ssts-web/src/main/resources/config/demo/mybatis/syncFromHERP_Mapper.xml
  12. /ssts-web/src/main/webapp/disinfectsystem/config/demo/print
  13. /ssts-web/src/main/resources/spring/projects/demo
  14. /ssts-web/src/main/resources/config/demo
  15. /ssts-web/src/main/webapp/disinfectsystem/config/demo
  16. … 3 more files in changeset.
4:42 下午

jeffli

解决bug：HDQRMYY-19

申领单中包含（需回收）和（不需要回收）的物品时，此单未被回收的情况下，不需要回收的物品不能进行发货

Options
    • -2
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java