forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

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

Friday 21 Jun 2019
9:39 上午

zc.li

PDA借物管理和科室申领后台代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
9:22 上午

yuandongxiao

selenium代码提交：删除多余的after方法
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
8:55 上午

jason

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/bjscylyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
1:05 上午

terrykwan

解决编译报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/bjcylyy/MQHelper.java
Thursday 20 Jun 2019
9:10 下午

zc.li

提交pda科室申领处理科室下拉框接口
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
9:06 下午

zc.li

解决:BJCYLYY-2、BJCYLYY-5、BJCYLYY-6、BJCYLYY-7
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.77_20190619_v4_1_release.apk
8:52 下午

jason

解决jira问题：北京垂杨柳医院BJCYLYY-8 科室人员病人接口开发
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/zsykzx/WebsphereMqDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/bjscylyy/HIS.xml
  3. /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/mqConfig
  4. /SterileSupplySystem/branches/V4.1.0/localrepo/com.ibm.mq/MQSDK1.6/3.0.1
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQDataDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/bjcylyy/SDKCaller.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/localrepo/com.ibm.mq/MQSDK1.6/3.0.1/MQSDK1.6-3.0.1.jar
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/bjcylyy/log4j.xml
  11. /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/bjcylyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/BaseDataDao.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/mqConfig/esbmq-config.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/bjcylyy/MQDataDaoImpl.java
  16. … 4 more files in changeset.
7:08 下午

zc.li

pda科室申领列表增加过滤。只显示1、当前登录用户的过滤（即：1、处理科室为自己所属科室的单 2、自己填的单 3、申请科室为自己所属科室的单。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
6:42 下午

yuandongxiao

selenium代码提交：解决找不到元素的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
4:38 下午

zc.li

解决：GZSZYYGZHC-39 高值耗材申请单审批通过以后，预入库页面绑定申请单明细没有显示该申请单信息

代永福提交

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
4:19 下午

shuyongfu

解决Jira问题:XJJQZYY-87 器械包定义中物品添加一次性物品材料保存后该器械包会出现无法搜索的情况
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
3:56 下午

yuandongxiao

selenium代码提交：解决弹出非预期提示框的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
Wednesday 19 Jun 2019
8:46 下午

yuandongxiao

selenium代码提交：解决当前句柄获取到页面的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
8:40 下午

jason

解决jira问题： 广州中医药大学第一附属医院GZZYYFY-56

已上传的外来器械注意事项图片在装配管理模块不能正常查看图片信息

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
8:03 下午

shuyongfu

BJCYLYY-1 pda上增加科室申领模块
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.77_20190619_v4_1_release.apk
7:43 下午

zc.li

解决：ASSDGSZYY-60。1.清洗区工作量及不合格率月报材料不合格增加过滤条件，质量监测po类材料名称为空的不计数。2.器械材料清洗不合格统计报表明细和汇总添加总计，统计总数量。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.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/washUnUnqualifiedReportSum.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/washUnUnqualifiedReportDetail.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/washUnUnqualifiedReportDetail.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/washUnUnqualifiedReportSum.jasper
5:04 下午

zc.li

完善：XJJQZYY-83。灭菌阶段为已结束才会移走文件。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java
2:39 下午

zc.li

修复测试时，使用绝对路径解决新华接口切换目录失败的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java
1:53 下午

yuandongxiao

selenium代码提交：解决浏览器中途关闭的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
Tuesday 18 Jun 2019
4:54 下午

weizhenyu

BJCYLYY-1:增加config.js配置项，配置项中文名字：启用PDA科室申领功能，英文名字：enablePdaApply，值为true时，PDA上显示科室申领的图标；值为false或者没配置时，PDA上不显示科室申领的图标，不能使用该功能。

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

jason

解决：中山市小榄人民医院ZSSXLRMYY-178

批量打印加入外部代理灭菌单类型，外部代理灭菌单放在批量打印的最后打印

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
3:32 下午

yk

新建项目：福建石狮市医院 project=fjsssyy
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fjsssyy/config.js
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/fjsssyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/fjsssyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/fjsssyy/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fjsssyy/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/fjsssyy/dataSyncConfig.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/fjsssyy/mybatis/syncFromHERP_Mapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/fjsssyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
  9. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fjsssyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/fjsssyy/mybatis/SyncOrgUnitAndUserMapper.xml
  11. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/fjsssyy/mybatis
  12. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/fjsssyy
  13. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fjsssyy/print
3:09 下午

zc.li

广东省医包装区工作量报表开启消毒物品按包统计
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
11:15 上午

shuyongfu

2019年6月17日与汪工微信沟通,确定广医二院禁用科室同步、及人员同步
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gyey/config.js
9:45 上午

zc.li

设备接口的接口方式添加默认值为共享文件夹；修改旧数据，null改为共享文件夹
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.35_4.9.36.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java
Monday 17 Jun 2019
7:54 下午

zc.li

完善：XJJQZYY-83。灭菌阶段是否已结束才把文件移动到已读文件夹。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java
7:51 下午

zc.li

PDA科室申领后台
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
7:24 下午

jason

解决jira问题：中山市小榄人民医院ZSSXLRMYY-175 材料图片排序不成功
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionUploadImageManager.js
6:15 下午

yuandongxiao

selenium代码提交：解决有时无法归还借物的问题
Options
    • ?
    /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/Assemble.java
6:04 下午

zengyuan

解决器械包信息上面的文本框在Google浏览上不能显示的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js