forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 58
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 58
Total Lines of Code (LoC): 4,712,715
Net change in LoC this week: 1,931

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 08 Feb 2018
6:32 下午

adairkang

灭菌卸载扫描器械包PO的定义及对应操作接口
Options
  1. /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationunload/service
    • -0
    • +56
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterileUnloadScanTousse.java
    • -56
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationComplete.java
    • too large
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -0
    • +24
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationunload/service/SterileUnloadScanTousseManagerImpl.java
    • -0
    • +21
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationunload/service/SterileUnloadScanTousseManager.java
  7. /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationunload
4:49 下午

ZhuangQinLiu

流程定义权限配置
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +6
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -0
    • +2
    /ssts-web/src/main/resources/systemset/operationDefine.xml
4:48 下午

liuliben

修改清洗SQL语句
Options
    • -2
    • +2
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
4:28 下午

alan.lee

灭菌卸载信息PO类忘记加上主键
Options
    • -0
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationComplete.java
4:27 下午

shuyongfu

增加高值耗材扫描三个自身条码录入使用记录的功能
Options
    • -0
    • +216
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • -1
    • +86
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
4:06 下午

alan.lee

灭菌卸载信息po类
Options
    • -0
    • +51
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationComplete.java
3:48 下午

adairkang

带下划线器械包的使用记录转换导致申请项没有包名称的问题，暂时简单修改，有待进一步重构
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
3:15 下午

ZhuangQinLiu

待办任务最后一个节点审批界面优化
Options
    • -45
    • +33
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js
2:49 下午

shuyongfu

解决jira:GDSRMYY-412 同一张入库单存在同一物品两个批次会产生一个新的物品
Options
    • -0
    • +7
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
2:44 下午

jeffli

发货计划列表里面新增预览功能

江门市中心医院JMSZXYY-31

Options
    • -222
    • +267
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
2:32 下午

liuliben

解决江门市中心医院JMSZXYY-27清洗消毒模块的问题

Options
    • -0
    • +7
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
2:23 下午

liuliben

更改高值耗材图片类型名称
Options
    • -5
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/imagefilemanager/ImageFile.java
1:51 下午

niutou_ren

中山一院消毒供应项目ZSYY-220(器械包信息改进)

1、灭菌开始日期、灭菌结束日期：过滤范围增加时间过滤;

2、器械包信息页面增加字段列：可以做成config配置项显示。

