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

Wednesday 13 Mar 2024
11:06 上午

zc.li

修复 扫描篮筐内还有标识牌未装配完成，提示异常的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Tuesday 12 Mar 2024
6:25 下午

zc.li

解决：STDXYXYFSZ-37 【核算月报】新增可扩展查询项“查询范围”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/MonthReportGroupByDisposableGoodsTypeHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/MonthReportGroupBySterilizationModeHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/MonthReportHelper.java
6:09 下午

frank.qiu

解决了 STDXYXYFSZ-37 - 【核算月报】新增可扩展查询项“查询范围”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/stdxyxyfszlyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.jsp
6:03 下午

zc.li

完善： BJ309YY-21 - 允许设置为少于已发货数量的前提是设置回收前发货
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
5:57 下午

jason

解决jira问题：FSFY-101【病人使用记录】新增根据病人信息合并转换申请单
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
5:40 下午

zc.li

解决： BJ309YY-21 - 【回收清点】回收数量允许设置为少于已发货数量
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
5:11 下午

zc.li

解决： BJ309YY-21 - 【回收清点】回收数量允许设置为少于已发货数量
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
3:52 下午

zc.li

删除IDCardInstance的冗余字段 lastClassifiedItemIds时 验证字段是否存在
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/5.0.18_5.0.19_oracle.sql
3:37 下午

zc.li

删除IDCardInstance的冗余字段 lastClassifiedItemIds时 验证字段是否存在
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/5.0.18_5.0.19_oracle.sql
3:29 下午

frank.qiu

解决了 GDSRMYY-579 - 新增报表【手术器械闭环信息追溯报表】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperationDetailReportView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/exportMonitorData.jsp
3:29 下午

zc.li

删除IDCardInstance的冗余字段 lastClassifiedItemIds时 验证字段是否存在
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/5.0.18_5.0.19_sqlserver.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/5.0.18_5.0.19_oracle.sql
3:09 下午

linnansheng

广州市中医院的路径地址修改成新的正确的地址。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/spring/HIS.xml
2:15 下午

hongrun.zhou

删除svn上原有的错误文件，提交现场文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/interfaces/mybatis/queryAndWriteProject_Mapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/interfaces/dataSyncConfig.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/interfaces/mybatis/queryAndWriteVerificationCode_Mapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/interfaces/mybatis/syncFromHERP_Mapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/interfaces/fieldsMappingTalbe.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/interfaces/mybatis/SyncOperationReservation_Mapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
2:13 下午

hongrun.zhou

删除svn上原有的错误配置，提交现场实际配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/spring/webservice-cxf.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/spring/verification.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/spring/timer.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/spring/project.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/spring/HIS.xml
11:47 上午

hongrun.zhou

删除svn上原有的错误的logo，更改为正确的logo
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/img/logo_idcard.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/img/logo_gdszyy.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/img/logo_gzszyy.png
11:45 上午

hongrun.zhou

提交广州市中医院现场的config配置项文件，SVN上原有的是错误的
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js
11:42 上午

hongrun.zhou

提交广州市中医院现场的printconfig文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/recyclingDetailPrintConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js
Monday 11 Mar 2024
6:41 下午

zc.li

解决： BJ309YY-21 - 【回收清点】回收数量允许设置为少于已发货数量
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/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/disinfectsystem/version/RecyAmountNoMatchException.java
6:38 下午

frank.qiu

解决了 BJ309YY-21 - 【回收清点】回收数量允许设置为少于已发货数量
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
5:15 下午

zc.li

完善：GDSRMYY-579 【手术器械闭环信息追溯报表】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/OperationTousseOperationRepartHelper.java
4:33 下午

jason

解决jira问题：GMQRMYY-35 【物品绑定】不同的主绑定物品绑定相同的次绑定物品，使用记录转换申请单包含多种主绑定物品只生成了1件次绑定物品的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
2:13 下午

zc.li

完善：GDSRMYY-579 【手术器械闭环信息追溯报表】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/OperationTousseOperationRepartHelper.java
2:02 下午

zc.li

完善：GDSRMYY-579 【手术器械闭环信息追溯报表】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/OperationTousseOperationRepartHelper.java
1:52 下午

frank.qiu

解决了 GDSRMYY-579 - 新增报表【手术器械闭环信息追溯报表】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperationDetailReportView.js
Friday 08 Mar 2024
6:26 下午

zc.li

完善：GDSRMYY-579 【手术器械闭环信息追溯报表】明细查询只显示发货到当前科室的数据 增加在库状态和仓库名称
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/OperationTousseOperationRepartHelper.java
6:20 下午

zc.li

完善：GDSRMYY-579 【手术器械闭环信息追溯报表】明细查询时间过滤不过滤二次发货的时间的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/OperationTousseOperationRepartHelper.java
5:25 下午

frank.qiu

解决了 SSTS-646 - 【物品绑定】不同的主绑定物品绑定相同的次绑定物品，生成的申请单经过回收后 包含多种主绑定物品只生成了1件次绑定物品的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
4:04 下午

jason

解决jira问题：BJDXZLYY-53 【库位管理】"库存查看"的取出页面增加按器械包名称进行搜索功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/dwr/StorageLocationTableManager.java
3:54 下午

frank.qiu

解决了 BJDXZLYY-53 - 【库位管理】"库存查看"的取出页面增加按器械包名称进行搜索功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js
3:34 下午

zc.li

解决：DGSFYBJY-79【灭菌炉使用次数统计报表】可以选择时间类型进行查询（年份、月份、日期范围）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java