forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

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

Tuesday 13 Sep 2016
7:14 下午

chenjiaru

改善：PYQZYY-69 登录用户所在部门，绑定登录电脑的IP
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/systemset/operationDefine.xml
    • ?
    /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/homepage/menu.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
6:25 下午

zengjc

灭菌篮筐监控中的灭菌筐状态中的'灭菌'改为'灭菌中'，解决jira问题GDSRMYY-151
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/basketMonitor/sterileBasketMonitorView.js
6:00 下午

zengjc

装配管理灭菌程序中增加显示灭菌目的，解决jira问题广东省人民医院GDSRMYY-159.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/modifyTousseInstances.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
  3. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/service/SterilisationManager.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/packing/directPacking.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/service/SterilisationManagerImpl.java
5:59 下午

chenjiaru

改善：PYQZYY-69 登录用户所在部门，绑定登录电脑的IP
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/userIPAndOrgUnitMapping/userIPAndOrgUnitMappingForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/strtus_oa.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/action/UserAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/service/UserManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java
5:21 下午

wangyi

修复 同一种器械包，退货重装的装配任务和扫篮筐的装配任务可以分别装配，互不影响
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
4:39 下午

zhonghaowen

解决GDSRMYY-158:科室申领界面中模版显示的材料排序与在科室申领模版配置中的排序不一样
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
3:21 下午

wangyi

报表中设置统计物品grid增加行号列
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setGoodsOption.js
3:16 下午

zhonghaowen

解决PYQZYY-70:科室申领，申领一次性物品时，可以采用中包装规格进行申领
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/util/IntegerUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
11:12 上午

adairkang

器械包信息界面显示当前用户科室仓库的器械包
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
11:06 上午

jeffli

东莞中医院标签调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
11:01 上午

jeffli

东莞中医院标签调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
10:50 上午

wangyi

增加外来器械未拆包的情况下支持拆包干预功能
Options
    • ?
    /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/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.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-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.js
10:18 上午

jeffli

解决bug：

扫描不在发货计划中的外来器械包，提示文字前面有null

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
9:26 上午

cherry

更新PDA
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.4.28_20160821.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.4.30_20160912.apk
2:04 上午

chenjiaru

解决：PYQZYY-69 登录用户所在部门，绑定登录电脑的IP
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/useripandorgunitmapping/action
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/userIPAndOrgUnitMapping/userIPAndOrgUnitMappingForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/useripandorgunitmapping/dwr/UserIPAndOrgUnitMappingTableManager.java
  4. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/useripandorgunitmapping
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/useripandorgunitmapping/service/UserIPAndOrgUnitMappingManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/useripandorgunitmapping/action/UserIPAndOrgUnitMappingAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/useripandorgunitmapping/UserIPAndOrgUnitMapping.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/useripandorgunitmapping/service/UserIPAndOrgUnitMappingManagerImpl.java
  9. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/userIPAndOrgUnitMapping
  10. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/useripandorgunitmapping
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/userIPAndOrgUnitMapping/userIPAndOrgUnitMappingView.js
  12. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/useripandorgunitmapping/dwr
  13. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/useripandorgunitmapping/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/userIPAndOrgUnitMapping/userIPAndOrgUnitMappingView.jsp
2:00 上午

chenjiaru

解决：PYQZYY-69 登录用户所在部门，绑定登录电脑的IP
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/dwr.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/openSystemMainPage.jsp
1:57 上午

chenjiaru

解决：PYQZYY-69 登录用户所在部门，绑定登录电脑的IP
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/strtus_oa.xml
1:56 上午

chenjiaru

解决：PYQZYY-69 登录用户所在部门，绑定登录电脑的IP
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/service/UserManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/action/UserAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
Monday 12 Sep 2016
9:36 下午

adairkang

代理灭菌二次发货
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
  5. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/proxydisinfection
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/proxydisinfection/ProxyDisinfection.java
5:21 下午

jeffli

装配中灭菌程序默认为空，增加配置项packingPageAutoSetSterilizationProgramAfterSelectTousse

广东省人民医院GDSRMYY-156

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
4:46 下午

shuyongfu

省医科室、人员、使用记录的病人信息、物资入库及回写接口相关功能、同时增加省医的同步按钮配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/jetsuncrm/webservice/svrwebservice/WebServiceSoap_WebServiceSoap12_Server.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/jetsuncrm/webservice/svrwebservice/WebService.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/resources/com/forgon/directory/model/OrgUnit.hbm.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/gdsy/HIS.xml
  5. /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/webservice/helper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/StorageEntryItem.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/inventorymanagement/gdsy/dao/WriteBackInventoryDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/webservice/server/InventoryStockWebServiceImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/jetsuncrm/webservice/svrwebservice/WebServiceSoap12Impl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/gdsy/inStorageAuthConfig.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/gdsy/writeBackInventoryConfig.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/inventorymanagement/gdsy/dao/InventoryDao.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/OrgUnitVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
  16. … 23 more files in changeset.
4:09 下午

jeffli

修改提示信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
3:53 下午

jeffli

优化保存材料定义的校验和错误处理
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
3:13 下午

jeffli

外来器械申请界面图片显示问题(BUG)

广东省人民医院GDSRMYY-148

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js
3:08 下午

shuyongfu

应封枫的要求，器械包信息的有效期至列名改为失效日期，预警期至改为预警日期
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
3:05 下午

zengjc

修正外来器械导入重复材料的问题.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
3:03 下午

adairkang

入库单选择供应商后js报错
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
2:24 下午

zhonghaowen

解决GZFDZL-81:南院高级视图-科室申领-全部申请单没有显示每张单的申请科室（北院有）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
11:48 上午

zengjc

定期监测根据监测项范围显示监测项信息，解决jira问题DGDHYY-63.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
11:26 上午

adairkang

灭菌完成代码改造
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java