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

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
5:16 下午

zc.li

解决 BJCYZXYYY-15 【回收清点】待回收申请单的div窗口对已回收的物品添加背景颜色
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/vo/RecyclingDetailItemVo.java
5:16 下午

frank.qiu

解决了 BJCYZXYYY-15 - 【回收清点】待回收申请单的div窗口对已回收的物品添加背景颜色
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
5:11 下午

frank.qiu

解决了 GDSRMYY-572 - 优化接口接收的第三方消毒供应中心（聚力康公司）产生包实例在器械包信息中显示的信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
4:50 下午

frank.qiu

解决了 GDSRMYY-572 - 优化接口接收的第三方消毒供应中心（聚力康公司）产生包实例在器械包信息中显示的信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
4:05 下午

frank.qiu

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

linnansheng

IE登录时会提示报错，添加免登录访问
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zjyy/spring/security/applicationContext-acegi-security.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/spring/security/applicationContext-acegi-security.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/cszxyy/spring/security/applicationContext-acegi-security.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/spring/security/applicationContext-acegi-security.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/spring/security/applicationContext-acegi-security.xml
1:44 下午

jason

解决jira问题：GDSRMYY-573 与北大医信集成平台进行单点登录接口
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/filter/RequestHeaderAuthenticationFilter.java
11:47 上午

zc.li

装配打印日志优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/controller/PackingController.java
11:47 上午

frank.qiu

打印日志接口logPrintTousse参数简化

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
11:08 上午

zc.li

增加装配日志，增加配置项excludeDuplicatePackingTask，用于现场排除后台重复数据的可能 默认不开启 当现场出现重复打印时，可开启进行数据观察
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
Friday 01 Dec 2023
7:00 下午

zc.li

解决 DGSFYBJY-68 - 回收单界面的“终止”按钮无法终止回收单
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/GoodsBindingConfigManagerImpl.java
6:30 下午

jason

解决jira问题：GDSRMYY-577 对聚力康第三方消毒供应系统WebService处理批次接口进行改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/imagefilemanager/ImageFile.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/webservice/server/JLKBatchImageDataPushWebServiceImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/JLKBatchImageVo.java
6:02 下午

zc.li

解决BJ309YY-9 【标识牌管理】配置项“idCardUseAmountNoticeType”改进提醒方式以及增加装配时提醒
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java
5:43 下午

frank.qiu

解决了 BJ309YY-9 - 【标识牌管理】配置项“idCardUseAmountNoticeType”改进提醒方式以及增加装配时提醒
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
5:26 下午

zc.li

解决BJ309YY-9 【标识牌管理】配置项“idCardUseAmountNoticeType”改进提醒方式以及增加装配时提醒
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java
4:04 下午

frank.qiu

解决了 DGSFYBJY-69 - 装配或者审核打印标签时，每次发出打印命令后，不再判断是否打印成功，避免重复打印情况出现
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js