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
Saturday 12 Nov 2016
6:25 下午

adairkang

发货单打印,如果有中包装单位及数量，则对一次性物品，打印中包装单位和数量
Options
    • -2
    • +21
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java
  2. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/idpredicate
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -0
    • +26
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/idpredicate/IDPredicate.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/idpredicate/IDAble.java
4:14 下午

jeffli

一次性物品根据申领数量（以前的中包装数量）发货
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -0
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
    • -0
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • -2
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java
    • -1
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -6
    • +36
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -0
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • -2
    • +23
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
Friday 11 Nov 2016
11:00 下午

terrykwan

文字字体加粗
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
6:36 下午

adairkang

发货计划打印,如果有中包装单位及数量，则对一次性物品，打印中包装单位和数量
Options
    • -2
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
    • -0
    • +41
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
    • -3
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -0
    • +13
    /forgon-tools/src/main/java/com/forgon/tools/util/ForgonIntegerUtils.java
    • -1
    • +1
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -1
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
5:54 下午

cherry

更新PDA版本
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.0_20161031.apk
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.2_20161111.apk
5:16 下午

zhonghaowen

修改将表单所选中的行的某个属性用分隔号拼接起来并返回方法
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/js/common.js
5:05 下午

shuyongfu

东莞东华医院住院病人接口增加洗手护士、巡回护士字段
Options
    • -0
    • +6
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsdhyy/FindPatientInfoByHospitalNumDaoImpl.java
4:58 下午

zhonghaowen

1.一次性物品申请单中包装单位改成申领单位

2.一次性物品定义中包装单位改成申领单位

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
4:51 下午

shuyongfu

东莞市中医院his人员接口所属科室字段名由ksdm改为ksdh
Options
    • -1
    • +1
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgszyy/SyncOrgUnitAndUserDaoImpl.java
4:31 下午

jeffli

发货项增加中包装单位，中包装数量，中包装转换系数
Options
    • -1
    • +29
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java
4:23 下午

shuyongfu

解决jira问题:DGZYY-32 使用记录、外来器械申请单调整
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • -2
    • +3
    /ssts-web/src/main/resources/config/dgszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
4:21 下午

adairkang

外来器械生物检测不合格，不能发货
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
4:21 下午

zhonghaowen

添加是否要隐藏批量审核借物单按钮方法
Options
    • -1
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js
4:06 下午

chenjiaru

修改了灭菌表单的宽度
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
3:56 下午

chenjiaru

外来器械包的植入物和植入型器械灭菌监测及发放报表，隐藏"器械包编码"列
Options
    • -13
    • +13
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseSterilizationMonitorAndDelivery.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseSterilizationMonitorAndDelivery.jasper
3:33 下午

zengjc

1.修正次日下送计算器械包数量的方式.

2.十八项指标添加'处理器械包总包数'，器械包总包数不包括消毒物品、敷料包、外来器械包.

Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +7
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
2:58 下午

wangyi

报损、丢失补充的器械关联清洗记录
Options
    • -2
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/recyclingDamageRecordView.js
    • -0
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/recyclingerror/service/RecyclingErrorManager.java
    • -3
    • +5
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingdamagerecord/service/RecyclingDamageManager.java
    • -13
    • +7
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingdamagerecord/action/RecyclingDamageAction.java
    • -0
    • +36
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingdamagerecord/RecyclingDamageItem.java
    • -2
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/dwr/table/BarcodeTableManager.java
    • -0
    • +42
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingerror/RecyclingError.java
    • -80
    • +139
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -3
    • +36
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecordMaterial.java
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/recyclingDamageRecordView.jsp
    • -145
    • +196
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • -1
    • +7
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • -0
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifyBasket.java
    • -349
    • +21
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
  16. … 7 more files in changeset.
2:26 下午

adairkang

回收器械交接在pc端的功能
Options
    • -0
    • +149
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/action/TousseTransitionAction.java
    • -0
    • +22
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java
  3. /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/dwr/table
  4. /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/action
    • -0
    • +131
    /ssts-web/src/main/webapp/disinfectsystem/recycle/tousseTransition/tousseTransitionView.js
    • -0
    • +74
    /ssts-web/src/main/webapp/disinfectsystem/recycle/tousseTransition/tousseTransitionView.jsp
    • -0
    • +4
    /ssts-web/src/main/webapp/WEB-INF/dwr.xml
  8. /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/dwr
    • -1
    • +2
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -0
    • +69
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/dwr/table/TousseTransitionTableMamager.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -1
    • +6
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManager.java
    • -0
    • +97
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java
  15. /ssts-web/src/main/webapp/disinfectsystem/recycle/tousseTransition
  16. … 3 more files in changeset.
1:38 下午

shuyongfu

禁用标识牌改为false,增加住院号与诊疗号前缀
Options
    • -2
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
1:35 下午

adairkang

东莞中医院发货单打印，增加领料人，表头加粗，其他字体调小，整体左移1.1cm
Options
    • -4
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
    • -24
    • +26
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
12:01 下午

chenjiaru

修改了：外来器械包的植入物和植入型器械灭菌监测及发放报表 的时间显示格式
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseSterilizationMonitorAndDelivery.jasper
    • -2
    • +2
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseSterilizationMonitorAndDelivery.jrxml
11:16 上午

chenjiaru

修复了：器械包各生产环节统计报表的bug
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
10:51 上午

chenjiaru

定义了三个常量
Options
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
    • -4
    • +4
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -1
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
10:36 上午

zhonghaowen

修复借物管理申请时报变量未定义错误
Options
    • -2
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js
Thursday 10 Nov 2016
10:09 下午

chenjiaru

解决：灭菌前扫描篮筐，无法统计筐数。（灭菌扫描界面，只有器械包数量显示，没有篮筐数量显示）的问题

现在已经增加了灭菌篮筐数量显示

Options
    • -1
    • +15
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
    • -4
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -0
    • +6
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
7:18 下午

chenjiaru

如果生物监测的结果为 "无" 就当成没有做生物监测，如果结果为 "不合格" 则强制制止此外来器械包发货
Options
    • -0
    • +4
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -3
    • +25
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java
    • -5
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java
    • -1
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManager.java
    • -4
    • +7
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
7:09 下午

zengjc

质量监测项为'器械包'或者'器械包和材料'时，配置添加'显示炉次炉号'，如果配为是，则在添加质量监测记录时，扫描器械包实例条码，自动显示炉次炉号信息。解决jira问题PYQZYY-113
Options
    • -0
    • +2
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoringconfig/action/QualityMonitoringConfigAction.java
    • -0
    • +25
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoring.java
    • -0
    • +15
    /ssts-web/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/action/QualityMonitoringAction.java
    • -1
    • +53
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js
    • -2
    • +8
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/service/QualityMonitoringManagerImpl.java
    • -1
    • +50
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualitymonitoringConfigView.js
    • -0
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoringconfig/QualityMonitoringConfig.java
7:02 下午

zengjc

修正注释.
Options
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
6:44 下午

shuyongfu

解决jira问题:DGDHYY-73 屏蔽一次性物品同步入库的功能菜单
Options
    • -1
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/config.js
5:49 下午

adairkang

no_comment
Options
    • -0
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java