Activity forgon-ssts-v4.1/

5:25 下午

frank.qiu

More
33179
changed 2 files
V4.1.0

解决了 CDSLQYQYYY-103 - 装配界面点击“查看包图片”、“教学图片”、“说明书”按钮时，弹窗显示图片，并且在弹窗界面支持鼠标滚动缩放图片

- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
- History
- Source
- Diff
/SterileSupplySystem/.../packingView.js
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
- History
- Source
- Diff
/SterileSupplySystem/.../tousseImage.jsp

3:10 下午

frank.qiu

More
33178
changed 1 file
V4.1.0

解决了 GZYKDXFSKQ-75 - 回收清点添加器械包界面显示空白

- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp
- History
- Source
- Diff
/SterileSupplySystem/.../disinfectionTousseItems.jsp

1:57 下午

jason

More
33177
changed 6 files
V4.1.0

人员同步代码优化

- ?
/SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/service/UserManager.java
- History
- Source
- Diff
/SterileSupplySystem/.../UserManager.java
- ?
/SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
- History
- Source
- Diff
/SterileSupplySystem/.../UserManagerImpl.java
- ?
/SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/model/User.java
- History
- Source
- Diff
/SterileSupplySystem/branches/.../User.java
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/UserVo.java
- History
- Source
- Diff
/SterileSupplySystem/branches/.../UserVo.java
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
- History
- Source
- Diff
/SterileSupplySystem/.../DataSynchronizationManagerImpl.java
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/gdsy/dao/SyncOrgUnitAndUserDataSyncDao.java
- History
- Source
- Diff
/SterileSupplySystem/.../SyncOrgUnitAndUserDataSyncDao.java

12:00 下午

zc.li

More
33176
changed 37 files
V4.1.0

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

- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/menu/menuconfigure.js
- History
- Source
- Diff
/SterileSupplySystem/.../menuconfigure.js
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/bjscylyy/menu/menuconfigure.js
- History
- Source
- Diff
/SterileSupplySystem/.../menuconfigure.js
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/menu/menuconfigure.js
- History
- Source
- Diff
/SterileSupplySystem/.../menuconfigure.js
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/menu/menuconfigure.js
- History
- Source
- Diff
/SterileSupplySystem/.../menuconfigure.js
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/menu/menuconfigure.js
- History
- Source
- Diff
/SterileSupplySystem/.../menuconfigure.js
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/menu/menuconfigure.js
- History
- Source
- Diff
/SterileSupplySystem/.../menuconfigure.js
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fssdermyy/menu/menuconfigure.js
- History
- Source
- Diff
/SterileSupplySystem/.../menuconfigure.js
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/menu/menuconfigure.js
- History
- Source
- Diff
/SterileSupplySystem/.../menuconfigure.js
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/hbdxfsyy/menu/menuconfigure.js
- History
- Source
- Diff
/SterileSupplySystem/.../menuconfigure.js
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/standardProjectTemplate/menu/menuconfigure.js
- History
- Source
- Diff
/SterileSupplySystem/.../menuconfigure.js
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/menu/menuconfigure.js
- History
- Source
- Diff
/SterileSupplySystem/.../menuconfigure.js
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/klmysrmyy/menu/menuconfigure.js
- History
- Source
- Diff
/SterileSupplySystem/.../menuconfigure.js
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/sszxyy/menu/menuconfigure.js
- History
- Source
- Diff
/SterileSupplySystem/.../menuconfigure.js
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qysfybjy/menu/menuconfigure.js
- History
- Source
- Diff
/SterileSupplySystem/.../menuconfigure.js
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dlzxyy/menu/menuconfigure.js
- History
- Source
- Diff
/SterileSupplySystem/.../menuconfigure.js
… 22 more files in changeset.

11:56 上午

zc.li

More
33175
changed 2 files
V4.1.0

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

- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/statisticalWorkload.jrxml
- History
- Source
- Diff
/SterileSupplySystem/.../statisticalWorkload.jrxml
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/statisticalWorkload.jasper
- History
- Source
- Diff
/SterileSupplySystem/.../statisticalWorkload.jasper

11:35 上午

zc.li

More
33174
changed 1 file
V4.1.0

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

- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/report/cssdWorkloadCountByDate/cssdWorkloadMainReportPage.jsp
- History
- Source
- Diff
/SterileSupplySystem/.../cssdWorkloadMainReportPage.jsp

11:30 上午

zc.li

More
33173
changed 3 files
V4.1.0

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

- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/report/cssdWorkloadCountByDate/cssdWorkloadMainReport.js
- History
- Source
- Diff
/SterileSupplySystem/.../cssdWorkloadMainReport.js
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
- History
- Source
- Diff
/SterileSupplySystem/.../JasperreportsAction.java
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js
- History
- Source
- Diff
/SterileSupplySystem/.../yearWorkloadReportView2.js

