forgon-ssts-v4.1 / SterileSupplySystem / branches / V4.1.0 / ssts-recyclingapplication

src

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 5
Total Committers: 18
Last Commit: 14 Feb 16
Commits this week: 5
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 31331 is being indexed.

Tuesday 18 May 2021
3:40 下午

jason

解决jira问题：ZSSXLRMYY-201 外部代理灭菌单用批量打印发货计划打印出来单价显示为0.
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
10:03 上午

jason

解决jira问题：GDSZYY-91 一张外来器械申请单中有多套外来器械包时，可以支持每套外来器械包分别更改病人信息(加急、拆分小包发货)
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
Monday 17 May 2021
5:14 下午

jason

解决jira问题：GDSZYY-91 一张外来器械申请单中有多套外来器械包时，可以支持每套外来器械包分别更改病人信息(部分回收拆单后，申请单包状态不正常；多余回收记录)
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
11:11 上午

jason

解决jira问题：GDSZYY-91 一张外来器械申请单中有多套外来器械包时，可以支持每套外来器械包分别更改病人信息
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
10:44 上午

jason

解决jira问题：GDSZYY-91 一张外来器械申请单中有多套外来器械包时，可以支持每套外来器械包分别更改病人信息(拆单新产生的回收记录回收时间取旧回收记录的回收时间)
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
Friday 14 May 2021
7:38 下午

jason

解决jira问题：SSTS-373 已经做了拆包装配的外来器械申请单在外来器械干预管理中修改申请科室保存会报错
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
6:58 下午

jason

解决jira问题：GDSZYY-91 一张外来器械申请单中有多套外来器械包时，可以支持每套外来器械包分别更改病人信息(已接收申请单支持拆分)
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
Wednesday 12 May 2021
10:27 下午

jason

解决jira问题：GDSZYY-91 一张外来器械申请单中有多套外来器械包时，可以支持每套外来器械包分别更改病人信息(已接收申请单先不拆分)
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
6:55 下午

jason

解决jira问题：GDSZYY-91 一张外来器械申请单中有多套外来器械包时，可以支持每套外来器械包分别更改病人信息(已回收申请单先不拆分)
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
5:14 下午

jason

解决jira问题：GDSZYY-91 一张外来器械申请单中有多套外来器械包时，可以支持每套外来器械包分别更改病人信息(已回收申请单的拆分)
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
Tuesday 11 May 2021
6:50 下午

jason

解决jira问题：GDSZYY-91 一张外来器械申请单中有多套外来器械包时，可以支持每套外来器械包分别更改病人信息
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
    • ?
    ./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
4:23 下午

shuyongfu

解决:BJ307YY-72 回收模块待回收列表的文字修改，以及PDA预回收页面的文字、时间取值等的修改

DGZYY-178 灭菌炉增加按炉次提醒的灭菌程序设置

DGZYY-181 灭菌记录扫描位置保存提交灭菌记录后，重新打开该灭菌记录，位置信息为空（PC与PDA端均有此问题）

SSTS-366 PDA端清洗任务连续展开多个清洗筐时，程序会崩溃

SZSDSRMYY-51 发货计划列表增加待发货物品已灭菌状态背景颜色显示

Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
  2. … 5 more files in changeset.
10:40 上午

jason

解决jira问题：BJ307YY-82 使用记录转换申请单，消毒物品增加合并功能
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
10:28 上午

jason

解决jira问题：BJ307YY-82 使用记录转换申请单，消毒物品增加合并功能
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
10:15 上午

jason

解决jira问题：BJ307YY-82 使用记录转换申请单，消毒物品增加合并功能
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
  2. … 1 more file in changeset.
Monday 10 May 2021
9:39 下午

jason

解决jira问题：BJ307YY-82 使用记录转换申请单，消毒物品增加合并功能(useRecordConvertRecyclingApplicationMergeRegular)
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
  2. … 1 more file in changeset.
4:28 下午

jason

解决jira问题：BJ307YY-82 使用记录转换申请单，消毒物品增加合并功能(不同名字的非整包申请的消毒物品，转换后可以存在于同一张申请单，同一张单中，同一种物品的数量只有1个)
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
Saturday 08 May 2021
8:27 下午

jason

解决jira问题：BJ307YY-82 使用记录转换申请单，消毒物品增加合并功能(非整包申请的同名字的消毒物品，不进行合并，1个包要转换为一张申请单)
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
  2. … 1 more file in changeset.
11:08 上午

jason

解决jira问题：BJ307YY-82 使用记录转换申请单，消毒物品增加合并功能
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
  2. … 1 more file in changeset.
Friday 07 May 2021
10:14 上午

jason

解决jira问题：GDSZYY-64 提交一次性物品申请单时需要检查该科室是否已有【打印状态为否，发货状态为待发货，终止状态为空】的申请单(暂存的一次性物品申请单提交时也要检查)
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
Thursday 06 May 2021
4:02 下午

jason

解决jira问题：BJ307YY-82 使用记录转换申请单，消毒物品增加合并功能
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
Wednesday 28 Apr 2021
5:27 下午

jason

解决jira问题：SZSDSRMYY-51 发货计划列表增加待发货物品已灭菌状态背景颜色显示
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
Tuesday 27 Apr 2021
5:31 下午

jason

解决jira问题：SZSDSRMYY-51 发货计划列表增加待发货物品已灭菌状态背景颜色显示
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
Monday 26 Apr 2021
8:40 下午

jason

解决jira问题：SZSDSRMYY-51 发货计划列表增加待发货物品已灭菌状态背景颜色显示
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/vo/InvoicePlanVo.java
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
Tuesday 20 Apr 2021
4:52 下午

jason

解决jira问题：DGZYY-170 物品预约单增加权限控制(1.具有【查看全部申请单】权限的用户，在科室申领列表可以看到所有科室的物品预约单;2.临床科室用户提交物品预约单后，如果该申请单没有被打印并且发货状态为待发货，则应该允许用户进行修改)
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
Thursday 15 Apr 2021
7:48 下午

shuyongfu

解决:SZYK-36 PDA清洗消毒模块，允许查询1周内的数据

NFYY-8 允许不扫描器械包条码的情况下，就可以提交“病人使用记录”。（前提是输入了病人姓名）

ZJJSRM-48 PDA发固定条码物品时，应该不允许扫描出的数量大于库存的数量

GZZYYFY-84 PDA退货后，退货记录的结算科室为空，导致核算月报查询结果有NULL值的科室的问题

FSSZYY-16 PDA预回收页面增加查看和修改非整包申请的消毒物品的材料数量的功能

DGZYY-178 灭菌炉增加按炉次提醒的灭菌程序设置

Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • ?
    ./main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/PrepareRecycleTousseManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/controller/CustomRecyclingApplicationController.java
  7. … 17 more files in changeset.
Wednesday 14 Apr 2021
6:06 下午

zc.li

删除多余代码
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
6:02 下午

zc.li

解决：BJ307YY-76。外来器械包装配时拆包支持部分拆包。
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java
  3. … 5 more files in changeset.
5:30 下午

jason

解决jira问题：SZYK-35 物品预约单改进为支持显示库存数量以及可限制预约数量不能大于库存数量(代码优化)
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
  4. … 1 more file in changeset.
5:10 下午

shuyongfu

解决:CDSLQYQYYY-91 多张外来器械申请单申请同名字的外来器械包时，发货计划显示的待发数量有问题
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java