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

2:38 下午

frank.qiu

More
39128
changed 1 file
V4.1.0

解决了 SSTS-722 - 将丢失报损数量减少为0后，回收界面的丢失报损备注没有消失的问题

- ?
./webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.js
- History
- Source
- Diff
./webapp/.../recyclingDamage.js

2:18 下午

frank.qiu

More
39127
changed 2 files
V4.1.0

解决了 SSTS-722 - 将丢失报损数量减少为0后，回收界面的丢失报损备注没有消失的问题

- ?
./webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.js
- History
- Source
- Diff
./webapp/.../recyclingDamage.js
- ?
./webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.js
- History
- Source
- Diff
./webapp/.../recyclingErrors.js

10:47 下午

hongrun.zhou

More
39125
changed 1 file
V4.1.0

上传现场最新config.js文件，

新增：

//是否开启手术预约同步按钮,默认为false

enableSyncOperationReservation:true,

//同步手术预约申请单时，若有匹配不到的手术名，是否允许同步

syncOperation_AllowSyncWhenAnyNoMatchingOperationName:true,

//启用回收后生成实例的功能

enableAnInstanceIsGeneratedAfterRecycled:true,

//器械包信息的默认查询数据排序方式

defaultSortingMethodOfTousseInstanceManager:"packing"

修改：

doNotNeedValidateOperationRoomToShowInOperationReservationList:true,

- ?
./webapp/disinfectsystem/config/zsyy/config.js
- History
- Source
- Diff
./webapp/disinfectsystem/.../zsyy/config.js

10:33 下午

hongrun.zhou

More
39124
changed 1 file
V4.1.0

1、手术时间字段jira登记错误，故将原字段SCHEDULED_DATE_TIME修改SCHEDULE_DATE_TIME

2、由于手术预约申请单需要获取状态为5的申请单，故将文件中按手术时间查找手术预约单中，where1=1修改为WHERE STATUS = 5

- ?
./webapp/disinfectsystem/config/zsyy/interfaces/mybatis/SyncOperationReservation_Mapper.xml
- History
- Source
- Diff
./webapp/.../SyncOperationReservation_Mapper.xml

6:03 下午

frank.qiu

More
39123
changed 2 files
V4.1.0

解决了 SSTS-722 - 将丢失报损数量减少为0后，回收界面的丢失报损备注没有消失的问题

- ?
./webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.js
- History
- Source
- Diff
./webapp/.../recyclingDamage.js
- ?
./webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.js
- History
- Source
- Diff
./webapp/.../recyclingErrors.js

5:42 下午

jason

More
39122
changed 7 files
V4.1.0

解决jira问题：ZSYY-403 使用记录定时自动完成审核并生成申请单功能

- ?
./webapp/disinfectsystem/config/zsyy/interfaces/mybatis/FindPatientSurgicalStatusMapper.xml
- History
- Source
./webapp/.../FindPatientSurgicalStatusMapper.xml
- ?
./webapp/disinfectsystem/config/zsyy/spring/his.xml
- History
- Source
- Diff
./webapp/disinfectsystem/.../spring/his.xml
- ?
./webapp/disinfectsystem/config/zsyy/spring/timer.xml
- History
- Source
- Diff
./webapp/disinfectsystem/.../spring/timer.xml
… 4 more files in changeset.

3:17 下午

frank.qiu

More
39120
changed 1 file
V4.1.0

解决了 ZSWY-247 - 【新功能】增加【设备运行时间统计报表】

- ?
./webapp/disinfectsystem/reportforms/deviceUptimeStatisticsReportView.js
- History
- Source
- Diff
./webapp/.../deviceUptimeStatisticsReportView.js

12:53 下午

hongrun.zhou

More
39118
changed 1 file
V4.1.0

同步现场配置，调整了外部代理灭菌单的条码大小。

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

4:59 下午

frank.qiu

More
39114
changed 2 files
V4.1.0

解决了 DGSDBZXYY-222 - 【设备维护报表】配置项“isDeviceMaintenanceCus”中新增查询项“项目名称”

- ?
./webapp/disinfectsystem/reportforms/deviceMaintenanceCusReportView.jsp
- History
- Source
- Diff
./webapp/.../deviceMaintenanceCusReportView.jsp
- ?
./webapp/disinfectsystem/reportforms/deviceMaintenanceCusReportView.js
- History
- Source
- Diff
./webapp/.../deviceMaintenanceCusReportView.js

4:51 下午

frank.qiu

More
39113
changed 1 file
V4.1.0

