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

Monday 18 Feb 2019
5:36 下午

zc.li

修改checkDoubleIsNaNOrIsfinite(Double param)的方法变为为nanAndInfiniteDoubleToNull(Double number).
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/util/StringUtil.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
4:52 下午

shuyongfu

解决Jira问题:GZZYYFY-15 一次性物品增加固定条码使用功能

pda与pc的后台使用记录录入的业务处理逻辑进行了统一

pda增加支持一次性物品固定条码及批次条码的录入

删除不用的类引入及变量定义

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveDisposablegoods.java
11:49 上午

shuyongfu

解决Jira问题:GZZYYFY-15 一次性物品增加固定条码使用功能

pda与pc的后台使用记录录入的业务处理逻辑进行了统一

pda增加支持一次性物品固定条码及批次条码的录入

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.60_20190218_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
11:48 上午

zc.li

导包。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
11:47 上午

zengyuan

新疆军区总医院 XJJQZYY-26 外来器械增加重量字段
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
11:28 上午

zc.li

解决：XJJQZYY-26。TousseInstance类weight类型由String改为Double.外来器械拆包添加新的包定义和包实例时添加重量数值。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/util/StringUtil.java
    • ?
    /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
11:19 上午

zengyuan

新疆军区总医院 XJJQZYY-26 外来器械增加重量字段
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js
11:12 上午

zengyuan

新疆军区总医院 XJJQZYY-26 外来器械增加重量字段
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
11:10 上午

zengyuan

新疆军区总医院 XJJQZYY-26 外来器械增加重量字段
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
11:07 上午

zengyuan

新疆军区总医院 XJJQZYY-26 外来器械增加重量字段
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/print/printConfig.js
10:31 上午

shuyongfu

解决Jira问题:GZZYYFY-15 一次性物品增加固定条码使用功能

pda与pc的后台使用记录录入的业务处理逻辑进行了统一

pda增加支持一次性物品固定条码及批次条码的录入

删除不用的类引入及变量定义

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordToJson.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/util/UseRecordUtil.java
  7. /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/util
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordActionBase.java
10:20 上午

terrykwan

修改版权信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
10:19 上午

terrykwan

提交中间版本
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionInthaBox.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionInthaBox.js
10:11 上午

shuyongfu

解决Jira问题:XJJQZYY-24手术预约和器械包信息增加手术相关信息

自定义发货时增加对发货单的申请单对象的判空

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
Saturday 16 Feb 2019
10:21 下午

terrykwan

将Container表的bindDepartCodes字段类型改为Lob，并编写了升级脚本，避免字段长度不够。GZYKDXFSKQ-31
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.30_4.9.31_sqlserver.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/container/Container.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java
9:14 下午

terrykwan

完成了PDA程序，发货物品异常的弹窗确认提醒。XJJQZYY-20，器械包发货遵循先失效先发货原则。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.59_20190216_v4_1_release.apk
9:14 下午

terrykwan

删除误提交的文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json.bak
8:55 下午

terrykwan

完成了PDA程序，发货物品异常的弹窗确认提醒。XJJQZYY-20，器械包发货遵循先失效先发货原则。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json.bak
8:05 下午

shuyongfu

解决pda科室切换后,发货计划的外来器械申请单未显示出来的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
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