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

Changeset 29927 is being indexed.

Monday 21 Dec 2020
6:46 下午

frank

解决BJ307YY-67:标签打印不出包装者、包装类型和灭菌程序简称
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
6:07 下午

zc.li

FTP增加日志内容
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/FtpFileManagerImpl.java
2:59 下午

jason

解决jira问题：东莞市东部中心医院 DGSDBZXYY-146 质量监测项统计月报查询不出数据，后台报错
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.59_4.9.60_sqlserver.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/customform/formdefinition/FormDefinitionItem.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.59_4.9.60_oracle.sql
10:26 上午

frank

解决ZSRY-5：增加新功能：标识牌信息记录(3.5 问题登记界面和备注登记界面的登记时间输入框改为可编辑)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/cardInfoMaintain.js
10:02 上午

jason

解决jira问题：增加新功能：标识牌信息记录（问题登记和备注登记页面的登记时间修改为可编辑）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/service/IDCardInfoMaintainManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/action/IDCardInfoMaintainAction.java
Sunday 20 Dec 2020
12:11 下午

terrykwan

删除掉重复的配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/config.js
Saturday 19 Dec 2020
5:51 下午

frank

解决ZSRY-5：增加新功能：标识牌信息记录(3.5 问题登记界面和备注登记界面的登记时间输入框改为可编辑)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/cardInfoMaintain.js
5:50 下午

frank

解决ZSRY-5：增加新功能：标识牌信息记录(3.5 问题登记界面和备注登记界面的登记时间输入框改为可编辑)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/cardInfoMaintain.js
5:01 下午

frank

解决ZSRY-5：增加新功能：标识牌信息记录(3.5 问题登记界面和备注登记界面的登记时间输入框改为可编辑)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/cardInfoMaintain.js
4:56 下午

jason

解决jira问题：增加新功能：标识牌信息记录（问题登记和备注登记页面的登记时间修改为可编辑）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/action/IDCardInfoMaintainAction.java
2:35 下午

frank

解决SZSDSRMYY-37：在科室申领的申请单填写界面将申请数量放在加急数量的前面
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
Friday 18 Dec 2020
7:43 下午

zc.li

完善：BJ307YY-54。登录科室是申请科室，且未配置结算科室时,查询无科室的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
7:13 下午

shuyongfu

解决:DGSDBZXYY-139 安全检测漏洞问题修复。及登录页面提示信息的显示样式调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/service/UserManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/model/User.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/model/UserLogonRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/logon.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/security/userdetails/DaoUserDetailSSTSImpl.java
4:59 下午

frank

解决ZJJSRM-40:同一外来器械包同时勾选多条装配任务进行装配会弹出提示“装配任务不能为空！”的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
4:11 下午

zc.li

解决：ZJJSRM-41。在回收时归还借物，如果是扫包实例条码进行回收，并且回收申请单中包含了消毒物品，保存时系统会报错：failed to lazily initialized...
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
12:37 下午

zc.li

修复：BJ307YY-54。退货业务改动后，核算月报退货查询不正常的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:09 上午

frank

优化SZSDSRMYY-36：同一种物品，分别用几个不同篮筐进行回收清洗，在装配页面同时扫描这几个篮筐，系统只会自动勾选上你扫描的第一个清洗篮筐里的物品
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
10:07 上午

zc.li

修复：BJ307YY-54。明细核算月报会退货会查询出其他科室的数据的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
Thursday 17 Dec 2020
11:01 下午

jason

解决jira问题：BJ307YY-47 申请单提交时要进行版本检查，避免出现数据覆盖问题(增加打印状态检查)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
10:50 下午

jason

解决jira问题：BJ307YY-47 申请单提交时要进行版本检查，避免出现数据覆盖问题(增加打印状态检查)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
10:41 下午

jason

解决jira问题：BJ307YY-47 申请单提交时要进行版本检查，避免出现数据覆盖问题(增加打印状态检查)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
10:10 下午

jason

解决jira问题：BJ307YY-47 申请单提交时要进行版本检查，避免出现数据覆盖问题(增加回收状态、发货状态检查)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
9:46 下午

jason

解决jira问题：BJ307YY-47 申请单提交时要进行版本检查，避免出现数据覆盖问题(返回修改时做检查)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
9:34 下午

jason

解决jira问题：GGSRMYY-150 器械包和一次性物品退货界面增加结算科室等优化(一次性物品退货取申请科室下的库存)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
9:14 下午

frank

回滚：允许改包装类型为"否"时，装配页面的包装类型为只读
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
8:42 下午

jason

解决jira问题：BJ307YY-47 申请单提交时要进行版本检查，避免出现数据覆盖问题(增加回收状态、发货状态检查)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
8:39 下午

zc.li

完善：BJ307YY-54。明细核算月报修复申请科室不填，退货查询不正常的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
8:03 下午

frank

打印标签灭菌程序多了个"件"
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
7:57 下午

frank

解决GGSRMYY-150:器械包和一次性物品退货界面增加结算科室等优化(结算科室手动不允许更改)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
7:55 下午

jason

解决jira问题：GGSRMYY-150 器械包和一次性物品退货界面增加结算科室等优化(查申请科室下的库存)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java