forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 46
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 46
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 30167 is being indexed.

Friday 08 Jan 2021
7:05 下午

frank

优化ZSRY-1：申请单干预功能改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/splitRecyclingApplicationView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereGoodsApplicationView.js
6:43 下午

shuyongfu

解决:GDSZYY-57 科研项目耗材申领（一次性物品申领）功能开发

科研项目接口整合,去掉老的api方法,改调用新的api方法

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
5:57 下午

jason

解决jira问题：GDSZYY-57 科研项目耗材申领（一次性物品申领）功能开发
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
5:12 下午

shuyongfu

解决:GDSZYY-57 科研项目耗材申领（一次性物品申领）功能开发

科研项目接口整合,去掉老的api方法,改调用新的api方法

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/project/service/zsykzx/ProjectManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/project/service/BaseProjectManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/project/service/gdszyy/ProjectManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/project/service/ProjectManager.java
4:59 下午

shuyongfu

解决:GDSZYY-57 科研项目耗材申领（一次性物品申领）功能开发

科研项目接口调整

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/project/dao/zsykzx/ProjectDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/project/service/gdszyy/ProjectManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/project/service/BaseProjectManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/project/model/BudgetProjectWriteBackData.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/project/dao/ProjectDao.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/queryAndWriteProject_Mapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/project/service/ProjectManager.java
4:34 下午

frank

优化ZSRY-1：申请单干预功能改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/splitRecyclingApplicationView.js
4:20 下午

jason

解决jira问题：ZSRY-1 申请单干预功能改进(不是整包清洗的包，不能进行拆分)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
3:37 下午

zc.li

回滚误提交的文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
3:06 下午

jason

解决jira问题：SSTS-276 新增标签模板时，如果标签名称已存在时，提示 “failure = server”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java
2:02 下午

frank

解决SSTS-276:新增标签模板时，如果标签名称已存在时，提示 “failure = server”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateForm.js
11:49 上午

jason

解决jira问题：GDSZYY-50 增加多区院设置的以及按院区进行核算月报的查询和汇总统计(增加同一个科室只能属于一个院区的校验)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitGroupManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/BrancheOfHospitalManagerImpl.java
10:51 上午

frank

优化GDSZYY-50:增加多区院设置的以及按院区进行核算月报的查询和汇总统计
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js
10:21 上午

frank

优化GDSZYY-50:增加多区院设置的以及按院区进行核算月报的查询和汇总统计
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupCommonForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/branchesOfHospital/branchesOfHospitalForm.js
10:05 上午

frank

解决ZSRY-1：申请单干预功能改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/splitRecyclingApplicationView.js
10:02 上午

jason

解决jira问题：ZSRY-1 申请单干预功能改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
Thursday 07 Jan 2021
7:29 下午

jason

解决jira问题：GDSZYY-50 增加多区院设置的以及按院区进行核算月报的查询和汇总统计(增加同一个科室只能属于一个院区的校验)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/BrancheOfHospitalManagerImpl.java
7:17 下午

jason

解决jira问题：GDSZYY-50 增加多区院设置的以及按院区进行核算月报的查询和汇总统计(增加同一个科室只能属于一个院区的校验)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/BrancheOfHospitalManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitGroupManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/BrancheOfHospitalManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/action/BrancheOfHospitalAction.java
6:51 下午

frank

优化GDSZYY-43：参数设置新增【科室分组设置】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/branchesOfHospital/branchesOfHospitalForm.js
6:07 下午

zc.li

GDSZYY-50.调整核算月报格式
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jasper
5:54 下午

frank

优化GDSZYY-43：参数设置新增【科室分组设置】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js
5:22 下午

frank

优化GDSZYY-43：参数设置新增【科室分组设置】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupCommonForm.js
5:10 下午

frank

优化GDSZYY-43：参数设置新增【科室分组设置】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupCommonForm.js
4:40 下午

frank

替换回收科室分组，审核科室分组，物品科室共用配置的选择科室的界面
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroupOption/departmentgroupOptionView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroupOption/departmentgroupOptionForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/goodsDepartShareConfig/goodsDepartShareConfigForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/goodsDepartShareConfig/goodsDepartShareConfigView.jsp
4:10 下午

frank

优化GDSZYY-43：参数设置新增【科室分组设置】(重做选择科室的对话框)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupCommonForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupCommonView.jsp
3:49 下午

zc.li

修复院区格式报表，无院区的数据没有合计，且因此总合计不正常的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:15 下午

zc.li

解决：SSTS-275。开启了patternOfAccountingMonthlyReport和enableMultipleBranchesOfHospital配置项后，核算月报的有一些选项的问题
Options
    • ?
    /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/JasperReportManager.java
    • ?
    /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/departmentMonthlyView.js
10:51 上午

jason

PDA提交申请单报错
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
Wednesday 06 Jan 2021
8:43 下午

frank

解决装配聚合包没有打印出科室的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
7:23 下午

liwei

增加接口队列配置文件
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/bjscylyy/interfaces/mqConfig
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/bjscylyy/interfaces/mqConfig/esbmq-config.xml
7:16 下午

frank

解决装配聚合包只装配一个时会报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js