forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 43
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 43
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 28881 is being indexed.

Wednesday 02 Sep 2020
2:43 下午

shuyongfu

解决:ZSYKZX-135 PDA发货模块的已灭菌的待发货物品的默认背景色的修改

SSTS-182 PDA端扫描一些不符合条件的条码时，有时后面会跟着访问失败的提示和文字

版本号由4.7.01调整为4.7.02

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.02_20200902_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.02_20200902_v4_1_nologo_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.02_20200902_v4_1_6p_release.apk
11:15 上午

jason

解决jira问题：GDSZYY-12 广东省中医院 一次性物品接口开发
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/systemset/operationDefine.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/Inventory/service/InventoryStockWebServiceImpl.java
  5. /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/Inventory/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/syncFromHERP_Mapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dwr/DataSynchronizationTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/Inventory/service/InventoryStockWebService.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/Inventory.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/timer.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/webservice-cxf.xml
  13. /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/Inventory
10:49 上午

zc.li

修复oralce质量监测报表清洗环节的监测项查询时，后台报错的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
10:34 上午

frank

解决GDSZYY-12：一次性物品接口开发
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menu.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp
Tuesday 01 Sep 2020
6:04 下午

frank

解决HBSXKYY-23：谷歌浏览器批量打印发货单无反应
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrintModule.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/selectInvoiceConfig.jsp
3:44 下午

LJH

南方医院现场config

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/config.js
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy
3:43 下午

LJH

//生物监测接口

enableBioreaderInterface: true,

//使用记录转申请单备注信息格式

//useRecordConvertRecyclingApplicationRemark: '巡回护士:@circuitNurseLabelName;洗手护士:@circuitNurse;备注:@useRecordRemark;病人:@patientName;器械包数量:@tousseAmount',

//器械保养模块使能

disableTousseMaintain:false,

//设置生物阅读器监测数据的灭菌结束时间与生物监测开始时间的间隔

timeOfMonitoringInterval: 120,

//是否启用：IP对应的默认科室配置的菜单

enableIPAndOrgUnitMapping: true,

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/nfykdxfsdsyy/config.js
3:16 下午

frank

解决ZSWY-144：运作监控查询出“线圈”的申请数量为undefined
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
2:31 下午

frank

解决灭菌管理暂存返回乱码的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
2:18 下午

jason

解决jira问题：HBSXKYY-19河北省胸科医院 灭菌记录支持暂存
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
2:04 下午

yuandongxiao

个性化菜单统一加上“停用的组织机构”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szszlyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zjjsrmyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsrmyyzhyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fjsssyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgfy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/hbdxfsyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/bjscylyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qysfybjy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/hbsxkyy/menu/menuconfigure.js
1:32 下午

shuyongfu

解决:ZSYKZX-127 很多即将过期的器械包都没有显示在系统告警里，器械包信息里的背景颜色也没有变
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
Monday 31 Aug 2020
6:14 下午

shuyongfu

解决:GGSRMYY-131 材料发货管理里添加发货单，录入器械包后未显示器械包内各材料的规格。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
4:27 下午

shuyongfu

解决:ZSYKZX-132 已装配，待审核的器械包，能在pda上进行灭菌装载的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
4:13 下午

yuandongxiao

新建项目：深圳市眼科医院

project=szsykyy

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/interfaces/dataSyncConfig.json
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/interfaces
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/print
  4. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/interfaces/mybatis
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/spring/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
  9. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsykyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/interfaces/mybatis/syncFromHERP_Mapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
  12. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/spring
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/print/printConfig.js
  15. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/menu
2:32 下午

zc.li

注释补充，修改变量名
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/returnGoodsDetailView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/returnGoodsDetailView.js
2:25 下午

jason

解决jira问题：HBSXKYY-19河北省胸科医院 灭菌记录支持暂存(代码优化)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
2:16 下午

jason

解决jira问题：HZSRMYY-51 惠州市中心人民医院 更改科室名称时，科室所属仓库名称联动修改(单元测试删除多余代码)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/directory/service/OrgUnitManagerTest.java
1:58 下午

frank

解决SZYK-3：回收模块修改物品的回收数量有js报错
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/speaker.js
12:17 下午

frank

灭菌管理多个了标点符号，IE8有问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
11:30 上午

jason

解决jira问题：ZYYFS-118 广州中医药大学附属第三医院 灭菌记录和待灭菌物品列表中显示按照科室供应室设置里面的每天开始时间作为时间节点
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManager.java
11:15 上午

jason

解决jira问题：HBSXKYY-19河北省胸科医院 灭菌记录支持暂存
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
Sunday 30 Aug 2020
8:13 下午

jason

解决jira问题：BJ307YY-7 解放军总医院第五医学中心（原307医院） 申请单的申请科室和结算科室不一样，敷料包打印标签时的科室会显示为结算科室
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
2:17 下午

frank

解决HBSXKYY-19：灭菌记录支持暂存
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/hbsxkyy/config.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/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
1:16 上午

terrykwan

解决GZYKDXFSKQ-59，发货日期的取值，由取打印的时间修改为取发货日期
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/print/printConfig.js
12:13 上午

shuyongfu

解决:SZYK-2 灭菌炉在灭菌结束时间没有自动完成灭菌的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
Friday 28 Aug 2020
7:06 下午

frank

解决选择回收时间时输入数字会提示validateNumber不存在的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectRecyclingDate.jsp
5:30 下午

jason

解决jira问题：HZSRMYY-51 惠州市中心人民医院 更改科室名称时，科室所属仓库名称联动修改(发货记录根据科室编码联动修改科室名称，单元测试报错)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/directory/service/OrgUnitManagerTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
4:03 下午

shuyongfu

解决:ASSFDZLYY-34 高值耗材发货后库存有误

对之前高值耗材旧版本发货后关联的仓库不正确的数据做了功能上的兼容容错处理,7月31号更新新版本发货后的高值耗材退货不会出现这种情况

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
3:57 下午

jason

解决jira问题：HZSRMYY-51 惠州市中心人民医院 更改科室名称时，科室所属仓库名称联动修改(发货记录根据科室编码联动修改科室名称)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java