forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 43
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 43
Total Lines of Code (LoC): 0
Net change in LoC this week: 0

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
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Thursday 16 Aug 2018
10:17 上午

shuyongfu

解决Jira问题:ZSYY-253 历史装配记录增加过滤条件

同时页面排版布局进行了调整,增加对低分辨率的兼容,增加相关的联动(根据器械包分组、器械包类型过滤器械包名称)、分页等

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js
10:10 上午

shuyongfu

解决Jira问题:ZSYY-253 历史装配记录增加过滤条件

同时页面排版布局进行了调整,增加对低分辨率的兼容,增加相关的联动(根据器械包分组、器械包类型过滤器械包名称)、分页等

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp
9:44 上午

yanweining

排班模块：排班信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/schedule/ScheduleDefinition.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/UserScheduleManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/dto/ScheduleDefinitionDTO.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/ScheduleDefinitionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/controller/ScheduleDefinitionController.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/dto/CondititonScheduleInformationDTO.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/vo/UserScheduleVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/UserScheduleManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/controller/ScheduleInformationController.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/ScheduleDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/vo/UserScheduleDTO.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/dto/CondititonScheduleDefintitionDTO.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/schedule/ScheduleInformation.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/schedule/UserSchedule.java
  16. … 3 more files in changeset.
Wednesday 15 Aug 2018
8:49 下午

terrykwan

解决运行时javax.el的class找不到的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/build.gradle
6:33 下午

simon.bai

解决JR问题：解决文件误提交问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
5:40 下午

yanweining

排班模块：排班定义
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/ScheduleDefinitionManagerImpl.java
3:57 下午

jeffli

新疆军区总医院XJJQZYY-3

增加扫描器械包定义名称使用标识牌功能

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
3:04 下午

adairkang

现场反馈包定义材料打印没有表格线的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fsfy/print/printConfig.js
12:33 下午

yanweining

排班模块：班次定义保存修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/controller/ScheduleDefinitionController.java
11:53 上午

shuyongfu

解决Jira问题:ZSYY-256 使用记录病人接口字段调取

增加对手术名称从手术预约里取值

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/zsyy/FindPatientInfoByHospitalNumDaoImpl.java
11:52 上午

jeffli

新疆军区总医院XJJQZYY-3

增加扫描器械包定义名称使用标识牌功能

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js
11:46 上午

simon.bai

解决JR问题：ZSLY-362 手术室不能申请消毒物品，也不能给手术室发申请物品（消毒物品合并单问题）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
11:11 上午

yanweining

排班模块
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/resources
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/ScheduleInformationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/controller/ScheduleInformationController.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/schedule/ScheduleInformation.java
  5. /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/test/resources
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/resources/rebel.xml
  7. /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/test/java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/schedule/UserSchedule.java
  9. /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/test
  10. /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/test/resources/org/gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/test/resources/org/gradle/test-resource.xml
  12. /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/test/resources/org
11:04 上午

shuyongfu

解决Jira问题:ZSYY-254 使用记录有效期字眼更改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereUseRecordForm.js
10:43 上午

jeffli

新疆军区总医院XJJQZYY-3

增加扫描器械包定义名称使用标识牌功能

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/service/BarcodeManagerImpl.java
10:39 上午

shuyongfu

解决Jira问题:ZSYY-254 使用记录有效期字眼更改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereUseRecordForm.js
10:31 上午

yanweining

排班定义模块
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/.classpath
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/ScheduleInformationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/controller/ScheduleDefinitionController.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/ScheduleDefinitionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/dto/PageDTO.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/dto/TimeFrameDTO.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/build.gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/dto/ScheduleDefinitionDTO.java
  9. /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsysyem
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/dto/ScheduleInformationDTO.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/controller/ScheduleInformationController.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/.project
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/ScheduleInformationManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/dto/ConditionScheduleDTO.java
  15. /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/dto
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/ScheduleDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/dto/CondititonScheduleDefintitionDTO.java
9:58 上午

yanweining

2.新加入validation用依赖

3.spring4兼容jackson:把2.7.1降至2.6.5

4.spring-mvc-servlet.xml增加扫描注解设置

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/settings.gradle
9:56 上午

yanweining

1.新增排班模块

2.新加入validation用依赖

3.spring4兼容jackson:把2.7.1降至2.6.5

4.spring-mvc-servlet.xml增加扫描注解设置

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/controller/ScheduleInformationController.java
  2. /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsysyem
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/ScheduleInformationManagerImpl.java
  4. /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/ScheduleInformationManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsysyem/schedule/dto/ScheduleDefinitionDTO.java
  7. /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src
  8. /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsysyem/schedule/dto/ConditionScheduleDTO.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/ScheduleDefinitionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsysyem/schedule/dto/ScheduleInformationDTO.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsysyem/schedule/dto/PageDTO.java
  14. /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/controller
  15. /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem
  16. … 19 more files in changeset.
9:27 上午

yanweining

排班：排班定义表，排班信息表，用户排班表
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/schedule/ScheduleInformation.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/log/model/Log.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/schedule/ScheduleDefinition.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/schedule/UserSchedule.java
  5. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/schedule
Tuesday 14 Aug 2018
8:11 下午

adairkang

FSFY-48 回收列表中没有的包，在添加的时候，也要闪烁提示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
6:46 下午

adairkang

没有消毒物品但是有器械包的时候，打印回收清单提示没有需要打印的物品
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
Monday 13 Aug 2018
7:00 下午

adairkang

外来器械连续回收两次导致有两张回收记录，并且回收数量为2的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ForeignTousseRecyclingTests.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/recyclingrecord/AllTests.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
5:16 下午

simon.bai

解决JR问题：ZSLY-362 手术室不能申请消毒物品，也不能给手术室发申请物品（消毒物品合并单问题）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
4:43 下午

shuyongfu

经过与李伟沟通,贵港市人民医院的生物监测的状态定时任务可以不用了,所以先屏蔽
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/ggsrmyy/timer.xml
3:11 下午

jeffli

解决问题：

打开外部代理灭菌单列表报错

材料里面有x时，打开列表界面都会报错

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/results/handler/LendGoodsBriefHandler.java
Sunday 12 Aug 2018
6:25 下午

terrykwan

转移了applicationContext-test.xml的路径，故删除
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/test
6:24 下午

terrykwan

注释掉springsource的repository，解决编译时的fatal error提示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
6:23 下午

terrykwan

修改测试用例的spring上下文xml文件定义的位置，改为和beanRefContext.xml一样的路径，便于分析和对比。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/beanRefContext-test.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
6:16 下午

terrykwan

修改注释信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java