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
Tuesday 22 Mar 2016
4:13 下午

shuyongfu

供应室服务临床科室及供应室处理器械包相关功能
Options
    • -0
    • +103
    /forgon-core/src/main/java/com/forgon/directory/model/CssdHandleTousses.java
    • -0
    • +164
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/cssdhandletousses/CssdHandleToussesAction.java
  3. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts
    • -2
    • +19
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • -2
    • +16
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -0
    • +166
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts/CssdServiceDeptsAction.java
    • -95
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/CssdHandleTousses.java
    • -0
    • +79
    /ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/OrgUnitTableManager.java
  9. /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/cssdhandletousses
2:57 下午

adairkang

退库单信息中仓库的选择
Options
    • -5
    • +52
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
    • -2
    • +35
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/WareHouseAction.java
2:47 下午

wangyi

增加库存常量字段
Options
    • -3
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/goodsstock/GoodsStock.java
2:43 下午

adairkang

器械包信息列表显示所属仓库
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
1:43 下午

adairkang

器械包已灭菌和消毒物品已消毒时，设置入库的仓库属性(完成灭菌时)，wince和android pda都有调用
Options
    • -0
    • +13
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • -0
    • +50
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -0
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
11:21 上午

wangyi

修复器械包定义标识牌为null时，回收提示要扫描标识牌条码bug
Options
    • -2
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
9:09 上午

adairkang

查询科室的仓库的sql语句

调整部分入库单的代码

入库单添加到默认仓库的处理

Options
    • -0
    • +101
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
    • -64
    • +13
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
    • -7
    • +126
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
    • -2
    • +29
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java
    • -0
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java
    • -0
    • +30
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java
Monday 21 Mar 2016
7:43 下午

shuyongfu

器械包与材料库存实体类及manager接口方法定义
Options
    • -0
    • +38
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/GoodsStockManager.java
  2. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/goodsstock
  3. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock
    • -0
    • +155
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/goodsstock/GoodsStock.java
7:42 下午

shuyongfu

仓库管理-新增、修改、删除功能实现
Options
    • -0
    • +75
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseView.jsp
    • -0
    • +211
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/WareHouseAction.java
    • -0
    • +5
    /ssts-web/src/main/webapp/WEB-INF/dwr.xml
    • -0
    • +160
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseView.js
    • -0
    • +192
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseForm.js
  6. /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java
  8. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action
    • -0
    • +31
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/dwr/WarehouseTableManager.java
    • -0
    • +88
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
    • -0
    • +16
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
  12. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/dwr
6:50 下午

wangyi

触摸屏回收JavaScript代码提取成js文件
Options
    • -0
    • +2138
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -2145
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
4:51 下午

shuyongfu

对接第三方接口属性调整
Options
    • -0
    • +51
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/PatientInfoVO.java
4:50 下午

shuyongfu

变量定义类型调整
Options
    • -6
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java
    • -3
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java
    • -3
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsItem.java
    • -3
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsRecord.java
    • -3
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialmanager/MaterialEntryItem.java
    • -3
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialmanager/MaterialEntry.java
    • -3
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java
    • -3
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
3:30 下午

wangyi

修改回收未设置分组篮筐数量提示信息带？提示
Options
    • -2
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
1:42 下午

wangyi

同步4.0代码
Options
    • -1
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
    • -5
    • +0
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
    • -0
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -24
    • +3
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
12:58 下午

shuyongfu

4.0合并到4.1
Options
    • -1
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
12:58 下午

shuyongfu

4.0合并到4.1
Options
    • -0
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilisation/Sterilisation.java
    • -0
    • +41
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/action/SterilisationAction.java
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • -6
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -0
    • +15
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
    • -18
    • +22
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
    • -0
    • +3
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -14
    • +30
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -0
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • -2
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationView.js
    • -0
    • +54
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.js
    • -1
    • +26
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationForm.js
12:01 下午

adairkang

DateQueryAdapter添加日期区间的sql语句生成

DataSynchronizationManager添加根据住院号或诊疗号查询病人信息，并将相应的代码合并

同步以供应商分类的一次性物品入库报表

材料丢失报表添加科室过滤条件

