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 14 Jan 2021
2:09 下午

zc.li

发货物品查询报表格式调整。不显示null值。
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_childAddSupplierName.jasper
    • -5
    • +9
    /ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1AddSupplierName.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_mainAddSupplierName.jasper
    • -3
    • +3
    /ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_child.jasper
    • -1
    • +1
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_child.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1.jasper
    • -1
    • +2
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_mainAddSupplierName.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_main.jasper
    • -1
    • +1
    /ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1AddSupplierName.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1.jasper
    • -2
    • +3
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_main.jrxml
    • -1
    • +1
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_childAddSupplierName.jrxml
2:05 下午

jason

解决jira问题：ASSZNSRMYY-11 深圳市南山区人民医院 新的外来器械申请单接口开发
Options
    • -0
    • +21
    /ssts-web/src/main/webapp/disinfectsystem/config/sznsrmyy/spring/webservice-cxf.xml
    • -0
    • +343
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceExImpl.java
    • -0
    • +116
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceEx.java
    • -0
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/webservice-cxf.xml
Wednesday 13 Jan 2021
6:58 下午

frank

解决NFYY-3：在“器械包信息”处增加一条器械包状态的“进度条”(兼容IE8)
Options
    • -34
    • +92
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
    • -28
    • +133
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
6:45 下午

zc.li

修复oracle审核模块待审核列表加急排序不正常的问题；
Options
    • -1
    • +1
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
6:27 下午

zc.li

修复历史回收记录oracle报错的数据显示不全的问题；
Options
    • -1
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
6:24 下午

jason

解决jira问题：GGSRMYY-142 丢失报损，退货记录，材料发货的结算科室优化(ORA-00904："ISNULL"： 标识符无效)
Options
    • -2
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
6:17 下午

zc.li

修复oracle科室申领加急排序不正常的问题；
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
5:55 下午

zc.li

修复回收模块待回收列表加急排序不正常的问题；
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
5:27 下午

zc.li

修复退货时，材料数量不对的问题；
Options
    • -2
    • +1
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
5:04 下午

terrykwan

print()函数增加对donotPrintTotal属性的支持
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
5:03 下午

frank

解决NFYY-3：在“器械包信息”处增加一条器械包状态的“进度条”(兼容IE8)
Options
    • -0
    • +96
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/PIE.htc
    • -78
    • +30
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
    • -14
    • +60
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
4:49 下午

zc.li

修复：BJ307YY-43。明细核算月报oracle报标识符过长的问题；
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
4:23 下午

zc.li

解决：BJ307YY-43。发货物品查询结果表格增加物品数量和金额的统计，以及增加申请科室列。

修复明细核算月报不显示材料数量列可能报错，器械包退货材料数量不正常的问题；

调整报表样式。

Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailSupplierNameAndDiscountPrice_child.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_main.jasper
    • -0
    • +1
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailIntegral_child.jrxml
    • -23
    • +129
    /ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1AddSupplierName.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailShowMaterialsAmount_child.jasper
    • -0
    • +1
    /ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailShowMaterialsAmount_child.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1AddSupplierName.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailIntegral_child.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jasper
    • 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/InvoiceQuerySummaryService.java
    • -0
    • +1
    /ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailSupplierName_child.jrxml
    • -0
    • +1
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jrxml
  16. … 15 more files in changeset.
3:38 下午

frank

解决NFYY-3：在“器械包信息”处增加一条器械包状态的“进度条”
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/config.js
    • -1
    • +177
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
    • -1
    • +60
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
2:57 下午

jason

解决jira问题：珠江医院ZJYY-28 webservice接口录使用记录(使用记录转换申请单异常)
Options
    • -5
    • +21
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/common/HIPMessageWebServiceImpl.java
2:20 下午

frank

优化DGZYY-176:灭菌扫描生物监测包和化学监测包的改进(兼容IE8)
Options
    • -135
    • +151
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -40
    • +49
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
12:11 下午

liwei

修改一次性物品同步SQL语句
Options
    • -20
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/config/klmysrmyy/interfaces/mybatis/syncFromHERP_Mapper.xml
12:07 下午

liwei

根据现场需求，隐藏部分菜单
Options
    • -10
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/config/klmysrmyy/menu/menuconfigure.js
12:05 下午

liwei

更新打印格式
Options
    • -32
    • +98
    /ssts-web/src/main/webapp/disinfectsystem/config/klmysrmyy/print/printConfig.js
12:02 下午

liwei

根据现场需求，启用配置项对应功能
Options
    • -12
    • +36
    /ssts-web/src/main/webapp/disinfectsystem/config/klmysrmyy/config.js
11:12 上午

jason

修复JYSRMYY-19，明细核算月报不显示材料数量列时，会报错的问题；
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:00 上午

jason

解决jira问题：DGZYY-176 东莞中医院 灭菌扫描生物监测包和化学监测包的改进
Options
    • -0
    • +4
    /forgon-core/src/main/java/com/forgon/directory/model/BarcodeDevice.java
10:31 上午

frank

解决DGZYY-176:灭菌扫描生物监测包和化学监测包的改进
Options
    • -33
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js
10:24 上午

jason

解决jira问题：DGZYY-176 东莞中医院 灭菌扫描生物监测包和化学监测包的改进
Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java
    • -2
    • +10
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
10:04 上午

frank

解决DGZYY-176:灭菌扫描生物监测包和化学监测包的改进
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -121
    • +239
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
    • -0
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
    • -32
    • +162
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
9:03 上午

terrykwan

科室的括号改为半角括号
Options
    • -1
    • +1
    /ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
Tuesday 12 Jan 2021
8:09 下午

yuandongxiao

新建项目：海南省儿童医院

project=hnsetyy

Options
    • -0
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • -0
    • +55
    /ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
  3. /ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy
    • -0
    • +787
    /ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/menu/menuconfigure.js
    • -0
    • +119
    /ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/spring/HIS.xml
  6. /ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/menu
  7. /ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/spring
    • -0
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/interfaces/dataSyncConfig.json
  9. /ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/print
    • -0
    • +143
    /ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/config.js
    • -0
    • +111
    /ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/interfaces/mybatis/syncFromHERP_Mapper.xml
    • -0
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
  13. /ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/interfaces/mybatis
  14. /ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/interfaces
    • -0
    • +1172
    /ssts-web/src/main/webapp/disinfectsystem/config/hnsetyy/print/printConfig.js
5:57 下午

frank

解决DGSDBZXYY-128：质量监测清洗不合格扫描标识牌需要带出清洗信息等优化(6,7,8)
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
5:48 下午

jason

解决jira问题：DGSDBZXYY-128 质量监测清洗不合格扫描标识牌需要带出清洗信息等优化(扫描标识牌带出清洗信息的同时，也需要带出器械包名称出来)
Options
    • -0
    • +2
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java
5:47 下午

zc.li

删除多余代码
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java