forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 59
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 59
Total Lines of Code (LoC): 4,711,364
Net change in LoC this week: 3,161

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

Subversion Details

1 property
  • svn:global-ignores = .gradle .settings bin build rebel.xml
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Thursday 02 Jun 2022
4:21 下午

shuyongfu

处理:NFYY-59 发货计划模块的待发货物品的按时间查询条件，改进为可以只按申请时间或只按回收时间进行查询

SSTS-525 旧版发货，筛选发货单类型进行发货，发货后的发货单类型不对应

SSTS-523 新版发货中，虚拟篮筐整筐发货，当虚拟篮筐中的物品均已发货，虚拟篮筐的状态没有变为空闲

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -0
    • +30
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/invoice/service/InvoiceUtils.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -11
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoicePlanManagerTest.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/synthetic/allrecycle/service/InvoiceModule.java
    • -1
    • +23
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
    • -3
    • +1
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -37
    • +7
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • -0
    • +26
    /forgon-tools/src/main/java/com/forgon/tools/util/ForgonDateUtils.java
    • -1
    • +10
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/controller/InvoiceController.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
  16. … 4 more files in changeset.
3:23 下午

frank.qiu

解决了 FSSDERMYY-18 - 质量监测定义的监测范围是“无”，填写质量监测记录时不应显示器械包信息栏，应无需录入材料信息
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
3:04 下午

zc.li

解决： GZSDBRMYY-26 新增需求 - 【供应室护理质量指标统计报表】增加统计的数据指标，改进报表查询条件，以满足医院的报表上报需求
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/reportoption/GoodsOptionManagerImpl.java
2:52 下午

frank.qiu

解决了 ZJYY-100 - 器械包信息模块的查询项新增扩展项【加急级别】和【影像记录】
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
    • -8
    • +134
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js
2:36 下午

frank.qiu

解决了 SSTS-530 - IE浏览器，器械包告警点击 查看所有科室，提示"java.lang.IllegalArgumentException: Invalid character found in the request target. The valid characters are defined in RFC 7230 and RFC 3986"
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/departTousseGoodsWarningView.js
1:46 下午

jason

解决jira问题：SSTS-531 谷歌浏览器下，器械包告警导出临床用户即将过期的包，报错unexpected token
Options
    • -1
    • +2
    /ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/action/SystemWarningAction.java
1:44 下午

zc.li

解决： GZSDBRMYY-26 新增需求 - 【供应室护理质量指标统计报表】增加统计的数据指标，改进报表查询条件，以满足医院的报表上报需求
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/reportoption/GoodsOption.java
    • -11
    • +1
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SupplyRoomQualityQuota.java
    • -1
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/reportoption/GoodsOptionManagerImpl.java
    • -10
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/reportoption/GoodsOptionManager.java
11:21 上午

frank.qiu

解决了 GZSDBRMYY-26 - 【供应室护理质量指标统计报表】增加统计的数据指标，改进报表查询条件，以满足医院的报表上报需求(补充灭菌方式选择不正确)
Options
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setUnqualifiedSourceForm.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/gzsdbrmyy/config.js
10:14 上午

zc.li

解决：DGSETYY-38 新华灭菌炉设备接口参数匹配方式改为灭菌开始时间+机器号的方式
Options
    • -0
    • +18
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -8
    • +31
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java
Wednesday 01 Jun 2022
5:29 下午

frank.qiu

解决了 ZJYY-86 - 器械包信息模块的信息列表表格新增扩展列【加急级别】和【影像记录】
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js
    • -0
    • +26
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
5:26 下午

frank.qiu

解决了 FSSDERMYY-18 - 质量监测定义的监测范围是“无”，填写质量监测记录时不应显示器械包信息栏，应无需录入材料信息
Options
    • -14
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoringWithNoLogon/qualitymonitoringInstanceForm.js
    • -22
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
    • -18
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForReviewViewForm.js
3:27 下午

frank.qiu

器械包种类名称改为所属种类
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js
3:01 下午

frank.qiu

所属种类跟器械包种类功能重复，删除所属种类
Options
    • -20
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
2:56 下午

frank.qiu

所属种类跟器械包种类功能重复，删除所属种类
Options
    • -0
    • +3369
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
2:36 下午

frank.qiu

解决了 DGSETYY-32 - 保存清洗记录时，增加对清洗记录的清洗程序和清洗物品的清洗程序是否符合的检查
Options
    • -25
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
2:29 下午

jason

解决jira问题：DGSETYY-32 保存清洗记录时，增加对清洗记录的清洗程序和清洗物品的清洗程序是否符合的检查
Options
    • too large
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -0
    • +15
    /forgon-tools/src/main/java/com/forgon/exception/CleanMethodNotTheSameException.java
    • -16
    • +5
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • -2
    • +2
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
2:17 下午

frank.qiu

解决了 ZJYY-90 - 启用[器械包种类定义]功能后“器械包工作量统计报表”、“质量监测报表”的查询条件中增加“器械包种类”的查询字段
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js
2:10 下午

zc.li

完善：KSDQDYRMYY-11 扫描标识牌提示的条码改为标识牌的条码
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
1:46 下午

zc.li

代码调整
Options
    • too large
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
11:40 上午

zc.li

修复：KSDQDYRMYY-11 已签收过滤异常的问题
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
11:39 上午

zc.li

删除无用代码
Options
    • too large
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
11:21 上午

zc.li

修复：KSDQDYRMYY-11 扫描标识牌 没有绑定包实例时报错的问题
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
11:15 上午

linnansheng

提交配置项 KSDQDYRMYY-6 开启显示待发货物品的来源信息功能
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/config.js
11:06 上午

jason

解决jira问题：GDSRMYY-324 科室申领界面中用鼠标指着‘一次性物品申领单’显示弹出框显示的数量单位为申领单位(代码优化)
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
10:53 上午

frank.qiu

解决了 ZJYY-90 - 启用[器械包种类定义]功能后“器械包工作量统计报表”、“质量监测报表”的查询条件中增加“器械包种类”的查询字段
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js
Tuesday 31 May 2022
6:33 下午

terry.kwan

解决:GDSZYY-171 问题，fastjson升级到1.2.83版本，解决反序列化漏洞的问题。
Options
    • -1
    • +1
    /build.gradle
5:34 下午

zc.li

提交：KSDQDYRMYY-11 配置项
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/config.js
4:24 下午

frank.qiu

解决了 SZSDSRMYY-82 - 桌面快捷图标增加手术预约管理模块
Options
    • binary
    /ssts-web/src/main/webapp/themes/portalPage/img/surgeryAppointment.png
    • binary
    /ssts-web/src/main/webapp/themes/portalPage/img/surgeryAppointment.jpg
3:21 下午

zc.li

解决：KSDQDYRMYY-11 通过扫码回收发货到了科室的包，如该包的状态不为已使用（未录入使用记录），则不能回收并弹出提示信息
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
3:08 下午

frank.qiu

解决了 SSTS-529 - 在质量监测模块，点击监测项名称后面的“+”按钮，登记多条监测记录，保存时页面会提示：保存失败：For input string: "否"
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js