工作量统计及年度工作量统计添加发货单的核对数量列

pda使用记录添加根据住院号诊疗号查询病人信息的功能

眼科中心使用记录界面，添加使用记录提交后打开新的添加界面

ServiceManager中取消buildErrorMsgJsonResult,调用JSONUtil中的定义

Options
    • -1
    • +14
    /forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +11
    /forgon-tools/src/main/java/com/forgon/tools/json/JsonDefaultValueProcessor.java
    • -1
    • +57
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/materialMissTotalView.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -0
    • +10
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -0
    • +80
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordToJson.java
    • -0
    • +264
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.js
    • -0
    • +68
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/GodownEntryItemVo.java
    • -0
    • +33
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/godownEntrySummary.jasper
    • -1
    • +28
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • -0
    • +234
    /ssts-web/src/main/webapp/jasperRtp/godownEntrySummary.jrxml
    • -0
    • +49
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.jsp
    • -0
    • +9
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java
  16. … 14 more files in changeset.
10:37 上午

shuyongfu

多仓库功能供应室处理器械包、供应室服务处理科室的配置功能manager方法
Options
    • -0
    • +21
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java
    • -0
    • +10
    /forgon-core/src/main/java/com/forgon/directory/model/CssdServiceDepts.java
    • -0
    • +26
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • -2
    • +9
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -2
    • +11
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
10:09 上午

shuyongfu

供应室科室处理器械包、仓库查询、管理功能的manager接口方法定义
Options
    • -0
    • +15
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
  2. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service
    • -0
    • +22
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/warehouse/WareHouse.java
    • -0
    • +15
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -0
    • +41
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java
  6. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse
9:40 上午

shuyongfu

仓库的单词warehouse拼错调整
Options
    • -0
    • +83
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/warehouse/WareHouse.java
  2. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/warehouse
  3. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/warehousse
    • -83
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/warehousse/WareHousse.java
Sunday 20 Mar 2016
10:10 下午

terrykwan

优化表格的列宽，优化打印标签的提示，显示正在打印的器械包的名称
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
    • -4
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
    • -8
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • -7
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
    • -6
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • -7
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • -9
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/recyclingRecord/foreignTousseApplicationView.js
    • -5
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
    • -10
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
12:18 上午

shuyongfu

多仓库功能的新建实体类及原有实体类新建字段
Options
    • -0
    • +26
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
    • -0
    • +26
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialmanager/MaterialEntryItem.java
  3. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/warehousse
    • -0
    • +27
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsRecord.java
    • -0
    • +27
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java
    • -1
    • +28
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -0
    • +83
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/warehousse/WareHousse.java
    • -0
    • +26
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialmanager/MaterialEntry.java
    • -0
    • +68
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java
    • -0
    • +28
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java
    • -0
    • +27
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsItem.java
    • -0
    • +31
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
    • -0
    • +131
    /forgon-core/src/main/java/com/forgon/directory/model/CssdServiceDepts.java
    • -0
    • +95
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/CssdHandleTousses.java
Saturday 19 Mar 2016
3:16 下午

jeffli

同步4.0稳定版的修改
Options
    • -12
    • +48
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
2:52 下午

terrykwan

解决触摸屏回收添加的包器械包定义ID为空导致报错的问题
Options
    • -0
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -6
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
11:43 上午

terrykwan

修改为广州复大肿瘤的配置
Options
    • -3
    • +3
    /ssts-web/src/main/resources/jdbc.properties
9:28 上午

terrykwan

取科室名称时，修改为名称默认不包含科室所属的分类，解决组织机构的科室名称有多级时，登记使用记录时，验证的科室名称不对的问题
Options
    • -3
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
Friday 18 Mar 2016
11:28 下午

terrykwan

解决空指针问题
Options
    • -9
    • +16
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
7:31 下午

terrykwan

解决变量名找不到的问题
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
6:49 下午

terrykwan

先注释掉timer相关定义，避免java8下无法启动
Options
    • -7
    • +5
    /ssts-web/src/main/resources/spring/projects/gzfdzl/timer.xml
10:50 上午

wangyi

外来器械报表增加权限
Options
    • -1
    • +6
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml