Activity forgon-ssts-v4.1/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp

5:37 下午

li.wei

More
37996
changed 1 file
V4.1.0

根据现场业务需求，新增如下配置项：

//使用记录单的必填项配置

notAllowBlankFieldsOnUseRecordPage:["washHandNurse"],

//各环节的器械包内物品件数统计是否包含一次性物品

statisticTousseWorkLoadIncludeDisposableGoodsAmount:{"装配":false}

- ?
./disinfectsystem/config/szslgzxyy/config.js
- History
- Source
- Diff
./disinfectsystem/config/.../config.js

4:08 下午

frank.qiu

More
37994
changed 2 files
V4.1.0

解决了 ZSRY-81 - 【装配管理】新增"一键展开"与"去除勾选"功能按钮以及改进“材料清单”可伸缩展开

- ?
./homepage/portalPage.js
- History
- Source
- Diff
./homepage/portalPage.js
- ?
./disinfectsystem/packing/packingView.js
- History
- Source
- Diff
./disinfectsystem/packing/packingView.js

3:59 下午

frank.qiu

More
37993
changed 1 file
V4.1.0

解决了 ZSRY-81 - 【装配管理】新增"一键展开"与"去除勾选"功能按钮以及改进“材料清单”可伸缩展开

- ?
./disinfectsystem/packing/packingView.js
- History
- Source
- Diff
./disinfectsystem/packing/packingView.js

3:34 下午

frank.qiu

More
37990
changed 3 files
V4.1.0

解决了 DGSDBZXYY-231 - 【核算月报】及【明细核算月报】新增扩展查询项“灭菌程序”

- ?
./disinfectsystem/config/dgsdbzxyy/config.js
- History
- Source
- Diff
./disinfectsystem/config/.../config.js
- ?
./disinfectsystem/reportforms/departmentMonthlyView.js
- History
- Source
- Diff
./disinfectsystem/.../departmentMonthlyView.js
- ?
./disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
- History
- Source
- Diff
./disinfectsystem/.../departmentMonthlyDetailDSInvoiceItemView.js

5:56 下午

frank.qiu

More
37986
changed 1 file
V4.1.0

解决了 SZSZYY-34 - 【外来器械申请单】允许创建未申请器械包的外来器械申请单(第三方接口)

- ?
./disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
- History
- Source
- Diff
./disinfectsystem/.../foreignTousseInfoForm.js

5:24 下午

frank.qiu

More
37983
changed 5 files
V4.1.0

解决了 BJ309YY-24 - 新增报表【科室装配明细汇总报表】

- ?
./disinfectsystem/config/bj309yy/config.js
- History
- Source
- Diff
./disinfectsystem/config/bj309yy/config.js
- ?
./disinfectsystem/reportforms/departPackingDetailSummaryReport.jsp
- History
- Source
./disinfectsystem/.../departPackingDetailSummaryReport.jsp
- ?
./homepage/menuconfigure.js
- History
- Source
- Diff
./homepage/menuconfigure.js
- ?
./homepage/menu.jsp
- History
- Source
- Diff
./homepage/menu.jsp
- ?
./disinfectsystem/reportforms/departPackingDetailSummaryReport.js
- History
- Source
./disinfectsystem/.../departPackingDetailSummaryReport.js

4:42 下午

frank.qiu

More
37981
changed 1 file
V4.1.0

解决了 SZSZYY-34 - 【外来器械申请单】允许创建未申请器械包的外来器械申请单(第三方接口)

- ?
./disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
- History
- Source
- Diff
./disinfectsystem/.../recycleForTouchScreen.js

3:00 下午

frank.qiu

More
37978
changed 1 file
V4.1.0

解决了 ZSRY-81 - 【装配管理】新增"一键展开"与"去除勾选"功能按钮以及改进“材料清单”可伸缩展开

- ?
./disinfectsystem/packing/packingView.js
- History
- Source
- Diff
./disinfectsystem/packing/packingView.js

10:02 上午

zc.li

More
37973
changed 7 files
V4.1.0

解决 SSTS-663 固定条码设计优化

- ?
./dataUpdater/sqls/5.0.22_5.0.23_oracle.sql
- History
- Source
./dataUpdater/sqls/5.0.22_5.0.23_oracle.sql
- ?
./dataUpdater/sqls/5.0.22_5.0.23_sqlserver.sql
- History
- Source
./dataUpdater/sqls/5.0.22_5.0.23_sqlserver.sql
… 5 more files in changeset.

5:07 下午

jason

More
37971
changed 4 files
V4.1.0

解决jira问题：GZSZYY-48 【数据实时看板】对接手术排班信息

- ?
./disinfectsystem/config/gzszyy/spring/HIS.xml
- History
- Source
- Diff
./disinfectsystem/config/.../spring/HIS.xml
… 3 more files in changeset.

4:04 下午

frank.qiu

More
37969
changed 1 file
V4.1.0

解决了 ZYYFS-189 - 器械包定义中名称存在连续多个空格，明细核算月报查询并导出也需保留同样数量的空格

