forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 46
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 46
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 37632 is being indexed.

Monday 04 Mar 2024
10:59 上午

jason

解决jira问题：NFYY-98 设备接口管理模块增加对倍力曼新版灭菌器、清洗机的接口文件解析的支持(清洗机)
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/UserUpLoadFiles/belimedPdf/V2.0
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/UserUpLoadFiles/belimedPdf/V2.0/WD
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/UserUpLoadFiles/belimedPdf/V2.0/MST
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashDataLineChartAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/BelimedV2WashDataPDF.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataV2ManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/BelimedV2SterilizerRecord.java
Friday 01 Mar 2024
2:46 下午

li.wei

增加img文件夹以及医院logo图片
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/img/logo_szslgzxyy.png
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/img
2:41 下午

frank.qiu

删除console.log
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
2:32 下午

jason

解决jira问题：GDSRMYY-591 配置项：checkTousseLocatedInOperatingRoomWhenAddUseRecord新增可操作开关
Options
    • ?
    /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/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
2:29 下午

frank.qiu

解决了 GDSRMYY-591 - 配置项：checkTousseLocatedInOperatingRoomWhenAddUseRecord新增可操作开关
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
11:47 上午

li.wei

新增如下配置项：

//用来控制发货计划模块的待发货物品颜色变化规则

colorChangeRuleOfInvoicPlanToSendGoodsList:2,

//LOGO大小

logoSetting: { "width" : 80, "height" : 80 },

//聚合包按大包发货。

comboTousseSendByWrapperTousse:2

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/config.js
Thursday 29 Feb 2024
6:34 下午

zc.li

提交后台代码 NFYY-98 设备接口管理模块增加对倍力曼新版灭菌器、清洗机的接口文件解析的支持
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataV2ManagerImpl.java
4:01 下午

frank.qiu

解决了 SSTS-643 - 开启notAllowBlankFieldsOnUseRecordPage配置项之后，保存科室使用记录时报错，提示"client"
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
2:06 下午

jason

解决jira问题：GYEY-815【病人使用记录】配置项“notAllowBlankFieldsOnUseRecordPage”新增后台校验环节
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/util/UseRecordUtil.java
12:01 下午

frank.qiu

解决了 SSZXYY-19 - 【回收清点】回收清点页面的加急按钮底色随加急级别设定颜色显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_blue_green_color.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_orange_red_color.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_yellow_green_color.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_blue_purple_color.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/unUrgentBg.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_blue_color.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_orange_color.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_purple_red_color.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_purple_color.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_red_color.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
  12. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_green_color.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_orange_yellow_color.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_yellow_color.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp
11:55 上午

frank.qiu

解决了 DGSFYBJY-76 - 【消毒供应中心年度工作量统计报表】增加同比、环比统计功能以及新增统计图显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/exportMonitorData.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.jsp
10:22 上午

zc.li

解决 SSZXYY-19 - 【回收清点】回收清点页面的加急按钮底色随加急级别设定颜色显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemManagerImpl.java
10:16 上午

zc.li

解决 DGSFYBJY-76 - 【消毒供应中心年度工作量统计报表】增加同比、环比统计功能以及新增统计图显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/YearWorkloadBean.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/YearWorkloadShowBean.java
    • ?
    /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/service/JasperReportManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/YearWorkloadReportHelper.java
Wednesday 28 Feb 2024
5:32 下午

jason

解决jira问题：NFYY-97 洁定灭菌器、清洗机设备通过不同电脑生成的接口文件存在重名，导致系统无法正常获灭菌、清洗参数。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java
11:44 上午

shuyongfu

处理 SZSLGZXYY-26 【PDA】【发货单签收】新增可签收自定义发货的发货单
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
10:59 上午

shuyongfu

处理 SZSLGZXYY-26 【PDA】【发货单签收】新增可签收自定义发货的发货单
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
Tuesday 27 Feb 2024
11:35 上午

jason

解决jira问题：NFYY-98 设备接口管理模块增加对倍力曼新版灭菌器、清洗机的接口文件解析的支持
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
Monday 26 Feb 2024
6:10 下午

frank.qiu

解决了 NFYY-98 - 设备接口管理模块增加对倍力曼新版灭菌器、清洗机的接口文件解析的支持
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/showFileForPDF.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
5:32 下午

frank.qiu

解决：DGSETYY-80 【发货计划】新增可追溯的复用性物品发货时优先发回原申请单模式（4.3提示发货失败信息）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js
5:22 下午

shuyongfu

处理 DGSETYY-80 【发货计划】新增可追溯的复用性物品发货时优先发回原申请单模式
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
5:17 下午

frank.qiu

解决：DGSETYY-80 【发货计划】新增可追溯的复用性物品发货时优先发回原申请单模式（第六点）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
5:09 下午

shuyongfu

处理 DGSETYY-80 【发货计划】新增可追溯的复用性物品发货时优先发回原申请单模式
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
4:42 下午

shuyongfu

处理 DGSETYY-85 【PDA】【发货计划】新增支持可追溯的复用性物品发货时优先发回原申请单模式
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.38_20240223_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.38_20240223_v4_1_nologo_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.38_20240226_v4_1_nologo_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.38_20240226_v4_1_release.apk
4:12 下午

jason

解决jira问题：DGSETYY-80 【发货计划】新增可追溯的复用性物品发货时优先发回原申请单模式(同时选择了退货重发和退货重装,新装配的包实例没有显示退货重发和退货重发的内容)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
4:05 下午

jason

解决jira问题：DGSETYY-80 【发货计划】新增可追溯的复用性物品发货时优先发回原申请单模式(同时选择了退货重发和退货重装,新装配的包实例没有显示退货重发和退货重发的内容)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
3:34 下午

jason

解决jira问题：DGSETYY-80 【发货计划】新增可追溯的复用性物品发货时优先发回原申请单模式(包定义配置了发回原单为是,再把配置项关了,这些配置了发回原单的包定义也不能添加进聚合包定义)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
3:25 下午

jason

解决jira问题：DGSETYY-80 【发货计划】新增可追溯的复用性物品发货时优先发回原申请单模式(包定义配置了发回原单为是,再把配置项关了,这些配置了发回原单的包定义也不能添加进聚合包定义)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service/ComboTousseManagerImpl.java
3:01 下午

jason

解决jira问题：DGSETYY-80 【发货计划】新增可追溯的复用性物品发货时优先发回原申请单模式(同时选择了退货重发和退货重装,新装配的包实例没有显示退货重发和退货重发的内容)
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/basedatamanager/toussedefinition/TousseInstance.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
2:45 下午

shuyongfu

处理 DGSETYY-85 【PDA】【发货计划】新增支持可追溯的复用性物品发货时优先发回原申请单模式
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.38_20240223_v4_1_6p_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.38_20240226_v4_1_6p_release.apk
Friday 23 Feb 2024
6:47 下午

zc.li

提交后台代码 NFYY-98 设备接口管理模块增加对倍力曼新版灭菌器、清洗机的接口文件解析的支持
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/UserUpLoadFiles/belimedPdf