forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 46
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 46
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 16286 is being indexed.

Monday 19 Dec 2016
3:04 下午

zengjc

修正对旧的已确认的灭菌记录点击灭菌完成错的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
2:12 下午

jeffli

历史装配记录增加扫描灭菌篮筐功能

东莞中医院DGZYY-55

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
1:44 下午

zengjc

灭菌未确认记录，是否确认属性值为null，也显示在当天记录列表.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
1:05 下午

chenjiaru

生物监测的时间默认为190分钟
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
12:59 下午

shuyongfu

增加重名科室干预功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/treenode/service/THTreeNodeManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/action/ProcessSameOrgunitNameController.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-action.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menu.jsp
10:55 上午

zhonghaowen

明细核算月报下拉物品改成分页显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
10:48 上午

chenjiaru

写了数据库升级脚本，处理旧数据
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.4.9_4.4.10.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/Constants.java
9:46 上午

zhonghaowen

解决SSTS-81:组织机构编辑时,选择人员的下拉框做成分页显示,优化性能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/applicationContext-service.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/selPersonByOrgUnitByExt.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/entity/PageEntity.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/DirectoryManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/vo/DirectoryVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/DirectoryManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/util/ObjectUtil.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/extendProJs.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/DirectoryReHandler.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/util/PageUtil.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/selPersonByOrgUnitByExt.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/systemmanage/orgUnitExt.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/orgUnitHelper.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/action/DirectoryAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/Ext2CompUtil.js
1:27 上午

terrykwan

解决1024x768分辨率下，教学图片显示不全的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/tousesPackingTeachingImage.js
1:26 上午

terrykwan

优化装配界面的显示速度，将css放到页面头部，js放到body下部。部分js文件改为并行加载
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
12:18 上午

terrykwan

减少ExtJS组件的过度嵌套，加快页面的显示速度
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
12:07 上午

terrykwan

去掉不需要的引用
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
Sunday 18 Dec 2016
11:13 下午

chenjiaru

解决：PYQZYY-122 灭菌记录各种监测的结果和历史记录的结果
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
  16. … 3 more files in changeset.
10:31 下午

chenjiaru

外来器械使用后交接报表的清洗者签名，如果篮筐责任人有则取记篮筐责任人，如果没有则记清洗操作员
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
6:14 下午

jeffli

重构装配代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
5:56 下午

adairkang

核算月报价格统计或者数据统计只有一列的时候，使用单列的模板，同时显示的名称从配置中读取

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
5:50 下午

adairkang

核算月报单价格统计或者数据统计只有一列的模板

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportOneColumn.jasper
5:42 下午

adairkang

核算月报单价格统计或者数据统计只有一列的模板

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportOneColumn.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportOneColumn.jasper
5:04 下午

terrykwan

增加对只引用了Ext4的API的jsp文件的支持
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
4:25 下午

adairkang

价格统计或者数据统计只有一列的模板
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportOneColumn.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportOneColumn.jrxml
4:07 下午

adairkang

核算月报只有一列的模板
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportOneColumn.jrxml
2:53 下午

adairkang

中大五院发货计划打印，签名的项只在最后一页上打印
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
12:04 下午

zengjc

从责任环节进入质量检测的录入，监测项支持不做限制，目前只有中大五院，番禺区中医院进行配置。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js
Friday 16 Dec 2016
5:50 下午

adairkang

添加配置，审核界面，审核人是否可以为空
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
4:51 下午

zengjc

灭菌未确认记录显示部分功能漏提交的代码.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
4:09 下午

zengjc

配了灭菌需要完成确认，则确认的灭菌记录在当天的灭菌记录列出.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
3:49 下午

zhonghaowen

修改科室申领申请单弹框大小
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
3:03 下午

jeffli

器械包定义增加自定义装配打印标签属性
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.4.8_4.4.9.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/Constants.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
2:23 下午

zhonghaowen

1.修改打印发货计划设置弹窗大小

2.修改打印发货单设置弹窗大小

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/printRecyclingConfig2/printRecyclingConfigForm2.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/printInvoiceConfig/printInvoiceConfigForm.js
1:41 下午

jeffli

外部代理灭菌，临床科室填单后，供应室不能修改

番禺区中医院PYQZYY-123

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java