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
Saturday 18 Aug 2018
2:53 下午

simon.bai

排班模块--第一测试版
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleInformationView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinition.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinitionView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/schedule/tools.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleInformation.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinitionHistory.js
  7. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/schedule
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinitionHistoryView.jsp
2:52 下午

simon.bai

排班模块菜单显示设置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
2:02 下午

yanweining

排班模块：代码优化
Options
    • ?
    /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/ScheduleDefinitionDTO.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/enums/ErrorCodeEnum.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/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/PageDTO.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/ScheduleDefinitionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/ScheduleInformationManagerImpl.java
1:41 下午

shuyongfu

删掉不需要的文件夹
Options
  1. /SterileSupplySystem/branches/V4.1.0/forgon-ssts
12:06 下午

shuyongfu

将主页的dwr请求的同步设置去掉,恢复为默认的设置(即异步),提高主页展示的效率
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
Friday 17 Aug 2018
7:30 下午

yanweining

排班模块：排班查询
Options
    • ?
    /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/ScheduleInformationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/vo/UserScheduleVo.java
6:30 下午

shuyongfu

解决Jira问题:PYQZYY-166 器械返消功能改进支持外来器械
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
6:28 下午

yanweining

排班模块:排班查询，获取当前登录科室下的用户，根据科室名称查询班次定义的科室，根据关键词获得班次定义
Options
    • ?
    /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/ScheduleInformationManagerImpl.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/vo/ScheduleInformationVo.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/ScheduleDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/dto/ScheduleDefinitionDTO.java
6:15 下午

simon.bai

提交引入的插件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/bootstrap-x-editable-develop/test/libs/jquery-ui-1.10.2.custom/css/redmond/images/ui-icons_f9bd01_256x240.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/bootstrap-select/dist/js/i18n/defaults-ar_AR.js
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/bootstrap-x-editable-develop/test/libs/bootstrap300/fonts
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/bootstrap-select/dist/js/i18n/defaults-pt_BR.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/bootstrap-x-editable-develop/dist/bootstrap3-editable/css/bootstrap-editable.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/bootstrap-x-editable-develop/src/inputs/typeahead.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/bootstrap-x-editable-develop/src/inputs-ext/wysihtml5/wysihtml5.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/bootstrap-x-editable-develop/test/libs/jquery-ui-1.10.2.custom/css/redmond/images/ui-icons_2e83ff_256x240.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/bootstrap-x-editable-develop/src/inputs/select2/lib/select2.min.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/bootstrap-x-editable-develop/test/libs/jquery/jquery-1.8.2.js
  11. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/bootstrap-x-editable-develop/test/libs/jquery-ui-1.10.3.custom
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/bootstrap-x-editable-develop/test/libs/jquery-ui-1.10.3.custom/js/jquery-ui-1.10.3.custom.min.js
  13. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/bootstrap-x-editable-develop/src/containers
  14. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/bootstrap-x-editable-develop/test/libs/jquery-ui-1.10.1.custom/css/redmond
  15. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/bootstrap-x-editable-develop/test/libs/jquery
  16. … 526 more files in changeset.
6:10 下午

shuyongfu

解决外来器械包返消后,生成的外来器械申请单查不出来的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
5:36 下午

shuyongfu

PYQZYY-169 外来器械申请单统计报表改进 增加申请科室与发货状态列的显示

解决Jira问题:PYQZYY-166 器械返消功能改进支持外来器械

器械返消统计报表增加外来器械包及拆分小包类型的过滤查询

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
5:11 下午

shuyongfu

PYQZYY-169 外来器械申请单统计报表改进 增加申请科室与发货状态列的显示

解决Jira问题:PYQZYY-166 器械返消功能改进支持外来器械

器械返消统计报表增加外来器械包及拆分小包类型的过滤查询

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseReturnDisinfectionView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseReturnDisinfectionView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jrxml
3:08 下午

shuyongfu

申请单增加器械返消id字段,用于外来器械包申请单
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
2:58 下午

shuyongfu

解决Jira问题:PYQZYY-166 器械返消功能改进支持外来器械
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-toussereturndisinfect/src/main/java/com/forgon/disinfectsystem/tousseReturnDisinfectRecord/service/TousseReturnDisinfectRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/tousseReturnDisinfect/tousseReturnDisinfectForm.js
2:43 下午

yk

初始导入。
Options
  1. /SterileSupplySystem/branches/V4.1.0/forgon-ssts
1:49 下午

shuyongfu

放开广东省医回写bean的注释
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/gdsy/HIS.xml
1:47 下午

shuyongfu

解决广东省医一次性物品入库单webservice接口服务不能访问的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/webservice/server/InventoryStockWebServiceImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/gdsy/webservice-cxf.xml
10:52 上午

shuyongfu

解决科室供应室配置外来器械打印份数等看不到的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
10:16 上午

jeffli

新疆军区总医院XJJQZYY-3

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

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

jeffli

贵港市人民医院GGSRMYY-53

结算科室与申请科室不一样时，在发货管理模块不能正常退货

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoice.js
Thursday 16 Aug 2018
10:19 下午

yanweining

排班模块：排班查询
Options
    • ?
    /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/PageDTO.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/vo/ConditionTimesVo.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/ScheduleDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/ScheduleInformationManagerImpl.java
6:23 下午

yanweining

排班模块:排班信息查询
Options
    • ?
    /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/ScheduleInformationManagerImpl.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/vo/ScheduleInformationVo.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
4:06 下午

yanweining

排班模块：排班信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/ScheduleInformationManagerImpl.java
4:03 下午

yanweining

排班模块：排班信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/dto/ScheduleInformationDTO.java
4:03 下午

yanweining

排班模块：排班信息
Options
    • ?
    /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/ScheduleDefinitionManagerImpl.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/service/ScheduleInformationManager.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/ScheduleDefinitionManager.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/vo/ScheduleInformationVo.java
3:33 下午

shuyongfu

解决Jira问题:PYQZYY-168 材料退库没带出供应商信息和价格信息

如果没有先选择仓库,直接选择物品名称与供应商时后台会报错

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialOutView.js
11:22 上午

adairkang

番禺区中医院外来器械接收单供应商打印不全的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js
11:21 上午

shuyongfu

解决Jira问题:PYQZYY-169 外来器械申请单统计报表改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:08 上午

adairkang

新版本apk,包含以下更新：

● FSFY-52 PDA灭菌列表增加“炉次”

● ZSYY-245 PDA的手术仪器的发货处理优化

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.50_20180816_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.48_20180705_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
11:06 上午

jeffli

中山一院消毒供应项目ZSYY-253

历史装配记录增加过滤条件

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java