解决了 DGSDBZXYY-222 - 【设备维护报表】配置项“isDeviceMaintenanceCus”中新增查询项“项目名称”

- ?
./webapp/disinfectsystem/reportforms/deviceMaintenanceCusReportView.js
- History
- Source
- Diff
./webapp/.../deviceMaintenanceCusReportView.js

4:13 下午

frank.qiu

More
39111
changed 1 file
V4.1.0

解决了 ZSYY-396 - 【急用物品处理周期统计报表】新增多项改进(新增多个表格列，移除部分表格列，更改部分表格列取值)

- ?
./webapp/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.js
- History
- Source
- Diff
./webapp/.../urgentNeedGoodsProcessingCycleView.js

10:56 上午

jason

More
39109
changed 1 file
V4.1.0

解决jira问题：BJDWLJZQJY-4【科室问题反馈】新增供应室和服务科室之间进行反馈沟通

- ?
./java/com/forgon/disinfectsystem/problemreportmanager/problemreport/service/ProblemManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ProblemManagerImpl.java

10:48 上午

frank.qiu

More
39108
changed 1 file
V4.1.0

解决了 FSSZYY-41 - 【一次性物品管理】系统设置的一次性物品的最大申请数量上线提高到99999

- ?
./webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
- History
- Source
- Diff
./webapp/.../goodsApplicationForm.js

5:21 下午

terry.kwan

More
39106
added 3 files
V4.1.0

增加一个自定义的servlet过滤器。解决Tomcat的CVE-2016-5388漏洞。GZSZYY-86

./webapp/disinfectsystem/config/gzszyy/web-xml
- History
- Source
./webapp/disinfectsystem/config/gzszyy/web-xml
- ?
./webapp/disinfectsystem/config/gzszyy/web-xml/web.xml
- History
- Source
./webapp/disinfectsystem/config/.../web-xml/web.xml
… 1 more file in changeset.

3:48 下午

frank.qiu

More
39104
changed 2 files
V4.1.0

解决了 SSZXYY-18 - 【满意度调查】新增可配置满意度选项以及填写原因的版本

- ?
./webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableForm.js
- History
- Source
- Diff
./webapp/.../satisfactionSurveyTableForm.js
- ?
./webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateForm.js
- History
- Source
- Diff
./webapp/.../satisfactionSurveyTemplateForm.js

3:19 下午

weigan.yang

More
39103
changed 1 file
V4.1.0

现场文件更新

- ?
./webapp/disinfectsystem/config/dgszyy/config.js
- History
- Source
- Diff
./webapp/disinfectsystem/.../dgszyy/config.js

11:59 上午

frank.qiu

More
39102
changed 3 files
V4.1.0

解决了 SSZXYY-18 - 【满意度调查】新增可配置满意度选项以及填写原因的版本

- ?
./webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateView.jsp
- History
- Source
- Diff
./webapp/.../satisfactionSurveyTemplateView.jsp
- ?
./webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableForm.js
- History
- Source
- Diff
./webapp/.../satisfactionSurveyTableForm.js
- ?
./webapp/disinfectsystem/satisfactionsurvey/satisfactionOptionForm.js
- History
- Source
- Diff
./webapp/.../satisfactionOptionForm.js

11:30 上午

frank.qiu

More
39100
changed 1 file
V4.1.0

解决了 SSZXYY-18 - 【满意度调查】新增可配置满意度选项以及填写原因的版本

- ?
./webapp/homepage/menuconfigure.js
- History
- Source
- Diff
./webapp/homepage/menuconfigure.js

10:49 上午

frank.qiu

More
39099
changed 6 files
V4.1.0

解决了 ZSWY-247 - 【新功能】增加【设备运行时间统计报表】

- ?
./webapp/homepage/menuconfigure.js
- History
- Source
- Diff
./webapp/homepage/menuconfigure.js
- ?
./resources/systemset/operationDefine.xml
- History
- Source
- Diff
./resources/systemset/operationDefine.xml
- ?
./webapp/homepage/menu.jsp
- History
- Source
- Diff
./webapp/homepage/menu.jsp
- ?
./webapp/disinfectsystem/reportforms/deviceUptimeStatisticsReportView.js
- History
- Source
./webapp/.../deviceUptimeStatisticsReportView.js
- ?
./webapp/disinfectsystem/config/zd5y/config.js
- History
- Source
- Diff
./webapp/disinfectsystem/.../zd5y/config.js
- ?
./webapp/disinfectsystem/reportforms/deviceUptimeStatisticsReportView.jsp
- History
- Source
./webapp/.../deviceUptimeStatisticsReportView.jsp

11:44 上午

