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

Tuesday 23 Jul 2024
10:18 上午

jason

解决jira问题：GZSZYY-44 【PC】新增在线考试功能
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/onlineexams/examdefinition/dwr
  2. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/onlineexams/question/dwr
  3. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/onlineexams/questionset/dwr
  4. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/onlineexams/question
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/ExamDefinitionVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/systemsetting/service/HttpTreeOptionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/onlineexams/examdefinition/dwr/ExamDefinitionTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/ExamDefinitionRoleVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/onlineexams/examanswer/controller/NormalExamAnswerFormController.java
  10. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/onlineexams/examanswer
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/onlineexams/examdefinition/service/ExamDefinitionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/QuestionVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/onlineexams/answersheet/AnswerSheet.java
  14. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/onlineexams/answersheet
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/onlineexams/question/Question.java
  16. … 55 more files in changeset.
Monday 22 Jul 2024
6:36 下午

frank.qiu

解决了 GZSZYY-44 - 【PC】新增在线考试功能(移植)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/commonForExt4.css
6:35 下午

frank.qiu

解决了 GZSZYY-44 - 【PC】新增在线考试功能(移植)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/onlineExams/questionSet/questionSetForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/onlineExams/examsAnswer/examAnswerForm.js
5:22 下午

frank.qiu

解决了 GZSZYY-44 - 【PC】新增在线考试功能(移植)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/onlineExams/httpTreeOptionView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/onlineExams/questionSet/questionSetView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/onlineExams/examsDifficult/examsDifficultForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/onlineExams/examsDifficult/examsDifficultView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/onlineExams/questionSet/questionSetView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/onlineExams/question/questionView.js
  7. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/onlineExams/examsDifficult
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/onlineExams/examsDefinition/examsDefinitionForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/onlineExams/httpTreeOptionView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/onlineExams/question/questionForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/onlineExams/examsDefinition/examsDefinitionView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/onlineExams/examsDifficult/examsDifficultView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/onlineExams/examsAnswer/examAnswerForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/onlineExams/examsAnswer/examAnswerView.js
  16. … 11 more files in changeset.
5:09 下午

jason

解决jira问题：ZSRY-85 【标识牌信息】新增多个改进(器械包状态不显示回收、清洗环节，新增标识牌信息表格列)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/dwr/table/IdCardInstanceTableManager.java
5:06 下午

zc.li

完善 KPSZXYY-70 系统的灭菌接口不支持读取跨天的倍力曼灭菌炉文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
4:39 下午

hongrun.zhou

移除灭菌模块默认查询时间段配置

移除后配置为：

//功能模块默认查询时间

defaultQueryTimeOfTheFunctionModule:[{"functionalModule": "invoicePlan","queryPeriod": "300"},{"functionalModule": "invoicePlan_inventoryInquiry","queryPeriod": "300"},{"functionalModule": "tousseManager","queryPeriod": "300"},{"functionalModule": "reviewView","queryPeriod": "300"},{"functionalModule": "useRecord","queryPeriod": "300"},{"functionalModule": "recyclingApplication","queryPeriod": "300"}]

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
1:57 下午

zc.li

增加文件被解析过时的日志
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
11:57 上午

zc.li

解决 SZSLGZXYY-35 灭菌记录信息中的今日审核的待灭菌物品列表为空
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
10:36 上午

jason

解决jira问题：ZSRY-85 【标识牌信息】新增多个改进(器械包状态不显示回收、清洗环节，新增标识牌信息表格列)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/dwr/table/IdCardInstanceTableManager.java
Sunday 21 Jul 2024
9:55 下午

hongrun.zhou

更新现场的打印规格设置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
9:46 下午

hongrun.zhou

同步现场config.js文件。

新增：

//启用【器械包种类定义】功能。

enableInstrumentSetTypeSetting:true,

//启用库位管理模块

enableWarehousePositionModule:true,

//启用手术仪器管理和库位管理联动功能

enableWarehousePositionAndSurgicalInstrumentsCanBeOperatedInTandemFunction:true,

