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

Thursday 22 Oct 2020
7:36 下午

shuyongfu

解决:SSTS-223 同一科室的不同申领模板如果存在相同的物品，在申领的时候选择全部模板该物品会在模板上显示出来多行
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionHelper.java
5:20 下午

jason

解决jira问题：ZJJSRM-36 张家界市人民医院 倍力曼长龙清洗机接口更改曲线图数据的取值(不读取K文件中“周期结束”时间为空的数据，防止读取正在写入的文件)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfBelimed.js
4:42 下午

frank

解决选择科室时会报js错误的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/org.js
3:45 下午

zc.li

修复一张回收单，同种物品放入不同的篮筐，一个篮筐内的物品已装配时，不能删除另外一个篮筐内的物品的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
3:41 下午

frank

解决SSTS-224：修改历史回收记录，将物品回收数量减少后入筐，保存后不生效
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
2:20 下午

shuyongfu

解决:GZYKDXFSKQ-17 器械包定义里面限制发货科室功能改进

SSTS-225 发货科室依据配置为结算科室，申领科室和结算科室不是同一科室时，申领科室申领的限制发货科室的器械包无法发到结算科室

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
11:55 上午

frank

解决QYSRMYY-27：密码复杂度要求的改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/systemmanage/userFormExt.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
11:28 上午

frank

解决SSTS-184：科室申领模板配置页面打开后看不到科室，点击查询按钮才显示出来
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateForm.js
11:17 上午

frank

解决QYSRMYY-27：密码复杂度要求的改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/systemmanage/userFormExt.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
10:10 上午

frank

解决SSTS-224：修改历史回收记录，将物品回收数量减少后入筐，保存后不生效
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
Wednesday 21 Oct 2020
7:04 下午

shuyongfu

解决:GZYKDXFSKQ-17 器械包定义里面限制发货科室功能改进

SSTS-225 发货科室依据配置为结算科室，申领科室和结算科室不是同一科室时，申领科室申领的限制发货科室的器械包无法发到结算科室

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
7:03 下午

frank

解决SZLGEY-3：打印全部物品时单据格式改进为一行两列器械包的格式
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
6:34 下午

frank

解决SZLGEY-3：打印全部物品时单据格式改进为一行两列器械包的格式
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslgqdermyy/print/printConfig.js
4:55 下午

frank

解决BJ307YY-24:外来器械管理增加独立设置灭菌程序。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp
4:49 下午

jason

解决jira问题：BJ307YY-24 解放军总医院第五医学中心（原307医院） 外来器械管理增加独立设置灭菌程序(将所有外来器械包包定义的默认灭菌程序的值，修改为【科室供应室设置】里面的外来器械包的默认灭菌程序的值)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.53_4.9.54.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java
3:24 下午

jason

解决jira问题：GGSRMYY-140 贵港市人民医院 发货单的消毒物品发货物品明细，已打印列状态显示有问题
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
2:55 下午

zc.li

解决：SZSZLYY-45。解决此任务业务改动后，测试用例断言不再适用的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java
2:02 下午

shuyongfu

解决:SSTS-223 同一科室的不同申领模板如果存在相同的物品，在申领的时候选择全部模板该物品会在模板上显示出来多行
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
11:34 上午

frank

解决SZSZLYY-45：装配管理界面多选或全选装配任务打印时，器械包的灭菌程序都以器械包定义中设置的默认灭菌程序为准打印
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
11:29 上午

zc.li

解决：SZSZLYY-45。装配管理界面多选或全选装配任务打印时，器械包的灭菌程序都以器械包定义中设置的默认灭菌程序为准打印。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
10:52 上午

zc.li

解决：SSTS-222。参考bjdxzlyy-5开启配置项后，通过扫描器械包“拆线包”的固定条码进行回收，可以回收成功，再次扫描“拆线包”的固定条码时，提示该器械包已回收
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
10:49 上午

frank

解决SSTS-222：参考bjdxzlyy-5开启配置项后，通过扫描器械包“拆线包”的固定条码进行回收，可以回收成功，再次扫描“拆线包”的固定条码时，提示该器械包已回收
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
10:42 上午

jason

解决jira问题：DGSDBZXYY-66东莞市东部中心医院 待签收物品过期提醒(OrgUnit表的isDeliveryToSignOrgUnit字段改成String类型)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/model/OrgUnit.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/resources/com/forgon/directory/model/OrgUnit.hbm.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/timeout/service/TimeoutManagerImpl.java
Tuesday 20 Oct 2020
8:31 下午

jason

解决jira问题：BJ307YY-14 外部代理灭菌使用自定义标签模板的标签打印缺陷问题(器械包信息，勾选外部代理的器械包打印标签)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
6:28 下午

einstein.kang

安卓PDA上传,下载，删除预回收的视频和图片
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-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/VideoFileManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/servlet/DownloadServlet.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/web-xml-standard/web.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/videomanager/service/VideoFileManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/servlet/UploadServlet.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManagerImpl.java
5:20 下午

shuyongfu

解决:BJ307YY-13 预回收功能增加功能改进-允许预回收后发货

先提交po新加的字段及新字段值的升级语句

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
    • ?
    /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.52_4.9.53.sql
4:38 下午

frank

解决HZSRMYY-59:清洗（灭菌）篮筐监控，翻页后搜索bug
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/basketMonitor/washBasketMonitorView.js
4:16 下午

jason

解决jira问题：GDSZYY-19 广东省中医院 消息发布的科室范围限制为只能选择申领科室以及一、二级供应室
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
4:16 下午

frank

解决GDSZYY-19:消息发布的科室范围限制为只能选择申领科室以及一、二级供应室
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/selectOrgByExt.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/message/messageForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/org.js
3:04 下午

jason

解决jira问题：DGSDBZXYY-84 东莞市东部中心医院 室外质量监测，除了供应室的人能录，其他科室的人都报该科室未配置处理该包
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/action/QualityMonitoringDefinitionAction.java