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 23 May 2016
2:04 上午

shuyongfu

高值耗材相关功能:

1.高值耗材材料发货及使用记录选择

2。使用记录功能调整-增加器械材料使用信息及一次性物品高值耗材的条码扫描

3。高植耗材一次性物品调拨功能

Options
    • -0
    • +137
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.jsp
    • -3
    • +24
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/dwr/table/UseRecordTableManager.java
    • -0
    • +102
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/UseMaterialGoodsItem.java
    • -1
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp
    • -6
    • +80
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • -1
    • +22
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -1
    • +45
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialInvoiceItem.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -16
    • +10
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
    • -11
    • +255
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js
    • -0
    • +3
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
    • -0
    • +23
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/MaterialInvoiceAction.java
    • -0
    • +169
    /ssts-web/src/main/webapp/disinfectsystem/invoice/selectUserecordWindowView.jsp
    • -0
    • +17
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
  16. … 9 more files in changeset.
12:35 上午

wangyi

明细核算月报增加‘高值耗材’类型过滤条件
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -1
    • +1
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • -9
    • +44
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
    • -0
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returnmaterialrecord/ReturnMaterialItem.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialInvoiceItem.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
Friday 20 May 2016
7:12 下午

wangyi

材料定义、入库加高值耗材属性
Options
    • -1
    • +26
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js
    • -3
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js
    • -5
    • +60
    /ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.js
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.jsp
    • -3
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/materialCheckView.jsp
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp
    • -2
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialmanager/MaterialEntryItem.java
    • -4
    • +3
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java
7:03 下午

jeffli

新增一次性物品高值耗材功能
Options
    • -0
    • +1
    /forgon-core/src/main/java/com/forgon/directory/model/BarcodeDevice.java
    • -14
    • +286
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -1
    • +62
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
    • -3
    • +36
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -0
    • +69
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/DiposableGoodsItem.java
    • -1
    • +1
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -2
    • +43
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java
    • -0
    • +61
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
    • -5
    • +143
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -12
    • +72
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • -1
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js
    • -28
    • +64
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -0
    • +196
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveDisposablegoods.java
    • -2
    • +18
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
  16. … 4 more files in changeset.
5:26 下午

wangyi

修复消毒物品添加丢失报损未找到包定义问题
Options
    • -31
    • +58
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
3:53 下午

shuyongfu

查询一次性物品由查库存表改为查定义表
Options
    • -7
    • +7
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
3:14 下午

shuyongfu

一次性三类查询报表刚进入页面时不查询数据
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/goodsAmountSummaryByGradeView.js
3:07 下午

shuyongfu

使用记录转申请单逻辑调整
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
2:55 下午

wangyi

修改方法名字
Options
    • -3
    • +13
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
2:52 下午

wangyi

修复装配的消毒物品回收未生成包定义
Options
    • -9
    • +9
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
2:02 下午

jeffli

解决bug：

修改退库单时提示物品定义id不能为空

Options
    • -2
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
11:24 上午

jeffli

解决bug：

修改退库单时提示物品定义id不能为空

Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
10:43 上午

shuyongfu

调整器械包定义的ancestorId字段的oracle旧数据的升级脚本
Options
    • -10
    • +11
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.1.6_4.1.7_oracle.sql
Thursday 19 May 2016
6:20 下午

shuyongfu

一次性物品三类查询报表入库数据问题调整,新增入库单时类别自动带动调整
Options
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
    • -0
    • +7
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
5:23 下午

wangyi

待回收列表定时刷新
Options
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
5:14 下午

shuyongfu

解决消毒物品在装配页面查不到而导致不能装配的问题以及相关升级脚本
Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +12
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.1.6_4.1.7_sqlserver.sql
    • -0
    • +12
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.1.6_4.1.7_oracle.sql
4:04 下午

shuyongfu

解决采购计划的打印与导出问题
Options
    • -6
    • +22
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManagerImpl.java
4:04 下午

