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
Monday 15 Apr 2019
7:54 下午

zc.li

解决：GZZYYFY-32，GZZYYFY-44自定义器械包申请后保存包定义并且二次申请可以在器械包申请单选择。自定义器械申请单增加单价输入。
Options
    • -11
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -0
    • +135
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseDefinitionView.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/menu/menuconfigure.js
    • -0
    • +245
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseDefinitionView.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/dgfy/menu/menuconfigure.js
    • -1
    • +11
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -48
    • +94
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -0
    • +47
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +10
    /forgon-core/src/main/java/com/forgon/security/bean/ModuleOperationMapping.java
    • -0
    • +896
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseDefinitionForm.js
    • -2
    • +2
    /ssts-web/src/main/webapp/homepage/portalPage.js
  16. … 3 more files in changeset.
7:54 下午

shuyongfu

解决Jira问题:XJJQZYY-68 满意度调查表增加查看未填写科室按钮
Options
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateView.js
7:27 下午

zc.li

完善：XJJQZYY-58。删除不需要的查询统计，只查询统计指定的9个项。
Options
    • -90
    • +90
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java
5:53 下午

zengyuan

广州中医药大学第一附属医院 GZZYYFY-45 科室申领申请单干预后备注信息太长导致历史回收记录界面点击不了按钮
Options
    • -1
    • +16
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
Saturday 13 Apr 2019
6:41 下午

shuyongfu

解决Jira问题:XJJQZYY-62 清点确认功能需要配置提示是否归还物品(自动归还功能）

1.增加归还详细描述

2.删除回收项、申请项的申请数量、发货数量都为0的回收与申请单

Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -1
    • +27
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java
Friday 12 Apr 2019
5:52 下午

yk

新疆军区总医院发布包
Options
    • -1
    • +1
    /build.gradle
5:52 下午

yk

深圳市肿瘤医院发布包
Options
    • -1
    • +1
    /build.gradle
5:17 下午

weizhenyu

XJJQZYY-64:PDA上清洗消毒可以拍照上传清洗参数图片(pda部分)，多张图片的时候按钮会有报错
Options
    • -8
    • +33
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washRecordPic.js
2:13 下午

zc.li

开启按包统计消毒物品
Options
    • -2
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js
2:04 下午

shuyongfu

解决Jira问题:XJJQZYY-64 PDA上清洗消毒可以拍照上传清洗参数图片
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.72_20190412_v4_1_release.apk
11:18 上午

weizhenyu

XJJQZYY-64:PDA上清洗消毒可以拍照上传清洗参数图片
Options
    • -6
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
11:09 上午

weizhenyu

XJJQZYY-64

PDA上清洗消毒可以拍照上传清洗参数图片(器械包)

Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
11:05 上午

weizhenyu

XJJQZYY-64

PDA上清洗消毒可以拍照上传清洗参数图片

Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp
11:03 上午

weizhenyu

XJJQZYY-64

PDA上清洗消毒可以拍照上传清洗参数图片（图片窗口的代码）

Options
    • -0
    • +592
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washRecordPic.js
11:02 上午

weizhenyu

XJJQZYY-64

PDA上清洗消毒可以拍照上传清洗参数图片（清洗记录）

Options
    • -7
    • +16
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
9:50 上午

shuyongfu

解决Jira问题:XJJQZYY-62 清点确认功能需要配置提示是否归还物品(自动归还功能）
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
9:39 上午

yanweining

XJJQZYY-64：PDA上清洗消毒可以拍照上传清洗参数图片

1）新增新表：WashAndDisinfectPic 用于记录清洗记录图片

Options
    • -2
    • +21
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java
    • -0
    • +73
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectPic.java
9:38 上午

yanweining

XJJQZYY-64：PDA上清洗消毒可以拍照上传清洗参数图片

1）新增新表：WashAndDisinfectPic 用于记录清洗记录图片

2）WashAndDisinfectRecordAction：新增查看清洗图片的接口

3）新增pda上传灭菌记录,清洗记录图片的servlet

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/WEB-INF/web-stdxyxyfszlyy.xml
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
  3. /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/servlet
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/imagefilemanager/ImageFile.java
    • -1
    • +1
    /ssts-web/src/main/webapp/WEB-INF/web-cszxyy.xml
    • -0
    • +222
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • too large
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -0
    • +311
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/servlet/UploadServlet.java
    • -1
    • +1
    /ssts-web/src/main/webapp/WEB-INF/web-standard.xml
    • -4
    • +33
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
    • -0
    • +17
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • -1
    • +1
    /ssts-web/src/main/webapp/WEB-INF/web-zd5y.xml
Thursday 11 Apr 2019
9:01 下午

shuyongfu

解决Jira问题:XJJQZYY-62 清点确认功能需要配置提示是否归还物品(自动归还功能）
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -0
    • +7
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
7:37 下午

zengyuan

新疆军区总医院 XJJQZYY-72 材料库存统计报表增加仓库过滤选项 增加一个全部
Options
    • -10
    • +26
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/materialStockReportView.js
3:34 下午

yanweining

XJJQZYY-72：材料库存统计报表增加仓库过滤选项
Options
    • -53
    • +55
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/materialStockReportView.js
    • -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/dataindex/DataIndex.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/menu/menuconfigure.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:13 下午

shuyongfu

解决Jira问题:XJJQZYY-67 一次性物品可以根据物品设置有效期预警
Options
    • -4
    • +6
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
3:05 下午

shuyongfu

解决新疆项目登录首页后js报getBarcodeType函数不存在的问题
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/homepage/portalPage.jsp
10:10 上午

zc.li

方法名修改
Options
    • -4
    • +4
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java
10:08 上午

zengyuan

新疆军区总医院 XJJQZYY-67 一次性物品可以根据物品设置有效期预警,在科室供应室配置中，增加一个参数：一次性物品的预警期（天数）更改为可以为空
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
Wednesday 10 Apr 2019
7:17 下午

shuyongfu

处理Jira:XJJQZYY-67 一次性物品可以根据物品设置有效期预警
Options
    • -1
    • +17
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
    • -1
    • +8
    /ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java
7:00 下午

zc.li

解决：XJJQZYY-58。在中大附一的基础上修改工作质量持续收集统计报表，新加9项统计，修复非整年查询里回收材料数量，配包数量和整年查询不匹配的问题。
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java
    • -1
    • +1141
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java
    • -2
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/workQualityCollectionView.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
6:14 下午

shuyongfu

备注长度由2000调整到4000,和申请单的备注长度保存一致
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
5:25 下午

shuyongfu

处理Jira:XJJQZYY-67 一次性物品可以根据物品设置有效期预警
Options
    • -0
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
4:55 下午

zengyuan

新疆军区总医院 XJJQZYY-67 一次性物品可以根据物品设置有效期预警,在科室供应室配置中，增加一个参数：一次性物品的预警期（天数）
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js