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
Wednesday 18 Nov 2020
6:47 下午

jason

解决jira问题：SZSDSRMYY-29 深圳市第三人民医院 外来器械申请单接口
Options
    • -0
    • +5
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szsdsrmyy/DatasyncConstant.java
    • -0
    • +46
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/szsdsrmyy/ForeignTousseWebService.java
    • -0
    • +5
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManager.java
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/spring/webservice-cxf.xml
    • -0
    • +10
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/ForeignTousseInfoPushDao.java
    • -0
    • +477
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/szsdsrmyy/ForeignTousseWebServiceImpl.java
    • -0
    • +36
    /ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/spring/timer.xml
    • -0
    • +44
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szsdsrmyy/WebServiceClientHelper.java
    • too large
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/spring/HIS.xml
    • -0
    • +98
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szsdsrmyy/ForeignTousseInfoPushDaoImpl.java
6:17 下午

frank

解决SZSDSRMYY-35：不论是在系统的任何环节登记材料丢失或报损后，要支持在回收清点页面改小材料丢失或报损的数量
Options
    • -4
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
5:25 下午

zc.li

补充：SZSDSRMYY-35.增加记录改小丢失或者报损数量的日志。补充器械时，记录补充人。
Options
    • -0
    • +1
    /ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
    • -0
    • +3
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
4:57 下午

frank

解决SZSDSRMYY-35：不论是在系统的任何环节登记材料丢失或报损后，要支持在回收清点页面改小材料丢失或报损的数量
Options
    • -4
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
    • -1
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/recyclingDamageRecordView.js
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorForm.js
    • -2
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorView.jsp
4:32 下午

zc.li

解决：SZSDSRMYY-35。不论是在系统的任何环节登记材料丢失或报损后，要支持在回收清点页面改小材料丢失或报损的数量.
Options
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialerrordamage/MaterialErrorDamageDetail.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
4:07 下午

yuandongxiao

新建项目：克拉玛依市人民医院

project=klmysrmyy

Options
  1. /ssts-web/src/main/webapp/disinfectsystem/config/klmysrmyy/spring
  2. /ssts-web/src/main/webapp/disinfectsystem/config/klmysrmyy/interfaces
    • -0
    • +1513
    /ssts-web/src/main/webapp/disinfectsystem/config/klmysrmyy/print/printConfig.js
    • -0
    • +55
    /ssts-web/src/main/webapp/disinfectsystem/config/klmysrmyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -0
    • +119
    /ssts-web/src/main/webapp/disinfectsystem/config/klmysrmyy/spring/HIS.xml
    • -0
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/config/klmysrmyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
  7. /ssts-web/src/main/webapp/disinfectsystem/config/klmysrmyy/menu
    • -0
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/config/klmysrmyy/interfaces/dataSyncConfig.json
    • -0
    • +787
    /ssts-web/src/main/webapp/disinfectsystem/config/klmysrmyy/menu/menuconfigure.js
    • -0
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/config/klmysrmyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
    • -0
    • +111
    /ssts-web/src/main/webapp/disinfectsystem/config/klmysrmyy/interfaces/mybatis/syncFromHERP_Mapper.xml
    • -0
    • +141
    /ssts-web/src/main/webapp/disinfectsystem/config/klmysrmyy/config.js
  13. /ssts-web/src/main/webapp/disinfectsystem/config/klmysrmyy/print
  14. /ssts-web/src/main/webapp/disinfectsystem/config/klmysrmyy
  15. /ssts-web/src/main/webapp/disinfectsystem/config/klmysrmyy/interfaces/mybatis
3:02 下午

shuyongfu

解决:ASSDGSZYY-89 含植入物器械包灭菌监测及发货情况报表“常规发货”、“紧急发货”字段值未正确显示的问题

sql语句换行时末尾增加空格

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
2:20 下午

frank

解决KPSZXYY-50：外来器械申请单页面，不显示病区字段
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/kpszxyy/config.js
10:35 上午

shuyongfu

解决:ASSDGSZYY-89 含植入物器械包灭菌监测及发货情况报表“常规发货”、“紧急发货”字段值未正确显示的问题
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
Tuesday 17 Nov 2020
3:54 下午

zc.li

解决：DGSDBZXYY-122。外来器械申请单统计报表的灭菌包数量不对的问题；
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
2:52 下午

zc.li

