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

Friday 25 Dec 2020
11:57 上午

zc.li

提交龙岗配置项，新增是否FTP登录后再设置被动模式，有的环境要先登录再设置，否则读取文件时异常，和不打印接口日志配置项；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/config.js
11:53 上午

zc.li

修复：dgsdbzxyy-127。生物监测次数汇总不正确的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:12 上午

frank

优化 DGSDBZXYY-130：培训管理的阅读记录没有记录出来
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/knowledge/viewExt.js
11:10 上午

frank

解决 DGSDBZXYY-130：培训管理的阅读记录没有记录出来
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/knowledge/viewExt.js
11:06 上午

jason

解决jira问题：GDSZYY-50 广东省中医院 增加多区院设置的以及按院区进行核算月报的查询和汇总统计(增加注释)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/BrancheOfHospitalManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/BrancheOfHospitalManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitGroupManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitGroupManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/action/OrgUnitGroupAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/action/BrancheOfHospitalAction.java
10:47 上午

terrykwan

提交空白的占位图片
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/img/logo_jfjzyydwyxzx.png
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/img
10:18 上午

shuyongfu

解决:DGSDBZXYY-106 召回信息里把已召回的器械包转换成申请单会出现不对应的情况的修改及相关改进

2. 召回管理模块中，选中某条召回记录，点击工具栏的【转换申请单】按钮时，只将召回记录中的状态为【已召回】的器械包转换申请单，状态为【待召回】的器械包不用转换申请单；召回转换申请单时从哪个科室召回的器械包转换申请单的申请科室就是哪个科室，如果召回时器械包还没有发货状态为已灭菌，那么申请单的科室就应为供应室；

以及包定义的是否停用不为"是"的包才转换

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallRecordView.js
Thursday 24 Dec 2020
6:52 下午

frank

解决GDSZYY-50：增加多区院设置(限制最大序号为9999)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/branchesOfHospital/branchesOfHospitalForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/branchesOfHospital/branchesOfHospitalView.jsp
6:34 下午

jason

解决jira问题：GDSZYY-50 广东省中医院 增加多区院设置的以及按院区进行核算月报的查询和汇总统计
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/model/BrancheOfHospital.java
5:48 下午

jason

解决jira问题：ZSRY-10 中山二院 标识牌打印样式修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
5:46 下午

frank

解决ZSRY-10：标识牌打印样式修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
5:37 下午

frank

回滚ASSZDFY-80灭菌记录扫描不追溯的包的固定条码进行入炉的优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
5:34 下午

frank

解决GDSZYY-43：参数设置新增【科室分组设置】(取消背景颜色控制)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/common.css
4:55 下午

frank

解决DGSDBZXYY-106：召回信息里把已召回的器械包转换成申请单会出现不对应的情况的修改及相关改进(1. 器械包信息模块的器械包信息列表，状态列的状态列表，增加“待召回”和“已召回”2个状态)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
4:23 下午

jason

解决jira问题：GDSZYY-50 广东省中医院 增加多区院设置的以及按院区进行核算月报的查询和汇总统计(区院设置)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-disinfectsystem-service.xml
4:22 下午

jason

解决jira问题：GDSZYY-50 广东省中医院 增加多区院设置的以及按院区进行核算月报的查询和汇总统计(区院设置)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/model/Org_OrgGroup.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/BrancheOfHospitalManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitGroupManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/action/BrancheOfHospitalAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/BrancheOfHospitalManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/model/BrancheOfHospital.java
4:13 下午

frank

解决GDSZYY-50：增加多区院设置的以及按院区进行核算月报的查询和汇总统计
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/includeExtJs4_2.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/branchesOfHospital/branchesOfHospitalView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/branchesOfHospital/branchesOfHospitalView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/branchesOfHospital/branchesOfHospitalForm.js
  7. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/branchesOfHospital
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/common.css
3:41 下午

zc.li

完善：SZSLGZXYY-2。增加配置项setPassiveModeAfterLogin,控制FTP被动模式是否在FTP连接成功后设置。有的医院要配置为true才能正常连接。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/FtpFileManagerImpl.java
3:35 下午

jason

解决jira问题：DGZYY-174 东莞中医院 系统的接口改造开发(病人信息的接口，要同时支持新旧接口，查找病人信息时，先通过新接口查找，如果找不到，再通过旧接口查找)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/spring/HIS.xml
2:48 下午

frank

解决ZSRY-10：标识牌打印样式修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
2:06 下午

terrykwan

丰富异常情况的提示信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
2:01 下午

jason

解决jira问题：广东省中医院GDSZYY-43 参数设置新增【科室分组设置】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/action/OrgUnitGroupAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitGroupManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitGroupManager.java
1:40 下午

frank

基于29967版本的格式化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
1:39 下午

frank

优化解决ASSZDFY-80之后的代码(完善备注，删除用不上的方法，简化代码等等)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
1:35 下午

frank

解决GDSZYY-43：参数设置新增【科室分组设置】(增加搜索条件)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupCommonView.js
12:08 下午

frank

解决GDSZYY-43：参数设置新增【科室分组设置】(增加搜索条件)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupCommonView.js
11:34 上午

jason

解决jira问题：广东省中医院GDSZYY-43 参数设置新增【科室分组设置】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/action/OrgUnitGroupAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitGroupManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-disinfectsystem-service.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/model/OrgUnitGroup.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitGroupManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/model/Org_OrgGroup.java
11:33 上午

frank

解决GDSZYY-43：参数设置新增【科室分组设置】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupCommonView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupCommonForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupCommonView.js
10:36 上午

zc.li

完善：SZSLGZXYY-2。修复一些异常场景下，接口不再启动的问题。增加enableDetailedDeviceInformation控制是否打印日记
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/CommonFileManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/FtpFileManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/ChangLongDataManagerImplFJSSSYY.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/FtpFileManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/HighTemperatureManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JiangHanDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceDataManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JohnsonDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/LowTemperatureManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/CommonFileManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisDataManagerImpl.java
  16. … 4 more files in changeset.
10:25 上午

jason

解决jira问题：DGZYY-174 东莞中医院 系统的接口改造开发(病人信息的接口，要同时支持新旧接口，查找病人信息时，先通过新接口查找，如果找不到，再通过旧接口查找)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/spring/HIS.xml