Activity forgon-ssts-v4.1.0/

12:00 下午

zc.li

More
33176
changed 37 files
root:

解决：SSTS-492(提交部分菜单文件) 【消毒供应中心工作量统计报表】、【年度消毒中心指标工作量统计】、【消毒供应中心工作人员绩效评分表】报表的名称优化

- -1
- +1
/ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/menu/menuconfigure.js
- History
- Source
- Diff
/ssts-web/src/main/.../menu/menuconfigure.js
- -1
- +1
/ssts-web/src/main/webapp/disinfectsystem/config/xmsfybjy/menu/menuconfigure.js
- History
- Source
- Diff
/ssts-web/src/main/.../menu/menuconfigure.js
- -1
- +1
/ssts-web/src/main/webapp/disinfectsystem/config/dlzxyy/menu/menuconfigure.js
- History
- Source
- Diff
/ssts-web/src/main/.../menu/menuconfigure.js
- -1
- +1
/ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/menu/menuconfigure.js
- History
- Source
- Diff
/ssts-web/src/main/.../menu/menuconfigure.js
- -1
- +1
/ssts-web/src/main/webapp/disinfectsystem/config/fjsssyy/menu/menuconfigure.js
- History
- Source
- Diff
/ssts-web/src/main/.../menu/menuconfigure.js
- -1
- +1
/ssts-web/src/main/webapp/disinfectsystem/config/dgfy/menu/menuconfigure.js
- History
- Source
- Diff
/ssts-web/src/main/.../menu/menuconfigure.js
- -1
- +1
/ssts-web/src/main/webapp/disinfectsystem/config/hbsxkyy/menu/menuconfigure.js
- History
- Source
- Diff
/ssts-web/src/main/.../menu/menuconfigure.js
- -1
- +1
/ssts-web/src/main/webapp/disinfectsystem/config/zjjsrmyy/menu/menuconfigure.js
- History
- Source
- Diff
/ssts-web/src/main/.../menu/menuconfigure.js
- -1
- +1
/ssts-web/src/main/webapp/disinfectsystem/config/hbdxfsyy/menu/menuconfigure.js
- History
- Source
- Diff
/ssts-web/src/main/.../menu/menuconfigure.js
- -1
- +1
/ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/menu/menuconfigure.js
- History
- Source
- Diff
/ssts-web/src/main/.../menu/menuconfigure.js
- -1
- +1
/ssts-web/src/main/webapp/disinfectsystem/config/klmysrmyy/menu/menuconfigure.js
- History
- Source
- Diff
/ssts-web/src/main/.../menu/menuconfigure.js
- -1
- +1
/ssts-web/src/main/webapp/disinfectsystem/config/dgsrkyy/menu/menuconfigure.js
- History
- Source
- Diff
/ssts-web/src/main/.../menu/menuconfigure.js
- -1
- +1
/ssts-web/src/main/webapp/disinfectsystem/config/gzthzlyy/menu/menuconfigure.js
- History
- Source
- Diff
/ssts-web/src/main/.../menu/menuconfigure.js
- -1
- +1
/ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/menu/menuconfigure.js
- History
- Source
- Diff
/ssts-web/src/main/.../menu/menuconfigure.js
- -1
- +1
/ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/menu/menuconfigure.js
- History
- Source
- Diff
/ssts-web/src/main/.../menu/menuconfigure.js
… 22 more files in changeset.

11:56 上午

zc.li

More
33175
changed 2 files
root:

修复消毒供应中心员工工作量统计报表标题显示不全的历史BUG

- binary
/ssts-web/src/main/webapp/jasperRtp/statisticalWorkload.jasper
- History
- Source
- Diff
/ssts-web/src/.../statisticalWorkload.jasper
- -2
- +2
/ssts-web/src/main/webapp/jasperRtp/statisticalWorkload.jrxml
- History
- Source
- Diff
/ssts-web/src/.../statisticalWorkload.jrxml

11:35 上午

zc.li

More
33174
changed 1 file
root:

解决：SSTS-492(提交部分文件) 【消毒供应中心工作量统计报表】、【年度消毒中心指标工作量统计】、【消毒供应中心工作人员绩效评分表】报表的名称优化

- -1
- +1
/ssts-web/src/main/webapp/disinfectsystem/report/cssdWorkloadCountByDate/cssdWorkloadMainReportPage.jsp
- History
- Source
- Diff
/ssts-web/.../cssdWorkloadMainReportPage.jsp

