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

Tuesday 26 Mar 2019
10:01 下午

shuyongfu

解决:添加灭菌记录、选择灭菌炉后反应慢的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
8:36 下午

terrykwan

解决快速回收保存止血带无法成功的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
5:30 下午

yk

新建项目福建柘荣县医院 ： project=fjzrxyy
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fjzrxyy/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/fjzrxyy/mybatis/SyncOrgUnitAndUserMapper.xml
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/fjzrxyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/fjzrxyy/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/fjzrxyy/dataSyncConfig.json
  6. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/fjzrxyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/fjzrxyy/mybatis/syncFromHERP_Mapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fjzrxyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/fjzrxyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
  10. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/fjzrxyy/mybatis
  11. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fjzrxyy/print
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/fjzrxyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
  13. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fjzrxyy
Monday 25 Mar 2019
7:38 下午

zc.li

解决回收添加器械包向后台查询数据时，会把不需要回收的包也查询出来的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
2:59 下午

shuyongfu

解决Jira问题:ASSZSYK-38未灭菌的器械包能录入使用记录
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/zsykzx/HerpPathManagerImpl.java
11:45 上午

shuyongfu

解决Jira问题:GZZYYFY-31 PDA发货一次性物品时增加一键扫描一次性物品功能按钮
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.68_20190325_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
9:34 上午

zc.li

解决：GZZYYFY-31。PDA发货后台支持一键扫描一次性物品。CSSDSYY-2：PDA,PC发货模块添加器械包分组过滤。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.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/recyclingapplication/controller/InvoicePlanController.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoicePlanManagerTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForProxyDisinfectionTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/synthetic/allrecycle/service/InvoiceModule.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/controller/InvoiceController.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
Saturday 23 Mar 2019
6:32 下午

weizhenyu

ASSJMSZXYY-20：材料出库单的打印格式优化（数量和金额靠右对齐）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
4:40 下午

weizhenyu

（修复）材料发货管理模块，页面点击添加，进入材料发货单信息的窗口，并输入完数量后，直接回车，添加出来的数量和价格会颠倒
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js
3:14 下午

terrykwan

提交现场修改的打印格式
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/print/printConfig.js
1:48 下午

yanweining

同步新疆军区医院，现场timer.xml文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/xjjqzyy/timer.xml
1:47 下午

weizhenyu

CSSDSYY-2:PDA发货任务模块及PC端发货计划模块，增加“器械包分组”过滤的功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
12:49 下午

weizhenyu

GZZYYFY-31：PDA发货一次性物品时增加一键扫描一次性物品功能按钮。是否启用按钮的配置项。

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/config.js
9:50 上午

weizhenyu

（修复）审核模块 ：待审核任务列表的行被选中的情况下并再次点击取消选中状态，控制台报错“无法获取未定义或null的属性get，”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
Friday 22 Mar 2019
7:21 下午

terrykwan

增加判断当前用户帐号是否为管理员的方法
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/tools/Util.java
6:48 下午

zengyuan

标识牌打印不能铺满的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
4:41 下午

yanweining

ASSZJYY-3：灭菌报告问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/util/ForgonDateUtils.java
4:19 下午

yanweining

findDisposableGoodsListWhitStock方法 增加判空
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
11:29 上午

LiHaiFeng

处理快速入筐保存时遗漏提交一单
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.js
11:20 上午

LiHaiFeng

处理快速入筐保存时遗漏提交一单
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.js
9:52 上午

zc.li

解决：XJJQZYY-56。包装区工作量及不合格率报表消毒物品统计方式做成了配置项，默认showDisinfectionByPackage:false按照材料统计，开启配置项,showDisinfectionByPackage:true后按照包统计。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
9:38 上午

zc.li

完善：XJJQZYY-50 XJJQZYY-52，更改关联列，又关联包实例的invoicePlanID改为recyclingApplication_ID.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
9:29 上午

terrykwan

解决快速入筐后，部分单仍然处于已清点状态的问题。XJJQZYY-37 回收清点与入筐的操作分开
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Thursday 21 Mar 2019
7:33 下午

weizhenyu

GDSRMYY-484: 发货计划的申请单的变色：含非今天和不含非今天的物品的底色差别
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/common.css
7:30 下午

weizhenyu

GDSRMYY-484: 发货计划的申请单的变色：含非今天和不含非今天的物品的底色差别
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
7:01 下午

weizhenyu

GDSRMYY-484: 发货计划的申请单的变色：含非今天和不含非今天的物品的底色差别
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
2:45 下午

weizhenyu

广东省人民医院GDSRMYY-484

发货计划模块扫描后物品的背景色变色（PC端）

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
1:00 下午

LiHaiFeng

修改清点确认前整包清洗入筐限制
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
11:13 上午

LiHaiFeng

回复到之前的版本
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp
10:06 上午

LiHaiFeng

修改新页面下拉组合框样式
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/slick.enhancementpager.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dx-disinfectsystem/plugins/SlickGrid/slick.grid.css