Activity forgon-ssts-v4.1.0/ssts-basedata/src

10:18 上午

jason

More
38383
changed 70 files
root:

解决jira问题：GZSZYY-44 【PC】新增在线考试功能

- -0
- +366
./main/java/com/forgon/disinfectsystem/entity/onlineexams/examdefinition/ExamDefinition.java
- History
- Source
./main/java/.../examdefinition/ExamDefinition.java
./main/java/com/forgon/disinfectsystem/basedatamanager/onlineexams/examanswer/dwr
- History
- Source
./main/java/com/.../onlineexams/examanswer/dwr
- -0
- +212
./main/java/com/forgon/disinfectsystem/entity/onlineexams/question/Question.java
- History
- Source
./main/java/com/.../question/Question.java
./main/java/com/forgon/disinfectsystem/basedatamanager/onlineexams/examdefinition/dwr
- History
- Source
./main/java/com/.../onlineexams/examdefinition/dwr
- -0
- +244
./main/java/com/forgon/disinfectsystem/entity/onlineexams/answersheet/AnswerSheet.java
- History
- Source
./main/java/com/.../answersheet/AnswerSheet.java
- -0
- +318
./main/java/com/forgon/disinfectsystem/vo/ExamDefinitionVo.java
- History
- Source
./main/java/com/.../vo/ExamDefinitionVo.java
./main/java/com/forgon/disinfectsystem/basedatamanager/onlineexams/question/dwr
- History
- Source
./main/java/com/forgon/.../onlineexams/question/dwr
- -0
- +55
./main/java/com/forgon/disinfectsystem/vo/QuestionItemVo.java
- History
- Source
./main/java/com/.../vo/QuestionItemVo.java
- -0
- +22
./main/java/com/forgon/disinfectsystem/basedatamanager/onlineexams/examdefinition/service/ExamQuestionManager.java
- History
- Source
./main/java/.../service/ExamQuestionManager.java
- -0
- +115
./main/java/com/forgon/disinfectsystem/basedatamanager/onlineexams/examanswer/dwr/ExamAnswerTableManager.java
- History
- Source
./main/java/com/.../dwr/ExamAnswerTableManager.java
- -0
- +60
./main/java/com/forgon/disinfectsystem/entity/onlineexams/examdefinition/ExamDefinitionRole.java
- History
- Source
./main/java/.../ExamDefinitionRole.java
- -0
- +78
./main/java/com/forgon/disinfectsystem/entity/onlineexams/questionset/QuestionItem.java
- History
- Source
./main/java/com/.../questionset/QuestionItem.java
./main/java/com/forgon/disinfectsystem/entity/onlineexams/examdefinition
- History
- Source
./main/java/com/.../onlineexams/examdefinition
- -0
- +27
./main/java/com/forgon/disinfectsystem/basedatamanager/onlineexams/question/service/QuestionManager.java
- History
- Source
./main/java/com/.../service/QuestionManager.java
./main/java/com/forgon/disinfectsystem/entity/onlineexams/answersheet
- History
- Source
./main/java/com/.../entity/onlineexams/answersheet
… 55 more files in changeset.

10:39 上午

jason

More
38364
changed 14 files
root:

解决jira问题：ZSRY-85 【标识牌信息】新增多个改进(器械包状态不显示回收、清洗环节，新增标识牌信息表格列)

- -13
- +1
./main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
- History
- Source
- Diff
./main/java/.../TousseInstanceUtils.java
- -5
- +1
./main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
- History
- Source
- Diff
./main/java/.../TousseInstance.java
… 12 more files in changeset.

2:42 下午

shuyongfu

More
38345
changed 2 files
root:

处理 ZSYY-377 【发货计划】增加默认查询时间周期来优化查询速度

- -2
- +2
./main/java/com/forgon/disinfectsystem/common/CssdUtils.java
- History
- Source
- Diff
./main/java/com/.../common/CssdUtils.java
… 1 more file in changeset.

4:49 下午

shuyongfu

More
38340
changed 6 files
root:

处理 ZSYY-377 【发货计划】增加默认查询时间周期来优化查询速度

- -0
- +44
./main/java/com/forgon/disinfectsystem/common/CssdUtils.java
- History
- Source
- Diff
./main/java/com/.../common/CssdUtils.java
… 5 more files in changeset.

10:42 上午

zc.li

More
38332
changed 1 file
root:

注释补充

- -1
- +3
./main/java/com/forgon/disinfectsystem/entity/idcardinstance/IDCardInstance.java
- History
- Source
- Diff
./main/java/.../IDCardInstance.java

5:45 下午

zc.li

More
38319
changed 2 files
root:

完善 ZSWY-231 【装配管理】可终止装配数量功能

- -1
- +6
./main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
- History
- Source
- Diff
./main/java/.../HttpOptionManagerSSTSImpl.java
… 1 more file in changeset.

3:26 下午

jason

More
38301
changed 7 files
root:

解决jira问题：ZSYY-371 【清洗机管理设置】清洗机信息新增字段“用途”