11:30 上午

zc.li

More
33173
changed 3 files
root:

解决：SSTS-492(提交部分文件) 【消毒供应中心工作量统计报表】、【年度消毒中心指标工作量统计】、【消毒供应中心工作人员绩效评分表】报表的名称优化

- too large
/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
- History
- Source
- Diff
/ssts-reports/.../JasperreportsAction.java
- -1
- +1
/ssts-web/src/main/webapp/disinfectsystem/report/cssdWorkloadCountByDate/cssdWorkloadMainReport.js
- History
- Source
- Diff
/ssts-web/src/.../cssdWorkloadMainReport.js
- -1
- +1
/ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js
- History
- Source
- Diff
/ssts-web/src/.../yearWorkloadReportView2.js

6:50 下午

shuyongfu

More
33172
changed 1 file
root:

处理:GDSZYY-130 支持在代理灭菌列表扫描代理灭菌包条码后，自动打开对应的代理灭菌单

- too large
/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
/ssts-webservice/.../ServiceManagerImpl.java

6:21 下午

jason

More
33171
changed 1 file
root:

解决jira问题：GDSZYY-130 支持在代理灭菌列表扫描代理灭菌包条码后，自动打开对应的代理灭菌单(提示信息优化)

- -8
- +9
/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
/ssts-sterile/.../ProxyDisinfectionManagerImpl.java

5:30 下午

frank.qiu

More
33170
changed 1 file
root:

解决了 SSTS-490 - 今天本组装配记录如果有多页数据，列表无法正常按照装配时间进行降序排列

- too large
/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
- History
- Source
- Diff
/ssts-web/src/main/.../packing/packingView.js

5:26 下午

zc.li

More
33169
changed 1 file
root:

解决：SSTS-490，今天本组装配记录如果有多页数据，列表无法正常按照装配时间进行降序排列

- -1
- +2
/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
- History
- Source
- Diff
/ssts-packing/src/.../PackingAction.java

5:20 下午

jason

More
33168
changed 1 file
root:

解决jira问题：GDSZYY-130 支持在代理灭菌列表扫描代理灭菌包条码后，自动打开对应的代理灭菌单(提示信息优化)

- -0
- +3
/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java
- History
- Source
- Diff
/ssts-sterile/.../ProxyDisinfectionAction.java

5:10 下午

jason

More
33167
changed 1 file
root:

解决jira问题：GDSZYY-130 支持在代理灭菌列表扫描代理灭菌包条码后，自动打开对应的代理灭菌单

- -1
- +7
/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
/ssts-sterile/.../ProxyDisinfectionManagerImpl.java

4:49 下午

frank.qiu

More
33166
changed 1 file
root:

解决了 ZJYY-77 - IE浏览器下，装配界面在完成一个装配后，下一个物品装配时光标无法定位到页面的扫码输入框，无法录入“装配人”和“审核人”。

- too large
/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
- History
- Source
- Diff
/ssts-web/src/main/.../packing/packingView.js

4:09 下午

shuyongfu

More
33165
changed 1 file
root:

处理:GDSZYY-130 支持在代理灭菌列表扫描代理灭菌包条码后，自动打开对应的代理灭菌单

- too large
/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
/ssts-webservice/.../ServiceManagerImpl.java

3:57 下午

frank.qiu

More
33164
changed 1 file
root:

解决了 ZJYY-77 - IE浏览器下，装配界面在完成一个装配后，下一个物品装配时光标无法定位到页面的扫码输入框，无法录入“装配人”和“审核人”。

- too large
/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
- History
- Source
- Diff
/ssts-web/src/main/.../packing/packingView.js

3:44 下午

zc.li

More
33163
changed 3 files
root:

解决：SSTS-491，开启配置项enablePartRecycle，回收时删除物品不生效

- too large
/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
/ssts-recyclingrecord/.../RecyclingRecordManagerImpl.java
- too large
/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
/ssts-recyclingapplication/.../InvoicePlanManagerImpl.java
- -0
- +5
/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
- History
- Source
- Diff
/ssts-recyclingapplication/.../InvoicePlanManager.java

3:01 下午

frank.qiu

More
33162
changed 1 file
root:

解决了 SSTS-496 - IE8浏览器点击基数盘点历史记录，出现'Invalid character found in the request target. The valid characters are defined in RFC 7230 and RFC 3986"

