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

Changeset 24051 is being indexed.

Monday 20 Aug 2018
4:52 下午

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-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/dto/CondititonScheduleDefintitionDTO.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/dto/ScheduleDefinitionDTO.java
3:09 下午

simon.bai

排班优化

Options
    • ?
    /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
2:17 下午

simon.bai

排班优化

Options
    • ?
    /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/scheduleDefinitionHistory.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/scheduleInformationView.jsp
1:12 下午

shuyongfu

解决Jira问题:GZZYYFY-2 HIS接口调试

增加门诊病人接口

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/DatasyncConstant.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/HttpInterfaceHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/gzzyyfy/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/FindPatientInfoByTreatmentNumDaoImpl.java
12:55 下午

shuyongfu

广医二院hl7病人接口推送手术申请信息时增加对病室与病区的更新
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/gyey/PatientAdmissionInfoManagerImpl.java
11:56 上午

adairkang

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

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/scheduleDefinitionHistory.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinition.js
10:59 上午

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
8:58 上午

simon.bai

排班优化

Options
    • ?
    /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/tools.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/scheduleDefinition.js
    • ?
    /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/scheduleDefinitionHistoryView.jsp
Saturday 18 Aug 2018
8:22 下午

simon.bai

排班优化

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/service/ScheduleInformationManagerImpl.java
7:27 下午

shuyongfu

解决Jira问题:ZSLY-362 手术室不能申请消毒物品，也不能给手术室发申请物品
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
6:38 下午

simon.bai

排班更新
Options
    • ?
    /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/scheduleInformation.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinitionHistory.js
5:36 下午

simon.bai

排班优化
Options
    • ?
    /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/scheduleInformation.js
5:08 下午

simon.bai

排班优化
Options
    • ?
    /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/scheduleInformation.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinitionView.jsp
4:38 下午

yanweining

orgUnitAction:增加获得当前默认科室action
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/strtus_oa.xml
3:34 下午

simon.bai

排班
Options
    • ?
    /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/scheduleInformation.js
3:12 下午

yanweining

增加获得当前用户的科室action方法

排班模块：排班查询默认当前科室

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/ScheduleInformationManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/util/ApiResultVoUtil.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-schedule/src/main/java/com/forgon/disinfectsystem/schedule/vo/UserScheduleVo.java
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