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
12:49 下午

shuyongfu

解决jira问题及相关功能,具体如下:

GDSRMYY-187 同名的外部代理灭菌包发货时A科室的包发到B科室也能扫描出来

GDSRMYY-182 使用住院号调取病人信息时报错

广东省医his与物资回写接口及中大附一手术排班相关功能

Options
    • -0
    • +4
    /ssts-web/src/main/resources/config/zsyy/operationScheduleAuthConfig.json
  2. /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/operationschedule/zsyy
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -7
    • +44
    /ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/gdsy/dao/SyncOrgUnitAndUserDataSyncDao.java
  5. /ssts-userecord/src/main/java/com/forgon/disinfectsystem/operationSchedule/service
    • -0
    • +47
    /ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/service/ReceiveRecordManagerImpl.java
    • -0
    • +21
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/operationschedule/zsyy/OperationScheduleWebService.java
    • -19
    • +104
    /ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/inventorymanagement/gdsy/dao/InventoryDaoImpl.java
    • -0
    • +19
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/operationSchedule/service/OperationScheduleManager.java
    • -0
    • +49
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/gdsy/HIS.xml
    • -25
    • +0
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/userecord/service/UseRecordWebServiceImpl.java
    • -7
    • +18
    /ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/webservice/helper/WebServiceClientHelper.java
  14. /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/operationschedule
    • -4
    • +12
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
  16. … 12 more files in changeset.
11:54 上午

shuyongfu

科室同步增加判空校验
Options
    • -3
    • +5
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
11:49 上午

jeffli

优化查看发货单界面，增加类型属性
Options
    • -26
    • +17
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
    • -0
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/DiposableGoodsItem.java
    • -0
    • +2
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
11:26 上午

wangyi

清洗触摸屏提示信息样式修改
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js
11:18 上午

jeffli

优化查看发货单界面，增加类型属性
Options
    • -4
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
11:04 上午

jeffli

优化科室供应室界面，解决复制到结算科室按钮被挡住的问题
Options
    • -30
    • +31
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
10:48 上午

wangyi

灭菌人去掉非空验证
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
10:30 上午

jeffli

外部代理灭菌新增灭菌员属性，高级视图添加时，当前用户填到灭菌。科室申领添加时，当前用户填到申请人。

番禺区中医院PYQZYY-86

Options
    • -28
    • +18
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js
10:19 上午

zhonghaowen

解决ZSSXLRMYY-74:供应室领用单列表，输入关键字找不到单
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js
    • -3
    • +25
    /ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/action/ReceiveRecordAction.java
10:14 上午

shuyongfu

解决jira问题:PYQZYY-71 过期包通过扫描条码进行录入，并转成申请单。
Options
    • -0
    • +77
    /ssts-toussereturndisinfect/src/main/java/com/forgon/disinfectsystem/tousseReturnDisinfectRecord/service/TousseReturnDisinfectRecordToJson.java
  2. /ssts-toussereturndisinfect/src/main/java
    • -7
    • +7
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +20
    /ssts-toussereturndisinfect/build.gradle
    • -0
    • +66
    /ssts-toussereturndisinfect/src/main/java/com/forgon/disinfectsystem/tousseReturnDisinfectRecord/dwr/table/TousseReturnDisinfectRecordTableManager.java
  6. /ssts-toussereturndisinfect/src/main/java/com/forgon/disinfectsystem/tousseReturnDisinfectRecord
    • -0
    • +140
    /.project
    • -0
    • +2
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -0
    • +124
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussereturndisinfect/TousseReturnDisinfectRecord.java
    • -0
    • +4
    /ssts-web/src/main/webapp/WEB-INF/dwr.xml
    • -0
    • +24
    /ssts-toussereturndisinfect/.project
  12. /ssts-toussereturndisinfect/src/main/java/com/forgon/disinfectsystem
    • -1
    • +2
    /settings.gradle
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
  15. /ssts-toussereturndisinfect/src/main/java/com/forgon/disinfectsystem/tousseReturnDisinfectRecord/action
  16. … 28 more files in changeset.
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