- ?
./disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
- History
- Source
- Diff
./disinfectsystem/.../departmentMonthlyDetailDSInvoiceItemView.js

3:04 下午

jason

More
37968
changed 9 files
V4.1.0

解决jira问题：GZSZYY-51 对接平台获取手术排班信息

- ?
./WEB-INF/spring/applicationContext-disinfectsystem-service.xml
- History
- Source
- Diff
./WEB-INF/.../applicationContext-disinfectsystem-service.xml
… 8 more files in changeset.

4:53 下午

frank.qiu

More
37966
changed 1 file
V4.1.0

解决了 ZYYFS-189 - 器械包定义中名称存在连续多个空格，明细核算月报查询并导出也需保留同样数量的空格

- ?
./homepage/exportMonitorData.jsp
- History
- Source
- Diff
./homepage/exportMonitorData.jsp

4:44 下午

frank.qiu

More
37965
changed 1 file
V4.1.0

解决了 ZSRY-81 - 【装配管理】新增"一键展开"与"去除勾选"功能按钮以及改进“材料清单”可伸缩展开

- ?
./disinfectsystem/packing/packingView.js
- History
- Source
- Diff
./disinfectsystem/packing/packingView.js

6:13 下午

frank.qiu

More
37963
changed 1 file
V4.1.0

解决了 GYEY-813 - 【器械生命周期】器械实例替换功能改进(增加查询、增加替换器械)

- ?
./disinfectsystem/basedatamanager/tousse/instrumentConfig.js
- History
- Source
- Diff
./disinfectsystem/.../instrumentConfig.js

11:40 上午

frank.qiu

More
37960
changed 1 file
V4.1.0

解决了 SZSDSRMYY-127 - 【回收清点】外来器械包支持在回收时修改价格

- ?
./disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
- History
- Source
- Diff
./disinfectsystem/.../recycleForTouchScreen.js

2:13 下午

frank.qiu

More
37959
changed 3 files
V4.1.0

解决了 GZSZYY-48 - 【数据实时看板】对接手术排班信息

- ?
./disinfectsystem/config/gzszyy/realTimeDashboards/js/index.js
- History
- Source
- Diff
./disinfectsystem/config/.../js/index.js
- ?
./disinfectsystem/config/gzszyy/realTimeDashboards/css/index.css
- History
- Source
- Diff
./disinfectsystem/config/.../css/index.css
- ?
./disinfectsystem/config/gzszyy/realTimeDashboards/index.jsp
- History
- Source
- Diff
./disinfectsystem/config/.../index.jsp

11:39 上午

frank.qiu

More
37957
changed 2 files
V4.1.0

解决了 SZSDSRMYY-127 - 【回收清点】外来器械包支持在回收时修改价格

- ?
./disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
- History
- Source
- Diff
./disinfectsystem/.../setForeignTousseDefinition.jsp
- ?
./disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
- History
- Source
- Diff
./disinfectsystem/.../recycleForTouchScreen.js

11:22 上午

frank.qiu

More
37956
changed 1 file
V4.1.0

解决了 ZSRY-84 - 【器械包信息】新增扩展查询项"回收时间"与"器械包类型"

- ?
./disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
- History
- Source
- Diff
./disinfectsystem/.../tousseInstanceView.js

11:15 上午

frank.qiu

More
37955
changed 1 file
V4.1.0

解决了 SZSDSRMYY-127 - 【回收清点】外来器械包支持在回收时修改价格

- ?
./disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
- History
- Source
- Diff
./disinfectsystem/.../recycleForTouchScreen.js

10:54 上午

frank.qiu

More
37954
changed 1 file
V4.1.0

解决了 GDSZYY-238 - 【外来器械申请单】不需要二次回收时字段调整相应的状态显示（已回收显示为已接收）

- ?
./disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
- History
- Source
- Diff
./disinfectsystem/.../foreignTousseApplicationView.js

5:57 下午

frank.qiu

More
37952
changed 1 file
V4.1.0

解决了 GYEY-813 - 【器械生命周期】器械实例替换功能改进(增加查询、增加替换器械)

- ?
./disinfectsystem/basedatamanager/tousse/instrumentConfig.js
- History
- Source
- Diff
./disinfectsystem/.../instrumentConfig.js

3:50 下午

frank.qiu

More
37950
changed 3 files
V4.1.0

解决了 ZSRY-84 - 【器械包信息】新增扩展查询项"回收时间"与"器械包类型"

- ?
./disinfectsystem/config/zsdxfsdeyy/config.js
- History
- Source
- Diff
./disinfectsystem/config/.../config.js
- ?
./disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
- History
- Source
- Diff
./disinfectsystem/.../tousseInstanceView.jsp
- ?
./disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
- History
- Source
- Diff
./disinfectsystem/.../tousseInstanceView.js

6:38 下午

hongrun.zhou

More
37947
added 22 files
V4.1.0

上传现场数据实时看板配置文件，realTimeDashboards配置文件

