forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 43
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 43
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 25687 is being indexed.

Saturday 16 Feb 2019
6:23 下午

zc.li

修改审核时，会自动修改预定灭菌时间的问题。改为needToModifySterileDate为true时，才会修改预定的灭菌时间。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
6:10 下午

yanweining

一次性物品管理页面：物质编码列增加配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
5:46 下午

terrykwan

解决拆包装配外来器械时，重量字段报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
5:28 下午

shuyongfu

去掉不用的类的import,告警的代码增加注解
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
Friday 15 Feb 2019
5:31 下午

yk

新疆军区总医院发布包
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
5:15 下午

zc.li

删除PrintRowVo的刚添加的weight字段，外来器械申请打印处用页面有的重量。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintRowVo.java
4:12 下午

terrykwan

增加手术预约发货的弹窗提醒。JIRA问题：器械包发货遵循先失效先发货原则，XJJQZYY-20
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js
3:52 下午

zc.li

优化：oralce和sqlserver数据库的TousseInstance表的weight字段由String变为float
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.29_4.9.30_sqlserver.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.29_4.9.30_oracle.sql
3:43 下午

zc.li

删除误提交的文件
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-expensivegoods/.settings
3:38 下午

zc.li

XJJQZYY-26.后台提供打印外来器械的重量数据。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintRowVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-expensivegoods/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
2:37 下午

yanweining

XJJQZYY-8：清洗机接口
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.js
2:36 下午

yanweining

XJJQZYY-8:清洗机接口

注释优化

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/MeiYaJieDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/device/service/ModbusControllerManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
12:28 下午

terrykwan

增加自定义发货的弹窗提醒。JIRA问题：器械包发货遵循先失效先发货原则，XJJQZYY-20
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js
12:20 下午

terrykwan

增加手术预约发货的弹窗提醒。JIRA问题：器械包发货遵循先失效先发货原则，XJJQZYY-20
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationMergeInvoiceForm.js
12:07 下午

terrykwan

完成了发货时，如果存在同名字的更早失效的器械包，统一PC和PDA端的提醒用户的方式。JIRA问题：器械包发货遵循先失效先发货原则，XJJQZYY-20
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
11:51 上午

yanweining

解决：invoiceAction之前的误提交
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
11:50 上午

terrykwan

修改注释
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
11:23 上午

terrykwan

完成了发货时，如果存在同名字的更早失效的器械包，统一PC和PDA端的提醒用户的方式。JIRA问题：器械包发货遵循先失效先发货原则，XJJQZYY-20
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js
10:23 上午

weizhenyu

广州中医药大学第一附属医院GZZYYFY-23：未发货的标识牌可以重新回收 添加的配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/config.js
10:22 上午

weizhenyu

广州中医药大学第一附属医院GZZYYFY-23:未发货的标识牌可以重新回收 添加了清洗完未装配的判断条件并附上配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
10:16 上午

yanweining

新疆军区总医院：config.js：是否显示设备接口菜单
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js
10:04 上午

zc.li

程序健壮性增强。对字段weight的值由String转Double时,添加验证，NaN或报错就使用Null.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
2:18 上午

terrykwan

完成了发货时，如果存在同名字的更早失效的器械包，PC和PDA端的弹窗提醒用户的功能。JIRA问题：器械包发货遵循先失效先发货原则，XJJQZYY-20
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/date/DateTools.java
1:25 上午

terrykwan

优化注释信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
1:16 上午

terrykwan

完善注释
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
1:15 上午

terrykwan

完善注释
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/util/ConfigUtils.java
Thursday 14 Feb 2019
8:27 下午

zc.li

修改数据库TousseInstance表的字段weight类型由varchar变为float；TousseInstance类weight属性类型由String变为Double.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.29_4.9.30_sqlserver.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.29_4.9.30_oracle.sql
6:33 下午

yanweining

GYEY-724:一次性物品入库单改进

一次性物品入库单页面添加行号

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
6:10 下午

yanweining

XJJQZYY-8:清洗机接口

添加debug日志

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
5:16 下午

zc.li

提交XJJQZYY-26后台代码，方便前台测试
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java