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
Saturday 25 Aug 2018
2:11 下午

shuyongfu

解决Jira问题:ZSSXLRMYY-166 增加灭菌方式属性
Options
    • -2
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -0
    • +24
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationForm.js
    • -17
    • +25
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -1
    • +59
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
    • -1
    • +36
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseSimpleVO.java
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -1
    • +33
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/action/SterilisationAction.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -3
    • +4
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -1
    • +1
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -0
    • +4
    /forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java
    • -1
    • +83
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
  16. … 5 more files in changeset.
2:05 下午

shuyongfu

解决Jira问题:GZZYYFY-8 干预申请数量配置项功能增强
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
2:02 下午

shuyongfu

解决Jira问题:SZSZYY-10 病人信息接口更改
Options
    • -4
    • +7
    /ssts-datasync-szszyy-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/FindPatientInfoByHospitalNumDaoImpl.java
    • -109
    • +11
    /ssts-datasync-szszyy-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/WebServiceClientHelper.java
    • -2
    • +2
    /ssts-datasync-szszyy-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/FindPatientInfoByTreatmentNumDaoImpl.java
    • -0
    • +10
    /ssts-datasync-szszyy-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/DataSyncConstant.java
1:57 下午

shuyongfu

增加对设备(清洗机)接口的数值判断,为整数时才会进行统计
Options
    • too large
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
12:25 下午

shuyongfu

包定义的是否灭菌默认设置为是
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
11:53 上午

adairkang

整合清洗跟回收的器械包图片显示界面，因为一直都是一样的，所以用同一个jsp就可以了
Options
    • -17
    • +16
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • -291
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/tousseImage.jsp
10:49 上午

adairkang

根据id而不是材料名称加载材料图片（器械包图片也根据id加载）

翻页按钮的显示及对应功能处理

Options
    • -29
    • +39
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
    • -5
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -5
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
Friday 24 Aug 2018
8:29 下午

adairkang

序号的问题
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
7:38 下午

adairkang

URL编码问题
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
6:09 下午

adairkang

外来器械大标签病人所属科室的问题
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js
5:17 下午

adairkang

URL编码问题

获取材料图片数量时，添加类型过滤

Options
    • -3
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
4:33 下午

jeffli

增加查看系统事务功能
Options
    • -3
    • +22
    /forgon-tools/src/main/java/com/forgon/system/transaction/model/TransactionInfo.java
    • -0
    • +47
    /forgon-tools/src/main/java/com/forgon/system/transaction/service/TransactionInfoManager.java
    • -2
    • +13
    /forgon-tools/src/main/java/com/forgon/system/concurrent/service/OptimisticLockInterceptor.java
    • -0
    • +2
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
  5. /forgon-tools/src/main/java/com/forgon/system/transaction/controller
    • -0
    • +56
    /forgon-tools/src/main/java/com/forgon/system/transaction/controller/TransactionController.java
4:31 下午

jeffli

中山市小榄人民医院ZSSXLRMYY-165

器械材料定义增加字段及对应的图片

Options
    • -0
    • +3
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
4:29 下午

jeffli

中山市小榄人民医院ZSSXLRMYY-165

器械材料定义增加字段及对应的图片

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

adairkang

ZSSXLRMYY-165 器械材料定义增加字段及对应的图片，丢失报损部分显示问题
Options
    • -2
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
    • -2
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/tousseImage.jsp
3:16 下午

yanweining

ZSSXLRMYY-165：器械材料定义增加字段及对应的图片
Options
    • -2
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java
    • -0
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp
    • -0
    • +10
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManagerImpl.java
    • -0
    • +5
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • -0
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java
2:24 下午

adairkang

ZSSXLRMYY-163 丢失、报废功能，增加备注功能
Options
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js
12:57 下午

adairkang

ZSSXLRMYY-165 器械材料定义增加字段及对应的图片，回收部分的处理
Options
    • -20
    • +114
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
    • -3
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/imagefilemanager/ImageFile.java
    • -7
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
    • -2
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
    • -20
    • +114
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/tousseImage.jsp
Wednesday 22 Aug 2018
5:35 下午

shuyongfu

针对“GZZYYFY-8 干预申请数量配置项功能增强” 启用申请数量干预的配置项
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/config.js
4:19 下午

jeffli

东莞东华医院DGDHYY-111

外来器械价格修改的问题

Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
1:46 下午

shuyongfu

巫劲锋8月8日发回来的成都龙泉第一医院现场printConfig.js配置文件
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/print/printConfig.js
1:44 下午

shuyongfu

罗乐8月7日发回来的广医二院现场config.js配置文件
Options
    • -3
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/config/gyey/config.js
1:41 下午

shuyongfu

陈国强8月3日发回来的广州中医药附一现场config.js及printConfig.js配置文件
Options
    • -19
    • +33
    /ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/config.js
    • -2
    • +241
    /ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/print/printConfig.js
11:59 上午

shuyongfu

陈国强7月26日发回来的广州市中医院现场打印回收清单配置文件
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/recyclingDetailPrintConfig.js
10:37 上午

yanweining

ZSSXLRMYY-165：器械材料定义增加字段及对应的图片
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js
10:29 上午

yanweining

ZSSXLRMYY-165：

1、增加【清洗方式设置】系统参数配置。

2.1、材料定义增加【清洗方式】属性（下拉选择【清洗方式设置】的内容）

2.2、材料定义增加【是否可拆】属性（是、否）。当选择为“是”时，可允许上传图片。

2.3、材料定义增加【清洗质量检查方法】属性（文本框）。可允许上传图片

3、将原有属性【清洗质量检查关注点】和【功能检查】改为文本框，与原有【注意事项】一致。并增加对应的图片上传功能

Options
    • -38
    • +39
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js
    • -0
    • +8
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java
    • -181
    • +317
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js
    • -1
    • +5
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java
    • -2
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +202
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionUploadImageManager.js
    • -1
    • +53
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
    • -3
    • +46
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManagerImpl.java
    • -0
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/imagefilemanager/ImageFile.java
    • -0
    • +63
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
10:27 上午

yanweining

增加【清洗方式设置】系统参数配置
Options
    • -0
    • +4
    /forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java
    • -0
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
10:27 上午

yanweining

材料定义添加字段：清洗方式，是否可拆，清洗质量检查方法
Options
    • -1
    • +39
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java
10:23 上午

jeffli

贵港市人民医院GGSRMYY-54

装配管理界面清洗篮筐显示不完整

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
Tuesday 21 Aug 2018
6:14 下午

shuyongfu

解决Jira问题:DGKHYY-18 满意度调查表用户无法打开填写 (乐观锁报错:因为业务bean未配置为带事务、但方法里有forUpdate的方式)
Options
    • -9
    • +3
    /ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTableManagerImpl.java
    • -0
    • +16
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -3
    • +2
    /ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTemplateManagerImpl.java