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
Monday 17 Oct 2016
10:09 上午

wangyi

清洗区工作量及不合格率月报功能增强
Options
    • -4
    • +0
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • -16
    • +15
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -92
    • +74
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -10
    • +23
    /ssts-web/src/main/webapp/jasperRtp/washWorkloadReport.jrxml
    • -14
    • +10
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
    • -0
    • +24
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifiedItem.java
    • -4
    • +1
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/washWorkloadReport.jasper
    • -17
    • +7
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java
    • -2
    • +17
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java
    • -1
    • +7
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/WashWorkload_child.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/mainWashWorkloadReprot.jasper
  14. /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/vo
    • -12
    • +28
    /ssts-web/src/main/webapp/jasperRtp/mainWashWorkloadReprot.jrxml
    • -0
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
    • -0
    • +0
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/vo/WorkloadInfo.java
10:02 上午

jeffli

修改界面文字
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
10:01 上午

jeffli

修改界面文字
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
9:40 上午

cherry

更新PDA版本
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.4.34_20160923.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.4.36_20161017.apk
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
9:13 上午

adairkang

PYQZYY-99(pda)添加查看历史灭菌记录功能,以方便上传图片
Options
    • -1
    • +1
    /forgon-tools/src/main/java/com/forgon/tools/string/StringTools.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
1:22 上午

chenjiaru

在灭菌记录中增加了两个新的属性"监测员"和"监测核对员"
Options
    • -0
    • +18
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
    • -1
    • +3
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
    • -2
    • +68
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
Sunday 16 Oct 2016
5:45 下午

jeffli

解决编译报错
Options
    • -1
    • +1
    /build.gradle
5:17 下午

shuyongfu

灭菌记录的灭菌完成操作人与页面实际录入的灭菌完成人字段的注释
Options
    • -1
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
4:23 下午

chenjiaru

1、灭菌记录添加一个新属性"生物监测的结束时间"

2、发货记录添加一个新属性"是否常规",默认是常规发货（解释一下：非常规指的是正在做"生物监测"时发货员就就把这个器械包发货了）

Options
    • -0
    • +54
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java
    • -0
    • +8
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • -0
    • +37
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • -1
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
    • -0
    • +41
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
    • -0
    • +2
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -0
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManager.java
    • -5
    • +29
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -0
    • +5
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -1
    • +12
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
Friday 14 Oct 2016
7:25 下午

zengjc

位置信息跟质量监测相关联，质量监测报表显示器械或者包的位置信息.
Options
    • -2
    • +48
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -0
    • +10
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MonitoringItemBean.java
    • -4
    • +43
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jasper
    • -0
    • +5
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -1
    • +24
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoring.java
    • -3
    • +23
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/service/QualityMonitoringManagerImpl.java
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
    • -20
    • +135
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js
    • -0
    • +57
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoringconfig/action/QualityMonitoringConfigAction.java
5:29 下午

shuyongfu

江门相关配置文件更新
Options
    • -37
    • +10
    /ssts-web/src/main/resources/spring/projects/jmrmyy/HIS.xml
    • -12
    • +31
    /ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js
    • -15
    • +5
    /ssts-web/src/main/resources/config/jmrmyy/mybatis/SyncOrgUnitAndUserMapper.xml
    • -341
    • +807
    /ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/print/printConfig.js
    • -3
    • +3
    /ssts-web/src/main/resources/config/jmrmyy/dataSyncConfig.json
5:15 下午

shuyongfu

贵阳市第二人民医院接口配置文件更新
Options
    • -4
    • +4
    /ssts-web/src/main/resources/spring/projects/gysdermyy/applicationContext-his.xml
    • -22
    • +0
    /ssts-web/src/main/resources/config/gysdermyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
5:12 下午

shuyongfu

东莞中医院的科室与人员查询sql配置文件不用,现删除
Options
    • -28
    • +0
    /ssts-web/src/main/resources/config/dgszyy/mybatis/SyncOrgUnitAndUserMapper.xml
5:10 下午

shuyongfu

丽江人民医院、惠州中心人民医院、贵阳市第二人民医院的同步科室与人员的按钮放开
Options
    • -4
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/config/gysdermyy/config.js
    • -4
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/config.js
    • -4
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/config/ljsrmyy/config.js
4:54 下午

