forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 62
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 62
Total Lines of Code (LoC): 4,714,781
Net change in LoC this week: 2,406

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 13 Apr 2018
2:11 下午

yanweining

GGSRMYY-5：手术预约管理接口
Options
    • -1
    • +357
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.jsp
    • -0
    • +273
    /ssts-web/src/main/webapp/disinfectsystem/invoice/synOperationReservationForm.js
    • -2
    • +30
    /ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js
    • -0
    • +32
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManager.java
    • -2
    • +2
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManager.java
    • -2
    • +22
    /ssts-web/src/main/resources/spring/projects/ggsrmyy/HIS.xml
    • -2
    • +132
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java
    • -2
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js
    • -1
    • +131
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/HrpInvoicePlan.java
    • -0
    • +87
    /ssts-web/src/main/resources/config/ggsrmyy/mybatis/SyncOperationReservation_Mapper.xml
    • -1
    • +22
    /ssts-web/src/main/resources/spring/projects/ggsrmyy/timer.xml
    • -8
    • +55
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/InvoicePlanDao.java
11:34 上午

adairkang

移动位置
Options
  1. /forgon-core/src/main/java/com/forgon/disinfectsystem/barcodepredicate
  2. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcodepredicate
    • -0
    • +27
    /forgon-core/src/main/java/com/forgon/disinfectsystem/barcodepredicate/BarcodePredicate.java
    • -0
    • +29
    /forgon-core/src/main/java/com/forgon/disinfectsystem/barcodepredicate/BarcodeOperators.java
    • -27
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcodepredicate/BarcodePredicate.java
    • -29
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcodepredicate/BarcodeOperators.java
11:05 上午

shuyongfu

gradle配置增加版本控制的全局变量,维护jdbc.propperties文件的版本号,最终用于处理页面文件缓存问题
Options
    • -1
    • +6
    /build.gradle
9:44 上午

shuyongfu

新增gradle对db2驱动jar包的配置
Options
    • binary
    /localrepo/com.ibm.db2.jcc/db2jcc4/4.16.53/db2jcc4-4.16.53.jar
  2. /localrepo/com.ibm.db2.jcc
  3. /localrepo/com.ibm.db2.jcc/db2jcc/3.66.46
    • -0
    • +2
    /build.gradle
  5. /localrepo/com.ibm.db2.jcc/db2jcc
    • binary
    /localrepo/com.ibm.db2.jcc/db2jcc/3.66.46/db2jcc-3.66.46.jar
  7. /localrepo/com.ibm.db2.jcc/db2jcc4/4.16.53
  8. /localrepo/com.ibm.db2.jcc/db2jcc4
1:10 上午

shuyongfu

巫朝平4月12日发回来的江门市中心医院现场配置文件
Options
    • -4
    • +4
    /ssts-web/src/main/resources/spring/projects/jmszxyy/HIS.xml
    • -2
    • +27
    /ssts-web/src/main/resources/config/jmszxyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -3
    • +4
    /ssts-web/src/main/resources/config/jmszxyy/mybatis/SyncOrgUnitAndUserMapper.xml
Thursday 12 Apr 2018
6:06 下午

cherry

增加外来器械申请单添加外来器械定义场景
Options
    • -6
    • +39
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/helper/ApplyHelper.java
5:46 下午

shuyongfu

解决中大附一使用记录录入页面的丢失和报损按钮看不全的问题
Options
    • -6
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
3:41 下午

niutou_ren

GGSRMYY-11(在基础数据导入导出中增加手术名称导入，导出功能)

修改：

1、导入手术名称时，增加对器械包过滤：

1）只能导入普通器械包和敷料包

2）不能导入停用的器械包

2、导出时，根据所属科室，调整手术名称的导出顺序

3、调整导入导出页面显示的错误信息。由原来的数字拼接改为字符串提示