frank.qiu

More
39092
changed 1 file
V4.1.0

解决了 SSZXYY-18 - 【满意度调查】新增可配置满意度选项以及填写原因的版本

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

11:39 上午

frank.qiu

More
39090
changed 2 files
V4.1.0

解决了 SSZXYY-18 - 【满意度调查】新增可配置满意度选项以及填写原因的版本

- ?
./webapp/disinfectsystem/config/szszlyy/menu/menuconfigure.js
- History
- Source
- Diff
./webapp/disinfectsystem/.../menuconfigure.js
- ?
./webapp/disinfectsystem/config/sszxyy/menu/menuconfigure.js
- History
- Source
- Diff
./webapp/disinfectsystem/.../menuconfigure.js

11:36 上午

frank.qiu

More
39089
changed 1 file
V4.1.0

解决了 SSZXYY-18 - 【满意度调查】新增可配置满意度选项以及填写原因的版本

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

5:40 下午

frank.qiu

More
39088
changed 1 file
V4.1.0

解决了 SSZXYY-18 - 【满意度调查】新增可配置满意度选项以及填写原因的版本

- ?
./webapp/disinfectsystem/reportforms/departSatisfyView.js
- History
- Source
- Diff
./webapp/.../departSatisfyView.js

2:53 下午

zc.li

More
39084
changed 10 files
V4.1.0

解决 SSZXYY-18 【满意度调查】新增可配置满意度选项以及填写原因的版本

- ?
./webapp/jasperRtp/departSatisfyDetailReport1.jrxml
- History
- Source
./webapp/.../departSatisfyDetailReport1.jrxml
- ?
./webapp/jasperRtp/departSatisfyDetailReport1_child.jasper
- History
- Source
./webapp/.../departSatisfyDetailReport1_child.jasper
- ?
./webapp/jasperRtp/departSatisfyDetailReport1.jasper
- History
- Source
./webapp/.../departSatisfyDetailReport1.jasper
- ?
./webapp/jasperRtp/departSatisfyDetailReport1_child.jrxml
- History
- Source
./webapp/.../departSatisfyDetailReport1_child.jrxml
… 6 more files in changeset.

11:55 上午

frank.qiu

More
39083
changed 1 file
V4.1.0

解决了 QIFUYY-17 - 【核算月报】【明细核算月报】导出的excel文件新增自带边框线

- ?
./webapp/disinfectsystem/reportforms/js/sheetjs/xlsxExport.utils.js
- History
- Source
- Diff
./webapp/.../xlsxExport.utils.js

11:37 上午

frank.qiu

More
39082
changed 1 file
V4.1.0

解决了 SSZXYY-18 - 【满意度调查】新增可配置满意度选项以及填写原因的版本

- ?
./webapp/disinfectsystem/config/sszxyy/config.js
- History
- Source
- Diff
./webapp/disinfectsystem/.../sszxyy/config.js

11:16 上午

frank.qiu

More
39081
changed 1 file
V4.1.0

解决了 SSZXYY-18 - 【满意度调查】新增可配置满意度选项以及填写原因的版本

- ?
./webapp/disinfectsystem/reportforms/departSatisfyView.js
- History
- Source
- Diff
./webapp/.../departSatisfyView.js

10:48 上午

frank.qiu

More
39080
changed 1 file
V4.1.0

解决了 SSZXYY-18 - 【满意度调查】新增可配置满意度选项以及填写原因的版本

- ?
./webapp/disinfectsystem/reportforms/departSatisfyView.js
- History
- Source
- Diff
./webapp/.../departSatisfyView.js

10:33 上午

frank.qiu

More
39079
changed 1 file
V4.1.0

解决了 SSZXYY-18 - 【满意度调查】新增可配置满意度选项以及填写原因的版本

- ?
./webapp/disinfectsystem/reportforms/departSatisfyView.js
- History
- Source
- Diff
./webapp/.../departSatisfyView.js

10:03 上午

frank.qiu

More
39078
changed 1 file
V4.1.0

解决了 SSZXYY-18 - 【满意度调查】新增可配置满意度选项以及填写原因的版本

- ?
./webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableForm.js
- History
- Source
- Diff
./webapp/.../satisfactionSurveyTableForm.js

main

Line History

Stats

Commits this week: 17

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

frank.qiu

frank.qiu

hongrun.zhou

hongrun.zhou

frank.qiu

jason

frank.qiu

hongrun.zhou

frank.qiu

frank.qiu

frank.qiu

jason

frank.qiu

terry.kwan

frank.qiu

weigan.yang

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

zc.li

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu

frank.qiu