- -3
- +3
/ssts-web/src/main/webapp/disinfectsystem/config/szszlyy/menu/menuconfigure.js
- History
- Source
- Diff
/ssts-web/src/main/.../menu/menuconfigure.js

2:28 下午

frank.qiu

More
33161
changed 1 file
root:

解决了 SSTS-496 - IE8浏览器点击基数盘点历史记录，出现'Invalid character found in the request target. The valid characters are defined in RFC 7230 and RFC 3986"

- -1
- +1
/ssts-web/src/main/webapp/disinfectsystem/config/szszlyy/menu/menuconfigure.js
- History
- Source
- Diff
/ssts-web/src/main/.../menu/menuconfigure.js

2:14 下午

frank.qiu

More
33160
changed 1 file
root:

解决了 GDSZYY-130 - 支持在代理灭菌列表扫描代理灭菌包条码后，自动打开对应的代理灭菌单

- -0
- +86
/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js
- History
- Source
- Diff
/ssts-web/src/.../proxyDisinfectionView.js

1:37 下午

jason

More
33159
changed 3 files
root:

解决jira问题：GDSZYY-130 支持在代理灭菌列表扫描代理灭菌包条码后，自动打开对应的代理灭菌单

- -0
- +21
/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManager.java
- History
- Source
- Diff
/ssts-sterile/.../ProxyDisinfectionManager.java
- -0
- +98
/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
/ssts-sterile/.../ProxyDisinfectionManagerImpl.java
- -59
- +17
/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java
- History
- Source
- Diff
/ssts-sterile/.../ProxyDisinfectionAction.java

11:11 上午

jason

More
33158
changed 1 file
root:

解决jira问题：GDSZYY-133更改病人信息报错（org.hibernate.HibernateException: Found shared references to a collection）代码优化

- -3
- +2
/forgon-tools/src/main/java/com/forgon/tools/BeanUtils.java
- History
- Source
- Diff
/forgon-tools/src/.../tools/BeanUtils.java

6:19 下午

frank.qiu

More
33157
changed 10 files
root:

优化了 CDSLQYQYYY-98 - 新增器械维修管理功能(重写Ext4日期控件，可选时间，不兼容IE8)

- -0
- +143
/ssts-web/src/main/webapp/ext-4.2.3/datetime/top_TimePickerField.js
- History
- Source
/ssts-web/src/.../datetime/top_TimePickerField.js
- -2
- +5
/ssts-web/src/main/webapp/ext-4.2.3/resources/common.css
- History
- Source
- Diff
/ssts-web/src/main/.../resources/common.css
- -4
- +7
/ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementView.jsp
- History
- Source
- Diff
/ssts-web/.../instrumentRepairManagementView.jsp
- -0
- +41
/ssts-web/src/main/webapp/ext-4.2.3/datetime/top_DateTimeField.js
- History
- Source
/ssts-web/src/.../datetime/top_DateTimeField.js
- -0
- +103
/ssts-web/src/main/webapp/ext-4.2.3/datetime/DateTimePicker.js
- History
- Source
/ssts-web/src/main/.../datetime/DateTimePicker.js
- -19
- +26
/ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js
- History
- Source
- Diff
/ssts-web/.../instrumentRepairManagementForm.js
- -0
- +41
/ssts-web/src/main/webapp/ext-4.2.3/datetime/DateTimeField.js
- History
- Source
/ssts-web/src/main/.../datetime/DateTimeField.js
/ssts-web/src/main/webapp/ext-4.2.3/datetime
- History
- Source
/ssts-web/src/main/webapp/ext-4.2.3/datetime
- -0
- +143
/ssts-web/src/main/webapp/ext-4.2.3/datetime/TimePickerField.js
- History
- Source
/ssts-web/src/main/.../datetime/TimePickerField.js
- -0
- +103
/ssts-web/src/main/webapp/ext-4.2.3/datetime/top_DateTimePicker.js
- History
- Source
/ssts-web/src/.../datetime/top_DateTimePicker.js

5:29 下午

frank.qiu

More
33156
changed 1 file
root:

解决了 SSTS-494 - 批量打印发货计划完成后，页面还一直显示正在处理请求请稍候...

- too large
/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
- History
- Source
- Diff
/ssts-web/src/.../goodsApplicationView.js

2:02 下午