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
Thursday 24 Jan 2019
12:48 上午

terrykwan

解决包装区工作量统计报表，消毒物品数量按材料统计的问题。ASSDGSZYY-37。器械包工作量统计报表，增加了按装配的材料数量统计列。
Options
    • -0
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jasper
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
    • -0
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -5
    • +25
    /ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad_child.jrxml
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -660
    • +129
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
    • -0
    • +12
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseWorkLoadChildVO.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad_child.jasper
    • -19
    • +50
    /ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jrxml
Wednesday 23 Jan 2019
10:19 下午

weizhenyu

广州医科大学附属口腔医院GZYKDXFSKQ-32：发货计划增加不属于当前科室物品列表
Options
    • -153
    • +151
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
3:48 下午

shuyongfu

解决jira:SZSSKRMYY-17 PDA更新后 按发货单签收不了

接口方法支持供室签收和临床科室签收两种

Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.57_20190123_v4_1_release.apk
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
3:40 下午

shuyongfu

解决jira:SZSSKRMYY-17 PDA更新后 按发货单签收不了

接口方法支持供室签收和临床科室签收两种

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -2
    • +3
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
11:48 上午

weizhenyu

广州医科大学附属口腔医院GZYKDXFSKQ-32：发货计划增加不属于当前科室物品列表
Options
    • -470
    • +636
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
10:26 上午

shuyongfu

使用记录接口代码调整优化
Options
    • -3
    • +4
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java
10:12 上午

jeffli

广州医科大学附属口腔医院GZYKDXFSKQ-32

发货计划增加不属于当前科室物品列表

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -0
    • +19
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java
9:31 上午

jeffli

广州医科大学附属口腔医院GZYKDXFSKQ-32

发货计划增加不属于当前科室物品列表

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
9:28 上午

zengyuan

去掉不必要的注释
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
Tuesday 22 Jan 2019
10:16 下午

terrykwan

提供拼音码给前台，做过滤检索。GZYKDXFSKQ-30
Options
    • -0
    • +6
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemManagerImpl.java
    • -0
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
8:32 下午

zc.li

解决问题：GYEY-719；修复不在申请名单里也能通过扫描条码的方式登记申请科室的问题。
Options
    • -3
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
7:27 下午

zc.li

新增生物阅读功能；

具体：新增生物阅读器管理，灭菌炉页面添加生物阅读器，灭菌记录添加读取生物阅读器数据功能。

Options
    • -0
    • +209
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/bioreader/service/BioreaderManagerImpl.java
    • -0
    • +173
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/bioreader/bioreaderView.js
    • -0
    • +204
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/bioreader/bioreaderForm.js
    • -0
    • +5
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -2
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
  6. /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/bioreader/action
  7. /ssts-expensivegoods/.settings/gradle
    • -0
    • +66
    /forgon-tools/src/main/java/com/forgon/tools/util/GrabPageTool.java
    • -0
    • +16
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -3
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java
  11. /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/bioreader/vo
  12. /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/bioreader/dwr/table
    • -0
    • +4
    /forgon-core/src/main/java/com/forgon/security/bean/ModuleOperationMapping.java
    • -0
    • +63
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/bioreader/vo/BiologicalReadingDataVo.java
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
  16. … 16 more files in changeset.
4:17 下午

LiHaiFeng

处理选择科室弹窗多次弹出问题
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
4:14 下午

yanweining

XJJQZYY-8：清洗机接口
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp
3:25 下午

yanweining

新疆军区总医院：XJJQZYY-8
Options
    • -1
    • +1
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
2:54 下午

shuyongfu

解决外来器械材料重复时提交申请单后,再进行回收后包数量由1变为2的问题,在将申请单提交时增加材料重复的检查,如有重复则进行提交不予提交
Options
    • -4
    • +16
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
2:54 下午

yanweining

科室供应室设置页面：根据配置项显示/隐藏高值耗材打印标签选项
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
2:33 下午

jeffli

广州医科大学附属口腔医院GZYKDXFSKQ-35

消毒物品包定义限制发货bug

Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
2:13 下午

yanweining

XJJQZYY-8：清洗机接口

1.新增美亚洁超声清洗机数据po

2.新增美亚洁超声清洗机接口数据显示页面

Options
    • -0
    • +13
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashDataLineChartAction.java
    • -0
    • +448
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/ModbusControllerManager.java
    • -0
    • +138
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.jsp
    • -14
    • +176
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/MeiYaJieDataManagerImpl.java
    • -0
    • +57
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/controller/WashAndDisinfectRecordController.java
    • too large
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -315
    • +0
    /forgon-core/src/main/java/com/forgon/device/ModbusControllerManager.java
    • -0
    • +739
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataOfMarge.java
    • -2
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/DeviceDataByCommunicationManager.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java
    • -4
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp
    • -0
    • +4
    /ssts-web/src/main/resources/spring/projects/xjjqzyy/HIS.xml
    • -0
    • +27
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • -0
    • +167
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.js
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/deviceinterface/service/DeviceInterfaceManagerImpl.java
11:52 上午

zengyuan

广州医科大学附属口腔医院GZYKDXFSKQ-18 回收面板语音提示 器械包类型为消毒物品的，修改材料数量时也要报数
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp
11:48 上午

zengyuan

广州医科大学附属口腔医院GZYKDXFSKQ-18 回收面板语音提示 器械包类型为消毒物品的，修改材料数量时也要报数
Options
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp
11:02 上午

LiHaiFeng

处理广医口腔医院科室切换之后篮筐绑定问题
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -3
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp
10:42 上午

shuyongfu

解决jira:XJJQZYY-38 失效期当天的器械包允许发货并录入使用记录
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
10:07 上午

terrykwan

提供拼音码、五笔码给前台，做过滤检索。GZYKDXFSKQ-30
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
9:48 上午

zengyuan

中山大学附属第五医院 ASSZDWY-31 装配页面根据器械包的大小改变显示颜色

Options
    • -2
    • +60
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
9:45 上午

zengyuan

中山大学附属第五医院 ASSZDWY-31 装配页面根据器械包的大小改变显示颜色

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js
9:41 上午

zengyuan

中山大学附属第五医院 ASSZDWY-31 装配页面根据器械包的大小改变显示颜色
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
9:38 上午

zengyuan

中山大学附属第五医院 ASSZDWY-31 装配页面根据器械包的大小改变显示颜色

Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js
9:26 上午

jeffli

广州医科大学附属口腔医院GZYKDXFSKQ-32

发货计划增加不属于当前科室物品列表

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
2:04 上午

terrykwan

增加消毒物品工作量统计方式的配置
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js