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

Monday 11 Dec 2023
5:22 下午

jason

解决jira问题：DGSDBZXYY-221 使用记录对器械包进行加急后再进入回收单详情界面没有加急显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
3:37 下午

zc.li

解决 DGSDBZXYY-220 - 消毒供应中心员工绩效评分表改进为各环节评分的计算方式，可以选择数量来源为包数或者件数，以及选择是否需要乘以积分系数
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/StatisticalWorkloadHelper.java
Friday 08 Dec 2023
1:54 下午

frank.qiu

解决回收页面IE开启结算科室后提示的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
11:06 上午

zc.li

解决：DGSETYY-76 清洗时长统计多次清洗的总时长
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/UrgentNeedGoodsProcessingCycleHelper.java
Thursday 07 Dec 2023
5:14 下午

zc.li

完善：DGSETYY-76 兼容oracle
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/UrgentNeedGoodsProcessingCycleHelper.java
4:08 下午

jason

ZJYY-146 - 包定义另存为时会出现包内物品重复和翻倍 (非整包申请单的消毒物品，材料数量为0时，提示材料明细异常(旧版本允许保存材料数量为0的数据))
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
3:46 下午

zc.li

解决 DGSDBZXYY-220 - 消毒供应中心员工绩效评分表改进为各环节评分的计算方式，可以选择数量来源为包数或者件数，以及选择是否需要乘以积分系数
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/StatisticalWorkloadHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/reportoption/WorkScoreConfig.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:44 下午

frank.qiu

解决了 DGSDBZXYY-220 - 消毒供应中心员工绩效评分表改进为各环节评分的计算方式，可以选择数量来源为包数或者件数，以及选择是否需要乘以积分系数
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setWorkScoreConfig.js
3:24 下午

jason

解决jira问题：GDSRMYY-573 与北大医信集成平台进行单点登录接口(解决单点登录无法切换用户的问题)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/filter/AccessTokenAuthenticationToken.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/filter/RequestHeaderAuthenticationFilter.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/filter/TokenAuthenticationFilter.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/filter/TokenAuthenticationProvider.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/spring/security/applicationContext-acegi-security.xml
3:11 下午

li.wei

什么都没改，测试提交时不显示填写注释地方的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js
10:43 上午

li.wei

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/print/printConfig.js
Wednesday 06 Dec 2023
6:37 下午

zc.li

删除装配多余代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
4:25 下午

huangjian

与现场CONFIG文件对比合并后提交。

需要注意的是。以下配置项现场与SVN不同。暂时没有进行合并。

现场为：

//手术仪器管理别名配置

aliasNameOfSurgicalInstrumentsManagement:[ {"fieldName":"tousseLocationManagement","displayText":"器械包领出"}, {"fieldName":"recipient","displayText":"领出"}],

SVN为：

//手术仪器管理别名配置

aliasNameOfSurgicalInstrumentsManagement:[{"fieldName":"invoiceOfOperation","displayText":"领出"}, {"fieldName":"invoiceTypeOfPDA","displayText":"领出"}],

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
3:02 下午

frank.qiu

解决了 BJCYZXYYY-20 - 【回收清点】配置项“enablePartRecycle”启用后div窗口新增表格列“回收数量”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
11:39 上午

zc.li

修复灭菌装载中 篮筐总数中计算了已废弃的包数量的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
10:23 上午

frank.qiu

解决了 NFYY-91 - 【发货管理】新增可自定义不同物品类型打印的发货单表单样式
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/print/printConfig.js
Tuesday 05 Dec 2023
5:32 下午

zc.li

解决：ZSWY-209 【装配管理】新增按超时任务进行排序
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
4:47 下午

li.wei

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js
4:41 下午

li.wei

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/print/printConfig.js
3:31 下午

zc.li

解决：DGSETYY-76 【急用物品处理周期统计报表】增加“清洗时长”数据列
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport_child.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport_child_child.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport_child.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport_child_child.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport.jrxml
3:31 下午

zc.li

解决：DGSETYY-76 【急用物品处理周期统计报表】增加“清洗时长”数据列
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UrgentNeedGoodsProcessingCycle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/UrgentNeedGoodsProcessingCycleHelper.java
2:45 下午

frank.qiu

解决了 NFYY-95 - 【外来器械申请单】更改病人信息新增字段“病人ID”、“备注”以及支持通过接口获取信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
12:01 下午

frank.qiu

解决了 BJCYZXYYY-20 - 【回收清点】配置项“enablePartRecycle”启用后div窗口新增表格列“回收数量”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
11:44 上午

frank.qiu

解决了 DGZYY-208 - 外来器械申请单统计报表相应增加“重量”字段以及新增标签设计增加“重量”内置属性
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js
11:40 上午

frank.qiu

解决了 DGZYY-208 - 外来器械申请单统计报表相应增加“重量”字段以及新增标签设计增加“重量”内置属性
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js
11:38 上午

zc.li

解决：DGZYY-208 外来器械申请单统计报表相应增加“重量”字段以及新增标签设计增加“重量”内置属性
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseItemVO.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/ForeignTousseApplicationReportHelper.java
11:13 上午

zc.li

解决：DGZYY-208 外来器械申请单统计报表相应增加“重量”字段以及新增标签设计增加“重量”内置属性
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/ForeignTousseApplicationReportHelper.java
11:02 上午

jason

解决jira问题：GDSRMYY-577 对聚力康第三方消毒供应系统WebService处理批次接口进行改进(批次图片编号允许为非数字)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/webservice/server/JLKBatchImageDataPushWebServiceImpl.java
Monday 04 Dec 2023
6:14 下午

frank.qiu

解决了 SZSDSRMYY-135 - 使用记录嵌入页面需要支持结算科室根据包定义资产归属取值的功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/buttjoint/useRecord/useRecord.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js
5:20 下午

jason

解决jira问题：NFYY-95 【外来器械申请单】更改病人信息新增字段“病人ID”、“备注”以及支持通过接口获取信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java