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 15141 is being indexed.

Tuesday 27 Sep 2016
9:48 上午

zhonghaowen

更换桌面外来器械申请按钮图标
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/themes/portalPage/img/foreign-tousse.jpg
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/themes/portalPage/img/foreign-tousse.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/systemset/portalPage.xml
Monday 26 Sep 2016
7:19 下午

zhonghaowen

个人桌面如果是供应室则隐藏外来器械申请按钮
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/portalPage.js
7:17 下午

adairkang

GDSRMYY-82(明细核算月报跟核算月报数量不一致的问题)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
7:14 下午

chenjiaru

解决：GDSRMYY-166 篮筐监控增加科室名称字段
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/basketMonitor/sterileBasketMonitorView.js
7:00 下午

zhonghaowen

解决GDSRMYY-173:个人桌面增加外来器械申请按钮(科室申请界面去掉外来器械申请按钮)。(暂时缺少图标)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/systemset/portalPage.xml
6:41 下午

zhonghaowen

修复科室申请单查询未完成状态的过滤
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
6:36 下午

wangyi

修复外来器械只入到一个篮筐时候，装配不用拆分小包
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
6:06 下午

shuyongfu

江门的科室申领配置由通用申请单改为分单
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js
5:34 下午

jeffli

解决bug：

勾选多张不同科室的外部代理灭菌,点击打印标签按钮.打出来的的标签都是同一个科室的,而且标签条码跟申请单中器械包信息里面的条码不一样.

广东省人民医院GDSRMYY-161

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
5:33 下午

zhonghaowen

查看所有申请单增加默认状态改成未完成
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
5:31 下午

wangyi

修改外来器械表单样式
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext-4.2.3/resources/ext-theme-green/custom-theme-sandbox.css
5:22 下午

zengjc

拼接json改为JSONObject转字符串.

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/UserTableManager.java
5:12 下午

jeffli

灭菌程序里面包含双引号或者单引号时，页面报脚本错误
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
3:32 下午

zhonghaowen

修改一次性物品绑定下拉框传进后台参数
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsConfig.js
3:05 下午

zhonghaowen

1.修改一次性物品最小申请数量验证

2.一次性物品绑定下拉框改成分页

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
2:53 下午

wangyi

外来器械装配默认按清洗篮筐内的器械拆分
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java
    • ?
    /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/splitForeignTousseView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext-4.2.3/resources/ext-theme-green/custom-theme-sandbox.css
2:46 下午

jeffli

广东省人民医院GDSRMYY-163

优化科室供应室打开加载速度

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
2:02 下午

shuyongfu

解决jira问题:ZSYY-8 tomcat启动时报错：No class by name: DataSynchronizationTableManager

新增中大附一相关his接口配置文件

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/zsyy/dataSyncConfig.json
12:00 下午

shuyongfu

解决jira问题:GDSRMYY-174 灭菌装载界面'篮筐物品统计信息中增加科室字段
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
11:15 上午

jeffli

标签打印，代码完善
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/dwr/table/LabelTemplateTableManager.java
11:15 上午

jeffli

标签打印，代码完善
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp
11:14 上午

zhonghaowen

解决GDSRMYY-9:一次性物品的捆绑申请
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodsBindingConfig/entity/GoodsBindingConfig.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menu.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodsBindingConfig/service/GoodsBindSrv.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindingConfigView.js
  6. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindingConfigEdit.js
  8. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodsBindingConfig/enums
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindingConfigView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsConfig.js
  11. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodsBindingConfig/dwr
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodsBindingConfig/dwr/table/GoodsBindTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/dwr.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodsBindingConfig/impl/GoodsBindSrvImpl.java
  16. … 14 more files in changeset.
10:39 上午

shuyongfu

解决jira问题:ZSYY-8 tomcat启动时报错：No class by name: DataSynchronizationTableManager

新增中大附一相关his接口配置文件

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/zsyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/zsyy/his.xml
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/zsyy/mybatis
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/zsyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
9:53 上午

chenjiaru

解决：PYQZYY-85 器械包各生产环节统计报表，增加 “清洗数量”列，以及发货器械数量有误。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseDeliverDetailVO.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/tousseDeliverDetailReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/tousseDeliverDetailReport.jrxml
Saturday 24 Sep 2016
4:49 下午

jeffli

标签打印，代码完善
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.jsp
4:48 下午

jeffli

标签打印，代码完善
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/labeltemplate/LabelTemplate.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj.js
    • ?
    /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
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManager.java
2:23 下午

jeffli

自动根据数据源生成工具按钮。

加载设计模板时，自动选中对应的属性

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp
Friday 23 Sep 2016
8:54 下午

adairkang

同步4.0对完成灭菌时，二级供应室入部门库存的速度优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
  2. /SterileSupplySystem/branches/V4.1.0/ssts-stockmanage/src/main/java/com/forgon/disinfectsystem/stockmanage/departmentstock/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-stockmanage/src/main/java/com/forgon/disinfectsystem/stockmanage/departmentstock/service/DepartmentStockManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-stockmanage/src/main/java/com/forgon/disinfectsystem/stockmanage/departmentstock/service/DepartmentStockManagerImpl.java
8:51 下午

adairkang

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp
8:48 下午

adairkang

pc签收界面，进入后不能直接输入条码(GDSRMYY-171)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/systemset/portalPage.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp