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 03 Jul 2017
5:12 下午

yanweining

一次性物品：入库管理，退库管理，调拨管理，盘盈盘亏，采购计划，消毒供应中心物品领用。增加鼠标悬浮框功能
Options
    • -10
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js
    • -1
    • +72
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.js
    • -0
    • +64
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownStockTakeView.js
    • -1
    • +29
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
    • -0
    • +74
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownStockTakeView.jsp
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.jsp
    • -3
    • +73
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.jsp
    • -0
    • +64
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js
5:06 下午

yanweining

采购计划优化查询效率
Options
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GoodPurchasePlan.java
    • -0
    • +2
    /forgon-core/src/main/java/com/forgon/directory/model/OrgUserRelation.java
    • -1
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GoodPurchaseTableManager.java
3:56 下午

chenjiaru

解决jira问题：ZSYY-76 新增加“手术仪器管理”功能
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:33 下午

chenjiaru

解决jira问题：ZSYY-76 新增加“手术仪器管理”功能
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:15 下午

chenjiaru

解决jira问题：ZSYY-76 新增加“手术仪器管理”功能
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:10 下午

zengjc

解决回收项生成的装配任务加急字段会显示包定义和时间的问题.
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
2:53 下午

chenjiaru

解决jira问题：ZSYY-76 新增加“手术仪器管理”功能
Options
    • -3
    • +4
    /ssts-web/src/main/webapp/js/common.js
    • -2
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseTraceabilityInquiry.js
11:55 上午

adairkang

ZSYY-90 回收单加载申领模板是如果先添加包再选择科室出现装载问题。在添加器械包之前先选择科室
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
11:51 上午

zengjc

修正有模板的科室加载错误的问题.
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
11:30 上午

liuliben

材料发货单检索
Options
    • -7
    • +56
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java
    • -8
    • +150
    /ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.jsp
    • -62
    • +53
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
11:18 上午

zengjc

修正回收页面添加报损材料界面，保存、取消、添加质量监测按钮被遮住一点的问题.
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
10:52 上午

adairkang

ZSYY-88 PC端回收清点界面扫描科室条码可以打开申请单或创建申请单 配置项
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
10:49 上午

adairkang

ZSYY-88 PC端回收清点界面扫描科室条码可以打开申请单或创建申请单
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • -5
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
10:20 上午

shuyongfu

解决运作监控输入名称回收申请列表查不出数据的问题
Options
    • -1
    • +1
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
    • -0
    • +15
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
    • -0
    • +17
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManager.java
10:15 上午

shuyongfu

解决jira问题:QYSRMYY-1 清远市人民医院调用his系统webservice接口
Options
    • -0
    • +83
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/qysrmyy/FindPatientInfoByTreatmentNumDaoImpl.java
    • -0
    • +137
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/qysrmyy/WebServiceClientHelper.java
    • -0
    • +88
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/qysrmyy/DatasyncConstant.java
    • -0
    • +159
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/qysrmyy/SyncOrgUnitAndUserDaoImpl.java
    • -0
    • +96
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/qysrmyy/FindPatientInfoByHospitalNumDaoImpl.java
  6. /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/qysrmyy
10:11 上午

shuyongfu

注释错误进行调整
Options
    • -1
    • +1
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/FindPatientInfoByTreatmentNumDaoImpl.java
    • -1
    • +1
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/FindPatientInfoByHospitalNumDaoImpl.java
10:10 上午

shuyongfu

陈国强发回来的中大附一现场配置文件:增加"是否显示按器械包分组选择框"的配置项
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
Saturday 01 Jul 2017
4:30 下午

chenjiaru

解决jira问题：ZSYY-76 新增加“手术仪器管理”功能
Options
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -1
    • +2
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • -0
    • +16
    /ssts-web/src/main/webapp/js/common.js
    • -0
    • +11
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -0
    • +9
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • -0
    • +110
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseTraceabilityInquiry.java
    • -0
    • +186
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseTraceabilityInquiry.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -0
    • +341
    /ssts-web/src/main/webapp/jasperRtp/tousseTraceabilityInquiry.jrxml
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +19
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseTraceabilityInquiry.jsp
    • binary
    /ssts-web/src/main/webapp/jasperRtp/tousseTraceabilityInquiry.jasper
3:41 下午

zengjc

解决jira问题ZSYY-92，回收的丢失报损可以添加质量监测，并且可以关联质量监测，当丢失报损的记录删除时，也删除相关联的质量检测记录。
Options
    • -14
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp
    • -2
    • +69
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
    • -1
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -1
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -3
    • +74
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
    • -0
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoringInstance.java
    • -4
    • +40
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
    • -0
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialerrordamage/MaterialErrorDamageDetail.java
    • -2
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
    • -2
    • +36
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java
Friday 30 Jun 2017
6:44 下午

cherry

增加延时
Options
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java
2:24 下午

jeffli

装配加急任务时，校验数据库找到的加急任务加急数量是否大于0
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
9:55 上午

jeffli

去掉装配模块的同步关键字
Options
    • -0
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -1
    • +3
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -1
    • +1
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
Thursday 29 Jun 2017
9:07 下午

shuyongfu

解决oracle多线程灭菌和发货测试用例通不过的问题.

由于初始化的包实例超过1000个,查询时用in查询,由于子查询条件的元素超过1000个导致oracle语法报错(sqlserver支持超过1000,oracle最大只支持到1000个)

Options
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/synthetic/SterileAndInvoiceTests.java
8:01 下午

shuyongfu

所有项目的住院病人his接口调整,住院病人接口拆分成预约手术病人和已手术的病人两个接口
Options
    • -1
    • +18
    /ssts-web/src/main/resources/config/gd2zyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -1
    • +18
    /ssts-web/src/main/resources/config/sfypyfy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -1
    • +19
    /ssts-web/src/main/resources/config/gzspyqzyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -1
    • +17
    /ssts-web/src/main/resources/config/cszxyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -1
    • +24
    /ssts-web/src/main/resources/config/dgszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -1
    • +17
    /ssts-web/src/main/resources/config/demo/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -1
    • +2
    /ssts-web/src/main/resources/config/zjyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -1
    • +17
    /ssts-web/src/main/resources/config/zsykzx/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -1
    • +16
    /ssts-web/src/main/resources/config/gysdermyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -1
    • +16
    /ssts-web/src/main/resources/config/zsxlrmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -1
    • +19
    /ssts-web/src/main/resources/config/gzzyyfs/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -1
    • +18
    /ssts-web/src/main/resources/config/ljsrmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -1
    • +24
    /ssts-web/src/main/resources/config/hzszxrmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -1
    • +23
    /ssts-web/src/main/resources/config/zsszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -1
    • +17
    /ssts-web/src/main/resources/config/hdqrmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
  16. … 14 more files in changeset.
7:53 下午

shuyongfu

解决jira问题:CDSLQYQYYY-15 外来器械申领单界面调整
Options
    • -3
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
6:17 下午

cherry

优化调整
Options
    • -2
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • -6
    • +12
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
    • -1
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/factory/WaitFactory.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
2:17 下午

zhonghaowen

解决ZSYY-93:科室申领列表增加过滤条件和显示过滤
Options
    • -1
    • +18
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/config.js
    • -1
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -8
    • +5
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • -3
    • +5
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
2:08 下午

shuyongfu

解决审核管理:选择灭菌程序不一致的包的批量审核时的报错问题
Options
    • -3
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
11:13 上午

adairkang

CDSLQYQYYY-11 外来标签改进功能
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/print/printConfig.js
Wednesday 28 Jun 2017
2:01 下午

shuyongfu

增加对oracle通不过的测试用例的消毒物品包定义是的几个"是否.."属性是否赋值成功的断言
Options
    • -1
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/TestDisinfectGoodsSteriliManager.java