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
Tuesday 07 Mar 2017
11:47 下午

shuyongfu

解决jira问题:DYSYY-25 与HIS系统在PC端的对接

目前已经整合到通用的模块,现惠州和德阳采用url传递登录名的方式实现单点登录

Options
    • -4
    • +4
    /build.gradle
  2. /ssts-client-misc
  3. /ssts-client-misc/src/main
    • -0
    • +13
    /ssts-client-misc/.settings/org.eclipse.jdt.core.prefs
    • -0
    • +4
    /ssts-client-misc/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
  6. /ssts-client-misc/src/main/java
  7. /ssts-client-misc/src/test
    • -0
    • +9
    /ssts-client-misc/build.gradle
    • -0
    • +41
    /ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/handler/AuthenticationSuccessHandlerForHzszxrmyy.java
    • -0
    • +128
    /ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-dysyy.xml.back
  11. /ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/handler
  12. /ssts-client-misc/src/main/java/com/forgon/disinfectsystem
  13. /ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security
  14. /ssts-client-misc/.settings
  15. /ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/filter
  16. … 12 more files in changeset.
11:45 下午

chenjiaru

修整器械包定义管理那一块的UI代码
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js
    • -0
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -340
    • +188
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • -1
    • +5
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
    • -0
    • +5
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -11
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.js
6:46 下午

jeffli

修正代码错误
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
6:32 下午

wangyi

去掉权限id重复的选项
Options
    • -4
    • +0
    /ssts-web/src/main/resources/systemset/operationDefine.xml
6:22 下午

zhonghaowen

修改清洗机管理弹窗窗口大小
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js
5:51 下午

jeffli

改进：GDSRMYY-269

消毒物品可通过自定义装配进行装配

Options
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
    • -6
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
5:03 下午

zhonghaowen

修改查看发货单弹窗大小
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
5:00 下午

wangyi

完成：ZSYY-20，手术预约管理增加批量提交功能
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +16
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java
    • -1
    • +6
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -0
    • +6
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManager.java
    • -0
    • +10
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -11
    • +56
    /ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js
    • -0
    • +28
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
    • -10
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.jsp
4:53 下午

jeffli

解决bug：

外来器械拆包装配时，如果使用了自定义标签模板，包名是不带科室的包名，包名打印出来会为空

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
4:48 下午

zhonghaowen

修改发货计划弹窗大小
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
4:39 下午

zhonghaowen

添加灭菌弹窗修改大小
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
4:01 下午

zhonghaowen

修改添加清洗记录页面弹窗大小
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
2:45 下午

wangyi

完成：DGZYY-87，自定义装配后清理配包人
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
    • -2
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
1:42 下午

adairkang

器械包负载统计报表，排序的问题
Options
    • -7
    • +7
    /ssts-web/src/main/webapp/jasperRtp/tousseOverLoadReport.jrxml
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestTousseOverLoad.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/tousseOverLoadReport.jasper
    • -6
    • +6
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseOverLoadBean.java
11:37 上午

shuyongfu

解决jira问题:GDSRMYY-280 同一个功能模块在两个标签页中显示
Options
    • -4
    • +30
    /ssts-web/src/main/webapp/homepage/portalPage.js
11:36 上午

wangyi

完成：GDSRMYY-278，盘点一次性物品增加顺序号列
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.6.9_4.7.0.sql
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -1
    • +34
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakemanager/InventoryItem.java
    • -6
    • +12
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -0
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/action/InventoryRecordAction.java
    • -9
    • +19
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js
9:55 上午

adairkang

发货添加祖先id跟包定义id不同的测试用例(如消毒物品)
Options
    • -0
    • +153
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestDisinfectGoodsInvoiceWithDiffAncestorTousseDefinition.java
    • -0
    • +2
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/invoicemanager/service/AllTests.xml
9:52 上午

zhonghaowen

