forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

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

Thursday 16 Nov 2023
2:21 下午

feng.rui

selenium3提交:不补充器械直接装配的自动化用例的方法和脚本提交(因需在数据库中造样本数据,暂不启用)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestPack.java
2:13 下午

feng.rui

selenium3提交:不补充器械直接装配的自动化用例的方法和脚本提交(因需在数据库中造样本数据,暂不启用)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/pack/PackHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/pack/PackPage.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestPack.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/pack/PackProxy.java
2:10 下午

feng.rui

selenium3提交:新显式等待方式:定位成功后返回
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/basepage/BasePage.java
10:15 上午

frank.qiu

解决了 SZSDSRMYY-120 - 【物品签收】默认发货时间改为【近三天】(PC和PDA端都修改)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js
Wednesday 15 Nov 2023
6:16 下午

jason

解决jira问题： SZSDSRMYY-118 【病人使用记录】第三方嵌入的使用记录页面功能同步最新的基础信息和“结算科室”功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/PatientInfoVO.java
6:06 下午

frank.qiu

解决了 SZSDSRMYY-118 - 【病人使用记录】第三方嵌入的使用记录页面功能同步最新的基础信息和“结算科室”功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-acegi-security.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/spring/security-standard/applicationContext-acegi-security.xml
5:42 下午

frank.qiu

解决了 SZSDSRMYY-118 - 【病人使用记录】第三方嵌入的使用记录页面功能同步最新的基础信息和“结算科室”功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js
5:18 下午

frank.qiu

解决了 SZSDSRMYY-118 - 【病人使用记录】第三方嵌入的使用记录页面功能同步最新的基础信息和“结算科室”功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-acegi-security.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/buttjoint/useRecord/useRecord.jsp
5:08 下午

zc.li

历史代码完善 避免编译时出现告警
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
1:46 下午

zc.li

完善 SZSDSRMYY-115 代码完善 优化一些特殊数据下装配打印出来的备注丢失问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
Tuesday 14 Nov 2023
5:52 下午

jason

解决jira问题：ZSRY-63 【质量监测】一级供应室的“质量监测记录”页面新增过滤项“所选供应室”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/dwr/table/QualityMonitoringInstanceTableManager.java
5:51 下午

frank.qiu

解决了 ZSRY-63 - 【质量监测】一级供应室的“质量监测记录”页面新增过滤项“所选供应室”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.jsp
5:40 下午

jason

解决jira问题：XKYY-244 开发与集成平台对接的”器械信息接口“，通过MQ协议推送发货的器械包信息
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xkyy/interfaces/mqConfig
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xkyy/spring/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/xkyy/TousseInstancePushDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/TousseInstancePushDao.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xkyy/interfaces/mqConfig/SDKConfig.properties
  8. /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/xkyy
5:31 下午

jason

代码优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
4:11 下午

zc.li

修复历史bug FSFY-100 在回收界面选择科室后，会带出绑定了其它科室的篮筐（获取科室的绑定篮筐时，会同时获取到与此科室编码类似的科室的篮筐）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java
11:39 上午

jason

解决jira问题：SZSDSRMYY-116 自动审核使用记录功能增加判断条件按照【手术单号】匹配病人状态；

SZSDSRMYY-117 使用记录增加【手术单号】和【病人所在科室】取值

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szsdsrmyy/FindPatientInfoByHospitalNumDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/FindPatientSurgicalStatusByHospitalNumberDao.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/interfaces/mybatis/FindPatientSurgicalStatusByHospitalNumberMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/FindPatientSurgicalStatusDao.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/spring/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/interfaces/mybatis/FindPatientSurgicalStatusMapper.xml
10:45 上午

zc.li

完善：ZSSXLRMYY-226 【灭菌管理】新增多项改进(修改表格列名称、增加查询项“器械包名称”)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
Monday 13 Nov 2023
6:17 下午

frank.qiu

解决了 GYKQ-91 - 打开待回收申请单或者新增回收申请单的时候，点击选择申领模板的下拉框按钮无反应
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
5:35 下午

li.wei

同步现场配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js
2:30 下午

zc.li

解决：SSTS-628 明细核算月报查询的消毒物品定义超过32767个时，会报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DepartmentMonthDetailHelper.java
11:27 上午

zc.li

完善 SZSDSRMYY-115 代码完善 优化一些特殊数据下装配打印出来的备注丢失问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
Thursday 09 Nov 2023
4:30 下午

frank.qiu

解决了 DGZYY-215 - 外来器械申请界面增加入筐功能，可以扫描清洗篮筐绑定外申请的外来器械，在回收界面扫描清洗筐条码跳转到对应回收单
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
3:03 下午

frank.qiu

解决了 BJ309YY-11 - 启用标识牌跟清洗篮筐绑定，装配时扫描标识牌条码无法正常装配
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
2:44 下午

frank.qiu

解决了 SZSLGZXYY-24 - 明细核算月报和核算月报导出的excel不显示表头名称的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/exportMonitorData.jsp
Wednesday 08 Nov 2023
4:39 下午

frank.qiu

解决了 ZSSXLRMYY-227 - 【审核打包】中显示的器械包详细信息页面将字段“清洗方式”更改“清洗质量检查方法”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
4:38 下午

jason

解决jira问题：ZSSXLRMYY-227 【审核打包】中显示的器械包详细信息页面将字段“清洗方式”更改“清洗质量检查方法”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
3:26 下午

frank.qiu

解决了 SZSLGZXYY-21 - 【发货计划】辅助发货新增多项改进(扩展查询项物品来源科室、来源科室列、时间设置规则优化)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js
2:09 下午

frank.qiu

解决了 SZSLGZXYY-21 - 【发货计划】辅助发货新增多项改进(扩展查询项物品来源科室、来源科室列、时间设置规则优化)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js
1:48 下午

frank.qiu

解决了 SZSLGZXYY-21 - 【发货计划】辅助发货新增多项改进(扩展查询项物品来源科室、来源科室列、时间设置规则优化)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js
11:51 上午

zc.li

完善 DGZYY-215 - （不开启配置项，不提示预绑定篮筐信息）外来器械申请界面增加入筐功能，可以扫描清洗篮筐绑定外申请的外来器械，在回收界面扫描清洗筐条码跳转到对应回收单
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java