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
Friday 29 Apr 2022
2:35 下午

zc.li

解决：BJ307YY-105 明细核算月报的查询条件增加【显示发货日期】查询条件，可在查询结果报表中增加【发货日期】列的显示
Options
    • -0
    • +242
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailIntegralShowSendTime.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailShowSendTime.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailSupplierNameAndSendTime_child.jasper
    • -0
    • +226
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailSupplierNameAndSendTime.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailDiscountPriceAndSendTime.jasper
    • -0
    • +255
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailDiscountPriceAndSendTime.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailShowSendTime_child.jasper
    • -0
    • +236
    /ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailShowSendTime.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailIntegralShowSendTime.jasper
    • -0
    • +163
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailSupplierNameAndDiscountPriceAndSendTime_child.jrxml
    • -0
    • +155
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailIntegralShowSendTime_child.jrxml
    • -0
    • +153
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailDiscountPriceAndSendTime_child.jrxml
    • -0
    • +152
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailSupplierNameAndSendTime_child.jrxml
    • -1
    • +2
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailDiscountPriceAndSendTime_child.jasper
  16. … 15 more files in changeset.
2:11 下午

frank.qiu

完善 NFYY-62 - 发货计划模块增加【借物单发货】功能，能把借物单和非借物单分开进行发货
Options
    • -0
    • +3
    /ssts-web/src/main/webapp/homepage/portalPage.js
1:53 下午

frank.qiu

解决了 ZJYY-84 - 待回收列表和历史回收记录列表的表格列改进为可配置
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/styleForWaitList.css
11:41 上午

zc.li

修复：ZJYY-84 删除多余代码
Options
    • -1
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
11:30 上午

frank.qiu

解决了 NFYY-62 - 发货计划模块增加【借物单发货】功能，能把借物单和非借物单分开进行发货
Options
    • -15
    • +42
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
    • -0
    • +31
    /ssts-web/src/main/webapp/homepage/portalPage.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/config.js
    • -0
    • +6
    /ssts-web/src/main/webapp/homepage/portalPage.jsp
    • -0
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp
10:53 上午

shuyongfu

处理:NFYY-62 PDA发货任务模块增加【借物单发货】功能，能把借物单和非借物单分开进行发货
Options
    • -0
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
10:16 上午

frank.qiu

解决了 ZJYY-84 - 待回收列表和历史回收记录列表的表格列改进为可配置(开启序号后样式错乱的问题)
Options
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
10:13 上午

zc.li

修复：ZJYY-84 历史回收记录中的申请单号显示值为空。 历史回收记录中的物品清单只能显示一种包。
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
9:45 上午

zc.li

解决新增需求： BJ307YY-104 红色部分新需求
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/sterilizationAreaWorkLoad.jasper
    • -3
    • +3
    /ssts-web/src/main/webapp/jasperRtp/sterilizationAreaWorkLoad.jrxml
9:24 上午

zc.li

解决：ZYYFS-164 使用记录物品分类汇总表 (主刀医生核算科室）里增加【物品类型】查询条件
Options
    • -1
    • +2
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
Thursday 28 Apr 2022
6:05 下午

zc.li

完善：NYSY-44 修改返回的阶段名
Options
    • -1
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java
    • -1
    • +1
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java
5:55 下午

zc.li

完善：NYSY-44 修改返回的阶段名
Options
    • -1
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java
5:26 下午

frank.qiu

解决了 ZYYFS-164 - 使用记录物品分类汇总表 (主刀医生核算科室）里增加【物品类型】查询条件（删除器械材料）
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordTypeForDoctorAccountingDepartView.js
4:40 下午

frank.qiu

格式化
Options
    • -1062
    • +1070
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
3:48 下午

frank.qiu

解决了 ZYYFS-164 - 使用记录物品分类汇总表 (主刀医生核算科室）里增加【物品类型】查询条件
Options
    • -3
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordTypeForDoctorAccountingDepartView.js
3:30 下午

frank.qiu

解决了 ZYYFS-164 - 使用记录物品分类汇总表 (主刀医生核算科室）里增加【物品类型】查询条件
Options
    • -8
    • +33
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordTypeForDoctorAccountingDepartView.js
3:14 下午

frank.qiu

解决了 SSTS-519 - oracle数据库中，打印化学监测包时，当单位名称为空时，打印时，单位名称行显示为null
Options
    • too large
    /ssts-web/src/main/webapp/js/common.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
11:06 上午

zc.li

解决：BJ307YY-104 灭菌区工作量统计报表增加按灭菌炉名称显示灭菌包数量等改进，以及解决【总灭菌量】数值和【灭菌区工作量及不合格率月报】不一致的问题
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/sterilizationAreaWorkLoad.jasper
    • -1
    • +2
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • -5
    • +5
    /ssts-web/src/main/webapp/jasperRtp/sterilizationAreaWorkLoad.jrxml
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -30
    • +127
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationAreaWorkLoadView.js
    • -0
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationAreaWorkLoadView.jsp
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:02 上午

zc.li

解决：ZJYY-84 待回收列表和历史回收记录列表的表格列改进为可配置
Options
    • -0
    • +3
    /forgon-tools/src/main/java/com/forgon/tools/util/SqlUtils.java
Wednesday 27 Apr 2022
6:33 下午

jason

解决jira问题：KSDQDYRMYY-6 科室发货计划新增功能【待发货物品来源】，可查看【物品状态】、【条码】、【申请时间】、【单号】(代码优化)
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
6:06 下午

zc.li

解决ZYYFS-163 一次性物品管理定义里增加“是否收费”字段，同时这个字段是同步物资系统接口的和明细月报里可以筛选查询
Options
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java
4:51 下午

jason

解决jira问题：KSDQDYRMYY-6 科室发货计划新增功能【待发货物品来源】，可查看【物品状态】、【条码】、【申请时间】、【单号】(代码优化)
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
4:42 下午

frank.qiu

解决了 SZSDSRMYY-79 - 住院号允许为空配置不生效。
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
4:32 下午

frank.qiu

解决了 SZSDSRMYY-79 - 住院号允许为空配置不生效。
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
4:23 下午

zc.li

解决ZYYFS-163 一次性物品管理定义里增加“是否收费”字段，同时这个字段是同步物资系统接口的和明细月报里可以筛选查询
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -2
    • +4
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
3:21 下午

frank.qiu

解决了 SZSDSRMYY-79 - 住院号允许为空配置不生效。
Options
    • -4
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js
3:08 下午

zc.li

解决：ZJYY-84 待回收列表和历史回收记录列表的表格列改进为可配置
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
3:05 下午

zc.li

解决：ZJYY-84 待回收列表和历史回收记录列表的表格列改进为可配置
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -2
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • -8
    • +35
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/synthetic/allrecycle/service/RecyclingModule.java
    • -1
    • +51
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • -1
    • +52
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingRecordVo.java
2:36 下午

frank.qiu

解决了 ZJYY-84 - 待回收列表和历史回收记录列表的表格列改进为可配置
Options
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js
    • -54
    • +241
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
    • -42
    • +63
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
2:26 下午

jason

解决jira问题：ZYYFS-163 一次性物品管理定义里增加“是否收费”字段，同时这个字段是同步物资系统接口
Options
    • -1
    • +1
    /forgon-tools/src/main/java/com/forgon/Constants.java
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.90_4.9.91.sql
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/interfaces/mybatis/syncFromHERP_CKD_Mapper.xml
    • -0
    • +13
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/Inventory.java
    • -0
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
    • too large
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • -1
    • +3
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -0
    • +6
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java