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 16571 is being indexed.

Tuesday 03 Jan 2017
8:48 下午

chenjiaru

解决：DGZYY-65 生物监测结束后增加告警提示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/portalPage.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/portalPage.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/biologymonitorwarning/BiologyMonitorWarning.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
  7. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/biologymonitorwarning
  8. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/action
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
  10. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service
  11. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/action/BiologyMonitorWarningAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/openSystemMainPage.jsp
7:38 下午

adairkang

代理灭菌扫描篮筐添加筐内已审核的物品为代理灭菌物品
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
5:47 下午

wangyi

外来器械未归还不让申请配置功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
5:05 下午

jeffli

自定义装配模块，第二次装配打印的时候需要默认装配数量和灭菌时间

丽江市人民医院LJSRMYY-13

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/ljsrmyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
5:05 下午

jeffli

标签模板中固定把科室名字加到包名字前面（BUG）

广东省人民医院GDSRMYY-231

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
4:27 下午

zhonghaowen

科室申领工具栏分行优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
4:13 下午

zhonghaowen

去掉多余的逗号
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
4:11 下午

zhonghaowen

修复花都区人民医院科室申领页面变形
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
4:11 下午

jeffli

标签模板中固定把科室名字加到包名字前面（BUG）

广东省人民医院GDSRMYY-231

【外来器械】标签模板管理-增加住院号和病区选项

花都区人民医院HDQRMYY-12

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
3:15 下午

chenjiaru

增加注释

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
3:04 下午

chenjiaru

修复器械包信息列表的bug
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
2:09 下午

zhonghaowen

科室申领流水号显示列加长
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
10:41 上午

chenjiaru

器械包信息列表的"灭菌篮筐"和"灭菌员"列互换位置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
12:13 上午

terrykwan

spring security的配置文件改为放在spring/security的文件夹，各项目不同的配置通过后缀区分，不使用时文件扩展名改为back
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-zd5y.xml.back
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/beanRefContext.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-standard.xml.back
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/zd5y/applicationContext-acegi-security.xml
12:11 上午

terrykwan

增加新模块定义，恢复保守的gradle build
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/build.gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/settings.gradle
12:09 上午

terrykwan

增加惠州中心人民医院的模块
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-hzzxrmyy-misc/build.gradle
  2. /SterileSupplySystem/branches/V4.1.0/ssts-client-hzzxrmyy-misc/src/main/java/com/forgon/disinfectsystem/security
  3. /SterileSupplySystem/branches/V4.1.0/ssts-client-hzzxrmyy-misc/src/main/java/com/forgon/disinfectsystem/security/filter
  4. /SterileSupplySystem/branches/V4.1.0/ssts-client-hzzxrmyy-misc/bin/com
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-hzzxrmyy-misc/bin/rebel.xml
  6. /SterileSupplySystem/branches/V4.1.0/ssts-client-hzzxrmyy-misc/src/test/java
  7. /SterileSupplySystem/branches/V4.1.0/ssts-client-hzzxrmyy-misc/src/main
  8. /SterileSupplySystem/branches/V4.1.0/ssts-client-hzzxrmyy-misc
  9. /SterileSupplySystem/branches/V4.1.0/ssts-client-hzzxrmyy-misc/src/main/java/com
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-hzzxrmyy-misc/src/main/resources/rebel.xml
  11. /SterileSupplySystem/branches/V4.1.0/ssts-client-hzzxrmyy-misc/bin/com/forgon/disinfectsystem/security/filter
  12. /SterileSupplySystem/branches/V4.1.0/ssts-client-hzzxrmyy-misc/.settings
  13. /SterileSupplySystem/branches/V4.1.0/ssts-client-hzzxrmyy-misc/bin/com/forgon/disinfectsystem/security
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-hzzxrmyy-misc/.settings/org.eclipse.jdt.core.prefs
  15. /SterileSupplySystem/branches/V4.1.0/ssts-client-hzzxrmyy-misc/src/main/java
  16. … 11 more files in changeset.
12:08 上午

terrykwan

补充注释信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/security/userdetails/DaoUserDetailSSTSImpl.java
Monday 02 Jan 2017
6:30 下午

chenjiaru

解决：GDSRMYY-251 器械包信息增加列
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
6:23 下午

chenjiaru

添加注释

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
5:56 下午

terrykwan

完成2个改进：

1、gradle war包自动排除不需要的项目文件夹，包括spring/projects文件夹，src/main/resources/config、disinfectsystem/config文件夹下的文件

2、修改jdbc.propertis的的project后，只需要refresh gradle dependencies，不需要rebuild整个项目

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/build.gradle
5:46 下午

terrykwan

条件加载spring security的配置文件
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/settings
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/settings/JdbcProperties.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/beanRefContext.xml
5:44 下午

terrykwan

移动标准的spring security配置文件到spring/security文件夹
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/security/applicationContext-acegi-security.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/applicationContext-acegi-security.xml
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/security
5:43 下午

terrykwan

将在线人数统计功能改为可配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/footer.jsp
5:39 下午

terrykwan

删除不需要的包引用
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseImageProcessAction.java
5:31 下午

terrykwan

删除不需要的包引用
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
Sunday 01 Jan 2017
12:40 下午

terrykwan

提交标准的web.xml文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/web-standard.xml
12:39 下午

terrykwan

增加对http 403和404错误的处理
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/web.xml
Saturday 31 Dec 2016
6:11 下午

shuyongfu

德阳市人民医院科室、人员、住院病人、门诊病人信息接口
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/WebServiceClientHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/SyncOrgUnitAndUserDaoImpl.java
  3. /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/SyncSupplierDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/FindPatientInfoByTreatmentNumDaoImpl.java
  6. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/dysyy/mybatis
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/json/AESUtil.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/dysyy/applicationContext-his.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/dysyy/applicationContext-his-gzfdzl.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/DatasyncConstant.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/FindPatientInfoByHospitalNumDaoImpl.java
4:02 下午

terrykwan

解决了启用SSO后，web service调用时spring security Authentication对象为空时报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/acegi/tools/AcegiHelper.java
3:33 下午

shuyongfu

申请单表handleDepartId字段不再使用,现删除
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java