forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 35
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 35
Total Lines of Code (LoC): 0
Net change in LoC this week: 0

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 35235 is being indexed.

Wednesday 15 Feb 2023
6:11 下午

jason

解决jira问题：SZSDSRMYY-108 使用记录中器械包设置结算科室后，转换为申请单时没有按照器械包的结算科室进行拆单的问题;DGSETYY-56新增申请物品按照是否加急进行拆分合并申请单功能(使用记录按照加急情况拆分转换申请单)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java
5:00 下午

frank.qiu

解决了 SZSDSRMYY-108

使用记录中器械包设置结算科室后，转换为申请单时没有按照器械包的结算科室进行拆单的问题

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
4:07 下午

shuyongfu

处理:SZSSKRMYY-46 PDA【签收】和【科室签收】模块的“器械包签收”功能新增器械包签收数量汇总
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.32_20230210_v4_1_6p_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.32_20230210_v4_1_nologo_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.32_20230210_v4_1_release.apk
4:06 下午

shuyongfu

处理:SZSSKRMYY-46 PDA【签收】和【科室签收】模块的“器械包签收”功能新增器械包签收数量汇总
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.32_20230215_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.32_20230215_v4_1_6p_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.32_20230215_v4_1_nologo_release.apk
4:01 下午

frank.qiu

解决了 ZSYY-323 - 清洗和灭菌干预记录的开始、结束时间控件改为获取服务器时间
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext/ext_datefield/DatetimeForServerTop.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationTab1.js
2:23 下午

frank.qiu

解决了 ZSYY-323 - 清洗和灭菌干预记录的开始、结束时间控件改为获取服务器时间
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationTab1.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext/ext_datefield/DatetimeForServer.js
1:47 下午

shuyongfu

处理:GYEY-786 【发货管理】模块新增“一次性物品自定义批量发货”功能 增加对科室、一次性物品的停用的业务判断处理

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/model/OrgUnit.java
11:42 上午

zc.li

注释补充
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
11:23 上午

zc.li

解决SZSDSRMYY-107 装配管理模块当器械包有丢失\报损的备注信息时，增加手动输入备注信息后重新补打印标签时无法将手动输入的备注信息打印出来且备注框中也不显示手动输入的备注信息的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
11:04 上午

zc.li

解决SZSDSRMYY-107 装配管理模块当器械包有丢失\报损的备注信息时，增加手动输入备注信息后重新补打印标签时无法将手动输入的备注信息打印出来且备注框中也不显示手动输入的备注信息的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
10:56 上午

frank.qiu

解决了 ZSYY-323 - 清洗和灭菌干预记录的开始、结束时间控件改为获取服务器时间
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.jsp
10:43 上午

zc.li

解决SZSDSRMYY-107 装配管理模块当器械包有丢失\报损的备注信息时，增加手动输入备注信息后重新补打印标签时无法将手动输入的备注信息打印出来且备注框中也不显示手动输入的备注信息的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
10:26 上午

zc.li

解决SZSDSRMYY-107 装配管理模块当器械包有丢失\报损的备注信息时，增加手动输入备注信息后重新补打印标签时无法将手动输入的备注信息打印出来且备注框中也不显示手动输入的备注信息的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
Tuesday 14 Feb 2023
5:16 下午

frank.qiu

解决了 DLZXYY-10 - 【明细核算月报】个性化明细核算月报新增详细日期明细核算月报
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
4:58 下午

frank.qiu

解决了 DLZXYY-10 - 【明细核算月报】个性化明细核算月报新增详细日期明细核算月报
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
4:46 下午

zc.li

修复：DLZXYY-10 详细日期明细核算月报有时格式错乱的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
4:06 下午

frank.qiu

解决了 GYEY-786 - 【发货管理】模块新增“一次性物品自定义批量发货”功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/systemset/operationDefine.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/batchInvoice.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gyey/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/batchInvoice.jsp
11:44 上午

li.wei

同步深圳市第三人民医院现场的配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js
11:40 上午

frank.qiu

解决了 DLZXYY-10 - 【明细核算月报】个性化明细核算月报新增详细日期明细核算月报
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
11:20 上午

frank.qiu

解决了 DLZXYY-10 - 【明细核算月报】个性化明细核算月报新增详细日期明细核算月报
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
10:52 上午

zc.li

数据调整：DLZXYY-10 详细日期明细核算月报同科室同类型同名合并
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/DepartmentMonthDetail.java
10:50 上午

zc.li

解决：HDQRMYY-57 在【回收清点】模块中添加回收记录时搜索结果按器械包首字母排序(通用功能不止回收模块变更)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
10:43 上午

frank.qiu

解决了 DLZXYY-10 - 【明细核算月报】个性化明细核算月报新增详细日期明细核算月报
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
Monday 13 Feb 2023
6:41 下午

frank.qiu

解决了 DLZXYY-10 - 【明细核算月报】个性化明细核算月报新增详细日期明细核算月报
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
6:19 下午

zc.li

解决了 ZJJSRM-53 ：倍力曼设备接口【参数匹配方式】默认值修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.73_4.9.74.sql
6:17 下午

zc.li

解决了 ZJJSRM-53 ：倍力曼设备接口【参数匹配方式】默认值修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/5.0.4_5.0.5.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.73_4.9.74.sql
5:43 下午

zc.li

NYSY-53 修复早期开发的设备接口，打开有图标的灭菌记录，保存 图标会消失 再保存又会重新出现的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
5:38 下午

shuyongfu

处理:GYEY-786 【发货管理】模块新增“一次性物品自定义批量发货”功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
4:59 下午

shuyongfu

处理:GYEY-786 【发货管理】模块新增“一次性物品自定义批量发货”功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
4:40 下午

zc.li

数据调整：DLZXYY-11 厂家器械统计外来器械拆分小包因拆分小包没有包装类型统计不出的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java