forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

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

Thursday 10 Aug 2017
4:58 下午

adairkang

PDA审核人编码为空的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
4:35 下午

adairkang

CDSLQYQYYY-17 PC端发货界面增加“保存并打印”按钮
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrintModule.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
4:02 下午

zengjc

解决jira问题DGZYY-113，工作质量持续收集统计报表修改.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:39 下午

shuyongfu

解决jira问题:GXZYYFY-23 切换科室选择下拉框的选项显示不全

另外还有以下几处调整:

1.退出系统增加日志

2.中大五院的告警提示不显示"已过期的器械包"告警数据

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/portalPage.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
2:05 下午

liuliben

解决：在消毒供应中心物品领用界面，添加材料时，文本框里的文字不会自动清空
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js
1:46 下午

jeffli

解决：ZSSZYY-107

在器械包信息界面看到器械包的任务组不是装配对应时的那个任务组

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
11:59 上午

liuliben

材料，器械包，外来器械停用显示改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js
10:57 上午

jeffli

解决聚合包装配测试用例通不过问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
10:46 上午

liuliben

材料,器械包,外来器械的停用显示取消添加功能。添加取消停用功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp
9:24 上午

cherry

增加深圳中医院的配置，罗乐要求按广西的配置复制
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/szszyy/mybatis/FindPatientInfoByTreatmentNumMapper_xh.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/szszyy/dataSyncConfig.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/szszyy/HIS_xh.xml
  4. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/szszyy/mybatis
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/szszyy/mybatis/SyncOrgUnitAndUserMapper.xml
  6. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szszyy/print
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/szszyy/mybatis/SyncOrgUnitAndUserMapper2.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/szszyy/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/szszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/szszyy/mybatis/FindPatientInfoByHospitalNumMapper_xh.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szszyy/config.js
  12. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/szszyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/szszyy/mybatis/SyncOrgUnitAndUserMapper_xh.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/szszyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
  15. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szszyy
  16. … 3 more files in changeset.
Wednesday 09 Aug 2017
8:49 下午

jeffli

解决：ZSSZYY-107

在器械包信息界面看到器械包的任务组不是装配对应时的那个任务组

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.8.7_4.8.8.sql
8:49 下午

jeffli

解决：ZSSZYY-107

在器械包信息界面看到器械包的任务组不是装配对应时的那个任务组

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/Constants.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
3:43 下午

jeffli

修改佛山妇幼标识牌样式
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fsfy/print/printConfig.js
3:15 下午

jeffli

解决：GDSRMYY-354

外来器械小标签上增加‘植入物’文字标识

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
3:15 下午

zengjc

解决jira问题DGZYY-112，东莞中医院年度消毒供应中心工作量统计报表调整。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:11 下午

cherry

增加fluentWaitUntilFind的判断
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
2:50 下午

cherry

聚合包下拉选择由点击换成键盘下按
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
11:30 上午

adairkang

外部代理灭菌没有"包"字

添加外来器械拆分小包的类型

问题:如果有外部代理灭菌包申请单，在下一页的时候，会看不到外部代理灭菌包申请单。外来器械申请单有拆包的情况也有这样的问题

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
Tuesday 08 Aug 2017
8:50 下午

adairkang

记住回收人太宽导致清除按钮无法点击
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
8:19 下午

jeffli

修复聚合包装配测试用例
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
3:41 下午

jeffli

聚合包装配，继续装配后，清空器械包列表
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
2:32 下午

liuliben

解决材料管理导出后台报错
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/exportMaterials.jsp
1:45 下午

jeffli

解决：ZSYY-110

聚合包功能优化改进

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • ?
    /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/action/PackingAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
Monday 07 Aug 2017
9:01 下午

zengjc

解决jira问题ZSYY-112，一次性物品基础数据导入导出增加“包装规格”字段.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataTest.xls
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
5:24 下午

zengjc

材料的导入导出，添加“是否停用”属性.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataTest.xls
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
4:00 下午

liuliben

4.1添加停用材料功能模块
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/dwr/table/MaterialDefinitionTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
2:25 下午

zengjc

同步4.0代码，中山六院的年度消毒工作中心统计报表，添加腔镜器械，下收下送次数统计。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/yearWorkloadReport2.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsly/config.js
    • ?
    /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/disinfectsystem/reportforms/yearWorkloadReportView2.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/yearWorkloadReport2.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
12:10 下午

terrykwan

增加删掉32位IE浏览器的语句
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
Sunday 06 Aug 2017
10:48 下午

terrykwan

去掉一次性物品测试的一部分休眠延迟的代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java
10:48 下午

terrykwan

去掉灭菌中的一些休眠的代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java