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

Friday 19 Jul 2019
5:39 下午

zc.li

解决：ASSPYQZYY-35。1.灭菌区工作量及不合格率月报中灭菌总数跟护理工作质量指标报表的不合格数量不一致的问题。2.护理工作质量指标报表灭菌总数兼容oracle数据库。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
5:03 下午

zc.li

解决：ASSZDFY-34。开启enableTousseDefinitionBelongDepart和enableTousseDefinitionBelongDepartFilter后,无管理员权限查询不了包定义的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
3:48 下午

shuyongfu

处理Jira问题:ASSZDFY-35 优化pda进行快速发货时按pda筛选出的申请时间再发到对应申请单上
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
2:59 下午

yuandongxiao

selenium代码提交：增加场景

1.部分回收

2.回收时消毒物品修改材料数量

3.清点确认

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/service/ApplyComboService.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/constant/Constants.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/chain/ComboFillFormHandler.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/settings.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/service/ApplyComboServiceImpl.java
11:45 上午

shuyongfu

处理Jira问题:ASSZDFY-35 优化pda进行快速发货时按pda筛选出的申请时间再发到对应申请单上
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
9:29 上午

zc.li

解决：ASSZSYK-45。打开器械报损明细统计报表，页面显示空白的问题。

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/materialDamageItemView.jsp
Thursday 18 Jul 2019
6:59 下午

zc.li

解决：ASSPYQZYY-35。灭菌区工作量及不合格率月报中灭菌总数跟护理工作质量指标报表的无菌物品总件数不一致的问题。护理工作质量指标报表的无菌物品总件数计算方式改为和灭菌区工作量及不合格率月报中灭菌总数一致，由算包实例改为算灭菌记录。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
6:49 下午

shuyongfu

优化器械包信息查询速度
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
9:16 上午

zc.li

接口优化。新增日设备开始运行，运行完毕日记。优化贝丽曼和洁定的文件过滤。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/FtpFileManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java
Wednesday 17 Jul 2019
10:25 下午

chengq

现场业务有变化，功能配置作出调整。启用配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/bjscylyy/config.js
8:35 下午

LW

根据现场业务需求，更改查询语句
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/xjjqzyy/mybatis/FindPatientInfoByHospitalNumMapper2.xml
8:34 下午

LW

根据现场业务需求，更改查询语句
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/xjjqzyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
8:33 下午

LW

根据现场业务需求，更改数据源配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/xjjqzyy/HIS.xml
8:32 下午

LW

根据现场业务需求更改，增加打印机配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/print/printConfig.js
8:24 下午

LW

更改：

//打量打印发货单,发货单的合并方式

batchPrintInvoiceMergeType:"科室",

新增：

//PDA上是否启用器械包签收功能

enablePDATousseSign : true

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js
8:21 下午

LW

部分打印格式调整。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/print/printConfig.js
8:20 下午

zc.li

优化配置项说明
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js
9:43 上午

jason

解决：扫描病人手腕带没有去除住院号前缀问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
Tuesday 16 Jul 2019
9:18 下午

LW

增加了HIS数据源配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/bjscylyy/HIS.xml
6:39 下午

zc.li

修复灭菌记录干预扫描灭菌员条码写入灭菌员时页面报错的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationTab1.js
4:20 下午

zc.li

因为SZSZLYY-30部分回收改进任务中，把申请数量不为0的申请项改为也能删除，所以修改了原有的测试用例的判断。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/DeleteRecyclingRecordItemTests.java
3:54 下午

zc.li

代码优化。根据sql语句查询装配任务及器械包信息时，如果没有urgentLevelId,不需要打印错误信息。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
3:52 下午

zc.li

解决：ASSZDFY-32。灭菌干预新增干预确认完成人，灭菌卸载确认人功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationTab1.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
1:44 下午

zc.li

解决：SZSZLYY-30。回收时手工添加的器械包也能进行回收功能，删除器械包时，申请数量不为0也能从申请单中删除器械包。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szszlyy/config.js
11:01 上午

chengq

现场业务有变化，功能配置作出调整。启用配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szszlyy/config.js
9:38 上午

yk

北京垂杨柳医院发布包
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
Monday 15 Jul 2019
1:40 下午

zc.li

解决。ASSZDFY-33。灭菌记录待灭菌物品列表如果为入筐却不追溯的消毒包时，加载失败的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
1:35 下午

zc.li

解决：XJJQZYY-85。物品位于手术间，或流转位置类型为手术间才能扫描录入使用记录
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
Saturday 13 Jul 2019
6:01 下午

zengyuan

售后-中山小榄人民医院 ASSZSXLYY-13 科室申领页面的添加物品按钮没正常显示出来
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
Friday 12 Jul 2019
3:16 下午

zengyuan

深圳市肿瘤医院 SZSZLYY-29 PDA、PC扫描物品条码的回收、灭菌、发货、签收、使用记录模块需要按个人语音设置进行提示(只修改了PC端，没有修改PDA)补写注释
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/speaker.js