forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 50
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 50
Total Lines of Code (LoC): 0
Net change in LoC this week: 0

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
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 24216 is being indexed.

Wednesday 05 Sep 2018
6:55 下午

heweisong

新疆军区总医院最新版本
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
4:14 下午

shuyongfu

解决Jira问题:ZSSXLRMYY-164 装配页面增加返回器械包图片按钮 “查看器械包图片”按钮名称改为“查看包图片”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
2:37 下午

yanweining

JMSZXYY-73：所有材料库存盘点为0后,导出的报表里的材料数量为未盘点前
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
2:35 下午

yanweining

代码格式优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
2:19 下午

jeffli

新疆军区总医院XJJQZYY-7

条码增加二维码显示

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/printbarcode/action/PrintBarcodeAction.java
2:16 下午

jeffli

新疆军区总医院XJJQZYY-7

条码增加二维码显示

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationView.jsp
12:00 下午

yanweining

添加:责任环节设置，缺陷信息登记类型设置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menu.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/systemset/operationDefine.xml
10:56 上午

jeffli

新疆军区总医院XJJQZYY-7

条码增加二维码显示

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
10:49 上午

yanweining

复大肿瘤：

合同管理：

1、其他合同录入时，物品类型可以手动填

2、增加字段：单位

3、合同编号自由填

4、导出合同excel按钮

供应商：

1、导出供应商excel按钮

2、供应商授权支持多级授权

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/certificate/service/CertificateManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/authorizationCertificateForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/ContractManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/contract/contractWarningView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/ContractAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ContractItem.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/certificate/service/CertificateManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/contract/contractWarningFrom.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/ContractManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/exportSupplier.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/Contract.java
  16. … 4 more files in changeset.
10:40 上午

jeffli

新疆军区总医院XJJQZYY-7

条码增加二维码显示

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.jsp
10:36 上午

adairkang

待回收列表显示的物品明细不对的问题（用了同id的历史回收记录的物品明细）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
10:10 上午

jeffli

新疆军区总医院XJJQZYY-7

条码增加二维码显示

Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/printbarcode
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/printbarcode/action
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/printbarcode/action/PrintBarcodeAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.jsp
10:10 上午

jeffli

新疆军区总医院XJJQZYY-7

条码增加二维码显示

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js
10:05 上午

shuyongfu

增加责任环节的菜单
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
Tuesday 04 Sep 2018
9:45 下午

adairkang

监测项为无就不过滤
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
8:51 下午

adairkang

PDA版质量监测，灭菌和质量检测列表添加分布显示的功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/servlet/UploadServlet.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/action/QualityMonitoringDefinitionAction.java
8:08 下午

terrykwan

增加try catch方法，捕获异常信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
8:04 下午

terrykwan

在Class上增加@Component的注解，解决TestNG运行时它的objectDao属性为null的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
6:10 下午

shuyongfu

解决Jira问题:ZSSXLRMYY-164 装配页面增加返回器械包图片按钮
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
4:54 下午

jeffli

新疆军区总医院XJJQZYY-7

条码增加二维码显示

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
3:43 下午

jeffli

广州中医药大学第一附属医院GZZYYFY-11

外来器械标签模板补充字段

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
2:25 下午

shuyongfu

装配生成包实例(装配任务装配、外来器械装配、聚合包装配、外部代理灭菌装配、干预修改灭菌记录等)时根据灭菌程序设置灭菌方式的性能优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
2:25 下午

jeffli

广州中医药大学第一附属医院GZZYYFY-11

外来器械标签模板补充字段

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
11:19 上午

adairkang

牟立婷修改的调拨单打印，增大字体并删除了两列内容
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/print/printConfig.js
11:05 上午

yanweining

更新新疆军区总医院现场接口文件

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/xjjqzyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/xjjqzyy/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/xjjqzyy/mybatis/SyncOrgUnitAndUserMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/xjjqzyy/mybatis/SyncOperationReservation_Mapper.xml
10:18 上午

jeffli

广州中医药大学第一附属医院GZZYYFY-11

外来器械标签模板补充字段

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
Monday 03 Sep 2018
4:49 下午

simon.bai

SSTS-Rebuild:基础目录结构搭建、公共文件上传
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-x-editable-develop/test/libs/bootstrap222/img
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-x-editable-develop/src/inputs/datetime/bootstrap-datetimepicker/css/datetimepicker.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/bootstrap/js/bootstrap-transition.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/bootstrap/less-ie6/responsive-768px-979px.less
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/bootstrap/less/pager.less
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-x-editable-develop/.gitignore
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-x-editable-develop/test/libs/bootstrap221/js/bootstrap.min.js
  8. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/ie-6/html5shiv-3.7.3/test/unit
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-x-editable-develop/test/libs/poshytip/tip-yellowsimple/tip-yellowsimple_arrows.gif
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/ie-6/html5shiv-3.7.3/test/jquery-1.7.1/unit/traversing.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/bootstrap/js/tests/unit/bootstrap-carousel.js
  12. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-datetimepicker/branch
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-x-editable-develop/src/inputs/select2/lib/select2x2.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/ie-6/Respond-master/test/unit/test-with-comment.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-select/dist/js/i18n/defaults-ro_RO.js
  16. … 871 more files in changeset.
4:30 下午

jeffli

新疆军区总医院XJJQZYY-3

增加扫描器械包定义名称使用标识牌功能

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
4:15 下午

yanweining

JMSZXYY-73：所有材料库存盘点为0后,导出的报表里的材料数量为未盘点前
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
3:42 下午

jeffli

新疆军区总医院XJJQZYY-3

增加扫描器械包定义名称使用标识牌功能

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js