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 26923 is being indexed.

Monday 09 Sep 2019
2:09 下午

zengyuan

贵港市人民医院GGSRMYY-105 发货单签收增加扫描包条码签收功能(pc端)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/systemset/portalPage.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignViewVersion2.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/portalPage.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignVersion2.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
1:58 下午

zengyuan

广东省人民医院GDSRMYY-508 更新后发货计划列表以及灭菌篮筐物品明细的字体和行距变小了
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/common.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
Saturday 07 Sep 2019
3:42 下午

zc.li

解决:GGSRMYY-103.明细核算月报增加个性化格式.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/DepartmentMonthDetailItem.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailOfSingleDepart.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailOfSingleDepart.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailOfSingleDepart_child.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailOfSingleDepart_child.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
Friday 06 Sep 2019
1:40 下午

zc.li

解决：XJJQZYY-95。器械包退货后重新发货，临床科室无法将该器械包录入使用记录的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
Thursday 05 Sep 2019
8:29 下午

zc.li

取消修改表名，改用sql语句手动执行
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.39_4.9.40_sqlserver.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java
7:24 下午

jason

修改数库表名的长度：storageLocation_TousseDefinition to storageLocation_td;
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/warehouse/StorageLocation.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.39_4.9.40_sqlserver.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
7:14 下午

LJJ

基数管理开始查询日期设定为2030-01-01
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgskhyy/config.js
6:12 下午

zc.li

修改数库表名的长度。TousseInstance_InventoryItemOfBaseNum to Tousse_InventoryOfBase;
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.39_4.9.40_sqlserver.sql
5:06 下午

shuyongfu

处理Jira问题:ASSZDWY-50 外来器械使用记录转换申请单后打开历史同一套外来器械的二次回收申请单点击保存会将原待回收的使用记录申请单保存掉

处理器械包定义复制属性后的异常:org.hibernate.HibernateException: Found shared references to a collection: com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition.storageLocationList

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
3:16 下午

zc.li

修改数据库表名长度。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakemanager/InventoryItemOfBaseNum.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.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-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
Wednesday 04 Sep 2019
4:49 下午

zc.li

完善：DGZYY-156。修复测试用例。终止申请单和删除装配任务，篮筐里没有其他物品时，状态改为装配完成。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ContainerStatusTests.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
3:56 下午

shuyongfu

处理Jira问题:ASSZSLY-19 8月份供应室盘点一次性物品库存数跟hrp系统盘点数不一致

增加了退货及回写相关的日志记录

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
3:43 下午

yk

新建项目：深圳市南山区西丽人民医院

project=szsnsqxlrmyy

Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsnsqxlrmyy/print
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/szsnsqxlrmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/szsnsqxlrmyy/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/szsnsqxlrmyy/mybatis/syncFromHERP_Mapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsnsqxlrmyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/szsnsqxlrmyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/szsnsqxlrmyy/dataSyncConfig.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/szsnsqxlrmyy/mybatis/SyncOrgUnitAndUserMapper.xml
  9. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/szsnsqxlrmyy/mybatis
  10. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsnsqxlrmyy
  11. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/szsnsqxlrmyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsnsqxlrmyy/print/printConfig.js
  13. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/szsnsqxlrmyy
12:04 下午

zc.li

解决：DGZYY-156。装配任务删除和申请单终止物品后,重新回收不能回收的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
Tuesday 03 Sep 2019
8:18 下午

yk

广医二院发布包
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
4:54 下午

jason

解决器械包信息模块，装配记录不能查看图片信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
2:03 下午

shuyongfu

处理Jira问题:BJCYLYY-29 小码哥PDA扫描设置兼容性问题

解决honeywell扫描的问题

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.82_20190903_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
11:18 上午

zc.li

调整格式:BJCYLYY-31。数量在左边，价格在右边。
Options
    • ?
    /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/service/JasperReportManager.java
9:30 上午

shuyongfu

处理Jira问题:DGKHYY-21 系统被医院安全扫描出代码有漏洞要修复(反射性XSS漏洞）

sql注入部分的代码暂注释

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/xss/util/XSSFilterUtil.java
Monday 02 Sep 2019
10:03 下午

zengyuan

广东省人民医院GDSRMYY-508 更新后发货计划列表以及灭菌篮筐物品明细的字体和行距变小了
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/common.css
3:58 下午

jason

解决jira问题：广医二院消毒供应项目GYEY-727 组织机构增加科室停用、启用功能按钮(已停用的科室不能进行科室申领及修改申请单)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/selOrgUnitByExt.jsp
Friday 30 Aug 2019
6:05 下午

shuyongfu

处理Jira问题:BJCYLYY-29 小码哥PDA扫描设置兼容性问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.82_20190830_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
5:40 下午

zc.li

完善：BJCYLYY-31。下拉框默认第一个值显示不正常的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js
4:56 下午

jason

解决jira问题：售后-中山大学附属第一医院ASSZDFY-44 外来器械申请页面的供应商那项，点击下拉列表只显示25个供应商名称

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
4:51 下午

zc.li

解决：BJCYLYY-31。增加一个配置项，中文名称："核算月报的报表类型"，英文名称："patternOfAccountingMonthlyReport",控制核算月报报表格式。添加器械包统计列按照灭菌方式拆分统计（个性化）格式。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportGroupBySterilizationMode.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/service/SterilisationManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportGroupBySterilizationMode.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/bjscylyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportForGgsrmyy.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/service/SterilisationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportForGgsrmyy.jasper
2:39 下午

shuyongfu

处理Jira问题:DGKHYY-21 系统被医院安全扫描出代码有漏洞要修复(反射性XSS漏洞）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/xss/filter/XSSFilter.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/web-standard.xml
  3. /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/xss/filter
  4. /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/xss
  5. /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/xss/request
  6. /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/xss/util
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/xss/request/XSSServletRequest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/xss/util/XSSFilterUtil.java
2:33 下午

shuyongfu

处理Jira问题:ASSDGSZYY-63 辅助发货未能查询出已灭菌的器械包
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
Thursday 29 Aug 2019
5:43 下午

zc.li

完善：ASSZSLY-17。修复洁定和倍力曼曲线页面数据不正常的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java
4:48 下午

zengyuan

器械包信息设置搜索时不用搜索的项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
4:30 下午

jason

广医二院消毒供应项目GYEY-727 组织机构增加科室停用、启用功能按钮(代码优化)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/treenode/service/THTreeNodeManagerImpl.java