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

Wednesday 13 Sep 2017
11:03 上午

chenjiaru

增加注释
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
10:42 上午

adairkang

DGZYY-127 转化过来的回收申请单，无法添加器械包
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
Tuesday 12 Sep 2017
9:58 下午

shuyongfu

省医回写功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/inventorymanagement/gdsy/dao/WriteBackInventoryDaoImpl.java
6:02 下午

cherry

增加自定义装配敷料包和消毒物品场景
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
4:15 下午

jeffli

成都市五冶医院CDSWYYY-4

标签模板管理功能-普通器械包增加器械总件数属性

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/labelTemplateDesign/dataSource.js
3:50 下午

shuyongfu

陈国强发回来的东莞中医院现场配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/recyclingDetailPrintConfig.js
10:47 上午

cherry

清洗选择删除按钮优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java
9:59 上午

jeffli

新增测试用例，一个申请单上多个外来器械发货
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestMultiForeignTousseInvoiceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
Monday 11 Sep 2017
8:05 下午

liuliben

补：基础导入同器械包列值修改问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
6:40 下午

yanweining

gyey:新增单点登陆功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-standard.xml.back
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/logonSSOForGyey.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/security/applicationContext-acegi-security.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-settlement-gyey-impl/src/main/java/com/bjgoodwill/jhipwebsvc/JhipSsoWebsvcProxy.java
5:00 下午

cherry

清洗、灭菌的优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java
4:55 下午

liuliben

补基础数据导出是否申请转换物品列
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
3:35 下午

shuyongfu

增加广医二院科室人员接口
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/gyey/webservice-cxf.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-cxf.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/goodwillcis/SysUserAndOrgServiceImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/goodwillcis/SysUserAndOrgService.java
2:17 下午

shuyongfu

广医二院单点登录webservice的wsdl文件定义与客户端代码开发
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-settlement-gyey-impl/src/main/java/com/bjgoodwill/jhipwebsvc/JhipSsoWebsvcProxy.java
2:10 下午

shuyongfu

广医二院单点登录webservice的wsdl文件定义与客户端代码开发
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-settlement-gyey-impl/src/main/java/com/bjgoodwill/jhipwebsvc/JhipSsoWebsvcImplServiceLocator.java
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/wsdl/gyey
  3. /SterileSupplySystem/branches/V4.1.0/ssts-datasync-settlement-gyey-impl/src/main/java/com/bjgoodwill
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-settlement-gyey-impl/src/main/java/com/bjgoodwill/jhipwebsvc/JhipSsoWebsvcImplService.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-settlement-gyey-impl/src/main/java/com/bjgoodwill/jhipwebsvc/JhipSsoWebsvc.java
  6. /SterileSupplySystem/branches/V4.1.0/ssts-datasync-settlement-gyey-impl/src/main/java/com/forgon/disinfectsystem/constant
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-settlement-gyey-impl/src/main/java/com/bjgoodwill/jhipwebsvc/JhipSsoWebsvcImplServiceSoapBindingStub.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-settlement-gyey-impl/src/main/java/com/bjgoodwill/jhipwebsvc/JhipSsoWebsvcProxy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/wsdl/gyey/sso.wsdl
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-settlement-gyey-impl/src/main/java/com/forgon/disinfectsystem/constant/Constant.java
  11. /SterileSupplySystem/branches/V4.1.0/ssts-datasync-settlement-gyey-impl/src/main/java/com/bjgoodwill/jhipwebsvc
  12. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/wsdl
2:08 下午

shuyongfu

优化4.8.5升级到4.8.6的质量监测旧数据升级性能

质量监测明细记录与质量监测记录在many增加对one端的属性定义并设置为延迟加载,以提高性能和代码运行效率

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoringInstance.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoringGoods.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManager.java
2:02 下午

shuyongfu

申请单字段长度调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
1:50 下午

cherry

优化鼠标悬停
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
10:55 上午

shuyongfu

省医回写功能启用
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/gdsy/HIS.xml
10:17 上午

cherry

优化灭菌记录的选择

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java
Friday 08 Sep 2017
9:52 下午

chenjiaru

修复外来器械包的测试用例
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestForeignTousseGoodRecyclingApplication.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/application/ForeignTousseAppDataProvider.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ClassifyBasketsRecyclingSequenceTests.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
6:22 下午

liuliben

补基础数据导入测试数据
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataTest.xls
4:27 下午

cherry

退出方式由关闭浏览器改为退出系统
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/Login.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java
4:08 下午

adairkang

ZSYY-124 发货单格式调整

headerFooter添加只在最后一页打印的配置

修改字体大小，发货计划签名放到最后一页

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

jeffli

一个申请单上多个外来器械包，发货处理
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
3:43 下午

adairkang

ZSYY-124 发货单格式调整

headerFooter添加只在最后一页打印的配置

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
11:44 上午

adairkang

清洗篮筐监控，添加判空。有些浏览器是空数组，有些可能是null
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/basketMonitor/washBasketMonitorView.js
11:40 上午

shuyongfu

与小黎沟通，使用记录扫描外来器械包条码增加限制:

1.如果启用允许外来器械拆分小包部分发货,则录使用记录时判断该外来器械包的其它拆分小包是否也已经发货,如果其它外来器械拆分小包未发货则不允许录使用记录。

2.如果启用外来器械申请单是否允许申请多套外来器械包,判断该外来器械包的外来器械申请单的其它外来器械包是否也已经发货,如果其它外来器械包未发货则不允许录使用记录

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
11:23 上午

adairkang

外来器械历史回收记录打开，删除的包也被显示出来的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
10:32 上午

jeffli

解决bug：

装配多个同名的外来器械会报错

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java