forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

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

Thursday 25 Nov 2021
11:01 上午

shuyongfu

解决:SZSDSRMYY-69 登记器械包返消的外来器械包，在回收页面显示出来的是外来器械包定义材料数量，应该显示为和这个外来器械包相关联的包实例材料数量
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/MaterialInstanceVo.java
10:52 上午

zc.li

完善：ZYYFS-159 外来器械包已使用控件空值改为全部。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js
10:44 上午

zc.li

完善：ZYYFS-159 外来器械包已使用控件空值改为全部。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js
Wednesday 24 Nov 2021
6:49 下午

shuyongfu

解决:SZSDSRMYY-69 登记器械包返消的外来器械包，在回收页面显示出来的是外来器械包定义材料数量，应该显示为和这个外来器械包相关联的包实例材料数量
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.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
6:33 下午

zc.li

修复明细核算月报和消毒供应中心工作统计报表因为升到6.1.0数字左移功能失效的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
6:21 下午

jason

解决jira问题：XMSFYBJY-7 开发病人使用记录推送至集成平台的功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/xmsfybjy/UseRecordPushDaoImpl.java
5:14 下午

zc.li

解决：ZSWY-157，洁定灭菌炉数据接口文件读取了，但是系统有的显示参数图标里面没数据，有的没有显示参数。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
5:14 下午

zc.li

解决：ZSWY-157，洁定灭菌炉数据接口文件读取了，但是系统有的显示参数图标里面没数据，有的没有显示参数。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java
5:13 下午

frank.qiu

解决了 SZYK-54:取消装配页面必须扫描标识牌
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
4:54 下午

zc.li

解决：SZYK-54。取消装配页面必须扫描标识牌。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
4:27 下午

zc.li

解决：ZSWY-157，洁定灭菌炉数据接口文件读取了，但是系统有的显示参数图标里面没数据，有的没有显示参数。
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-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java
3:43 下午

zc.li

解决：GXZYYFY-70 在回收模块，回收非整包申请的消毒物品，并且修改了该消毒物品的材料数量后，在科室申领模块打印该申请单的单价和总金额不正确的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
3:33 下午

frank.qiu

解决了 SZYK-54:取消装配页面必须扫描标识牌(装配标识牌不会自动刷新篮筐的问题)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
1:58 下午

zc.li

解决：GXZYYFY-70 在回收模块，回收非整包申请的消毒物品，并且修改了该消毒物品的材料数量后，在科室申领模块打印该申请单的单价和总金额不正确的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.82_4.9.83.sql
11:33 上午

huang.cl

提交现场的config.js配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js
10:54 上午

zc.li

解决：GXZYYFY-70 在回收模块，回收非整包申请的消毒物品，并且修改了该消毒物品的材料数量后，在科室申领模块打印该申请单的单价和总金额不正确的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.82_4.9.83.sql
    • ?
    /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
10:30 上午

zc.li

修复因不同标识牌要分别产生装配任务的需求，导致旧的断言不再适用的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingAutoReturnBorrowTests.java
Tuesday 23 Nov 2021
10:49 上午

jason

解决jira问题：ZSYY-297 手术预约单信息中手术名字字段不能通过中文检索手术名称
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/operationNameManager/service/OperationNameManagerImpl.java
10:44 上午

frank.qiu

解决了 BJDXZLYY-19 - 手术预约发货列表中增加“手术间”列
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js
10:22 上午

zc.li

解决：SZYK-54。取消装配页面必须扫描标识牌。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java
10:10 上午

zc.li

解决：ZYYFS-159

外来器械申请单统计报表里新增【外来器械包已使用】列及相应查询条件

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js
10:04 上午

zc.li

解决：ZYYFS-159

外来器械申请单统计报表里新增【外来器械包已使用】列及相应查询条件

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport_subreport1.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationShowMaterialsReport_subreport1.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationShowMaterialsReport_subreport1.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationShowMaterialsReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport_subreport1.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseItemVO.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationShowMaterialsReport.jrxml
Monday 22 Nov 2021
9:24 下午

zc.li

GDSZYY-105 回收清点模块支持自定义入筐的篮筐或材料单个删除
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
6:12 下午

frank.qiu

解决了 GDSZYY-116:聚合包装配界面要记住审核人；普通装配界面改进为按照任务组独立记住配包人和审核人
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
5:52 下午

chunping.qiu

2021年11月22日邱春平提交，在这之前修改过发货单格式、配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xmsfybjy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xmsfybjy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xmsfybjy/print/printConfig.js
5:41 下午

kaking.lu

现场业务有变化，此版本新增医院logo显示。
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsly/img
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsly/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsly/img/zsly.png
5:37 下午

shuyongfu

解决:GDSZYY-102 开发二级供应室在历史装配记录生成代理灭菌单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.25_20211122_v4_1_nologo_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.25_20211122_v4_1_6p_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.25_20211122_v4_1_release.apk
5:18 下午

frank.qiu

解决了 GDSZYY-116:聚合包装配界面要记住审核人；普通装配界面改进为按照任务组独立记住配包人和审核人
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
5:15 下午

frank.qiu

解决了 GDSZYY-116:聚合包装配界面要记住审核人；普通装配界面改进为按照任务组独立记住配包人和审核人
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
5:13 下午

frank.qiu

解决了 GDSZYY-116:聚合包装配界面要记住审核人；普通装配界面改进为按照任务组独立记住配包人和审核人
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js