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

Wednesday 05 Aug 2020
5:01 下午

shuyongfu

解决:DGSDBZXYY-32 使用记录转换为申请单时，要支持转换使用记录单中的消毒物品
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.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/basedatamanager/toussedefinition/TousseDefinition.java
2:22 下午

zc.li

修复：NYSY-6。开启配置项查询手术间时历史回收记录不能显示的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
2:20 下午

zc.li

修复：NYSY-6。开启配置项查询手术间时历史回收记录不能显示的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
11:55 上午

zengyuan

优化：ZSWY-109;消毒物品通过扫描包外标签的条码回收后，看不到装配任务，出现大量积压的待装配物品的问题(增加对隔多代的消毒物品的处理),小黎做的修改，我只是提交
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
11:49 上午

shuyongfu

增加数据升级相关的代码注释说明

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/dataupdater/service/UpdateDataBetween2VersionImpl.java
11:47 上午

zc.li

优化：ZSWY-109;消毒物品通过扫描包外标签的条码回收后，看不到装配任务，出现大量积压的待装配物品的问题(增加对隔多代的消毒物品的处理)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
11:09 上午

shuyongfu

找回被删除的用升级方法升级数据版本的spring bean配置重新补上

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-service.xml
Tuesday 04 Aug 2020
8:55 下午

shuyongfu

相关类增加toString实现便于调试程序,去掉不用的import语句
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/util/UseRecordUtil.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-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveDisposablegoods.java
8:55 下午

frank

解决ZSRY-2：资产归属功能改进（过滤已停用的科室）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
8:54 下午

shuyongfu

解决:DGSDBZXYY-32 使用记录转换为申请单时，要支持转换使用记录单中的消毒物品
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationUtils.java
8:33 下午

frank

解决DGSDBZXYY-70:装配页面登记质量监测时扫描清洗篮筐有JS报错
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
5:48 下午

frank

解决ZSWY-130：装配界面的待装配任务表格的物品名称和清洗篮筐列的显示方式改进（兼容加大字体的情况）
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/packing/packingView.jsp
5:38 下午

frank

解决ZSWY-130：装配界面的待装配任务表格的物品名称和清洗篮筐列的显示方式改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
5:16 下午

zc.li

解决：NYSY-6。二级供应室录入加急的回收单，申请科室也是二级供应室自己的，没有红色“急”字背景
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingRecordVo.java
5:12 下午

frank

解决NYSY-6：二级供应室录入加急的回收单，申请科室也是二级供应室自己的，没有红色“急”字背景
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
4:34 下午

frank

解决DGSDBZXYY-71：标签模板设计的表头字体大小设置了没反应
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj.js
3:53 下午

shuyongfu

处理:PYQZYY-178

7月31日申请了一次性物品：一次性灭菌棉垫，数量180，发货时第一次发了60，第二次发了120，现在发货计划里显示还有120未发

发货时检索要发货的申请项增加对申请单的处理科室编码为当前用户所在科室的过滤条件

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
3:50 下午

frank

优化了DGSDBZXYY-22聚合包功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
3:41 下午

shuyongfu

处理:ASSFDZLYY-28 PC与PDA端一次性物品和高值耗材无法同时发货

jdk集合操作的异常问题.一个list只能被remove一次,再remove一次就报java.util.ConcurrentModificationException

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
3:25 下午

frank

优化了装配界面
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
2:19 下午

frank

优化DGSDBZXYY-22：聚合包功能优化（材料不齐全，不能一键聚合）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
1:52 下午

zengyuan

解决:中大五院ZSWY-132 待审核列表可精确选择每页显示的记录的数量
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
1:49 下午

frank

解决IE8装配页面报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
1:43 下午

jason

解决jira问题： DGSDBZXYY-69 东莞市东部中心医院 器械包信息导出的数据与查询出来的数据不一致
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
11:57 上午

zc.li

修复科室运作监控申请物品的数量为0也会显示的情况;

修复科室运作监控物品因为其他数量为0,但是使用数量不为0时,也会显示出来的问题;

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:53 上午

frank

运行监控页面删除使用数量
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperate.js
11:48 上午

zc.li

解决：NYSY-8。追加需求：新增对不产生申请单的数据的显示支持。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:19 上午

frank

解决打印待召回物品LODOP为null的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js
10:58 上午

frank

解决打开外部代理灭菌管理sstsConfig is not defined的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp
Monday 03 Aug 2020
7:03 下午

frank

解决ZSWY-130：装配界面的待装配任务表格的物品名称和清洗篮筐列的显示方式改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js