forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 43
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 43
Total Lines of Code (LoC): 0
Net change in LoC this week: 0

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
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 12503 is being indexed.

Monday 07 Mar 2016
11:26 下午

terrykwan

默认禁用标识牌
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity
  2. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager
  3. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
Monday 29 Feb 2016
11:57 上午

adairkang

同步4.0的外部代理灭菌单的签收功能
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
Wednesday 24 Feb 2016
6:29 下午

jeffli

同步4.0稳定版的修改
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-zd5y-misc
  2. /SterileSupplySystem/branches/V4.1.0/ssts-zd5y-misc/src
  3. /SterileSupplySystem/branches/V4.1.0/ssts-zd5y-misc/src/main
  4. /SterileSupplySystem/branches/V4.1.0/ssts-zd5y-misc/src/main/java
  5. /SterileSupplySystem/branches/V4.1.0/ssts-zd5y-misc/src/main/java/com
  6. /SterileSupplySystem/branches/V4.1.0/ssts-zd5y-misc/src/main/java/com/forgon
  7. /SterileSupplySystem/branches/V4.1.0/ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem
  8. /SterileSupplySystem/branches/V4.1.0/ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/webservice
  9. /SterileSupplySystem/branches/V4.1.0/ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/webservice/manager
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/webservice/manager/ZdwyWebServiceManagerImpl.java
6:29 下午

jeffli

同步4.0稳定版的修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
  4. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager/stockTakeInfoView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager/disposableGoodInfoView.js
  7. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsly
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsly/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/web/service/HomePageModelManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/UpdateReviewBasketReviewRecordManyToMany.java
6:28 下午

jeffli

同步4.0稳定版的修改
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/recall
  4. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
  6. /SterileSupplySystem/branches/V4.1.0/ssts-sterile
  7. /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src
  8. /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main
  9. /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java
  10. /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com
  11. /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon
  12. /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem
  13. /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager
  14. /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord
  15. /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr
  16. … 182 more files in changeset.
Friday 19 Feb 2016
5:04 下午

jeffli

解决bug：

清洗不合格报表，不能同时支持sql server和oracle

Options
  1. /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/databaseadapter
  2. /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/databaseadapter/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java
  4. /SterileSupplySystem/branches/V4.1.0/ssts-reports
  5. /SterileSupplySystem/branches/V4.1.0/ssts-reports/src
  6. /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main
  7. /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java
  8. /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com
  9. /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon
  10. /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem
  11. /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports
  12. /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
4:49 下午

jeffli

解决bug：

申请单列表界面，鼠标移到某一条记录上查看物品申请列表，消毒物品名称带下划线

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
Monday 15 Feb 2016
4:40 下午

terrykwan

解决jar通配符路径不正确的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/struts.xml
12:24 下午

jeffli

测试用例调整
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/TestDisinfectGoodsSteriliManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java
Sunday 14 Feb 2016
6:58 下午

jeffli

测试用例调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/DeleteRecyclingRecordItemTests.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
  4. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/AddRecyclingRecordTests.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerTests.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTaskTests.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/AddRecyclingItemsForRecyclingRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingMaterialsTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingBasketTests.java
4:44 下午

jeffli

解决bug：

科室申领界面直接填写一次性物品数量后提交，包定义id为空

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
4:11 下午

jeffli

解决bug：

科室申领界面直接填写物品数量后提交，包定义id为空

Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate
  2. /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
4:05 下午

terrykwan

去掉调试的信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
3:16 下午

terrykwan

提交升级到java8.0后的代码
Options
  1. /SterileSupplySystem/branches/V4.1.0/forgon-core
  2. /SterileSupplySystem/branches/V4.1.0/forgon-core/src
  3. /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main
  4. /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java
  5. /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com
  6. /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon
  7. /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/search
  8. /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/search/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/search/service/IndexHelper.java
  10. /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/oa
  11. /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/oa/wordtemplate
  12. /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/oa/wordtemplate/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/oa/wordtemplate/service/TemplateManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/localrepo/org.hibernate/hibernate-commons-annotations/5.0.1.Final/hibernate-commons-annotations-5.0.1.Final.jar
  15. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources
  16. … 350 more files in changeset.
3:09 下午

terrykwan

修改广医二院申请单的类型
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main
  4. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp
  5. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem
  6. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config
  7. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gyey
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gyey/config.js
1:12 下午

jeffli

功能修改：

保存通用申请单时，判断消毒物品包定义是否是用于显示的。

Options
  1. /
  2. /SterileSupplySystem
  3. /SterileSupplySystem/branches
  4. /SterileSupplySystem/branches/V4.1.0
  5. /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication
  6. /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src
  7. /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main
  8. /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java
  9. /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com
  10. /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon
  11. /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem
  12. /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication
  13. /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
Wednesday 02 Jan 2008
12:41 上午

zc.li

设备接口添加注释，调用listFiles时设置被动模式改为新建FtpClient时设置。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/FtpFileManagerImpl.java
12:35 上午

zengyuan

广东省人民医院GDSRMYY-503 高级视图-外部代理灭菌：打印申请单成功后会有一个异常信息提示框
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp
Tuesday 01 Jan 2008
6:57 上午

terrykwan

修改绿色和蓝色的颜色值，使之视觉效果更好：绿色不那么刺眼；蓝色和黑色的文字更加容易识别，之前比较难看清黑色的文字
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/common.css
4:59 上午

zc.li

代码补充
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
4:54 上午

zc.li

解决：ASSZDFY-41。优化灭菌管理PC端和PDA端登记灭菌记录时扫描固定条码读取不追溯包实例的速度.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
4:24 上午

zengyuan

广东省人民医院GDSRMYY-504 临床科室用IE浏览器登录后点击科室申领无法申领物品的图标
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion3.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion3.jsp
1:51 上午

zengyuan

广东省人民医院GDSRMYY-512 外来器械拆分装配界面，待拆分材料列表的材料显示不完整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
12:39 上午

jason

后台提示信息命名'msg'改成'message'
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java