• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
解决jira问题:GZSZYY-77【系统迁移兼容】文件和图片上传、下载的路径分隔符修改为Linux系统的正斜杠“/”
    • -1
    • +1
    ./expensiveGoods/action/ExpensiveGoodsAuthorizationAction.java
  1. … 29 more files in changeset.
解决jira问题:GZSZYY-71 系统适配TiDB数据库
    • too large
    ./expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • -0
    • +4
    ./expensiveGoods/service/ExpensiveGoodsBatchStockManagerImpl.java
  1. … 66 more files in changeset.
解决jira问题:GZSZYY-52 以Execl格式导出高值耗材模块数据
    • too large
    ./expensiveGoods/service/ExpensiveGoodsManagerImpl.java
解决jira问题:GZSZYY-52 以Execl格式导出高值耗材模块数据
    • too large
    ./expensiveGoods/service/ExpensiveGoodsManagerImpl.java
解决jira问题:GZSZYY-52 以Execl格式导出高值耗材模块数据
    • -0
    • +8
    ./expensiveGoods/service/ExpensiveGoodsManager.java
    • -0
    • +50
    ./expensiveGoods/action/ExpensiveGoodsAction.java
    • too large
    ./expensiveGoods/service/ExpensiveGoodsManagerImpl.java
解决jira问题:ZJYY-121 允许某些一次性物品的字段“批次”、“失效日期”为非必填项的功能开发
    • -6
    • +2
    ./expensiveGoods/action/ExpensiveGoodsStockAction.java
  1. … 25 more files in changeset.
测试objectDao.findSqlByParam方法返回map格式的集合形式的key的大小写问题(oracle数据库查出数据返回map的结果后转换成json时key为大小,sqlserver为小写)的处理
    • too large
    ./expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • -1
    • +4
    ./expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
    • -1
    • +1
    ./expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java
  1. … 12 more files in changeset.
解决:DGSDBZXYY-123。发货物品统计月报的外来器械包没有按包来统计而是按包内材料数量来统计
    • too large
    ./expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
    • too large
    ./expensiveGoods/service/ExpensiveGoodsManagerImpl.java
  1. … 8 more files in changeset.
解决:ASSGZSZYY-15 高值耗材系统预入库单新增物品时提示高值耗材与供应商获取不到得被授权的授权对象
    • too large
    ./expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
解决:ASSZSLY-21。器械件数增加配置项,决定或者最新包定义的材料总数还是当时的材料总数。
    • too large
    ./expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
  1. … 54 more files in changeset.
解决快速发货包实例数量超过32767条的错误(sqlserver),已改为分批处理,每批最只多只处理32767条
    • too large
    ./expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
  1. … 10 more files in changeset.
GZSZYYGZHC-35:高值耗材包定义被删,导致没法入库
    • too large
    ./expensiveGoods/service/ExpensiveGoodsManagerImpl.java
  1. … 2 more files in changeset.
解决Jira问题:GYEY-701 外来器械、外部代理灭菌实现多个供应室处理
    • too large
    ./expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
  1. … 19 more files in changeset.
sql工具类优化,in集合条件换成大集合的方法
    • -2
    • +2
    ./expensiveGoods/action/ExpensiveGoodsAction.java
    • too large
    ./expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • -1
    • +1
    ./expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
    • -2
    • +2
    ./expensiveGoods/service/ExpensiveGoodsBatchStockManagerImpl.java
    • -7
    • +7
    ./expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java
    • too large
    ./expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
  1. … 10 more files in changeset.
GZSZYYGZHC-29:高值耗材实例列表功能增强
    • -35
    • +367
    ./expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java
    • -0
    • +190
    ./expensiveGoods/action/ExpensiveGoodsAction.java
    • -0
    • +7
    ./expensiveGoods/service/ExpensiveGoodsManager.java
    • too large
    ./expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • -25
    • +52
    ./expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
  1. … 12 more files in changeset.
解决bug:

高值耗材一键退库没有记退库单和项的id

    • too large
    ./expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
解决bug:

高值耗材一键退库没有记退库单和项的id

    • too large
    ./expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
广州市中医院高值耗材GZSZYYGZHC-28(证件过期提示增加显示信息)

1、生产厂家添加到主页面上;

2、授权代理商详细信息(跟定义中一样)添加到详情页面;

    • -0
    • +2
    ./expensiveGoods/service/ExpensiveGoodsManager.java
    • -0
    • +7
    ./expensiveGoods/action/ExpensiveGoodsAction.java
    • too large
    ./expensiveGoods/service/ExpensiveGoodsManagerImpl.java
  1. … 3 more files in changeset.