签收人、签收时间：读包实例数据；显示位置在发货时间后面(配置为：showSignedItems）(以前由配置项notSignedItemsCanRegistUseRecord控制)

使用病人、使用医生、使用时间：读包实例数据；显示位置在签收时间的后面(配置为：showUseRecordItems)

灭菌交接人、灭菌接收人、灭菌交接时间：读包实例的灭菌交接时间；显示位置在包装类型的后面。注意：并且要在点击打开的”器械包追溯信息“中增加”灭菌交接记录“栏目，包含这3个字段数据。(配置为：enableSterilizationTransition)

3、过滤条件增加：发货开始时间、发货结束时间、灭菌交接开始时间、灭菌交接结束时间。按照选择的时间对包实例的数据进行过滤显示。开始时间的分钟默认为0点，结束时间的分钟默认为23：59：00

4、器械包信息页面的：灭菌完成时间、发货时间、灭菌交接时间、签收时间、使用时间；这些包含时间格式的列名都需要可以按照正序或倒序进行排序。目前是没有的。

5、器械包信息的“灭菌炉”下拉选择数据源：要所有登录科室的人员查询时都可以下拉选择，目前只能是灭菌炉所属的科室登录才能有下拉选择。查询时要所有科室都可以下拉查询，业务操作时才分开过滤显示。

Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/cszxyy/config.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js
    • -10
    • +17
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
    • -0
    • +68
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
    • -2
    • +83
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
    • -489
    • +591
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
    • -33
    • +79
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js
    • -12
    • +19
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java
1:46 下午

alan.lee

把更新失效期的提取到DateTools公用类中。并增加对月份的处理
Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -0
    • +13
    /forgon-tools/src/main/java/com/forgon/tools/date/DateTools.java
10:40 上午

ZhuangQinLiu

流程定义新增节点按钮大小改变
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowForm.js
9:56 上午

ZhuangQinLiu

系统设置 权限配置菜单下，给角色配置2000以上个用户后，出现配置的用户显示不出来，问题解决
Options
    • -4
    • +34
    /forgon-core/src/main/java/com/forgon/directory/service/DirectoryManagerImpl.java
    • -3
    • +8
    /ssts-web/src/main/webapp/common/selPersonByOrgUnitByExt.js
    • -10
    • +28
    /ssts-web/src/main/webapp/common/orgUnitHelper.js
    • -1
    • +38
    /forgon-core/src/main/java/com/forgon/directory/action/DirectoryAction.java
    • -0
    • +9
    /forgon-core/src/main/java/com/forgon/directory/service/DirectoryManager.java
Wednesday 07 Feb 2018
11:39 下午

chenjiaru

解决jira问题：FSFY-29 增加‘供应室护理质量指标统计表’
Options
    • -0
    • +250
    /ssts-web/src/main/webapp/jasperRtp/supplyRoomQualityQuota.jrxml
    • -0
    • +36
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/supplyRoomQualityQuota.jsp
    • 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
    • -0
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/reportoption/GoodsOptionManager.java
    • -0
    • +201
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/supplyRoomQualityQuota.js
    • binary
    /ssts-web/src/main/webapp/jasperRtp/supplyRoomQualityQuota.jasper
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/reportoption/GoodsOptionManagerImpl.java
    • -1
    • +3
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setUnqualifiedSource.js
    • -0
    • +106
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SupplyRoomQualityQuota.java
    • -0
    • +11
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
10:18 下午

adairkang

ZSYY-127 PDA发货任务默认日期更改
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
9:42 下午

adairkang

回收扫描篮筐，提示的装配任务，任务组从科室处理器械包配置中获取，外来器械和自定义器械包按科室供应室配置的任务组
Options
    • -3
    • +48
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java
7:51 下午

jeffli

发货计划列表里面新增预览功能

江门市中心医院JMSZXYY-31

Options
    • -1
    • +58
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp
7:50 下午

jeffli

发货计划列表里面新增预览功能

江门市中心医院JMSZXYY-31

Options
    • -0
    • +4
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -0
    • +14
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/InvoicePlanVo.java
7:05 下午

alan.lee

解决:

江门市中心医院JMSZXYY-33

包状态为灭菌中存在提示错误的问题

Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
6:28 下午

chenjiaru

修复终止申请单后，没有联动删除代办任务的缺陷
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -4
    • +3
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
    • -4
    • +3
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManager.java
    • -4
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java
5:15 下午

ZhuangQinLiu

待办任务回退出现任务名称为空
Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
4:36 下午

adairkang

装配任务删除不了的问题
Options
    • -0
    • +5
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDao.java
    • -0
    • +5
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java
    • -6
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/taskGroup/taskGroupView.js
    • -0
    • +5
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManager.java
    • -1
    • +5
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java
    • -2
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/taskGroup/action/TaskGroupAction.java
4:07 下午

adairkang

sql语句做的更新操作，导致对象没有更新，判断异常
Options
    • -4
    • +13
    /ssts-web/src/test/java/test/forgon/disinfectsystem/sterileLoading/SterileLoadingManagerTests.java
3:36 下午

chenjiaru

修复回收之后针对此次回收自动加急的物品没有及时做出提示的缺陷
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -2
    • +5
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java
3:33 下午

adairkang

测试用例灭菌筐条码添加常量定义
Options
    • -2
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/sterileLoading/SterileLoadingManagerTests.java
    • -2
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/waste/TousseInstanceWasteTests.java
3:32 下午

alan.lee

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

二级供应室自动发货改进

Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
2:24 下午

adairkang

测试用例灭菌筐条码添加常量定义
Options
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestTousseOverLoad.java
    • -2
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java
    • -5
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/BiologicalMonitoringSituationTest.java
    • -7
    • +7
    /ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/TestDisinfectGoodsSteriliManager.java
    • -0
    • +12
    /ssts-web/src/test/java/test/forgon/constant/Constants.java
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/TousseInstanceReviewManagerTests.java
    • -2
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/review/ComboTousseInstanceReviewTests.java
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/webservice/service/ServiceManagerTests.java
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/synthetic/SterileAndInvoiceTests.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/SterieRecordManagerTests.java
    • -6
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/ScanBasketInvoiceTests.java