• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
解决 ZSYY-423 【外来器械包申请】新增一单多套模式下也支持再次翻包申请
    • too large
    ./recyclingapplication/service/InvoicePlanManagerImpl.java
  1. … 1 more file in changeset.
解决jira问题:ZSYY-423 【外来器械包申请】新增一单多套模式下也支持再次翻包申请。
    • too large
    ./foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
解决jira问题:ZSYY-423 【外来器械包申请】新增一单多套模式下也支持再次翻包申请。
    • too large
    ./foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
解决jira问题:ZSYY-422 【外来器械包申请】新增多项改进(可查看整包归还物品,快捷二次回收跳转条件变更)
    • too large
    ./foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • too large
    ./recyclingapplication/service/InvoicePlanManagerImpl.java
解决jira问题:ZSYY-423 【外来器械包申请】新增一单多套模式下也支持再次翻包申请。
    • too large
    ./foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
解决jira问题:ZSYY-422 【外来器械包申请】新增多项改进(可查看整包归还物品,快捷二次回收跳转条件变更)
    • too large
    ./foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • -1
    • +7
    ./foreigntousseapplication/action/ForeignTousseApplicationAction.java
    • -0
    • +12
    ./foreigntousseapplication/service/ForeignTousseApplicationManager.java
解决jira问题:ZSYY-422 【外来器械包申请】新增多项改进(可查看整包归还物品,快捷二次回收跳转条件变更)
    • too large
    ./foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
解决jira问题:SSTS-755 装配时拆包的外来器械包,在二次回收后不能确认归还的问题
    • too large
    ./foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
解决jira问题:SSTS-755 装配时拆包的外来器械包,在二次回收后不能确认归还的问题
    • too large
    ./recyclingapplication/service/InvoicePlanManagerImpl.java
    • too large
    ./foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
提交2025年3月30日至6月2日期间的源代码,因6月2日感染了勒索病毒,所以提交本地备份的最新的源代码
    • -7
    • +15
    ./foreigntousseapplication/service/ForeignTousseApplicationManager.java
    • -0
    • +229
    ./foreigntousseapplication/vo/ForeignTousseDefinitionStatusVo.java
    • -1
    • +9
    ./operationreservation/action/OperationReservationAction.java
    • -2
    • +5
    ./foreigntousseapplication/action/ForeignTousseApplicationAction.java
    • -0
    • +13
    ./adverseeventrecord/service/AdverseEventRecordManager.java
    • -1
    • +0
    ./recyclingapplication/action/InvoicePlanAction.java
    • -59
    • +147
    ./foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java
    • too large
    ./recyclingapplication/service/InvoicePlanManagerImpl.java
    • too large
    ./foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • -5
    • +326
    ./operationreservation/service/OperationReservationManagerImpl.java
    • -1
    • +1
    ./toussetransition/action/TousseTransitionAction.java
    • -1
    • +2
    ./recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
    • -0
    • +35
    ./adverseeventrecord/action/AdverseEventRecordAction.java
    • -0
    • +61
    ./adverseeventrecord/vo/AdverseEventWarnOrgUnitVo.java
    • -1
    • +139
    ./adverseeventrecord/service/AdverseEventRecordManagerImpl.java
  1. … 421 more files in changeset.
增加c3p0日志输出到log4j文件 启动时需配置jvm参数 -Dcom.mchange.v2.log.MLog=com.mchange.v2.log.log4j.Log4jMLog;增加获取连接池信息接口 ;修复一些连接可能泄露的地方
    • -1
    • +13
    ./foreigntousseapplication/action/ForeignTousseApplicationAction.java
完善 SSTS-609 终止申请物品或申请单时,检验所在篮筐内的是否全部终止,如果是,则修改篮筐状态
    • too large
    ./recyclingapplication/service/InvoicePlanManagerImpl.java
解决jira问题:QHRSGZZYY-2【小程序】新增小程序平台以及外来申请单厂商下单功能
    • -0
    • +88
    ./foreigntousseapplication/vo/WeChatMiniProgForeignTousseVo.java
    • -0
    • +101
    ./foreigntousseapplication/dto/WeChatMiniProgForeignTousseApplicationDto.java
    • -0
    • +88
    ./foreigntousseapplication/dto/WeChatMiniProgForeignTousseDto.java
    • -0
    • +181
    ./foreigntousseapplication/vo/WeChatMiniProgForeignTousseApplicationVo.java
    • -12
    • +9
    ./foreigntousseapplication/action/ForeignTousseApplicationAction.java
    • -0
    • +206
    ./foreigntousseapplication/vo/ForeignTousseSaveVo.java
    • -0
    • +112
    ./foreigntousseapplication/dto/WeChatMiniProgForeignTousseMaterialDto.java
    • -0
    • +125
    ./foreigntousseapplication/vo/ForeignTousseMaterialSaveVo.java
    • -0
    • +92
    ./foreigntousseapplication/controller/ForeignTousseApplicationWeChatMiniProgramController.java
    • -0
    • +26
    ./foreigntousseapplication/service/ForeignTousseApplicationManager.java
    • -0
    • +112
    ./foreigntousseapplication/vo/WeChatMiniProgForeignTousseMaterialVo.java
    • too large
    ./foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
  1. … 20 more files in changeset.