wangyi

修复回收申请单为设置回收状态
Options
    • -7
    • +4
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
3:43 下午

shuyongfu

解决jira问题:广州复大肿瘤医院 GZFDZL-8 增加一次性物品（三类）报表

漏了供应室领用对应的数量，现弥补上

Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:27 下午

shuyongfu

一次性物品增加类别字段显示与新增、修改配置
Options
    • -2
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
3:25 下午

shuyongfu

解决jira问题:广州复大肿瘤医院 GZFDZL-8 增加一次性物品（三类）报表

提交报表页面的菜单

Options
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
3:06 下午

shuyongfu

解决jira问题:广州复大肿瘤医院 GZFDZL-8 增加一次性物品（三类）报表
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
    • -0
    • +43
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/goodsAmountSummaryByGradeView.jsp
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +265
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/goodsAmountSummaryByGradeView.js
    • -0
    • +181
    /ssts-web/src/main/webapp/jasperRtp/GoodsAmountSummaryByGrade.jrxml
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -0
    • +12
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/GoodsAmountSummaryByGrade.jasper
2:52 下午

wangyi

灭菌干预灭菌中的器械包不允许移动
Options
    • -1
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -2
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView.js
2:27 下午

zengjc

修正回收清点，添加回收记录，搜索器械包输入不了中文的问题.
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
2:07 下午

wangyi

生成的器械包定义设置祖先ID
Options
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
    • -0
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -1
    • +7
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
12:39 下午

shuyongfu

解决jira问题:中山市中医院 ZSSZYY-9 组织机构和人员信息接口

包括使用记录的病人接口也一起解决了

Options
    • -89
    • +0
    /ssts-web/src/main/resources/spring/projects/zsszyy/applicationContext-his-gzfdzl.xml
    • -1
    • +17
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/OrgUnitVo.java
    • -10
    • +8
    /ssts-web/src/main/resources/config/zsszyy/mybatis/SyncOrgUnitAndUserMapper.xml
    • -8
    • +8
    /ssts-web/src/main/resources/config/zsszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -1
    • +52
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/PatientInfoVO.java
    • -0
    • +93
    /ssts-web/src/main/resources/spring/projects/zsszyy/applicationContext-his.xml
    • -1
    • +13
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/UserVo.java
    • -0
    • +61
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/CommonVo.java
    • -8
    • +8
    /ssts-web/src/main/resources/config/zsszyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
Wednesday 18 May 2016
7:12 下午

wangyi

修复新添加的回收申请单扫描科室条码提示“已有回收单不能更改科室”
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
7:08 下午

wangyi

修复非临床科室的回收单有需要装配的消毒物品不允许保存；回写器械包月报增加材料丢失、报废
Options
    • -1
    • +2
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.1.5_4.1.6_oracle.sql
    • -2
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingerror/RecyclingError.java
    • -14
    • +22
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -0
    • +24
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryManagerImpl.java
    • -4
    • +10
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingdamagerecord/RecyclingDamageItem.java
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.1.5_4.1.6_sqlserver.sql
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -6
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/damageMaterialAdditionalForm.js
3:38 下午

shuyongfu

解决jira问题:广州复大肿瘤医院 GZFDZL-2 器械材料增加采购计划功能（如果能做到一次性物品采购计划里最好）

注:采购计划增加材料后，另起了一个菜单，从一次性物品管理那个菜单里挪了出来

Options
    • -0
    • +9
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • -0
    • +26
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GoodPurchaseItem.java
    • -0
    • +92
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -0
    • +60
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GoodPurchaseAction.java
    • -0
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManagerImpl.java
    • -2
    • +8
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +73
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GoodPurchaseTableManager.java
    • -55
    • +83
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.js
3:17 下午

zengjc

解决回收清点添加回收记录添加器械包,中文不能输入的问题.
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp