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

Tuesday 29 Jun 2021
1:38 下午

jason

解决jira问题：SSTS-395 满意度调查报表提交后提示“保存成功”，但是实际上没有提交成功
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTableManagerImpl.java
Monday 28 Jun 2021
5:44 下午

jason

解决jira问题：GGSRMYY-147 登录临床科室后，科室申领添加申请单时，申请科室和结算科室需要锁定为登录科室
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.78_4.9.79_oracle.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.78_4.9.79_sqlserver.sql
4:21 下午

frank.qiu

优化SSTS-380：视频播放功能改进为不需要使用Flash插件，新版本的浏览器能直接通过HTML5.0技术进行播放
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/watchVideoModel.jsp
3:56 下午

jason

解决jira问题：SSTS-380：视频播放功能改进为不需要使用Flash插件，新版本的浏览器能直接通过HTML5.0技术进行播放
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageAndVideoAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/videomanager/service/VideoFileManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/videomanager/service/VideoFileManager.java
2:58 下午

frank.qiu

解决了 ZJYY-53 - 外来器械包申请单界面字段别名设置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js
1:55 下午

HHM

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/spring/timer.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/menu/menuconfigure.js
Friday 25 Jun 2021
8:27 下午

jason

解决jira问题：GGSRMYY-147 登录临床科室后，科室申领添加申请单时，申请科室和结算科室需要锁定为登录科室(升级脚本)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.78_4.9.79_sqlserver.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.78_4.9.79_oracle.sql
7:50 下午

frank.qiu

解决了 GGSRMYY-147 - 登录临床科室后，科室申领添加申请单时，申请科室和结算科室需要锁定为登录科室
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/systemset/operationDefine.xml
5:03 下午

jason

解决jira问题：XKYY-204 广州胸科升级前后对比-4.1增加4.0版本中的【一次性物品月盘点记录】功能(代码还原)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/service/StockTakeRecordManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/action/StockTakerRecordController.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/service/StockTakeRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/StockTakeRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/dwr/table/StockTakeRecordTableManager.java
4:50 下午

frank.qiu

解决了 XKYY-204 - 广州胸科升级前后对比-4.1增加4.0版本中的【一次性物品月盘点记录】功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/stocktakerecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/stocktakerecordView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/importMonthGoodsStock.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xkyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
2:51 下午

frank.qiu

解决了 SSTS-393 - 开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode后，连续扫描同一固定条码回收，回收数量和装载数量没有实现+1的效果(解决扫描消毒物品固定条码数量没有加1的问题)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
Thursday 24 Jun 2021
6:38 下午

LQC

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
6:38 下午

LQC

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/menu/menuconfigure.js
6:38 下午

LQC

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/config.js
5:20 下午

frank.qiu

解决了 FSSDERMYY-5 - 发货计划扫灭菌筐发货，如果灭菌筐中没有装该科室的器械包，则会卡死在这个页面
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
5:13 下午

zc.li

注释修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
5:09 下午

zc.li

解决：SZSLHQZXYY-8.开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode后，扫包实例条码回收消毒物品会多出申请项，导致单状态变成部分回收的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
3:57 下午

jason

解决jira问题：ZSYKZX-148 科室干预里导入文件最终报错(检查导入文件里的新科室编码是否在系统里存在)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
3:53 下午

frank.qiu

解决了 SSTS-393 - 开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode后，连续扫描同一固定条码回收，回收数量和装载数量没有实现+1的效果
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
3:39 下午

zc.li

解决：SZSLHQZXYY-8.开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode后，扫包实例条码回收消毒物品会多出申请项，导致单状态变成部分回收的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Wednesday 23 Jun 2021
8:06 下午

frank.qiu

解决了 SZSLHQZXYY-8 - 开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode后，扫包实例条码回收消毒物品会多出申请项，导致单状态变成部分回收的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
8:02 下午

frank.qiu

解决了 SZSLHQZXYY-8 - 开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode后，扫包实例条码回收消毒物品会多出申请项，导致单状态变成部分回收的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
7:55 下午

frank.qiu

解决了 SSTS-392 - 设备接口定义中设备类型和设备型号的下拉框增加一个空的选项，要允许选择为空
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js
7:23 下午

frank.qiu

解决了 SSTS-392 - 设备接口定义中设备类型和设备型号的下拉框增加一个空的选项，要允许选择为空
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js
7:00 下午

frank.qiu

解决了 SZSLHQZXYY-8 - 开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode后，扫包实例条码回收消毒物品会多出申请项，导致单状态变成部分回收的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
6:58 下午

jason

解决jira问题：KSDQDYRMYY-2 基于CAS原生包的单点登录接口开发
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/spring/security-standard/applicationContext-acegi-security.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/logonSSOForKsdqdyrmyy.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
6:18 下午

jason

解决jira问题：XKYY-219 启用按照申请材料数量计算外来器械包积分及对所有包定义的“积分系数”进行赋值(外来器械包的积分系数默认取祖先包定义的积分系数)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
6:08 下午

yuandongxiao

更新张家界市人民医院个性化菜单：解决在tomcat8+IE浏览器下有些菜单报The valid characters are defined in RFC 7230 and RFC 3986错误的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zjjsrmyy/menu/menuconfigure.js
3:18 下午

zc.li

解决：SZSLHQZXYY-8。开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode后，扫包实例条码回收消毒物品会多出申请项，导致单状态变成部分回收的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
3:17 下午

frank.qiu

解决了 SZSLHQZXYY-8 - 开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode后，扫包实例条码回收消毒物品会多出申请项，导致单状态变成部分回收的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js