- -1
- +1
./main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManager.java
- History
- Source
- Diff
./main/java/.../BeCleanItemManager.java
- -0
- +24
./main/java/com/forgon/disinfectsystem/entity/basedatamanager/rinser/Rinser.java
- History
- Source
- Diff
./main/java/com/.../rinser/Rinser.java
- -2
- +59
./main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
- History
- Source
- Diff
./main/java/.../BeCleanItemManagerImpl.java
- -0
- +31
./main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManagerImpl.java
- History
- Source
- Diff
./main/java/.../service/RinserManagerImpl.java
- -0
- +8
./main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManager.java
- History
- Source
- Diff
./main/java/com/.../service/RinserManager.java
… 2 more files in changeset.

11:12 上午

zc.li

More
38292
changed 1 file
root:

解决 ZSWY-231 【装配管理】可终止装配数量功能 ZSWY-223 装配管理】新增终止待装配数量后同步减少待发货数量

- -0
- +52
./main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
- History
- Source
- Diff
./main/java/.../HttpOptionManagerSSTSImpl.java

3:28 下午

zc.li

More
38272
changed 2 files
root:

提交部分基础代码 ZSWY-223 【装配管理】新增终止待装配数量后同步减少待发货数量

- -1
- +13
./main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
- History
- Source
- Diff
./main/java/com/.../tousseitem/TousseItem.java
… 1 more file in changeset.

11:25 上午

zc.li

More
38265
changed 1 file
root:

保留字段sterilizationTransition，废除了话器械包信息中灭菌交接状态列显示和正序逆序功能异常

- -2
- +10
./main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
- History
- Source
- Diff
./main/java/.../TousseInstance.java

3:11 下午

jason

More
38256
changed 2 files
root:

解决jira问题：HDQRMYY-59 提供患者器械包使用情况视图（使用记录新增“记帐号”字段）

- -0
- +13
./main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java
- History
- Source
- Diff
./main/java/com/.../useRecord/UseRecord.java
… 1 more file in changeset.

11:05 上午

jason

More
38248
changed 5 files
root:

解决jira问题：DGSDBZXYY-239 【外来器械使用后交接报表】新增多项改进(字段自动取值功能,一单多套物品分行显示)

- -1
- +13
./main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
- History
- Source
- Diff
./main/java/com/.../tousseitem/TousseItem.java
… 4 more files in changeset.

6:12 下午

zc.li

More
38246
changed 1 file
root:

注释提交

- -0
- +1
./main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifiedItem.java
- History
- Source
- Diff
./main/java/.../ClassifiedItem.java

10:40 上午

zc.li

More
38235
changed 3 files
root:

解决 SSTS-682 灭菌篮筐实例增加创建时间创建人

- -1
- +26
./main/java/com/forgon/disinfectsystem/entity/packing/ReviewedBasket.java
- History
- Source
- Diff
./main/java/.../packing/ReviewedBasket.java
- -0
- +7
./main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java
- History
- Source
- Diff
./main/java/.../ContainerManagerImpl.java
- -0
- +5
./main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java
- History
- Source
- Diff
./main/java/.../ReviewedBasketManagerImpl.java

10:37 上午

zc.li

More
38234
changed 2 files
root:

完善 ZSYY-359 【灭菌交接】”灭菌交接单“新增支持直接转换为”代理灭菌单“

- -0
- +4
./main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItem.java
- History
- Source
- Diff
./main/.../SterilizationTransitionItem.java
… 1 more file in changeset.

10:18 上午

jason

More
38233
changed 3 files
root:

解决jira问题：ZJYY-153 【器械包定义管理】新增字段“配包注意事项提醒”

- -0
- +14
./main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
- History
- Source
- Diff
./main/java/.../TousseDefinition.java
… 2 more files in changeset.

6:53 下午

zc.li

More
38222
changed 1 file
root:

先挂在本问题上 SSTS-672 (因为此问题未下来，但是zdwy比较卡，所以先简单优化一下,2024.6.24使用zdwy清理缓存优化前后对比为61s比12s,用zsdxfsdyyy20230514，优化前后都是1s)优化在添加新的清洗记录，加载待清洗篮筐的效率。

- -5
- +3
./main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java
- History
- Source
- Diff
./main/java/.../ClassifyBasketManagerImpl.java

6:01 下午

zc.li

More
38221
changed 1 file
root:

注释补充

- -0
- +1
./main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
- History
- Source
- Diff
./main/java/.../InvoicePlan.java

6:39 下午

zc.li

More
38215
changed 1 file
root:

对申请单tousseBarcodes字段增加索引增加回收扫码找单和物品的效率

- -0
- +1
./main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
- History
- Source
- Diff
./main/java/.../InvoicePlan.java

12:01 下午

jason

More
38210
changed 6 files
root:

解决jira问题：NFYY-104 【发货管理】新增可自定义外来器械包物品类型打印的发货单表单样式