高值耗材:解决高值耗材入库单按申请单号排序时报错
    • -0
    • +1
    ./expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
    • too large
    ./expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
  1. … 4 more files in changeset.
优化发货速度,改为不刷新的锁定
    • too large
    ./expensiveGoods/service/ExpensiveGoodsManagerImpl.java
  1. … 2 more files in changeset.
GZSZYYGZHC-26:高值耗材物品型号对应价格
    • -5
    • +6
    ./expensiveGoods/action/ExpensiveGoodsAction.java
    • too large
    ./expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
  1. … 3 more files in changeset.
广州市中医院高值耗材GZSZYYGZHC-26(高值耗材物品型号对应价格)

给高值耗材型号增加参考价属性

1、可以页面修改

2、支持导入

3、默认型号的参考价取定义的参考价

4、导入时,定义的参考价是对应的最后一个型号的参考价

5、申请单,入库单还未处理

    • too large
    ./expensiveGoods/service/ExpensiveGoodsManagerImpl.java
  1. … 3 more files in changeset.
GZSZYYGZHC-23:发票管理和发货单管理打印增加格式和打印功能
    • -1
    • +1
    ./expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
GZSZYYGZHC-23:发票管理和发货单管理打印增加格式和打印功能
    • -24
    • +101
    ./expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
    • too large
    ./expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
    • -1
    • +25
    ./expensiveGoods/action/ExpensiveGoodsBillAction.java
    • -11
    • +9
    ./expensiveGoods/service/ExpensiveGoodsBillManager.java
  1. … 11 more files in changeset.
GZSZYYGZHC-17 高值耗材申请单打印增加打印功能
    • -0
    • +13
    ./expensiveGoods/service/ExpensiveGoodsInstanceManagerImpl.java
    • -0
    • +7
    ./expensiveGoods/service/ExpensiveGoodsGodownEntryItemManager.java
    • -0
    • +15
    ./expensiveGoods/service/ExpensiveGoodsGodownEntryItemManagerImpl.java
    • -0
    • +8
    ./expensiveGoods/service/ExpensiveGoodsInstanceManager.java
  1. … 16 more files in changeset.
申请项设置包定义祖先id
    • too large
    ./expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
  1. … 15 more files in changeset.
高值耗材发票:暂存后再保存,开票时间需要精确到时分
    • -3
    • +4
    ./expensiveGoods/action/ExpensiveGoodsBillAction.java
GZSZYYGZHC-16:发票管理对应高值耗材实例模式更改
    • -55
    • +197
    ./expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
    • -19
    • +31
    ./expensiveGoods/action/ExpensiveGoodsBillAction.java
    • -0
    • +16
    ./expensiveGoods/service/ExpensiveGoodsBillManager.java
  1. … 2 more files in changeset.
解决Jira问题:GZSZYYGZHC-8 高值耗材申请单改进
    • too large
    ./expensiveGoods/service/ExpensiveGoodsManagerImpl.java
  1. … 1 more file in changeset.
去掉不用的类的引用
    • -5
    • +2
    ./expensiveGoods/action/ExpensiveGoodsStockAction.java
    • -3
    • +1
    ./expensiveGoods/service/ExpensiveGoodsBatchStockManager.java
    • -3
    • +0
    ./expensiveGoods/dwr/table/ExpensiveGoodsGodownEntryTableManager.java
    • -4
    • +4
    ./expensiveGoods/service/ExpensiveGoodsPurchaseTableFilterManagerImpl.java
    • -2
    • +0
    ./expensiveGoods/dwr/table/ExpensiveGoodsPurchaseTableManager.java
    • -1
    • +0
    ./expensiveGoods/action/ExpensiveGoodsImportController.java
    • -3
    • +0
    ./expensiveGoods/service/ExpensiveGoodsBatchStockManagerImpl.java
    • -1
    • +0
    ./expensiveGoods/service/ExpensiveGoodsBillManager.java
    • -3
    • +0
    ./expensiveGoods/util/ExpensiveGoodsUtils.java
    • -4
    • +3
    ./expensiveGoods/service/ExpensiveGoodsStorageRecordManagerImpl.java
    • -19
    • +0
    ./expensiveGoods/action/ExpensiveGoodsBillAction.java
    • -5
    • +0
    ./expensiveGoods/service/ExpensiveGoodsStockManager.java
    • -15
    • +0
    ./expensiveGoods/dwr/table/ExpensiveGoodsBillTableManager.java