CSSZXYY-75:去掉checkTousseItemCanCancel方法的抛出异常
Options
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -2
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
Monday 06 Mar 2017
9:59 下午

chenjiaru

去掉器械包定义管理那一块多余的引用
Options
    • -1
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.js
    • -5
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.jsp
    • -4
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp
    • -16
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js
    • -38
    • +32
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
7:11 下午

shuyongfu

解决jira问题:GDSRMYY-280 同一个功能模块在两个标签页中显示
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/portalPage.js
7:04 下午

adairkang

发货扣库存找不到包定义的问题
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java
6:50 下午

zhonghaowen

GDSRMYY-279:培训管理模块打开文件时报错新增跳转到其他页面
Options
    • -33
    • +46
    /forgon-core/src/main/java/com/forgon/filedownload/servlet/FileDownLoadServlet.java
    • -0
    • +14
    /forgon-knowledge/src/main/java/com/forgon/knowledge/controller/KnowledgeFileController.java
    • -0
    • +8
    /ssts-web/src/main/webapp/knowledge/knowledgeErrorPage.jsp
6:41 下午

zhonghaowen

CSSZXYY-75:新增自定义异常
Options
    • -1
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
  2. /forgon-core/src/main/java/com/forgon/exception
    • -2
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -0
    • +24
    /forgon-core/src/main/java/com/forgon/exception/OperationException.java
6:22 下午

chenjiaru

补上：修改材料的“是否植入物”属性的测试用例
Options
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java
    • -0
    • +99
    /ssts-web/src/test/java/test/forgon/disinfectsystem/material/service/UpdateMterialIsImplantPropertyTest.java
    • -0
    • +1
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/material/AllTests.xml
    • -8
    • +37
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
5:58 下午

wangyi

修复一键入筐按钮鼠标移上去后按钮下移问题
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
11:12 上午

adairkang

器械包实际负载，对包类型过滤及字符串类型的日期的处理
Options
    • -0
    • +28
    /forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -11
    • +41
    /ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestTousseOverLoad.java
10:40 上午

zhonghaowen

解决CSSZXYY-75:申领物品A、B，发货A后，选择终止A，提示“终止成功”，实际上A没有终止由于A已发货
Options
    • -1
    • +21
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
    • -0
    • +9
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • -1
    • +11
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
10:37 上午

shuyongfu

解决jira问题:

GDSRMYY-273 组织机构中删除科室后科室申领配置与结算科室配置没有被同步删除

同时优化改进了组织机构的功能,删除增加确认提示,增加拼音码和五笔码的搜索,循环逐条数据处理改成批量处理提升性能，科室干预功能扩充

Options
    • -8
    • +16
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -0
    • +9
    /forgon-core/src/main/java/com/forgon/treenode/service/THTreeNodeManager.java
    • -0
    • +38
    /forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java
    • -1
    • +28
    /ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js
    • -1
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/interfere/orgUnit/interfereOrgUnit.jsp
    • -0
    • +57
    /forgon-core/src/main/java/com/forgon/treenode/service/THTreeNodeManagerImpl.java
    • -8
    • +12
    /ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/OrgUnitTableManager.java
10:31 上午

shuyongfu

灭菌篮筐实例增加相关索引列
Options
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/ReviewedBasket.java
Sunday 05 Mar 2017
11:44 下午

adairkang

GDSRMYY-272 器械包实际负载组合统计报表
Options
    • -0
    • +1
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/reports/AllTests.xml
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/reportoption/GoodsOption.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/tousseOverLoadReport.jasper
    • -1
    • +2
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -8
    • +25
    /ssts-web/src/main/webapp/jasperRtp/tousseOverLoadReport.jrxml
    • -0
    • +269
    /ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestTousseOverLoad.java
    • 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
    • -0
    • +56
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOverLoad.jsp
    • -0
    • +55
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/TousseOverLoadDetail.java
    • -0
    • +92
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseOverLoadBean.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • -0
    • +245
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOverLoad.js