forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 36
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 36
Total Lines of Code (LoC): 4,637,834
Net change in LoC this week: 851

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 27 Mar 2018
6:13 下午

cherry

统一日志输出的方法
Options
    • -4
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java
    • -4
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java
    • -1
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recall.java
    • -1
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Consume.java
    • -39
    • +41
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
    • -9
    • +11
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java
    • -5
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java
    • -10
    • +10
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
    • -2
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Apply.java
    • -4
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java
    • -5
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java
    • -2
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Intervene.java
5:12 下午

cherry

统一日志输出的方法
Options
    • -26
    • +26
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
Monday 26 Mar 2018
5:03 下午

chenjiaru

解决jira问题：GGSRMYY-1 将“外来器械申请”单独做为一个模块显示在桌面上
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/portalPage.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js
4:12 下午

chenjiaru

解决jira问题：ZSWY-83 报表中的CSSD包装物品总包数跟总件数没将2个供应室分开显示
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:33 下午

chenjiaru

解决jira问题：GZSZYY-6 填写申请单时处理科室的优化
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
3:04 下午

chenjiaru

调整科室申领的UI
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
11:36 上午

chenjiaru

删除多余的空字符
Options
    • -16
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableWinForm.js
11:34 上午

niutou_ren

中山大学中山眼科中心ZSYKZX-83（待清洗列表中的待清洗篮筐中的物品进行汇总及篮筐监控内的物品汇总）

1、待清洗页面、篮筐监控页面的清洗篮筐内物品进行汇总，如果整框清洗，则按包汇总，如果拆包清洗，按材料名称和规格汇总；

2、其中，待清洗页面中，对物品进行汇总时，不同科室也一起汇总。在篮筐监控页面中，对物品进行汇总时，要对不同科室分别汇总。原因是，篮筐监控页面中有科室显示，而待清洗页面中没有；

3、在清洗消毒页面，每条记录的悬浮窗中，以前篮筐里的数量统计一直为1，现修改为实际值。此情况也存在于每一次打开一条清洗记录时，清洗篮筐列表中。

Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java
    • -4
    • +26
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • -2
    • +40
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • -4
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
    • -0
    • +114
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifiedItemManagerImpl.java
    • -0
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifiedItemManager.java
Saturday 24 Mar 2018
4:24 下午

shuyongfu

修复config.js配置文件末尾空格的问题
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
Friday 23 Mar 2018
11:30 上午

alan.lee

发货里用不到的方法注释掉
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
10:53 上午

alan.lee

解决失效日期报错
Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
10:32 上午

alan.lee

解决：广东省人民医院GDSRMYY-419

虚拟篮筐数量增加

Options
    • -5
    • +22
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java
    • -2
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManager.java
    • -4
    • +17
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java
    • -7
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/basketMonitor/washBasketMonitorView.js
    • -353
    • +421
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/basketMonitor/virtualBasketMonitorView.js
    • -1
    • +23
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java
    • -4
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/basketMonitor/sterileBasketMonitorView.js
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
9:50 上午

adairkang

黎子聪发回来开平医院发货计划打印
Options
    • -6
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/config/kpszxyy/print/printConfig.js
Thursday 22 Mar 2018
11:36 下午

chenjiaru

满意度调查表功能的重构
Options
    • -10
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableView.js
    • -256
    • +173
    /ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/action/SatisfactionSurveyTableAction.java
    • -24
    • +16
    /ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTableManagerImpl.java
    • -2
    • +10
    /ssts-web/src/main/webapp/homepage/portalPage.jsp
    • -404
    • +338
    /ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableForm.js
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableView.jsp
    • -0
    • +436
    /ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableCustomFormHelper.js
    • -2
    • +1
    /ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTableManager.java
    • -430
    • +32
    /ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableWinForm.js
    • -503
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableWinCustomForm.js
4:33 下午

jeffli

解决bug：

虚拟篮筐不足继续装配时不打印标签

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
3:42 下午

shuyongfu

博罗县人民医院科室人员接口配置文件调整,去除各字段的首尾空格
Options
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/blxrmyy/HIS.xml
    • -6
    • +6
    /ssts-web/src/main/resources/config/blxrmyy/mybatis/SyncOrgUnitAndUserMapper.xml
3:11 下午

jeffli

解决bug：

装配任务数量大于空闲的虚拟篮筐数量时，会提示虚拟篮筐不足

Options
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/container/Container.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
11:55 上午

jeffli

虚拟篮筐不足时抛出异常
Options
    • -0
    • +15
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/VirtualBasketNotEnoughException.java
    • -1
    • +6
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
11:06 上午

shuyongfu

解决Jira问题:GZSZYY-6 填写申请单时处理科室的优化
Options
    • too large
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
Wednesday 21 Mar 2018
8:05 下午

adairkang

李健平发回来现场打印配置
Options
    • -3
    • +65
    /ssts-web/src/main/webapp/disinfectsystem/config/szszyy/print/printConfig.js
7:00 下午

shuyongfu

解决Jira问题:GZSZYY-6 填写申请单时处理科室的优化
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsView.js
    • too large
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
6:39 下午

chenjiaru

解决jira问题：GZSZYY-6 填写申请单时处理科室的优化
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
6:36 下午

adairkang

GZS12RMYY-6 部分回收中《一键入筐》改进，入筐后，回收记录未保存，再删除，然后不入筐，就保存，申请单是部分回收状态
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
6:04 下午

shuyongfu

处理Jira问题:GZSZYY-6 填写申请单时处理科室的优化
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsForm.js
5:51 下午

shuyongfu

处理Jira问题:GZSZYY-6 填写申请单时处理科室的优化
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsForm.js
5:23 下午

adairkang

JMSZXYY-45 回收时提示‘器械包必须是已发货已使用已签收或预回收状态’
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -0
    • +12
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
5:23 下午

shuyongfu

处理Jira问题:GZSZYY-6 填写申请单时处理科室的优化
Options
    • -4
    • +2
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • -34
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts/action/CssdServiceDeptsAction.java
    • -15
    • +54
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsForm.js
    • too large
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -5
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsView.js
    • -9
    • +2
    /ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/OrgUnitTableManager.java
2:17 下午

chenjiaru

解决jira问题：GZSZYY-6 填写申请单时处理科室的优化
Options
    • too large
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • -15
    • +29
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
    • -1
    • +3
    /forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
12:03 下午

chenjiaru

解决“分配权限功能”请求服务器乱码的问题
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/systemmanage/roleList.js
11:20 上午

shuyongfu

处理Jira问题:GZSZYY-6 填写申请单时处理科室的优化
Options
    • -0
    • +14
    /forgon-core/src/main/java/com/forgon/directory/model/CssdServiceDepts.java