- -0
- +30
./main/java/com/forgon/disinfectsystem/entity/printinvoiceconfig/PrintInvoiceConfig.java
- History
- Source
- Diff
./main/java/.../PrintInvoiceConfig.java
… 5 more files in changeset.

5:06 下午

zc.li

More
38207
changed 2 files
root:

新增一个方法，可选择两种功能，1：单独查询barcodeDevice 2：查询barcodeDevice和继承barcodeDevice的子表信息

- -1
- +22
./main/java/com/forgon/disinfectsystem/barcode/service/BarcodeManagerImpl.java
- History
- Source
- Diff
./main/java/.../BarcodeManagerImpl.java
- -1
- +10
./main/java/com/forgon/disinfectsystem/barcode/service/BarcodeManager.java
- History
- Source
- Diff
./main/java/.../service/BarcodeManager.java

4:54 下午

zc.li

More
38206
changed 1 file
root:

删除包实例冗余字段sterilizationTransition的注释补充

- -0
- +4
./main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
- History
- Source
- Diff
./main/java/.../TousseInstance.java

4:46 下午

zc.li

More
38205
changed 2 files
root:

删除包实例冗余字段sterilizationTransition

- -13
- +0
./main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
- History
- Source
- Diff
./main/java/.../TousseInstance.java
… 1 more file in changeset.

4:22 下午

zc.li

More
38204
changed 10 files
root:

解决 ZSYY-359 灭菌交接】”灭菌交接单“新增支持直接转换为”代理灭菌单“

- -1
- +12
./main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/proxydisinfection/ProxyDisinfection.java
- History
- Source
- Diff
./main/java/.../ProxyDisinfection.java
- -1
- +13
./main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransition.java
- History
- Source
- Diff
./main/java/.../SterilizationTransition.java
… 8 more files in changeset.

3:35 下午

jason

More
38202
changed 5 files
root:

解决jira问题：ZSRY-87 【加急级别管理】新增适用科室功能

- -6
- +3
./main/java/com/forgon/disinfectsystem/basedatamanager/urgent/action/UrgentLevelAction.java
- History
- Source
- Diff
./main/java/.../action/UrgentLevelAction.java
- -0
- +8
./main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManager.java
- History
- Source
- Diff
./main/java/.../UrgentLevelManager.java
- -0
- +63
./main/java/com/forgon/disinfectsystem/entity/urgent/UrgentApplicableOrgUnit.java
- History
- Source
./main/java/.../urgent/UrgentApplicableOrgUnit.java
- -18
- +242
./main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java
- History
- Source
- Diff
./main/java/.../UrgentLevelManagerImpl.java
- -0
- +42
./main/java/com/forgon/disinfectsystem/entity/urgent/UrgentLevel.java
- History
- Source
- Diff
./main/java/com/.../urgent/UrgentLevel.java

6:24 下午

zc.li

More
38198
changed 1 file
root:

完善 DGSFYBJY-87 灭菌装载模块扫描器械包入筐速度太快时可能产生多个篮筐实例的问题

- -20
- +50
./main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java
- History
- Source
- Diff
./main/java/.../ReviewedBasketManagerImpl.java

6:28 下午

jason

More
38192
changed 11 files
root:

解决jira问题：DGSETYY-98 科室互借模块打开互借记录的加载时间过长

- -0
- +1
./main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
- History
- Source
- Diff
./main/java/com/.../tousseitem/TousseItem.java
- -0
- +2
./main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
- History
- Source
- Diff
./main/java/.../TousseInstance.java
- -0
- +5
./main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveDisposablegoods.java
- History
- Source
- Diff
./main/java/.../ExpensiveDisposablegoods.java
… 8 more files in changeset.

4:34 下午

zc.li

More
38189
changed 1 file
root:

注释补充

- -1
- +5
./main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/FixedBarcode.java
- History
- Source
- Diff
./main/java/.../FixedBarcode.java

4:33 下午

zc.li

More
38188
changed 1 file
root:

删除多余代码

- -5
- +0
./main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/FixedBarcode.java
- History
- Source
- Diff
./main/java/.../FixedBarcode.java

10:42 上午

jason

More
38182
changed 8 files
root:

解决jira问题：FSFY-102 根据申请单中物品的发货科室与使用记录录入科室进行拆分功能失效 SSTS-678 methodOfSplitRecyclingApplication:2,进行部分拆单回收，即使原始申请单内有其他物品仍未回收，回收界面也不能看到原始申请单的问题

- -0
- +80
./main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingTousseInstance.java
- History
- Source
./main/java/.../RecyclingTousseInstance.java
… 7 more files in changeset.

src

Line History

Stats

Commits this week: 7

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

jason

jason

shuyongfu

shuyongfu

zc.li

zc.li

jason

zc.li

zc.li

zc.li

jason

jason

zc.li

zc.li

zc.li

jason

zc.li

zc.li

zc.li

jason

zc.li

zc.li

zc.li

zc.li

jason

zc.li

jason

zc.li

zc.li

jason