解决：FSSZYY-12，核算月报、明细核算月报增加的器械包积分统计的显示。
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailIntegral_child.jasper
    • -1
    • +12
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/DepartmentMonthDetailItem.java
    • -0
    • +372
    /ssts-web/src/main/webapp/jasperRtp/monthIntegralReport.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/monthIntegralReport.jasper
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -0
    • +141
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailIntegral_child.jrxml
    • -0
    • +227
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailIntegral.jrxml
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/fsszyy/config.js
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailIntegral.jasper
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -1
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -0
    • +12
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MonthReportBean.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
Monday 16 Nov 2020
4:08 下午

shuyongfu

解决:DGSDBZXYY-61 生物监测提示优化

pda:STDXYXYFSZ-10 灭菌篮筐内的灭菌物品没有发货的情况下，将另一个物品装载到该篮筐后灭菌，发货时扫描该灭菌框只会出来后面装载灭菌的物品。

Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
2:55 下午

frank

解决BJ307YY-31：装配管理增加【打印材料清单】
Options
    • -40
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.js
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/config.js
    • -41
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js
    • too large
    /ssts-web/src/main/webapp/js/common.js
2:51 下午

terrykwan

洗水布打印功能增强：

1、可设置打印的logo文件。

2、可设置纸张类型为连续纸，并指定纸张的宽度和打印后底部所留的下边距

3、可设置打印的材料明细表格的位置

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/img/logo_idcard.png
    • -0
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js
2:49 下午

terrykwan

定义projectName的js变量，供js代码进行引用
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/common/includeExtJsAndCss.jsp
2:42 下午

zc.li

解决：ASSZDFY-78。新增灭菌记录扫描固定条码的器械包提示：index：0，,Size：0。
Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
1:41 下午

jason

解决jira问题：GGSRMYY-140 贵港市人民医院 发货单的消毒物品发货物品明细，已打印列状态显示有问题(鼠标悬浮框的发货物品列表，同一个物品只需要显示一行)
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
11:54 上午

jason

解决jira问题：GZS12RMYY-34 广州市第十二人民医院 开发一次性物品库存、批次库存以及标识号的数据体检功能(根据DisposableGoodsIdentification的数量更新一次性物品库存)
Options
    • -1
    • +18
    /ssts-web/src/main/java/com/forgon/disinfectsystem/systemexamination/action/DisposableGoodsStockExaminationAction.java
    • -0
    • +16
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java
    • -0
    • +6
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManager.java
10:53 上午

frank

发货管理页面器械包类型重新改为物品类型
Options
    • -3
    • +36
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
Friday 13 Nov 2020
7:37 下午

frank

回滚BJ307YY-35之前的代码，BJ307YY-35场景还需要重新考虑
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
6:52 下午

frank

解决回收页面isIE未定义的问题
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp
6:36 下午

frank

解决回收修改数量isIE未定义的问题
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp
6:15 下午

zc.li

修复明细核算月报总价乘以了数量的问题；
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
5:58 下午

zc.li

解决：BJ307YY-35。扫描包外标签唯一条码进行回收，连续扫描数量不断+1的缺陷
Options
    • -0
    • +6
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
5:36 下午

jason

解决jira问题：GDSZYY-36 广东省中医院 一个科室只能填写一张未打印并且未发货的一次性物品申请单
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
5:12 下午

frank

解决BJ307YY-35:扫描包外标签唯一条码进行回收，连续扫描数量不断+1的缺陷
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
4:57 下午

huang.cl

提交现场的配置文件
Options
    • -51
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/print/printConfig.js
3:50 下午

zc.li

修复ASSZDFY-74消毒供应中心运作监控任务组不选择或者选择全部的情况下，装配信息列表不显示的问题;
Options
    • -2
    • +2
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/PkRoomControlHelper.java
3:18 下午

jason

解决jira问题：GZS12RMYY-34 广州市第十二人民医院 开发一次性物品库存、批次库存以及标识号的数据体检功能
Options
    • -1
    • +2
    /ssts-web/src/main/java/com/forgon/disinfectsystem/systemexamination/action/DisposableGoodsStockExaminationAction.java
3:17 下午

jason

解决jira问题：GDSZYY-39 广东省中医院 开启配置项storageUseStorageSubtractWaitDeliver后，申请一次性物品时提示库存不足，导致无法申领
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java