forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 62
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 62
Total Lines of Code (LoC): 4,714,781
Net change in LoC this week: 2,406

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
Thursday 15 Jun 2017
6:02 下午

chenjiaru

解决jira问题：ZSSXLRMYY-97 器械包数量预警或自动加急功能
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -1
    • +2
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • -3
    • +6
    /ssts-web/src/main/java/com/forgon/disinfectsystem/urgentgoodswarning/service/UrgentGoodsWarningManager.java
    • -3
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/urgentGoodsHintView.js
    • -2
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • -1
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/urgentGoodsHintView.jsp
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -1
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -1
    • +9
    /ssts-web/src/main/java/com/forgon/disinfectsystem/urgentgoodswarning/action/UrgentGoodsWarningAction.java
    • -4
    • +10
    /ssts-web/src/main/java/com/forgon/disinfectsystem/urgentgoodswarning/service/UrgentGoodsWarningManagerImpl.java
    • -2
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
5:13 下午

zengjc

清洗记录界面查看器械包检查点、功能关注点，图片和材料信息距离调小.
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
4:45 下午

jeffli

解决：GDSRMYY-333

科室申领一次性物品退货界面，增加‘删除所有退货数量为0的项’按钮

Options
    • -0
    • +21
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnDisposableGoodsByInvoicePlan.js
3:40 下午

zengjc

解决jira问题ZSSXLRMYY-136，清洗消毒记录增加器械图片显示、清洗质量检查关注点、功能检查点字段的显示。
Options
    • -0
    • +192
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/tousseImage.jsp
    • -2
    • +39
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • -1
    • +25
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
3:12 下午

jeffli

增加手术仪器管理权限
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.js
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +4
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.jsp
11:45 上午

jeffli

解决：GDSRMYY-329

装配管理界面，点“装配并打印”后，增加一个提示

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

jeffli

仪器班物品管理，修改排序，增加状态过滤查询
Options
    • -5
    • +17
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
9:41 上午

chenguina

PDA版本更新至4.5.72
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.70_20170612.apk
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.72_20170613.apk
Wednesday 14 Jun 2017
5:56 下午

adairkang

预回收添加回收申请单，只能添加需要回收的器械包
Options
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java
5:43 下午

zhonghaowen

GDSRMYY-330:修改findStorageByDisposeIdAndHandleDepartCode()方法
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
5:37 下午

adairkang

预回收添加回收申请单，只能添加需要回收的器械包
Options
    • -0
    • +7
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java
5:24 下午

adairkang

器械包已经转换申请单或者已经预回收了，就不再转换申请单了
Options
    • -1
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java
4:32 下午

zhonghaowen

GDSRMYY-330:修改库存剩余数量的判断方法
Options
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
3:58 下午

zhonghaowen

GDSRMYY-330:增加日志显示相关库存数量
Options
    • -0
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
2:11 下午

adairkang

设置tousseItemId的时候，避免覆盖
Options
    • -1
    • +4
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionItemManagerImpl.java
2:11 下午

zhonghaowen

解决GDSRMYY-330:一次物品库存不足的申领改进
Options
    • -0
    • +8
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • -0
    • +10
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManager.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -0
    • +27
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • -9
    • +3
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DisposableGoodsStockAction.java
12:01 下午

adairkang

预回收跟使用记录转申请单对同一个包的互斥处理
Options
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/TousseTransitionRecordItem.java
    • -1
    • +7
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java
    • -0
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionItemManagerImpl.java
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
11:04 上午

chenjiaru

解决jira问题：ZSSXLRMYY-97 器械包数量预警或自动加急功能
Options
    • -0
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • -0
    • +18
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
  3. /ssts-web/src/main/java/com/forgon/disinfectsystem/urgentgoodswarning
    • -0
    • +44
    /ssts-web/src/main/java/com/forgon/disinfectsystem/urgentgoodswarning/action/UrgentGoodsWarningAction.java
    • -0
    • +39
    /ssts-web/src/main/java/com/forgon/disinfectsystem/urgentgoodswarning/service/UrgentGoodsWarningManager.java
    • -0
    • +59
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/urgentgoodswarning/UrgentGoodsWarning.java
    • -0
    • +118
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/urgentGoodsHintView.js
    • -1
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
  9. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/urgentgoodswarning
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
  11. /ssts-web/src/main/java/com/forgon/disinfectsystem/urgentgoodswarning/action
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/portalPage.jsp
    • -0
    • +78
    /ssts-web/src/main/java/com/forgon/disinfectsystem/urgentgoodswarning/service/UrgentGoodsWarningManagerImpl.java
    • -0
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/urgentGoodsHintView.jsp
  16. … 8 more files in changeset.
10:36 上午

adairkang

器械包信息界面 状态的显示
Options
    • -2
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
Tuesday 13 Jun 2017
11:22 下午

shuyongfu

李健平发回来的成都五冶项目同步科室人员接口配置文件
Options
    • -10
    • +8
    /ssts-web/src/main/resources/config/cdswyyy/mybatis/SyncOrgUnitAndUserMapper.xml
    • -4
    • +4
    /ssts-web/src/main/resources/spring/projects/cdswyyy/applicationContext-his-cdswyyy.xml
11:18 下午

shuyongfu

陈国强发回的现场项目配置:

添加回收申请单是否加载申领模板及回收一键入筐

Options
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
8:52 下午

zengjc

1.修正质量监测月报查询到不同科室的数据的问题；

2.修正监测项配多个细则类型为多选，却都只有一个选项时，查询数据不对的问题.

3.质量监测月报年月查询的列加宽.

Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -2
    • +2
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectDayOfMonthReportView.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectDayOfMonthReportView.jasper
8:00 下午

jeffli

解决：ZSYY-85

新增标签打印格式

Options
    • -1
    • +1
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
    • -44
    • +66
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
6:38 下午

adairkang

ZSYY-84 科室申领中打印发货计划单格式调整
Options
    • -45
    • +41
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
3:31 下午

shuyongfu

解决质量监测旧数据action升级的问题
Options
    • -4
    • +9
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java
3:12 下午

zengjc

添加设备维护表单，‘表单元素’改为‘设备维护表单元素’
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsForm.js
3:01 下午

zengjc

设备维护数据录入页，‘表单元素’改为'设备维护元素'
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsForm.js
2:59 下午

zengjc

添加设备维护自定义表单一些注释.
Options
    • -1
    • +5
    /ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusins/service/DeviceMaintenanceCusInsManager.java
    • -11
    • +23
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/devicemaintenance/DeviceMaintenanceCusI.java
    • -1
    • +7
    /ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusdef/service/DeviceMaintenanceCusDefManager.java
    • -2
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/devicemaintenance/DeviceMaintenanceCusD.java
    • -2
    • +7
    /ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusins/action/DeviceMaintenanceCusInsAction.java
    • -27
    • +3
    /ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusdef/action/DeviceMaintenanceCusDefAction.java
2:40 下午

cherry

1.流畅等待修改为调用通用方法

2.把一次性物品入库调整到申请前

Options
    • -23
    • +25
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/factory/WaitFactory.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/service/GdsyApplyServiceImpl.java
    • -54
    • +18
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
    • -10
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java
    • -50
    • +9
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/PackingHistory.java
    • -25
    • +29
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java
    • -19
    • +31
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • -41
    • +8
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java
    • -11
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/UserRecord.java
    • -27
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Apply.java
    • -25
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java
2:22 下午

shuyongfu

解决质量监测旧数据action升级的问题
Options
    • -5
    • +6
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java