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

Tuesday 22 Jun 2021
4:11 下午

yuandongxiao

更新个性化菜单模板：解决在tomcat8+IE浏览器下有些菜单报The valid characters are defined in RFC 7230 and RFC 3986错误的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/standardProjectTemplate/menu/menuconfigure.js
3:52 下午

linnansheng

新沟桥个性化菜单提交
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/menu/menuconfigure.js
1:47 下午

jason

解决jira问题：XKYY-219 启用按照申请材料数量计算外来器械包积分及对所有包定义的“积分系数”进行赋值(消毒物品的积分系数默认取祖先包定义的积分系数)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
10:35 上午

zc.li

旧数据升级。ZJJSRM-46：器械包定义中【是否灭菌】值为空和null的器械包定义，给【是否灭菌】赋值为是。
Options
    • ?
    /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.77_4.9.78.sql
10:22 上午

linnansheng

新建项目:新沟桥街社区服务中心 project=xgqjsqfwzx
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/interfaces/dataSyncConfig.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
  5. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/interfaces
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/spring/HIS.xml
  7. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/menu
  8. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/interfaces/mybatis
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/print/printConfig.js
  10. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/spring
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
  12. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/print
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
  14. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx
Monday 21 Jun 2021
2:51 下午

zc.li

解决：ZJJSRM-46。包定义是否装配为否的物品灭菌方式为空的问题.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
2:46 下午

jason

解决jira问题：ZJJSRM-46 包定义是否装配为否的物品灭菌方式为空的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
2:03 下午

frank.qiu

解决了 SSTS-390 - 不开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode，扫包实例条码回收物品，入筐后在篮筐下看不到包实例条码，并且回收后该包实例也没有变成已回收状态
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
1:56 下午

jason

解决jira问题：SSTS-388 新疆军区总医院的多舱清洗机接口和福建石狮市的多舱清洗机接口是使用不同的协议进行解析的，但设置的却是同一个设备型号，现在需要增加一种设备型号以进行区分
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHua_ChangLongDataImpl.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-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js
    • ?
    /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/basedatamanager/deviceInterface/deviceInterfaceView.jsp
12:01 下午

jason

解决jira问题：SZYK-5 待灭菌物品增加灭菌方式的过滤条件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
11:15 上午

jiayu.xiong

配置项更新
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/mmsrmyy/print/printConfig.js
Saturday 19 Jun 2021
3:45 下午

jason

解决jira问题：SZYK-5 待灭菌物品增加灭菌方式的过滤条件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
Friday 18 Jun 2021
6:27 下午

zc.li

解决：SSTS-391。【入（退）库物品统计报表】和【入（退）库物品明细统计报表】查询出来的报表显示完全一样，而在旧版本这两个报表是有区别的
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntryStatisticView.js
5:52 下午

jason

解决jira问题：SZYK-38 查看清洗、灭菌记录图片功能的优化以及在视图列表中增加查看清洗、灭菌记录图片的快捷图标(查看保存到数据库的图片)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java
4:38 下午

frank.qiu

解决了 SZYK-5 - 待灭菌物品增加灭菌方式的过滤条件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
3:45 下午

jason

解决jira问题：GZTHZL-8 基于web service协议，HIS系统作为服务端的组织机构、人员接口以及病人接口（含门诊与住院病人）对接
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzthzlyy/SyncOrgUnitAndUserDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzthzlyy/spring/HIS.xml
  3. /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzthzlyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzthzlyy/WebServiceClientHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzthzlyy/FindPatientInfoByHospitalNumDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzthzlyy/DatasyncConstant.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzthzlyy/FindPatientInfoByTreatmentNumDaoImpl.java
3:23 下午

zc.li

修复明细核算月报同名消毒物品合并显示后，积分显示为0的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:13 下午

frank.qiu

解决了 SZYK-5 - 待灭菌物品增加灭菌方式的过滤条件
Options
    • ?
    /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/sterilizationLoadingForm.js
11:46 上午

jason

解决jira问题：GZTHZL-7 灭菌记录列表增加生物监测图片已上传的图标显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.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/SterilizationRecordManager.java
11:09 上午

frank.qiu

解决了 GZTHZL-7 - 灭菌记录列表增加生物监测图片已上传的图标显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
Thursday 17 Jun 2021
5:27 下午

frank.qiu

解决了 ZJJSRM-55 - 在同一张回收单里，多个标识牌器械包丢失标识牌入筐后保存报错和未保存前修改丢失标识牌为零后不能删除该器械包的回收记录
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
4:19 下午

zc.li

解决XKYY-203 广州胸科升级前后对比-4.1版本的【入库物品明细统计报表】和【入库物品明细统计报表】增加业务类型下拉框及修改报表名称（退库数据改为负数）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:35 下午

LQC

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/menu/menuconfigure.js
3:34 下午

LQC

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
3:32 下午

LQC

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/config.js
9:57 上午

jason

解决jira问题：XKYY-219 启用按照申请材料数量计算外来器械包积分及对所有包定义的“积分系数”进行赋值
Options
    • ?
    /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.77_4.9.78.sql
Wednesday 16 Jun 2021
6:24 下午

zc.li

解决：SZSLHQZXYY-8。开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode后，扫包实例条码回收消毒物品会多出申请项，导致单状态变成部分回收的问题.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
5:35 下午

jason

解决jira问题：XKYY-219 启用按照申请材料数量计算外来器械包积分及对所有包定义的“积分系数”进行赋值
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemoToussePoint.xls
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.77_4.9.78.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/action/ImportBasedataController.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
4:16 下午

shuyongfu

解决:GGSRMYY-133 清洗机和灭菌器的属性中增加【使用状态】属性以及增加拖动排序功能(pda及大屏幕清洗一起进行了处理)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.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-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
4:02 下午

jason

解决：聚合包保存报错
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java