forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 59
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 59
Total Lines of Code (LoC): 4,711,364
Net change in LoC this week: 3,161

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

Subversion Details

1 property
  • svn:global-ignores = .gradle .settings bin build rebel.xml
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Thursday 03 Sep 2020
4:23 下午

yuandongxiao

新建项目：深圳市龙岗中心医院

project=szslgzxyy

Options
  1. /ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy
    • -0
    • +139
    /ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/config.js
    • -0
    • +111
    /ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/interfaces/mybatis/syncFromHERP_Mapper.xml
    • -0
    • +764
    /ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/menu/menuconfigure.js
  5. /ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/interfaces/mybatis
  6. /ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/spring
  7. /ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/menu
    • -0
    • +121
    /ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/spring/HIS.xml
    • -0
    • +26
    /ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
    • -0
    • +1260
    /ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/print/printConfig.js
  11. /ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/interfaces
    • -0
    • +22
    /ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
  13. /ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/print
    • -0
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/interfaces/dataSyncConfig.json
    • -0
    • +55
    /ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
4:11 下午

jason

解决jira问题：SZHZ-2 深圳禾正医院 科室和职工接口调整
Options
    • -5
    • +1
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/szhzyy/MQDataDaoImpl.java
    • -12
    • +9
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/szhzyy/MQHelper.java
    • -25
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/spring/HIS.xml
    • -4
    • +4
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/szhzyy/OrgUserDataWebServiceManagerImpl.java
2:49 下午

yuandongxiao

提交现场配置
Options
    • -2
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
    • -10
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • -21
    • +24
    /ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/config.js
    • -22
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
  5. /ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/menu
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/spring/HIS.xml
    • -0
    • +786
    /ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/menu/menuconfigure.js
    • -37
    • +37
    /ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/print/printConfig.js
Wednesday 02 Sep 2020
8:27 下午

shuyongfu

解决:ZSYKZX-134 pda录入使用记录，保存并转换时出现乐观锁：requestLockById调用异常，当前上下文不存在事务!

处理修改和删除的场景

Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
8:01 下午

shuyongfu

解决:ZSYKZX-134 pda录入使用记录，保存并转换时出现乐观锁：requestLockById调用异常，当前上下文不存在事务!
Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
7:55 下午

shuyongfu

解决:ZSYKZX-134 pda录入使用记录，保存并转换时出现乐观锁：requestLockById调用异常，当前上下文不存在事务!
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
7:05 下午

jason

代zc.li提交。回收借物单保存代码健壮性加强
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
5:56 下午

shuyongfu

解决:ZSYKZX-134 pda录入使用记录，保存并转换时出现乐观锁：requestLockById调用异常，当前上下文不存在事务!
Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -0
    • +6
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
5:13 下午

jason

解决jira问题：ZJJSRM-29 张家界市人民医院 科室申领配置排序修改不生效
Options
    • -0
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
4:46 下午

frank

解决SSTS-180：消毒供应中心运作监控界面和消毒供应中心未完成工作列表界面在1280*800分辨率下没有横向滚动条，无法看全表格内容
Options
    • -0
    • +7
    /ssts-web/src/main/webapp/homepage/supplyRoomUnfinishedWork.jsp
    • -14
    • +6
    /ssts-web/src/main/webapp/homepage/supplyRoomOperate.jsp
4:37 下午

zc.li

解决：ZSYKZX-136.补充丢失器械时，回写超时，多次点击会造成乐观锁，从而导致整个系统运行变慢；
Options
    • -3
    • +4
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManager.java
    • -3
    • +17
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/controller/MaterialErrorDamageController.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/spring/HERP.xml
    • -2
    • +18
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/action/MaterialErrorDamageAction.java
    • -9
    • +17
    /ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/MaterialSupplementTests.java
    • -14
    • +92
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java
    • -7
    • +11
    /ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/RecyclingErrorAndDamageTests.java
2:49 下午

frank

解决质量监测添加监测元素信息后添加多选框报错的问题（没有设置触发项的情况）
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
2:43 下午

shuyongfu

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

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

版本号由4.7.01调整为4.7.02

Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.02_20200902_v4_1_release.apk
    • -4
    • +4
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.02_20200902_v4_1_6p_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.02_20200902_v4_1_nologo_release.apk
11:15 上午

jason

解决jira问题：GDSZYY-12 广东省中医院 一次性物品接口开发
Options
  1. /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/Inventory/service
    • -0
    • +227
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/Inventory/service/InventoryStockWebServiceImpl.java
    • -0
    • +27
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
    • -1
    • +19
    /ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/syncFromHERP_Mapper.xml
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -0
    • +21
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/Inventory/service/InventoryStockWebService.java
  7. /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/Inventory
    • -0
    • +16
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dwr/DataSynchronizationTableManager.java
    • -0
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/webservice-cxf.xml
    • too large
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • -0
    • +145
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/Inventory.java
    • -0
    • +22
    /ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/timer.xml
    • -1
    • +5
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManager.java
10:49 上午

zc.li

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

frank

解决GDSZYY-12：一次性物品接口开发
Options
    • -1
    • +54
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp
    • -2
    • +2
    /ssts-web/src/main/webapp/homepage/menu.jsp
Tuesday 01 Sep 2020
6:04 下午

frank

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

LJH

南方医院现场config

Options
  1. /ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy
    • -0
    • +241
    /ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/config.js
3:43 下午

LJH

//生物监测接口

enableBioreaderInterface: true,

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

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

//器械保养模块使能

disableTousseMaintain:false,

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

timeOfMonitoringInterval: 120,

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

enableIPAndOrgUnitMapping: true,

Options
    • -0
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/config/nfykdxfsdsyy/config.js
3:16 下午

frank

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

frank

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

jason

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

yuandongxiao

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

shuyongfu

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

shuyongfu

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

shuyongfu

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

yuandongxiao

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

project=szsykyy

Options
    • -0
    • +1172
    /ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/print/printConfig.js
    • -0
    • +107
    /ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/spring/HIS.xml
  3. /ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/print
  4. /ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/spring
  5. /ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/menu
    • -0
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/interfaces/dataSyncConfig.json
  7. /ssts-web/src/main/webapp/disinfectsystem/config/szsykyy
    • -0
    • +22
    /ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
    • -0
    • +104
    /ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/config.js
    • -0
    • +727
    /ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/menu/menuconfigure.js
  11. /ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/interfaces/mybatis
    • -0
    • +111
    /ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/interfaces/mybatis/syncFromHERP_Mapper.xml
  13. /ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/interfaces
    • -0
    • +49
    /ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -0
    • +25
    /ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
2:32 下午

zc.li

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

jason

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

jason

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