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

Friday 04 Jun 2021
6:36 下午

jason

解决jira问题：XKYY-190 PC端的退货功能增加对外部代理灭菌包的支持
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
6:11 下午

frank.qiu

searchComboTousseData接口添加参数onlySearchCssdHandleTousses
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesForm.js
6:03 下午

shuyongfu

解决:GDSZYY-89 从病人信息接口获取手术单号信息，并给使用记录表单的手术单号输入框赋值

DGSRKYY-2 kaicom H702 PDA接口的扫描接口开发

LCXZYY-2 PDA（未知品牌，型号：X5）的扫描接口开发

MMSRMYY-4 PDA程序增加对iData 55 Series型号的支持

SSTS-382 PDA修改一次性物品已扫数量，提示“物品“一次性气囊尿管（20#）”库存不足”

GDSZYY-95 用户登录成功后如果检查密码到不符合复杂度要求，则强制用户修改密码

DGSETYY-3 登记清洗记录时，改进为支持空炉清洗

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/json/AESTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.21_20210604_v4_1_nologo_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.21_20210604_v4_1_release.apk
    • ?
    /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/mobileClient/SterileSupplySystem_Android_V4.7.21_20210604_v4_1_6p_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
4:30 下午

jason

解决jira问题：SSTS-387 将福建石狮市医院的个性化定时器（deviceInterfaceDataProcessTimerTaskForFJSSSYY）去掉，改为使用通用的设备接口定时器（deviceInterfaceDataProcessTimerTask
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java
4:25 下午

jason

解决jira问题：ASSFDZLYY-44 干预一次性物品入库单时，如果入库后系统产生了结算数据，则应不允许干预修改入库单上物品的单价和数量
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
3:51 下午

frank.qiu

解决了 XKYY-190 - PC端的退货功能增加对外部代理灭菌包的支持（ 2. 外部代理灭菌包退货时不需要显示“是否重装”和“是否重发”按钮）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
3:31 下午

zc.li

回收代码整理，删除无用代码，便于后续写测试用例
Options
    • ?
    /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
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
2:23 下午

frank.qiu

解决了 DGSETYY-3 - 登记清洗记录时，改进为支持空炉清洗
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
1:53 下午

shuyongfu

解决:BJ307YY-95 更新后，PDA预回收把包数量改成0提交后，电脑端上数量还是显示1的缺陷
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/PrepareRecycleTousseManagerImpl.java
10:43 上午

jason

解决jira问题：SSTS-387 将福建石狮市医院的个性化定时器（deviceInterfaceDataProcessTimerTaskForFJSSSYY）去掉，改为使用通用的设备接口定时器（deviceInterfaceDataProcessTimerTask
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java
10:28 上午

zc.li

解决（灭菌炉部分）：SSTS-387。将福建石狮市医院的个性化定时器（deviceInterfaceDataProcessTimerTaskForFJSSSYY）去掉，改为使用通用的设备接口定时器（deviceInterfaceDataProcessTimerTask）.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java
Thursday 03 Jun 2021
8:38 下午

frank.qiu

解决了 XKYY-221 - 材料盘点管理的一些问题，导出无数据（修复一次性物品盘点导入谷歌打不开的问题）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js
8:14 下午

frank.qiu

解决了 XKYY-221 - 材料盘点管理的一些问题，导出无数据
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/importInventoryRecord.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js
7:17 下午

frank.qiu

解决了 DGSETYY-4 - 增加配置项enablePrintRecyclingDetailVersion2启用版本2的打印回收清单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js
5:43 下午

frank.qiu

解决了 XKYY-190 - PC端的退货功能增加对外部代理灭菌包的支持（ 2. 外部代理灭菌包退货时不需要显示“是否重装”和“是否重发”按钮）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
5:41 下午

jason

解决jira问题：XKYY-190 PC端的退货功能增加对外部代理灭菌包的支持
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
4:31 下午

frank.qiu

优化GDSZYY-44:打印回收清单的支持新的json配置格式（院区改为动态设置）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js
2:33 下午

frank.qiu

优化XKYY-211：广州胸科升级前后对比-升级前有"器械材料月盘点记录"模块，升级后没有
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menu.jsp
2:28 下午

frank.qiu

优化XKYY-211：广州胸科升级前后对比-升级前有"器械材料月盘点记录"模块，升级后没有
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/systemset/operationDefine.xml
Wednesday 02 Jun 2021
5:03 下午

frank.qiu

解决了 XKYY-211 - 广州胸科升级前后对比-升级前有"器械材料月盘点记录"模块，升级后没有
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/supplyRoomApplianceMonthStatisticsView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/materialCheckView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/supplyRoomApplianceMonthStatisticsView.js
5:02 下午

jason

解决jira问题：XKYY-211 广州胸科升级前后对比-升级前有"器械材料月盘点记录"模块，升级后没有
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialCheckManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/action/MaterialCheckAction.java
3:58 下午

jason

解决jira问题：SZYK-38 查看清洗、灭菌记录图片功能的优化以及在视图列表中增加查看清洗、灭菌记录图片的快捷图标
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
3:42 下午

frank.qiu

解决SZYK-38：查看清洗、灭菌记录图片功能的优化以及在视图列表中增加查看清洗、灭菌记录图片的快捷图标（整理预览图片的代码，清洗和灭菌的预览图片合并为一个方法）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/expensivegoodshomepage/portalPage.jsp
    • ?
    /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/sterilizationmanager/sterilizationrecord/sterilizationRecordPic.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washRecordPic.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereRecordForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/showUploadImagesForExtWin.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/portalPage.jsp
2:51 下午

shuyongfu

解决:GDSZYY-57 科研项目耗材申领（一次性物品申领）功能开发(中山眼科回写传参优化、防止传入null的参数导致回写程序代码报异常)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
10:02 上午

jason

解决jira问题：XKYY-217打开系统体检-一次性物品库存检查提示：ajax连接异常：[object Object]
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/systemexamination/action/DisposableGoodsStockExaminationAction.java
Tuesday 01 Jun 2021
11:04 下午

terry.kwan

提交深圳南山妇幼保健院的配置文件，迁移到了新的文件夹
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/sznsfy/interfaces/dataSyncConfig.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/sznsfy/spring/timer.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/sznsfy/spring/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/sznsfy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/sznsfy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
  6. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/sznsfy/interfaces/mybatis
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/sznsfy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
  8. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/sznsfy/interfaces
  9. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/sznsfy/spring
6:39 下午

frank.qiu

解决了 SZYK-38 - 查看清洗、灭菌记录图片功能的优化以及在视图列表中增加查看清洗、灭菌记录图片的快捷图标
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/images/web/queryImage.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washRecordPic.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordPic.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
4:08 下午

jason

解决jira问题：GZS12RMYY-43 组织机构和人员接口开发需求
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQDataDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQHelper.java
3:24 下午

jason

解决：已经存在的人员经过同步后，拥有角色变成默认角色
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
Monday 31 May 2021
5:20 下午

jason

解决jira问题：SSTS-379 灭菌干预，将状态由灭菌完成干预为灭菌中的一些场景问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java