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
Wednesday 22 Jun 2016
11:46 上午

jeffli

重构外部代理灭菌单提交方法

外部代理灭菌增加不追溯物品发货功能。

重构发货提交方法

解决bug：

外部代理灭菌单添加同一个包多次，生成的申请项只有1个。

Options
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/foreignproxydisinfection/ForeignProxyItem.java
  2. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service
  3. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -0
    • +52
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/disposablegoods/service/DisposableGoodsServiceContext.java
    • -0
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java
    • -0
    • +27
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java
    • -6
    • +13
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -0
    • +2
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDao.java
    • -0
    • +17
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
    • -0
    • +8
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -2
    • +3
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java
    • -0
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -0
    • +252
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java
    • -72
    • +81
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
12:26 上午

wangyi

修复 部分终止未回收的申请单发货状态错误bug，修复篮筐上限bug
Options
    • -43
    • +65
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1.jasper
    • -5
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1.jasper
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/materialMissItemView.jasper
    • -0
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -0
    • +8
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
    • -4
    • +34
    /ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1.jrxml
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingerror/RecyclingError.java
    • -11
    • +28
    /ssts-web/src/main/webapp/jasperRtp/materialMissItemView.jrxml
    • -4
    • +34
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.2.0_4.2.1.sql
    • -7
    • +28
    /ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1.jrxml
  16. … 5 more files in changeset.
Tuesday 21 Jun 2016
3:58 下午

shuyongfu

科室申领增加批量终止的功能
Options
    • -0
    • +68
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -11
    • +31
    /ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js
    • -1
    • +40
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
    • -2
    • +8
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
3:50 下午

adairkang

StrutsResponseUtils类封装返回结果，以json的格式
Options
    • -0
    • +76
    /forgon-tools/src/main/java/com/forgon/tools/StrutsResponseUtils.java
    • -9
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
2:46 下午

shuyongfu

根据包实例创建生成申请项时,tousseItem的器械包类型赋值由包实例的条码类型type改为包实例对应的包定义的器械包类型
Options
    • -6
    • +5
    /ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
2:34 下午

shuyongfu

根据包实例创建生成申请项时,tousseItem的器械包类型赋值由包实例的条码类型type改为包实例对应的包定义的器械包类型
Options
    • -1
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
10:11 上午

adairkang

部分终止的物品，打印状态的计算(GDSRMYY-37)
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -0
    • +39
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -0
    • +7
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • -2
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Monday 20 Jun 2016
6:07 下午

zengjc

对获取到的质量检测配置项判断是否为空.
Options
    • -7
    • +9
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/action/QualityMonitoringAction.java
5:56 下午

zengjc

解决灭菌失败添加质量监测需要扫篮筐的有js报错的问题,Jira问题GZFDZL-47
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
    • -2
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringView.jsp
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js
4:19 下午

zengjc

导入excel数据时,"容器管理、供应商管理、洗清程序管理、灭菌程序管理"支持更新数据.
Options
    • -0
    • +50
    /ssts-web/src/main/java/com/forgon/disinfectsystem/excel/service/CommonImportManagerImpl.java
12:00 下午

adairkang

供应室服务临床科室配置，临床科室下拉框可以选择供应室(如一级供应室给二级供应室提供器械包服务)
Options
    • -16
    • +16
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts/action/CssdServiceDeptsAction.java
11:42 上午

shuyongfu

解决jira问题:ZSWY-26 外部代理灭菌包，器械包定义里设置为不审核，待审核列表仍会出现

如果未扫描灭菌筐可外部代理灭菌包定义是否审核为否时,包实例的状态变为已审核.

Options
    • -1
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
11:23 上午

shuyongfu

番禺区中医院同步his科室、人员、病人接口相关配置文件
Options
    • -1
    • +1
    /ssts-web/src/main/resources/config/gzspyqzyy/dataSyncConfig.json
    • -21
    • +14
    /ssts-web/src/main/resources/config/gzspyqzyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • -21
    • +14
    /ssts-web/src/main/resources/config/gzspyqzyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -10
    • +10
    /ssts-web/src/main/resources/config/gzspyqzyy/mybatis/SyncOrgUnitAndUserMapper.xml
    • -14
    • +19
    /ssts-web/src/main/resources/spring/projects/gzspyqzyy/HIS.xml
10:55 上午

jeffli

解决bug：

装配界面扫描清洗完成的篮筐，如果当前任务组没有装配任务，界面上没有给出提示。

Options
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
10:52 上午

jeffli

解决bug：

回收界面，扫描人员条码速度很慢

广东省人民医院GDSRMYY-48

Options
    • -0
    • +3
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
10:47 上午

jeffli

解决bug：

回收界面，扫描人员条码速度很慢

广东省人民医院GDSRMYY-48

Options
    • -1
    • +6
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
Friday 17 Jun 2016
5:02 下午

shuyongfu

解决jira问题:广东省人民医院 GDSRMYY-50 灭菌物品装载功能，对已入框的篮筐，可以直接从页面选择，不用再次扫篮筐
Options
    • -6
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
3:55 下午

shuyongfu

解决一次性物品高值耗材调拨的问题
Options
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -0
    • +14
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
3:05 下午

zengjc

添加灭菌炉配置是否自动完成灭菌.
Options
    • -3
    • +5
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisDataManagerImpl.java
    • -1
    • +1
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceDataManager.java
    • -3
    • +5
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
    • -4
    • +4
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java
    • -0
    • +19
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
10:39 上午

adairkang

清洗篮筐监控界面添加清洗分类类型的显示列
Options
    • -2
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/basketMonitor/washBasketMonitorView.js
    • -0
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java
10:24 上午

adairkang

历史回收记录，备注列高度不固定
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
9:27 上午

shuyongfu

解决jira问题:广州复大肿瘤医院 GZFDZL-44 登记使用记录后发现住院号输错了（记录状态为未审核），不能修改。
Options
    • -2
    • +62
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -0
    • +4
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -1
    • +5
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
12:11 上午

wangyi

no_comment
Options
    • -1
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Thursday 16 Jun 2016
11:59 下午

wangyi

修复添加了丢失、报损的器械包删除后保存并未删除问题
Options
    • -0
    • +33
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -62
    • +73
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
6:36 下午

zengjc

灭菌记录添加一条或者多条质量监测信息,解决jira问题ZSWY-5
Options
    • -0
    • +6
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • -0
    • +14
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -0
    • +1
    /build.gradle
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringView.js
    • -0
    • +17
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/action/QualityMonitoringAction.java
    • -2
    • +28
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • -0
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoring.java
6:13 下午

jeffli

解决bug：

IE7首页报错

Options
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/portalPage.jsp
5:39 下午

jeffli

解决bug：

装配界面扫描篮筐时，如果篮筐状态不对，给予准确的提示。

广东省人民医院GDSRMYY-42

Options
    • -21
    • +3
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • -0
    • +1
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • -74
    • +74
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
5:33 下午

shuyongfu

解决回收申请单批量打印发货计划时小计金额为0的问题
Options
    • -1
    • +13
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
4:27 下午

adairkang

历史回收记录，表格内容不隐藏
Options
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
4:12 下午

adairkang

中医药附三发货单打印
Options
    • -8
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/print/printConfig.js