6:50 下午

shuyongfu

More
33172
changed 1 file
V4.1.0

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

- ?
/SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
/SterileSupplySystem/.../ServiceManagerImpl.java

6:21 下午

jason

More
33171
changed 1 file
V4.1.0

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

- ?
/SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
/SterileSupplySystem/.../ProxyDisinfectionManagerImpl.java

5:30 下午

frank.qiu

More
33170
changed 1 file
V4.1.0

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

- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
- History
- Source
- Diff
/SterileSupplySystem/.../packingView.js

5:26 下午

zc.li

More
33169
changed 1 file
V4.1.0

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

- ?
/SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
- History
- Source
- Diff
/SterileSupplySystem/.../PackingAction.java

5:20 下午

jason

More
33168
changed 1 file
V4.1.0

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

- ?
/SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java
- History
- Source
- Diff
/SterileSupplySystem/.../ProxyDisinfectionAction.java

5:10 下午

jason

More
33167
changed 1 file
V4.1.0

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

- ?
/SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
/SterileSupplySystem/.../ProxyDisinfectionManagerImpl.java

4:49 下午

frank.qiu

More
33166
changed 1 file
V4.1.0

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

- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
- History
- Source
- Diff
/SterileSupplySystem/.../packingView.js

4:09 下午

shuyongfu

More
33165
changed 1 file
V4.1.0

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

- ?
/SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
/SterileSupplySystem/.../ServiceManagerImpl.java

3:57 下午

frank.qiu

More
33164
changed 1 file
V4.1.0

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

- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
- History
- Source
- Diff
/SterileSupplySystem/.../packingView.js

3:44 下午

zc.li

More
33163
changed 3 files
V4.1.0

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

- ?
/SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
/SterileSupplySystem/.../RecyclingRecordManagerImpl.java
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
/SterileSupplySystem/.../InvoicePlanManagerImpl.java
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
- History
- Source
- Diff
/SterileSupplySystem/.../InvoicePlanManager.java

3:01 下午

frank.qiu

More
33162
changed 1 file
V4.1.0

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

- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szszlyy/menu/menuconfigure.js
- History
- Source
- Diff
/SterileSupplySystem/.../menuconfigure.js

2:28 下午

frank.qiu

More
33161
changed 1 file
V4.1.0

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

- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szszlyy/menu/menuconfigure.js
- History
- Source
- Diff
/SterileSupplySystem/.../menuconfigure.js

2:14 下午

frank.qiu

More
33160
changed 1 file
V4.1.0

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

- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js
- History
- Source
- Diff
/SterileSupplySystem/.../proxyDisinfectionView.js

1:37 下午

jason

More
33159
changed 3 files
V4.1.0

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

- ?
/SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java
- History
- Source
- Diff
/SterileSupplySystem/.../ProxyDisinfectionAction.java
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
/SterileSupplySystem/.../ProxyDisinfectionManagerImpl.java
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManager.java
- History
- Source
- Diff
/SterileSupplySystem/.../ProxyDisinfectionManager.java

11:11 上午

jason

More
33158
changed 1 file
V4.1.0

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

- ?
/SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/BeanUtils.java
- History
- Source
- Diff
/SterileSupplySystem/.../BeanUtils.java

6:19 下午

frank.qiu

More
33157
changed 10 files
V4.1.0

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

- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext-4.2.3/datetime/TimePickerField.js
- History
- Source
/SterileSupplySystem/.../TimePickerField.js
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext-4.2.3/datetime
- History
- Source
/SterileSupplySystem/branches/.../datetime
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext-4.2.3/datetime/top_DateTimeField.js
- History
- Source
/SterileSupplySystem/.../top_DateTimeField.js
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext-4.2.3/datetime/DateTimeField.js
- History
- Source
/SterileSupplySystem/branches/.../DateTimeField.js
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext-4.2.3/datetime/top_DateTimePicker.js
- History
- Source
/SterileSupplySystem/.../top_DateTimePicker.js
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementView.jsp
- History
- Source
- Diff
/SterileSupplySystem/.../instrumentRepairManagementView.jsp
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext-4.2.3/datetime/DateTimePicker.js
- History
- Source
/SterileSupplySystem/.../DateTimePicker.js
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext-4.2.3/resources/common.css
- History
- Source
/SterileSupplySystem/branches/.../common.css
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js
- History
- Source
- Diff
/SterileSupplySystem/.../instrumentRepairManagementForm.js
- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext-4.2.3/datetime/top_TimePickerField.js
- History
- Source
/SterileSupplySystem/.../top_TimePickerField.js

5:29 下午

frank.qiu

More
33156
changed 1 file
V4.1.0

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

- ?
/SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
- History
- Source
- Diff
/SterileSupplySystem/.../goodsApplicationView.js

2:02 下午