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

Wednesday 22 Feb 2017
7:10 下午

shuyongfu

解决jira问题：ZSSZYY-96 同一炉物品灭菌正常，有一个器械包状态为已审核

灭菌装载增加限制,只能对状态为已审核的器械包从灭菌筐移除

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
4:00 下午

zhonghaowen

解决DYSYY-9:借物发货的器械包在使用记录转化为申请单后，借物单的状态自动变为归还待确认状态
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/borrow/bo/BorrowBo.java
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/borrow
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/tousseDefinition/TousseDefinitionDataProvider.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/borrow/BorrowApplicationTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/application/ApplicationDataProvider.java
  9. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/UseRecord
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/AllTests.xml
  11. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  14. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/borrow
  15. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/tousseDefinition
  16. … 6 more files in changeset.
3:14 下午

jeffli

解决bug：

自定义装配，自定义标签模板中分开的科室没打印出来

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

adairkang

长沙中心医院，条码打印单号而不是科室条码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/cszxyy/print/printConfig.js
11:22 上午

zengjc

修复jira问题：ZSYY-18,DGZYY-79,修改工作量持续收集报表显示数量的单元格宽度。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/workQualityCollection.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/workQualityCollection.jrxml
Tuesday 21 Feb 2017
9:08 下午

adairkang

使用记录是否真正使用的数据获取不对，是否加急也有同样的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
6:09 下午

zengjc

工作量持续统计报表，修正统计项‘消毒物品不合格数’只算最后 一条数据的问题，统计项‘器械损坏件数’算记录条数的问题，本次提交没有jira想关问题.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
5:21 下午

adairkang

材料扣库存，返回所扣库存的信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
3:08 下午

jeffli

解决bug：

历史装配记录打印消毒物品时没有打印科室

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
2:22 下午

jeffli

解决bug：

消毒物品设置为打印科室（科室来源为资产归属或者回收科室），却没有把科室打出来

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

zengjc

解决jira问题：DGZYY-79、ZSYY-18，工作质量持续收集统计报表，整年报、上下半年对比、与去年对比报隐藏掉部分统计项，有百分比统计的数据，数量显示为"质量问题数量/工作量"。

目前只有东莞中医院、中大附一进行配置.

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/workQualityCollection2.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/workQualityCollectionView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/workQualityCollection3.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/workQualityCollection.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/workQualityCollection.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/workQualityCollection2.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/WorkQualityCollection.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/disinfectsystem/config/dgszyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/workQualityCollection3.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/reportforms/workQualityCollectionView.js
10:51 上午

shuyongfu

折扣价功能启用后才设置不允许为空,否则允许为空
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
10:46 上午

terrykwan

去掉关闭hibernate日志功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
10:06 上午

shuyongfu

解决基于oracle数据库的初始化科室方法sql语句写错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
Monday 20 Feb 2017
8:08 下午

chenjiaru

补上发货时针对“有植入物的器械包”提示其生物监测的情况的功能的测试用例，此次提交没有关联jira
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/util/ForgonDateUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/BiologicalMonitoringSituationTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/invoicemanager/service/AllTests.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
7:18 下午

jeffli

解决：DYSYY-6

重构自定义装配打印代码，支持资产归属和回收科室的配置

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/packing/directPacking.js
6:25 下午

jeffli

解决bug：

自定义发货，发货项的价格和折扣价为0

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
5:02 下午

wangyi

完成：DGZYY-82，东莞中医院定时清理2天前的未回收外来器械申请单
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManager.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-web/src/main/resources/spring/projects/dgszyy/timer.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/RecyclingErrorAndDamageUtil.java
3:00 下午

zengjc

修复jira问题：DGZYY-72，器械包信息关联质量监测记录项为无，又扫了器械包条码，器械包信息显示不了的问题.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
12:49 下午

shuyongfu

DYSYY-6 供应室的基数包，不管回收来自哪个科室，都打印科室为供应室。

DYSYY-10 器械包定义增加【是否发货】字段

器械包定义调整:

1.打印科室来源默认值由"否"改为"无"

2.类型为消毒物品、外部代理灭菌的包修改时,是否发货属性禁用,默认值设为"是"

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
11:55 上午

shuyongfu

创建消毒物品包定义,增加对资产归属字段的赋值
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
11:31 上午

wangyi

修复外来器械拆包的时候JSON转换报死循环错误问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
11:27 上午

shuyongfu

删除重复的资源文件
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/prepare
1:04 上午

shuyongfu

修改科室申领及借物的测试用例运行不通过的json数据
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/prepare/testForInvoicePlanStatus.json
12:03 上午

shuyongfu

修改科室申领及借物的测试用例运行不通过的json数据
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/prepare/testForInvoicePlanStatus.json
Sunday 19 Feb 2017
8:53 下午

jeffli

调整申请单测试数据，解决发货状态无法通过
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/prepare/testForInvoicePlanStatus.json
Saturday 18 Feb 2017
10:38 下午

adairkang

加急数量判空
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
10:35 下午

jeffli

申请项加急数量默认值改为0
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
7:15 下午

terrykwan

增加jdbc.url的传入参数
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
6:30 下午

wangyi

解决：ZSSZYY-52，一次性物品、材料支持添加库存为0的物品做盘点
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js
    • ?
    /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/stocktakerecordmanager/inventoryDisposableGoodsForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialOutView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryrecordView.js