- ?
./disinfectsystem/config/gzszyy/realTimeDashboards/js/jquery.min.js
- History
- Source
./disinfectsystem/config/.../js/jquery.min.js
- ?
./disinfectsystem/config/gzszyy/realTimeDashboards/images/rect.png
- History
- Source
./disinfectsystem/config/gzszyy/.../images/rect.png
- ?
./disinfectsystem/config/gzszyy/realTimeDashboards/fonts/icomoon.svg
- History
- Source
./disinfectsystem/config/.../fonts/icomoon.svg
- ?
./disinfectsystem/config/gzszyy/realTimeDashboards/js/bg.js
- History
- Source
./disinfectsystem/config/gzszyy/.../js/bg.js
- ?
./disinfectsystem/config/gzszyy/realTimeDashboards/js/index.js
- History
- Source
./disinfectsystem/config/gzszyy/.../js/index.js
- ?
./disinfectsystem/config/gzszyy/realTimeDashboards/images/line.png
- History
- Source
./disinfectsystem/config/gzszyy/.../images/line.png
- ?
./disinfectsystem/config/gzszyy/realTimeDashboards/css/index.css
- History
- Source
./disinfectsystem/config/gzszyy/.../css/index.css
- ?
./disinfectsystem/config/gzszyy/realTimeDashboards/fonts/icomoon.eot
- History
- Source
./disinfectsystem/config/.../fonts/icomoon.eot
./disinfectsystem/config/gzszyy/realTimeDashboards/images
- History
- Source
./disinfectsystem/config/.../images
./disinfectsystem/config/gzszyy/realTimeDashboards
- History
- Source
./disinfectsystem/config/.../realTimeDashboards
./disinfectsystem/config/gzszyy/realTimeDashboards/fonts
- History
- Source
./disinfectsystem/config/.../fonts
- ?
./disinfectsystem/config/gzszyy/realTimeDashboards/css/DISPLAY FREE TFB.ttf
- History
- Source
./disinfectsystem/config/.../DISPLAY FREE TFB.ttf
- ?
./disinfectsystem/config/gzszyy/realTimeDashboards/images/border.png
- History
- Source
./disinfectsystem/config/.../images/border.png
- ?
./disinfectsystem/config/gzszyy/realTimeDashboards/fonts/icomoon.css
- History
- Source
./disinfectsystem/config/.../fonts/icomoon.css
- ?
./disinfectsystem/config/gzszyy/realTimeDashboards/images/loading.gif
- History
- Source
./disinfectsystem/config/.../images/loading.gif
… 7 more files in changeset.

6:36 下午

hongrun.zhou

More
37946
changed 1 file
V4.1.0

更新上传现场最新config.js配置文件

- ?
./disinfectsystem/config/gzszyy/config.js
- History
- Source
- Diff
./disinfectsystem/config/gzszyy/config.js

6:35 下午

hongrun.zhou

More
37945
changed 1 file
V4.1.0

更新现场最新print配置文件

- ?
./disinfectsystem/config/gzszyy/print/printConfig.js
- History
- Source
- Diff
./disinfectsystem/config/.../printConfig.js

6:34 下午

hongrun.zhou

More
37944
changed 1 file
V4.1.0

更换现场最新menu配置文件

- ?
./disinfectsystem/config/gzszyy/menu/menuconfigure.js
- History
- Source
- Diff
./disinfectsystem/config/.../menuconfigure.js

6:28 下午

jason

More
37943
changed 8 files
V4.1.0

解决jira问题：SZSZYY-34 【外来器械申请单】允许创建未申请器械包的外来器械申请单(第三方接口)

- ?
./disinfectsystem/config/szszyy/spring/webservice-cxf.xml
- History
- Source
- Diff
./disinfectsystem/.../webservice-cxf.xml
… 7 more files in changeset.

5:20 下午

frank.qiu

More
37940
changed 4 files
V4.1.0

解决了 SZSZYY-34 - 【外来器械申请单】允许创建未申请器械包的外来器械申请单(第三方接口)

- ?
./disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
- History
- Source
- Diff
./disinfectsystem/.../recycleForTouchScreen.js
- ?
./disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
- History
- Source
- Diff
./disinfectsystem/.../foreignTousseInfoForm.js
- ?
./disinfectsystem/config/szszyy/config.js
- History
- Source
- Diff
./disinfectsystem/config/szszyy/config.js
- ?
./disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
- History
- Source
- Diff
./disinfectsystem/.../awaitForRecycleList.js

5:18 下午

frank.qiu

More
37939
changed 1 file
V4.1.0

借物管理超时时间改为3分钟

- ?
./disinfectsystem/borrowRecord/borrowRecordView.js
- History
- Source
- Diff
./disinfectsystem/.../borrowRecordView.js

webapp

Line History

Stats

Commits this week: 9

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

li.wei

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

zc.li

jason

frank.qiu

jason

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

hongrun.zhou

hongrun.zhou

hongrun.zhou

hongrun.zhou

jason

frank.qiu

frank.qiu