//定时废弃过期包的数量

maxAutoWasteAmountOneTimeTask: 500000,

//功能模块默认查询时间

defaultQueryTimeOfTheFunctionModule:[{"functionalModule": "invoicePlan","queryPeriod": "300"},{"functionalModule": "invoicePlan_inventoryInquiry","queryPeriod": "300"},{"functionalModule": "tousseManager","queryPeriod": "300"},{"functionalModule": "reviewView","queryPeriod": "300"},{"functionalModule": "sterilizationManager","queryPeriod": "300"},{"functionalModule": "useRecord","queryPeriod": "300"},{"functionalModule": "recyclingApplication","queryPeriod": "300"}]

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
Friday 19 Jul 2024
5:08 下午

shuyongfu

处理 DGSDBZXYY-230 开启配置项comboTousseSendByWrapperTousse:true（聚合包只允许大包发货）情况下发货数据异常，发货时系统认为是按小包发货
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
2:15 下午

zc.li

完善 SSTS-669 完善升级语句
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/5.0.23_5.0.24_oracle.sql
11:59 上午

zc.li

完善 SSTS-669 语句经系统修改后 执行不了的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/5.0.23_5.0.24_oracle.sql
11:48 上午

zc.li

完善 SSTS-669 增加修改数据的范围
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/5.0.23_5.0.24_oracle.sql
11:06 上午

zc.li

完善 SSTS-669 增加修改数据的范围
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/5.0.23_5.0.24_oracle.sql
10:59 上午

shuyongfu

处理 CDSLQYQYYY-132 富立叶品牌pda（型号：F760HC）适配开发 增加富立叶接口实现类的配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/scanner.txt
10:39 上午

jason

解决jira问题：ZSRY-85 【标识牌信息】新增多个改进(器械包状态不显示回收、清洗环节，新增标识牌信息表格列)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/util/IDCardInstanceUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/OperationReservationInvoiceHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/service/IDCardInstanceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/5.0.27_5.0.28.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/dwr/table/IdCardInstanceTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
Thursday 18 Jul 2024
6:57 下午

zc.li

解决 KPSZXYY-70 系统的灭菌接口不支持读取跨天的倍力曼灭菌炉文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
5:35 下午

frank.qiu

解决了 QYSRMYY-70 - 配置项“defaultQueryTimeOfTheFunctionModule”新增支持多个模块配置查询时间(兼容IE8)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
5:01 下午

frank.qiu

解决了 QYSRMYY-70 - 配置项“defaultQueryTimeOfTheFunctionModule”新增支持多个模块配置查询时间(兼容IE8)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
4:38 下午

frank.qiu

解决了 QYSRMYY-70 - 配置项“defaultQueryTimeOfTheFunctionModule”新增支持多个模块配置查询时间(兼容IE8)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
3:51 下午

frank.qiu

解决了 QYSRMYY-70 - 配置项“defaultQueryTimeOfTheFunctionModule”新增支持多个模块配置查询时间
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
3:33 下午

frank.qiu

解决了 QYSRMYY-70 - 配置项“defaultQueryTimeOfTheFunctionModule”新增支持多个模块配置查询时间
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js
2:59 下午

frank.qiu

解决了 QYSRMYY-70 - 配置项“defaultQueryTimeOfTheFunctionModule”新增支持多个模块配置查询时间
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
2:48 下午

frank.qiu

解决了 QYSRMYY-70 - 配置项“defaultQueryTimeOfTheFunctionModule”新增支持多个模块配置查询时间
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
Wednesday 17 Jul 2024
3:39 下午

frank.qiu

解决了 ZSYY-378 - 【回收清点】【清洗消毒】新增扫描固定条码标签(999999999、888888888)进行保存和取消
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
2:59 下午

zc.li

解决 ZSSXLRMYY-233 器械包自动加急功能不生效，申请单没有自动加急的标识

修复和增加测试用例

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerTests.java
11:52 上午

frank.qiu

解决回收页面更改器械包加急级别后不生效的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js