Options
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • -4
    • +24
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/importBasedata.jsp
    • -0
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/Constants.java
    • -1
    • +1
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
3:08 下午

adairkang

CSSZXYY-138 pda录灭菌记录扫描不追溯的器械包时提示"器械包已入篮筐、请扫描灭菌筐",pc端正常
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
2:28 下午

jeffli

不追溯物品扫描改进（PDA端优先处理）

中山一院消毒供应项目ZSYY-235

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js
2:04 下午

chenguina

pda版本更新至4.6.36
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.34_20180410_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.36_20180411_v4_1_release.apk
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
10:53 上午

jeffli

不追溯物品扫描改进（PDA端优先处理）

中山一院消毒供应项目ZSYY-235

Options
    • -28
    • +107
    /ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js
Wednesday 11 Apr 2018
4:30 下午

cherry

灭菌装载增加点击单独的【载入】按钮入筐、点击多选的【载入】按钮入筐的场景
Options
    • -4
    • +25
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java
4:12 下午

shuyongfu

党万统4月11号发回来的博罗县人民医院现场配置文件
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/blxrmyy/config.js
3:54 下午

jeffli

解决bug，IE8下面打印装配记录不会分页

将装配并打印按钮做成扫描条码就能打印标签

贵港市人民医院GGSRMYY-10

Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/js/barcodeBtn.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
3:41 下午

alan.lee

获取签收记录条数，判空
Options
    • -1
    • +5
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
3:20 下午

yanweining

GZSZYY-13：一次性物品库存列表打印批次问题
Options
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
12:05 下午

alan.lee

签收页面，获取签收记录的sql 对于科室编码需要加上引号 不然会报错
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
11:50 上午

jeffli

中大附一，调整装配记录打印样式
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
10:33 上午

jeffli

中大附一，调整装配记录打印宽度
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
10:32 上午

jeffli

解决bug：

IE8下面打印装配记录不会分页

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
10:01 上午

cherry

PDA版本更新为4.6.34
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.32_20180330_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.34_20180410_v4_1_release.apk
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
Tuesday 10 Apr 2018
5:49 下午

niutou_ren

GGSRMYY-11（在基础数据导入导出中增加手术名称导入，导出功能）

在基础数据导入导出模块中，添加了对手术名称导入导出的支持

Options
    • -2
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/operationNameManager/service/OperationNameManager.java
    • -6
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/operationNameManager/service/OperationNameManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • too large
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -0
    • +108
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/operationNameManager/OperationName.java
    • -2
    • +3
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
5:10 下午

jeffli

调整发货员和核对员字段
Options
    • -68
    • +30
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • -2
    • +3
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
4:47 下午

shuyongfu

博罗县人民医院科室人员接口mybatis配置文件
Options
    • -2
    • +2
    /ssts-web/src/main/resources/config/blxrmyy/mybatis/SyncOrgUnitAndUserMapper.xml
3:59 下午

jeffli

发货计划界面人员信息记录改进

开平市中心医院KPSZXYY-3

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
3:31 下午

jeffli

发货计划界面人员信息记录改进

开平市中心医院KPSZXYY-3

Options
    • -10
    • +69
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • -0
    • +12
    /ssts-web/src/main/webapp/js/configUtils.js
11:56 上午

shuyongfu

新高值耗材扫描三个自身条码录入使用记录增加科室物品共享的机制
Options
    • -3
    • +29
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
11:22 上午

adairkang

KPSZXYY-3 发货计划界面人员信息记录改进,增加对应的配置项
Options
    • -1
    • +18
    /ssts-web/src/main/webapp/disinfectsystem/config/kpszxyy/config.js
10:53 上午

chenjiaru

解决jira问题：KPSZXYY-2 清洗工作量统计，根据材料分类统计各个供应室人员清洗各类型的件数
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/jasperRtp/cleaningAreaWorkloadForUser.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/cleaningAreaWorkloadForUser.jasper