Activity forgon-ssts-v4.1.0/

4:45 下午

zc.li

More
29996
changed 19 files
root:

解决：GDSZYY-50。增加多区院设置的以及按院区进行核算月报的查询和汇总统计

- -1
- +1
/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/controller/SupplyRoomConfigController.java
- History
- Source
- Diff
/ssts-basedata/.../SupplyRoomConfigController.java
- -1
- +2
/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
- History
- Source
- Diff
/forgon-core/src/.../OrgUnitManager.java
- binary
/ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jasper
- History
- Source
/ssts-web/src/.../monthReportBranche.jasper
- too large
/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
- History
- Source
- Diff
/forgon-core/src/.../OrgUnitManagerImpl.java
- -2
- +101
/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js
- History
- Source
- Diff
/ssts-web/src/.../departmentMonthlyView.js
- -1
- +20
/forgon-core/src/main/java/com/forgon/directory/service/BrancheOfHospitalManager.java
- History
- Source
- Diff
/forgon-core/.../BrancheOfHospitalManager.java
- -1
- +117
/forgon-core/src/main/java/com/forgon/directory/service/BrancheOfHospitalManagerImpl.java
- History
- Source
- Diff
/forgon-core/.../BrancheOfHospitalManagerImpl.java
- too large
/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
- History
- Source
- Diff
/ssts-reports/.../JasperReportManagerImpl.java
- -1
- +3
/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.jsp
- History
- Source
- Diff
/ssts-web/src/.../departmentMonthlyView.jsp
- -1
- +3
/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
- History
- Source
- Diff
/ssts-reports/.../JasperReportManager.java
- -1
- +13
/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MonthReportBean.java
- History
- Source
- Diff
/ssts-reports/src/.../MonthReportBean.java
- -1
- +13
/forgon-tools/src/main/java/com/forgon/tools/format/ConvertNumber.java
- History
- Source
- Diff
/forgon-tools/src/.../ConvertNumber.java
- -5
- +14
/forgon-tools/src/main/java/com/forgon/tools/util/SqlUtils.java
- History
- Source
- Diff
/forgon-tools/src/main/.../util/SqlUtils.java
- too large
/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
/ssts-webservice/.../ServiceManagerImpl.java
- -4
- +9
/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
- History
- Source
- Diff
/ssts-basedata/.../SupplyRoomConfigAction.java
… 4 more files in changeset.

4:31 下午

zc.li

More
29995
changed 1 file
root:

解决：DGSDBZXYY-106.3. 有标识牌的器械包召回后，包实例的状态为“待召回”或者“已召回”，回收时扫描标识牌条码应该能正常进行回收，目前的功能会提示不能回收，要把不能提示的信息中增加“待召回”、“已召回”状态，即改为：【器械包必须是已发货、已使用、已签收、预回收、待召回、已召回的状态,该包当前状态为xxx】

4. 有标识牌的器械包已经召回之后要能入筐回收。

- too large
/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
/ssts-recyclingrecord/.../RecyclingRecordAction.java

4:27 下午

shuyongfu

More
29994
changed 1 file
root:

解决:DGSDBZXYY-106 召回信息里把已召回的器械包转换成申请单会出现不对应的情况的修改及相关改进

5.在召回记录登记表单，输入搜索条件后，点击“搜索器械包”按钮，已废弃的包不应被搜索出来。

- -3
- +4
/ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
- History
- Source
- Diff
/ssts-web/.../RecallRecordManagerImpl.java

4:15 下午

frank

More
29993
changed 1 file
root:

解决DGSDBZXYY-128：质量监测清洗不合格扫描标识牌需要带出清洗信息等优化

- too large
/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
- History
- Source
- Diff
/ssts-web/.../qualitymonitoringInstanceForm.js

4:12 下午

frank

More
29992
changed 3 files
root:

解决DGSDBZXYY-128：质量监测清洗不合格扫描标识牌需要带出清洗信息等优化

- -1
- +1
/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/loadScanBarcodeMsg.js
- History
- Source
- Diff
/ssts-web/src/.../loadScanBarcodeMsg.js
- too large
/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
- History
- Source
- Diff
/ssts-web/src/main/.../packing/packingView.js
- too large
/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
- History
- Source
- Diff
/ssts-web/.../qualitymonitoringInstanceForm.js

1:50 下午

jason

More
29991
changed 6 files
root:

解决jira问题：GDSZYY-50 广东省中医院增加多区院设置的以及按院区进行核算月报的查询和汇总统计(增加注释)

