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 28978 is being indexed.

Tuesday 15 Sep 2020
3:50 下午

frank

解决ASSZDWY-63：自定义入筐手工入筐时不需要匹配材料和清洗篮筐的清洗分类类型，应允许任意入筐
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp
3:17 下午

frank

解决GDSZYY-15：科室申领模板增加物品默认申请数量的功能（多了个逗号）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateForm.js
2:54 下午

shuyongfu

解决:BJ307YY-9 PDA发货模块物品类型过滤为一次性物品后，页面无法加载数据
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
2:36 下午

frank

解决GDSZYY-15：科室申领模板增加物品默认申请数量的功能（多了个逗号）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateForm.js
11:28 上午

zc.li

解决：SZSDSRMYY-21。器械包登记丢失材料或报损材料后，在装配页面自动备注
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java
9:04 上午

terrykwan

对密码复杂度的功能进行改进，完成一部分功能，以满足广东省中医院上线的需要，密码只要包含字母和数字，不需要既有大写字母，又有小写字母。JIRA问题：QYSRMYY-26
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
Monday 14 Sep 2020
7:02 下午

zc.li

解决：SZSDSRMYY-21。器械包登记丢失材料或报损材料后，在装配页面自动备注
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.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/vo/WaitPackingTaskItemVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/util/UseRecordUtil.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/ErrorDamageDetailVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialerrordamage/ErrorDamageRemark.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialerrordamage/MaterialErrorDamageDetail.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
6:52 下午

jason

解决jira问题：GDSZYY-12广东省中医院 一次性物品接口开发
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/gdszyy/InventoryStockWebServiceImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/HIS.xml
6:33 下午

jason

解决jira问题：GDSZYY-15广东省中医院 科室申领模板增加物品默认申请数量的功能(科室申领模板和一次性物品定义联动修改)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
6:15 下午

frank

解决SZSDSRMYY-21：器械包登记丢失材料或报损材料后，在装配页面自动备注
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • ?
    /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/useRecord/useRecordView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/pic_bg4.png
6:10 下午

jason

解决jira问题：GDSZYY-15广东省中医院 科室申领模板增加物品默认申请数量的功能(科室申领模板和一次性物品定义联动修改)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java
6:05 下午

jason

解决jira问题：GDSZYY-15广东省中医院 科室申领模板增加物品默认申请数量的功能(科室申领模板和一次性物品定义联动修改)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java
5:59 下午

jason

解决jira问题：GDSZYY-15广东省中医院 科室申领模板增加物品默认申请数量的功能(科室申领模板和一次性物品定义联动修改)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
5:50 下午

frank

解决GDSZYY-15：科室申领模板增加物品默认申请数量的功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateForm.js
2:42 下午

shuyongfu

解决:ASSZDWY-65 浏览器登录存在着自动登出的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/portalPage.jsp
1:48 下午

zc.li

解决：BJ307YY-16。装配页面修改灭菌日期后，打印出来的灭菌日期没有修改。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
3:14 上午

terrykwan

提交密码复杂度的功能进行改进后的配置文件。JIRA问题：QYSRMYY-26
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jmszxyy/config.js
3:13 上午

terrykwan

对密码复杂度的功能进行改进，完成一部分功能，以满足广东省中医院上线的需要。JIRA问题：QYSRMYY-26
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByUnmodified.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/systemmanage/userFormExt.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js
Sunday 13 Sep 2020
11:37 下午

terrykwan

oracle用户名区分大小写，广东省中医院的用户名的英文均为大写，采用的是oracle数据库，因此不再转换为小写的用户名
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/security/userdetails/DaoUserDetailSSTSImpl.java
10:26 下午

shuyongfu

解决:GDSZYY-15 科室申领模板增加物品默认申请数量的功能(解决数量为0或空保存不生效)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java
10:10 下午

shuyongfu

解决:GDSZYY-15 科室申领模板增加物品默认申请数量的功能(如果有某个科室有多个使用模板，模板上有相同的物品，但默认数量不同，则取大的数量作为申请时的默认填写数量。)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
4:08 下午

jason

解决jira问题：GDSZYY-12 广东省中医院一次性物品接口开发
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/gdszyy/InventoryDaoImpl.java
3:48 下午

jason

解决jira问题：GDSZYY-12 广东省中医院一次性物品接口开发
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/gdszyy/InventoryStockWebServiceImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/gdszyy/WebServiceClientHelper.java
  4. /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/gdszyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/gdszyy/InventoryDao.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/gdszyy/InventoryStockWebService.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/gdszyy/InventoryDaoImpl.java
  8. /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/Inventory
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/webservice-cxf.xml
2:59 下午

jason

解决jira问题：GDSZYY-17 广东省中医院 临床科室可维护并且只能维护自己科室的申领模板
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.48_4.9.49.sql
1:39 下午

jason

解决jira问题：GDSZYY-17广东省中医院 临床科室可维护并且只能维护自己科室的申领模板(替一帆提交)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menu.jsp
1:00 下午

jason

解决jira问题：GDSZYY-17 广东省中医院 临床科室可维护并且只能维护自己科室的申领模板
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.48_4.9.49.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/departmentapplicationtemplate/DepartmentAppTemplate.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/systemset/operationDefine.xml
  6. /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/dwr
  7. /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/dwr/table
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/dwr/table/DepartmentAppTemplateTableManager.java
10:45 上午

terrykwan

提交广东省中医院的配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/webservice-cxf.xml
Saturday 12 Sep 2020
12:21 上午

terrykwan

提交广东省中医院的配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/syncFromHERP_Mapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js
  4. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/img
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/img/logo_gdszyy.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/webservice-cxf.xml
Friday 11 Sep 2020
9:01 下午

frank

解决SSTS-195：自定义入筐界面，修改回收数量会有js报错
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp
8:51 下午

zc.li

解决：ZSYY-274。工作质量持续收集报表统计到的专科器械清洗量与工作量统计报表查询到的专科分组器械清洗量不一致。增加配置项operatingRoomCodes，针对本定制报表。不再写死手术一区手术二区手术三区。例如：operatingRoomCodes : "6412,6400"。使用6412和6400的编码所代表的科室代替原来写死的手术一区手术二区手术三区。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfZsyy.java