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 28 Sep 2016
3:08 下午

zengjc

质量监测记录增加责任环节，选择责任环节时，只能选改环节的质量监测项，目前在清洗，装配，灭菌界面录监测记录时，默认显示该环节的质量监测记录.解决jira问题ZSSZYY-37.
Options
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringView.jsp
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp
    • -3
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • -0
    • +1
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/service/QualityMonitoringManagerImpl.java
    • -10
    • +69
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js
    • -4
    • +50
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoringconfig/action/QualityMonitoringConfigAction.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoring.java
    • -1
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
2:15 下午

adairkang

器械交接实体类及Manager类
Options
    • -0
    • +9
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManager.java
    • -0
    • +61
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/TousseTransitionItem.java
    • -0
    • +38
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionItemManagerImpl.java
    • -0
    • +91
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/TousseTransitionRecord.java
  5. /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition
  6. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition
    • -0
    • +13
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java
    • -0
    • +85
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManager.java
    • -0
    • +21
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionItemManager.java
    • -0
    • +166
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java
  11. /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service
10:32 上午

jeffli

外部代理灭菌管理如果是临床科室做的申请则申请人在 制作者字段显示而不是在灭菌员哪里显示

番禺区中医院PYQZYY-86

Options
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
    • -0
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
    • -0
    • +17
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
10:27 上午

chenjiaru

no_comment
Options
    • -10
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java
    • -7
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java
    • -3
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManager.java
9:53 上午

jeffli

“灭菌员列”后面显示 “申请部门”列，“数量列”（该单的器械包数量） “是否打印” 列，“状态”列

番禺区中医院PYQZYY-83

Options
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/foreignproxydisinfection/ForeignProxyDisinfection.java
    • -0
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -3
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
Tuesday 27 Sep 2016
10:50 下午

chenjiaru

改善：DSRMYY-167 灭菌篮筐监控增加搜索列并且默认展开最后一次的装载记录
Options
    • -2
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManager.java
    • -85
    • +48
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/basketMonitor/sterileBasketMonitorView.js
    • -2
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java
    • -1
    • +1
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -6
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java
5:37 下午

shuyongfu

使用记录转申请单传入使用记录id参数
Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -2
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
5:35 下午

wangyi

外來器械根据包名称创建祖先类包定义
Options
    • -24
    • +20
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
4:31 下午

chenjiaru

解决：GXZYYFY-9 使用记录录入统计报表后三列增加合计项目
Options
    • -0
    • +24
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UseRecordBean.java
    • -0
    • +86
    /ssts-web/src/main/webapp/jasperRtp/useRecordTotalView.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/useRecordTotalViewSub.jasper
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/useRecordTotalView.jasper
4:05 下午

zhonghaowen

如果是配置了版本2，则隐藏申请单的申请外来器械图标按钮,在个人桌面显示申请外来器械图标

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -1
    • +6
    /ssts-web/src/main/webapp/homepage/portalPage.js
3:43 下午

shuyongfu

调整使用记录的住院病人与诊疗病人的年龄计算接口
Options
    • -1
    • +5
    /ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/gdsy/dao/FindPatientInfoByTreatmentNumDao.java
    • -1
    • +5
    /ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/gdsy/dao/FindPatientInfoByHospitalNumDao.java
3:38 下午

wangyi

快速回收默认按物品名称排序
Options
    • -61
    • +22
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -0
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • -0
    • +18
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
3:05 下午

shuyongfu

省医现场配置文件调整,使用记录的审核与转换按钮合并为1个
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
2:46 下午

zengjc

修正包装区工作量查询，导出execl报错的问题，解决jira问题ZSSXLRMYY-78
Options
    • -44
    • +83
    /ssts-web/src/main/webapp/jasperRtp/packingUnqualifieReport.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/packingUnqualifieReport.jasper
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -3
    • +33
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/PackingFractionDefectiveBean.java
2:39 下午

chenjiaru

解决：GDSRMYY-167 灭菌篮筐监控增加搜索列并且默认展开最后一次的装载记录
Options
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java
    • -2
    • +54
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/basketMonitor/sterileBasketMonitorView.js
    • -1
    • +23
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManager.java
1:39 下午

jeffli

解决bug：

科室供应室配置保存提示成功，实际上没保存

Options
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
11:25 上午

jeffli

发货计划界面打开发货单时,光标默认在核对员条码旁边的输入框中

广东省人民医院GDSRMYY-135

Options
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp
11:01 上午

jeffli

解决bug：

修改自定义器械包默认包装组后科室供应室配置保存不成功

东莞中医院DGZYY-12

Options
    • -7
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
9:48 上午

zhonghaowen

更换桌面外来器械申请按钮图标
Options
    • binary
    /ssts-web/src/main/webapp/themes/portalPage/img/foreign-tousse.jpg
    • binary
    /ssts-web/src/main/webapp/themes/portalPage/img/foreign-tousse.png
    • -1
    • +1
    /ssts-web/src/main/resources/systemset/portalPage.xml
Monday 26 Sep 2016
7:19 下午

zhonghaowen

个人桌面如果是供应室则隐藏外来器械申请按钮
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/portalPage.js
7:17 下午

adairkang

GDSRMYY-82(明细核算月报跟核算月报数量不一致的问题)
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
7:14 下午

chenjiaru

解决：GDSRMYY-166 篮筐监控增加科室名称字段
Options
    • -6
    • +110
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/basketMonitor/sterileBasketMonitorView.js
    • -1
    • +36
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
7:00 下午

zhonghaowen

解决GDSRMYY-173:个人桌面增加外来器械申请按钮(科室申请界面去掉外来器械申请按钮)。(暂时缺少图标)
Options
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/portalPage.xml
6:41 下午

zhonghaowen

修复科室申请单查询未完成状态的过滤
Options
    • -1
    • +6
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
6:36 下午

wangyi

修复外来器械只入到一个篮筐时候，装配不用拆分小包
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
6:06 下午

shuyongfu

江门的科室申领配置由通用申请单改为分单
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js
5:34 下午

jeffli

解决bug：

勾选多张不同科室的外部代理灭菌,点击打印标签按钮.打出来的的标签都是同一个科室的,而且标签条码跟申请单中器械包信息里面的条码不一样.

广东省人民医院GDSRMYY-161

Options
    • -4
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
5:33 下午

zhonghaowen

查看所有申请单增加默认状态改成未完成
Options
    • -2
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
5:31 下午

wangyi

修改外来器械表单样式
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/ext-4.2.3/resources/ext-theme-green/custom-theme-sandbox.css
5:22 下午

zengjc

拼接json改为JSONObject转字符串.

Options
    • -2
    • +7
    /ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/UserTableManager.java