forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 46
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 46
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
Monday 18 May 2020
4:19 上午

terrykwan

解决SSTS-132 改进发布包的打包和项目切换方式，使得一个发布包能用于多个不同的项目。修改了spring、mybatis等配置文件的位置，移动到了ROOT\disinfectsystem\config\${projectName}文件夹。目前只上传了广西中医药附一、中大五院、demo项目的完整配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/spring/serviceContext.xml
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/spring
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/spring
  4. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/spring/security
  5. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsrmyyzhyy/spring
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zd5y/interfaces/orInvoiceDeptConfig.json
  8. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/web-xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zd5y/interfaces/dataSyncConfig.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/web-stdxyxyfszlyy.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/interfaces/writeBackInventoryConfig.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-service.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/version.properties
  14. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/spring/security
  15. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/interfaces
  16. … 82 more files in changeset.
4:07 上午

terrykwan

增加通过file:///前缀的查找配置文件。SSTS-132 改进发布包的打包和项目切换方式，使得一个发布包能用于多个不同的项目
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/json/JsonObjectFromResourceFactoryBean.java
4:05 上午

terrykwan

增加webROOT的静态属性，便于xml文件中引用该属性。SSTS-132 改进发布包的打包和项目切换方式，使得一个发布包能用于多个不同的项目
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/Path.java
1:08 上午

terrykwan

修改售前演示项目的配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/config.js
Saturday 16 May 2020
7:41 下午

zc.li

增强：ZSWY-112；科室运作监控增加时间排序
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
7:27 下午

terrykwan

解决:GXZYYFY-50 装配任务扫描装配人和扫描审核人装配之后，右键刷新页面，关闭装配界面后重新打开，打开其他装配任务组，装配人和审核人就变成空了。,提交人:舒永福(20服务器的eclipse)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/controller/PackingController.java
5:22 下午

terrykwan

解决:ZSWY-113 临床呼吸机管道无法发货的问题,提交人:舒永福
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
Friday 15 May 2020
10:32 下午

zc.li

解决：GXZYYFY-51发货物品查询的查询结果中，增加对退货重发的记录的显示；

器械包各环节统计报表，增加退货重发的数量的统计

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
6:09 下午

jason

解决jira问题：SZSDSRMYY-10 深圳市第三人民医院 单点登录接口开发
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-szsdsrmyy.xml.back
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/sso/cas/client
  4. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/sso
  5. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/sso/cas
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/sso/cas/client/filter/UsernamePasswordAuthenticationForCasFilter.java
  7. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/sso/cas/client/filter
5:12 下午

jason

解决jira问题：SSTS-136器械包定义的图片丢失问题（完成包定义图片健康检查功能）(修改“文件日期”为“文件上传时间”)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/buttjoint/imageFileCheck.jsp
3:15 下午

terrykwan

删除zd5y的特殊的web.xml文件的配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/build.gradle
3:07 下午

terrykwan

删除zd5y的特殊的springsecurity文件的配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/build.gradle
3:05 下午

terrykwan

将深圳第三人民医院增加cas的依赖支持
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
11:49 上午

LQC

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js
9:32 上午

frank

解决GZYKDXFSKQ-63：添加回收单，有科室绑定篮筐，入筐后篮筐数量统计有问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
Thursday 14 May 2020
7:40 下午

zengyuan

修复 长沙市第四医院CSSDSYY-15 外来器械打印格式优化，并增加相应字段，小袁测试出的多次选择器械包名称，新增字段没有发现变化的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
6:07 下午

jason

解决jira问题：SSTS-136 消毒追溯系统V4.1稳定版 器械包定义的图片丢失问题（完成包定义图片健康检查功能)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/buttjoint/imageFileCheck.jsp
3:27 下午

LJH

新添加

//装配界面显示灭菌员字段

showSterileField: true,

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/nfykdxfsdsyy/config.js
2:40 下午

jason

解决jira问题：FSDERMYY-1 佛山第二人民医院 器械包定义管理，里面的批量修改功能，对部分选择的修改使用不了
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
12:03 下午

shuyongfu

解决jira问题：SZSDSRMYY-8 深圳市第三人民医院 待发货物品颜色状态显示

ASSZDFY-66发货计划模块，打开手术室的发货界面加载待发货的物品很慢

发货优化后,待发货列表消毒物品背景色的问题(有已消毒状态的包、但该消毒物品的背景未变成蓝色(还是显示黄色))、增加对有已消毒状态的包的背景色设置成蓝色

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
10:06 上午

LQC

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js
2:12 上午

terrykwan

中大五院的原来的cas的单点登录不使用了，因此删除cas相关的配置和文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-zd5y.xml.back
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
  3. /SterileSupplySystem/branches/V4.1.0/ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/sso
1:32 上午

terrykwan

中大五院的原来的cas的单点登录不使用了，因此删除此个性化的web.xml文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/web-zd5y.xml
12:13 上午

terrykwan

解决:GXZYYFY-49 4.0更新到4.1后，科室申领物品输入物品首字母不会按照正确顺序弹出相应物品。,提交人:舒永福
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
Wednesday 13 May 2020
5:45 下午

zengyuan

解决:清远市妇幼保健院QYSFYBJY-3 科室申领界面不显示整包申请的消毒物品的材料明细
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext-4.2.3/resources/ext-theme-green/custom-theme-sandbox.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qysfybjy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
3:41 下午

LQC

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/szsdsrmyy/HIS.xml
10:54 上午

zc.li

处理QYSRMYY-23:灭菌参数时间显示不正常的问题;
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/service/BelimedSterilizerRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
10:44 上午

HHM

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qysfybjy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qysfybjy/print/printConfig.js
Tuesday 12 May 2020
8:39 下午

frank

解决GZYKDXFSKQ-63：添加回收单，有科室绑定篮筐，入筐后篮筐数量统计有问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
4:41 下午

LQC

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js