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 03 Apr 2018
3:35 下午

niutou_ren

ZSYKZX-83（待清洗列表中的待清洗篮筐中的物品进行汇总及篮筐监控内的物品汇总)

修改bug：

1、触摸屏屏清洗界面：

如果配置了标识牌绑定篮筐enableIdCardBasketBinding，则，显示的条码为标识牌条码，支持扫标识牌条码和篮筐条码(现场该篮筐并没有打印条码，所以实际上只有标识牌条码）

如果没有配置标识牌绑定篮筐，则，显示的条码为篮筐条码，只能扫篮筐条码，扫篮筐对应的标识牌条码会提示“找不到该条码所对应的信息!”

2、修改显示不了篮筐内器械包图片的bug

Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
    • -10
    • +35
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • -4
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js
    • -2
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
    • -2
    • +14
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • too large
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -9
    • +34
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js
    • -5
    • +19
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/dwr/table/BarcodeTableManager.java
    • -1
    • +1
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp
3:30 下午

jeffli

发货管理-【物品汇总】功能增加申领单位字段

深圳市中医院SZSZYY-4

Options
    • -0
    • +43
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/vo/InvoiceItemSummaryVo.java
    • -0
    • +30
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/util/DisposableGoodsUtils.java
    • -1
    • +20
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceItemManagerImpl.java
    • -2
    • +18
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceItemSummary.js
2:08 下午

jeffli

解决bug：

高值耗材发货列表看不到发货计划

Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
10:22 上午

yanweining

一次性物品入库干预管理添加日志信息
Options
    • -0
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
    • -1
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -3
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownEntryView.js
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownEntryView.jsp
Monday 02 Apr 2018
6:12 下午

chenguina

pda版本更新至4.6.32
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.32_20180330_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.28_20180317_v4_1_release.apk
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
6:10 下午

jeffli

今天本组装配记录页面优化

中山一院消毒供应项目ZSYY-232

Options
    • -2
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
4:03 下午

alan.lee

解决：1.佛山市妇幼保健医院FSFY-38

调整‘灭菌物品列表‘宽度显示出删除按钮

2.灭菌交接 支持扫篮筐 字眼修改

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
3:52 下午

adairkang

修改科室名称，同步修改申请科室、结算科室等的拼音码和五笔码
Options
    • too large
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
2:38 下午

adairkang

灭菌交接添加器械包入灭菌篮筐的功能
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -9
    • +17
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
11:58 上午

niutou_ren

ZSYKZX-83（待清洗列表中的待清洗篮筐中的物品进行汇总及篮筐监控内的物品汇总)

1、待清洗页面、篮筐监控页面的清洗篮筐内物品进行汇总，如果整框清洗，则按包汇总，如果拆包清洗，按材料名称和规格汇总

2、篮筐监控对灭菌物品进行汇总

3、增加配置项：mergeSameDefinitionItemInClassifyBasket默认（不填或者为false）为不按器械包名合并汇总数量，清洗消毒的待清洗列表、清洗消毒列表的鼠标悬停、清洗篮筐监控三个页面如果没有启用合并显示的配置项时，增加回收时间、回收科室两列显示；为true时则合并。触摸屏清洗不用增加列、只用根据是否合并来决定列表的显示为合还是分

4、触摸屏清洗界面中，如果是标识牌绑定的篮筐，显示的条码由原来的篮筐条码改为标识牌条码

5、清洗记录干预管理也做了相关汇总处理

Options
    • -0
    • +16
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • -3
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/basketMonitor/washBasketMonitorView.js
    • too large
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -1
    • +22
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManager.java
    • -130
    • +190
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • -194
    • +42
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • -62
    • +120
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
    • -9
    • +22
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifiedItemManagerImpl.java
    • -2
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifiedItemManager.java
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js
    • -4
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js
    • -101
    • +327
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/basketMonitor/washBasketMonitor.jsp
    • -70
    • +256
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp
11:47 上午

jeffli

今天本组装配记录页面优化

中山一院消毒供应项目ZSYY-232

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
11:20 上午

jeffli

今天本组装配记录页面优化

中山一院消毒供应项目ZSYY-232

Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java
    • -2
    • +2
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
10:53 上午

jeffli

今天本组装配记录页面优化

中山一院消毒供应项目ZSYY-232

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
9:49 上午

yanweining

GDSRMYY-422:盘点报表排序改进
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js
9:48 上午

yanweining

GDSRMYY-424：一次性物品盘点报表改进
Options
    • -2
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryrecordView.js
Saturday 31 Mar 2018
9:44 上午

jeffli

今天本组装配记录页面优化

中山一院消毒供应项目ZSYY-232

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
9:44 上午

jeffli

解决bug：

发货界面打开后立即关闭，可能会报错

Options
    • -4
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
Friday 30 Mar 2018
11:17 下午

shuyongfu

长沙中心webservice认证接增加日志记录
Options
    • -1
    • +3
    /ssts-cszxyy-misc/src/main/java/com/forgon/disinfectsystem/security/service/SSOAuthenticationServiceForChangshaZhongxingHospital.java
4:30 下午

jeffli

今天本组装配记录页面优化

中山一院消毒供应项目ZSYY-232

Options
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/packing/exportTemplate.xls
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
4:28 下午

jeffli

今天本组装配记录页面优化

中山一院消毒供应项目ZSYY-232

Options
    • -4
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingRecord.java
    • -1
    • +3
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • -15
    • +27
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
3:57 下午

alan.lee

1.灭菌交接代码优化，不用查询ID，通过条码来关联篮筐

2.提交的地址防止缓存

Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js
    • -1
    • +0
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
2:45 下午

chenjiaru

解决jira问题：GZFDZL-122 批量终止申请单后，被终止的申请单没有备注终止原因
Options
    • -3
    • +3
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java
11:26 上午

niutou_ren

解决基础数据导入时，如果数据中有特殊符号'º'，重复导入，会出现多条记录的问题。（解决办法是把'º'替换为'°'）
Options
    • -0
    • +20
    /forgon-tools/src/main/java/com/forgon/tools/excel/ParerUtils.java
10:04 上午

alan.lee

解决中六在oracle下载入出错的Bug
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
Thursday 29 Mar 2018
7:52 下午

alan.lee

解决灭菌装载到篮筐，只允许扫描灭菌框。 删除物品，从篮筐内移除

Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -1
    • +10
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
4:31 下午

alan.lee

解决：中山一院消毒供应项目ZSYY-233

灭菌交接功能增加可以扫描灭菌篮筐装载

Options
    • -1
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManager.java
    • -5
    • +29
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -0
    • +7
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • -1
    • +15
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransition.java
    • -1
    • +10
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
    • -1
    • +29
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItemVO.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -2
    • +29
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js
    • -1
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java
    • -2
    • +25
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
2:48 下午

jeffli

解决bug：

自定义装配，重新装配，没有保存配包人和审核人工号

Options
    • -1
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
    • -0
    • +2
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
Wednesday 28 Mar 2018
9:24 下午

adairkang

开平市中心医院的打印发货计划，改为固定表格的自动分页打印，需要将后台分页取消（将分页数量改大）
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/kpszxyy/print/printConfig.js
8:26 下午

adairkang

GZSZYY-8 增加打印回收清单格式
Options
    • -0
    • +134
    /ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/recyclingDetailPrintConfig.js
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -1
    • +61
    /ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js
3:51 下午

jeffli

自定义装配扫描条码需要根据包定义的配置限制

中山一院消毒供应项目ZSYY-231

Options
    • -0
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
    • -0
    • +1
    /ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -0
    • +2
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java