forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 59
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 59
Total Lines of Code (LoC): 4,711,364
Net change in LoC this week: 3,161

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

Subversion Details

1 property
  • svn:global-ignores = .gradle .settings bin build rebel.xml
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Monday 11 Apr 2016
10:09 下午

jeffli

一次性物品代码重构
Options
    • -10
    • +9
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • -4
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DiposableGoodsInstance.java
    • -13
    • +14
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
    • -1
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManager.java
    • -2
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManagerImpl.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDAAssembleSendGoodsInvoiceManagerTests.java
    • -40
    • +49
    /ssts-web/src/test/java/test/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerTests.java
    • -13
    • +14
    /ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/webservice/manager/ZdwyWebServiceManagerImpl.java
    • -2
    • +3
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • -1
    • +1
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -6
    • +7
    /ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/service/StockTakeRecordManagerGzzyyfsImpl.java
    • -9
    • +10
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -5
    • +5
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBaseDataFromZipManagerImpl.java
    • -8
    • +9
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
  16. … 10 more files in changeset.
7:14 下午

shuyongfu

核算明细月报南院供应室登录后可选择科室,器械包库存页面去掉器械包名称的链接
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
7:12 下午

shuyongfu

灭菌器械包条码排序功能由4.0迁移至4.1
Options
    • -1
    • +6
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
7:11 下午

shuyongfu

南山附幼同步病人、科室、人员接口的实现代码邮4.0迁移至4.1
Options
    • -0
    • +66
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsfy/FindPatientInfoByTreatmentNumDaoImpl.java
    • -0
    • +22
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsfy/HisDbConnectionUtil.java
  3. /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsfy
    • -0
    • +63
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsfy/FindPatientInfoByHospitalNumDaoImpl.java
    • -0
    • +105
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsfy/SyncOrgUnitAndUserDaoImpl.java
7:06 下午

adairkang

移动位置
Options
    • -0
    • +128
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/storageRecord.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.jsp
    • -128
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/storageRecord.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp
6:48 下午

adairkang

一次性物品库存界面添加查看出入库流水
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.jsp
    • -2
    • +22
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js
6:26 下午

adairkang

一次性物品管理界面添加查看出入库流水的功能
Options
    • -0
    • +12
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManager.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -0
    • +128
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java
    • -1
    • +21
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
    • -0
    • +10
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.1.1_4.1.2.sql
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp
    • -0
    • +128
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/storageRecord.js
    • -0
    • +24
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
4:53 下午

wangyi

自定义装配的消毒物品加库存
Options
    • -0
    • +2
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +2
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
4:26 下午

jeffli

一次性物品代码重构
Options
    • -9
    • +5
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java
    • -1
    • +0
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java
4:14 下午

jeffli

重构一次性物品标识号管理，加上仓库的处理

调整一次性物品测试用例

Options
    • -2
    • +0
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • -2
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDAAssembleSendGoodsInvoiceManagerTests.java
    • -29
    • +27
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/IdentificationOfDiposableGoodsManagerImpl.java
    • -2
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/IdentificationOfDiposableGoodsManager.java
    • -2
    • +0
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManager.java
    • -0
    • +9
    /forgon-tools/src/main/java/com/forgon/tools/util/SqlUtils.java
    • -4
    • +8
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDADiposableGoodsInvoiceManager.java
    • -23
    • +0
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -5
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerTests.java
    • -19
    • +0
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManagerImpl.java
3:58 下午

wangyi

修复科室供应室配置偶尔会删除一级供应室bug
Options
    • -12
    • +45
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
    • -19
    • +21
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • -4
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
    • -6
    • +1
    /ssts-web/.classpath
3:55 下午

jeffli

新增功能：

添加一次性物品定义时，如果选择了类别，外部编码默认为该类别最大的外部编码加1

Options
    • -0
    • +23
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js
    • -0
    • +35
    /forgon-tools/src/main/java/com/forgon/tools/util/ForgonStringUtils.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp
    • -1
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
10:58 上午

wangyi

科室供应室配置加载时屏蔽页面操作
Options
    • -0
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
Sunday 10 Apr 2016
1:07 上午

shuyongfu

1.回收扫描已禁用或已删除的标识牌的条码时的信息提示

2.增加器械包库存(基数)查询页面

3.新增器械包时,默认时添加至一级供应室处理的器械包配置

4.一次性物品定义、库存、发货单等列表位置与殉宽度调整

Options
    • -0
    • +22
    /ssts-web/src/main/resources/spring/projects/gzfdzl/applicationContext-his-gzfdzl.xml
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -2
    • +3
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
  4. /ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock
    • -0
    • +148
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java
    • -0
    • +5
    /ssts-web/src/main/webapp/WEB-INF/dwr.xml
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -0
    • +136
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
    • -0
    • +5
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js
    • -3
    • +19
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -1
    • +0
    /ssts-web/src/main/resources/config/gzfdzl/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -0
    • +9
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -0
    • +50
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp
    • -0
    • +8
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
Friday 08 Apr 2016
5:41 下午

shuyongfu

复大肿瘤jdbc连his数据库邮jtds驱动更改为微软官网驱动
Options
    • -2
    • +2
    /ssts-web/src/main/resources/spring/projects/gzfdzl/applicationContext-his-gzfdzl.xml
3:14 下午

wangyi

科室改名处理
Options
    • -0
    • +3
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • -2
    • +42
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -17
    • +24
    /forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java
11:01 上午

jeffli

解决bug：

器械包管理上传图片显示成功，但实际并没有图片。

Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/imagefilemanager/ImageFile.java
    • -95
    • +101
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java
Thursday 07 Apr 2016
7:40 下午

adairkang

发货物品查询添加外部编码并排序

器械包没有外部编码，排在后面，代码的处理顺序调了位置

Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_child.jasper
    • -4
    • +11
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_main.jrxml
    • -4
    • +14
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_child.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_main.jasper
    • -0
    • +12
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/InvoiceQueryItem.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
6:16 下午

jeffli

优化功能：

删除一次性物品定义时，判断是否有库存记录，如果有则不允许删除

屏蔽一次性物品库存管理界面上的操作按钮

Options
    • -1
    • +1
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java
    • -5
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js
    • -25
    • +48
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
5:54 下午

adairkang

入库单跟调拨单对选择打印的处理
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
5:41 下午

shuyongfu

复大南院发货不成功旧数据引起的小问题处理
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
5:04 下午

adairkang

提示的标题
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
4:41 下午

wangyi

申请单支持中文检索器械包
Options
    • -1
    • +3
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
4:05 下午

adairkang

调拨单打印物品批次，一次选多个物品的问题

入库单打印批次的方法改为调用公共的方法

Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js
    • -43
    • +43
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
2:57 下午

adairkang

调拨单后台的处理代码
Options
    • -0
    • +6
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -3
    • +14
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
2:52 下午

adairkang

调拨单明细及批次打印

调拨单出入库方都能看到单

调拨单列表添加出库仓库及入库仓库列

Options
    • -15
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
    • -0
    • +46
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/commonEntry.js
    • -1
    • +74
    /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js
    • -18
    • +270
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.jsp
12:13 下午

jeffli

修改功能：

一次性物品库存管理，不显示库存为0的批次

Options
    • -0
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • -1
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -0
    • +11
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
11:58 上午

adairkang

no_comment
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
11:25 上午

wangyi

修复打开外来器械申请单报空指针错
Options
    • -49
    • +51
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
11:17 上午

shuyongfu

调整物品宽度，新加的明细添至第一行
Options
    • -3
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js