- -0
- +1
/forgon-core/src/main/java/com/forgon/directory/action/OrgUnitGroupAction.java
- History
- Source
- Diff
/forgon-core/src/.../OrgUnitGroupAction.java
- -0
- +1
/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitGroupManager.java
- History
- Source
- Diff
/forgon-core/src/.../OrgUnitGroupManager.java
- -0
- +1
/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitGroupManagerImpl.java
- History
- Source
- Diff
/forgon-core/.../OrgUnitGroupManagerImpl.java
- -0
- +1
/forgon-core/src/main/java/com/forgon/directory/service/BrancheOfHospitalManagerImpl.java
- History
- Source
- Diff
/forgon-core/.../BrancheOfHospitalManagerImpl.java
- -0
- +1
/forgon-core/src/main/java/com/forgon/directory/service/BrancheOfHospitalManager.java
- History
- Source
- Diff
/forgon-core/.../BrancheOfHospitalManager.java
- -0
- +1
/forgon-core/src/main/java/com/forgon/directory/action/BrancheOfHospitalAction.java
- History
- Source
- Diff
/forgon-core/.../BrancheOfHospitalAction.java

11:57 上午

zc.li

More
29990
changed 1 file
root:

提交龙岗配置项，新增是否FTP登录后再设置被动模式，有的环境要先登录再设置，否则读取文件时异常，和不打印接口日志配置项；

- -1
- +3
/ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/config.js
- History
- Source
- Diff
/ssts-web/src/main/.../szslgzxyy/config.js

11:53 上午

zc.li

More
29989
changed 1 file
root:

修复：dgsdbzxyy-127。生物监测次数汇总不正确的问题；

- too large
/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
- History
- Source
- Diff
/ssts-reports/.../JasperReportManagerImpl.java

11:12 上午

frank

More
29988
changed 1 file
root:

优化 DGSDBZXYY-130：培训管理的阅读记录没有记录出来

- -442
- +438
/ssts-web/src/main/webapp/knowledge/viewExt.js
- History
- Source
- Diff
/ssts-web/src/main/.../knowledge/viewExt.js

11:10 上午

frank

More
29987
changed 1 file
root:

解决 DGSDBZXYY-130：培训管理的阅读记录没有记录出来

- -40
- +74
/ssts-web/src/main/webapp/knowledge/viewExt.js
- History
- Source
- Diff
/ssts-web/src/main/.../knowledge/viewExt.js

11:06 上午

jason

More
29986
changed 6 files
root:

解决jira问题：GDSZYY-50 广东省中医院增加多区院设置的以及按院区进行核算月报的查询和汇总统计(增加注释)

- -0
- +4
/forgon-core/src/main/java/com/forgon/directory/action/OrgUnitGroupAction.java
- History
- Source
- Diff
/forgon-core/src/.../OrgUnitGroupAction.java
- -0
- +4
/forgon-core/src/main/java/com/forgon/directory/action/BrancheOfHospitalAction.java
- History
- Source
- Diff
/forgon-core/.../BrancheOfHospitalAction.java
- -1
- +4
/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitGroupManagerImpl.java
- History
- Source
- Diff
/forgon-core/.../OrgUnitGroupManagerImpl.java
- -0
- +4
/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitGroupManager.java
- History
- Source
- Diff
/forgon-core/src/.../OrgUnitGroupManager.java
- -1
- +4
/forgon-core/src/main/java/com/forgon/directory/service/BrancheOfHospitalManagerImpl.java
- History
- Source
- Diff
/forgon-core/.../BrancheOfHospitalManagerImpl.java
- -0
- +4
/forgon-core/src/main/java/com/forgon/directory/service/BrancheOfHospitalManager.java
- History
- Source
- Diff
/forgon-core/.../BrancheOfHospitalManager.java

10:47 上午

terrykwan

More
29985
added 2 files
root:

提交空白的占位图片

/ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/img
- History
- Source
/ssts-web/src/main/.../config/jfjzyydwyxzx/img
- binary
/ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/img/logo_jfjzyydwyxzx.png
- History
- Source
/ssts-web/src/main/.../img/logo_jfjzyydwyxzx.png

10:18 上午

shuyongfu

More
29984
changed 2 files
root:

解决:DGSDBZXYY-106 召回信息里把已召回的器械包转换成申请单会出现不对应的情况的修改及相关改进

2. 召回管理模块中，选中某条召回记录，点击工具栏的【转换申请单】按钮时，只将召回记录中的状态为【已召回】的器械包转换申请单，状态为【待召回】的器械包不用转换申请单；召回转换申请单时从哪个科室召回的器械包转换申请单的申请科室就是哪个科室，如果召回时器械包还没有发货状态为已灭菌，那么申请单的科室就应为供应室；

以及包定义的是否停用不为"是"的包才转换