解决jira问题:ZJYY-157 【借物管理】自动还物功能支持消毒物品
    • too large
    ./recyclingapplication/service/RecyclingApplicationManagerImpl.java
解决jira问题:ZJYY-157 【借物管理】自动还物功能支持消毒物品
    • too large
    ./recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -1
    • +1
    ./recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
处理:SSTS-734 关于发货计划 搜索 申请科室无法过滤, 选择科室分组无法过滤 的BUG
    • too large
    ./recyclingapplication/service/InvoicePlanManagerImpl.java
解决jira问题:DGSDBZXYY-251【加急告警】enableTousseVoluntarilyUrgent配置项新增加急提醒详细模式
    • too large
    ./recyclingapplication/service/RecyclingApplicationManagerImpl.java
  1. … 8 more files in changeset.
处理:HNSETYY-11 【外来器械申请单】申请多套一模一样的器械包,多套器械包一起入同一个篮筐再进行装配后,发货计划的待发货任务就会变成一套器械包

针对一张外来器械申请单申请多条同一个外来器械包定义的物品但只部分装配时显示的待发货数量为已装配的包数量的问题(应该显示已装配的包数量+未装配的包数量之和)

    • too large
    ./recyclingapplication/service/InvoicePlanManagerImpl.java
    • -1
    • +1
    ./recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
调用OrgUnit类的public String getBarcode()方法时,报错的问题(Caused by: java.sql.SQLRecoverableException: 无法从套接字读取更多的数据)(广东省中医药)
    • too large
    ./recyclingapplication/service/InvoicePlanManagerImpl.java
    • too large
    ./recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -2
    • +2
    ./recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
  1. … 5 more files in changeset.
SSTS-731 关于 回收保存时,归还物品,会卡住的BUG
    • too large
    ./recyclingapplication/service/InvoicePlanManagerImpl.java
处理:HNSETYY-11 【外来器械申请单】申请多套一模一样的器械包,多套器械包一起入同一个篮筐再进行装配后,发货计划的待发货任务就会变成一套器械包 补充注释
    • -0
    • +1
    ./recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
处理:HNSETYY-11 【外来器械申请单】申请多套一模一样的器械包,多套器械包一起入同一个篮筐再进行装配后,发货计划的待发货任务就会变成一套器械包
    • -3
    • +3
    ./recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
解决 SSTS-719 回收清点界面的最后修改时间的排序方式的取值不对的问题
    • too large
    ./recyclingapplication/service/InvoicePlanManagerImpl.java
解决jira问题:ZJYY-157【借物管理】自动还物功能支持消毒物品
    • -0
    • +17
    ./recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
    • -0
    • +15
    ./recyclingapplication/service/RecyclingApplicationManager.java
    • too large
    ./recyclingapplication/service/RecyclingApplicationManagerImpl.java
提交后台代码 ZSRY-116 改善多个用户同时进行回收保存操作时出现乐观锁的使用体验。
    • -2
    • +7
    ./recyclingapplication/service/InvoicePlanManager.java
    • too large
    ./recyclingapplication/service/InvoicePlanManagerImpl.java
提交后台代码 ZSRY-116 改善多个用户同时进行回收保存操作时出现乐观锁的使用体验。
    • too large
    ./recyclingapplication/service/InvoicePlanManagerImpl.java
  1. … 3 more files in changeset.
完善 DGZYY-236 【回收清点】外来器械单新增快速回收功能
    • too large
    ./recyclingapplication/service/InvoicePlanManagerImpl.java
完善 DGZYY-236 【回收清点】外来器械单新增快速回收功能:一单多套,且入到不同住院号时,扫描住院号要区分不同住院号的包
    • too large
    ./recyclingapplication/service/InvoicePlanManagerImpl.java
删除多余代码
    • too large
    ./recyclingapplication/service/InvoicePlanManagerImpl.java
提交后台代码 ZSRY-116 改善多个用户同时进行回收保存操作时出现乐观锁的使用体验。
    • too large
    ./recyclingapplication/service/RecyclingApplicationManagerImpl.java
  1. … 4 more files in changeset.