jeffli

器械包出库时自动减去材料或者一次性物品数量，然后费用进到报表

中山市小榄人民医院ZSSXLRMYY-4

Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -20
    • +302
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -0
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/DiposableGoodsItem.java
    • -0
    • +29
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsBatchStock.java
    • -1
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -0
    • +33
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java
    • -4
    • +51
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
    • -1
    • +16
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/receiverecord/ReceiveRecordItem.java
    • -0
    • +6
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -0
    • +15
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/receiverecord/ReceiveRecord.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
4:24 下午

adairkang

发货物品查询添加一次性物品和高值耗材的类型过滤
Options
    • -2
    • +84
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:19 下午

adairkang

添加配置信息
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.jsp
12:56 下午

adairkang

发货物品查询报表，器械包的数量统计与核算朋报与明细核算月报一致,消毒物品计材料数量,自定义器械包配置为材料就显示材料数量，其他都显示包数量
Options
    • -2
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js
    • -1
    • +1
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/InvoiceQueryItem.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
10:03 上午

wangyi

外来器械拆包灭菌人可以为空
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
9:47 上午

adairkang

no_comment
Options
    • -0
    • +2
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/InvoiceQuery.java
9:45 上午

adairkang

发货物品查询统计报表添加物品类型过滤

发货物品查询报表，器械包的总价使用包的价格,单价用包的价格除以数量

Options
    • -2
    • +29
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -3
    • +4
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/InvoiceQueryItem.java
    • -1
    • +1
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/InvoiceQuerySummaryService.java
    • -3
    • +12
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • -0
    • +30
    /forgon-core/src/main/java/com/forgon/util/DefaultValue.java
1:50 上午

shuyongfu

解决jira问题:DGZYY-9 HIS用户同步接口修改

同步人员去掉科室的条件,可同步所有科室下属人员

Options
    • -1
    • +1
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgszyy/SyncOrgUnitAndUserDaoImpl.java
Thursday 13 Oct 2016
4:21 下午

shuyongfu

解决jira问题:DGZYY-9 HIS用户同步接口修改

东莞市中医院his接口配置文件

Options
    • -3
    • +5
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgszyy/SyncOrgUnitAndUserDaoImpl.java
3:58 下午

wangyi

装配界面增加扫描灭菌人字段
Options
    • -2
    • +1
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
    • -2
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
    • -9
    • +11
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -3
    • +0
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • -15
    • +28
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • -3
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
    • -1
    • +1
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • -0
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java
    • -1
    • +7
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.jsp
    • -45
    • +72
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -0
    • +44
    /ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
    • -2
    • +22
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -58
    • +87
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
3:48 下午

jeffli

装配时不扣减一次性物品库存
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
3:23 下午

adairkang

发货物品查询界面,物品明细添加发货员、核对员、失效日期
Options
    • -0
    • +42
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/InvoiceQueryItem.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -12
    • +33
    /ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1.jasper
    • -8
    • +38
    /ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1.jasper
12:47 下午

adairkang

核算月报一次性物品显示失效期，取消生产日期列(一直都是空,jasper直接显示空字符)
Options
    • -21
    • +14
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml
    • -11
    • +4
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jasper
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
12:47 下午

zengjc

导入材料的属性‘是否外来器械’不是‘是’，默认为‘否’
Options
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
12:37 下午

zengjc

根据名称获取普通材料定义的时候，对是否外来器械增加空字符串判断.
Options
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
11:42 上午

shuyongfu

解决jira问题:DGZYY-9 HIS用户同步接口修改

东莞市中医院his接口配置文件

Options
    • -0
    • +114
    /ssts-web/src/main/resources/spring/projects/dgszyy/HIS.xml
    • -0
    • +28
    /ssts-web/src/main/resources/config/dgszyy/mybatis/SyncOrgUnitAndUserMapper.xml
  3. /ssts-web/src/main/resources/config/dgszyy/mybatis
  4. /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgszyy
    • -0
    • +22
    /ssts-web/src/main/resources/config/dgszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -0
    • +22
    /ssts-web/src/main/resources/config/dgszyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • -0
    • +130
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgszyy/SyncOrgUnitAndUserDaoImpl.java