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

Friday 22 Jan 2021
4:22 下午

frank

解决ZSYY-286：快速回收后导致原有申请单上所有物品的回收数量变成0
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
4:04 下午

jason

解决jira问题：NYSY-28 南方医科大学附属第三医院 新华清洗机接口读取卡顿问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHuaOfZJJSRM.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
3:35 下午

jason

解决jira问题：SSTS-285 修改材料定义的消毒价格时的联动修改引用该材料的消毒物品的价格
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
2:10 下午

frank

解决SSTS-286：入炉不追溯物品时，灭菌物品统计栏的数量及种类统计不实时
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
12:06 下午

frank

先回滚，发现 ZSYY-286 - 快速回收后导致原有申请单上所有物品的回收数量变成0跟解决BJ307YY-64：预回收把数量改成0之后，回收清点的回收数量没改成0，这个两个问题有冲突
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
11:54 上午

frank

解决ZSYY-286：快速回收后导致原有申请单上所有物品的回收数量变成0
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
11:51 上午

frank

解决ZSYY-286：快速回收后导致原有申请单上所有物品的回收数量变成0
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
11:32 上午

zc.li

解决：CDSLQYQYYY-83。自定义装配的消毒物品价格为0，导致明细核算月报中的多次发货的单价不相同的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDao.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
10:35 上午

zc.li

删除多余代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java
10:21 上午

frank

解决SSTS-284：材料发货管理，材料发货单信息中器械包翻页看不全，无法 点击下一页进行翻页
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js
Thursday 21 Jan 2021
7:50 下午

jason

解决jira问题：NYSY-28 南方医科大学附属第三医院 新华清洗机接口读取卡顿问题(共享文件夹方式)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java
5:54 下午

jason

解决jira问题：GDSRMYZHYY-29 谷歌浏览器打印外来器械包标签打不出条码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/printbarcode/action/PrintBarcodeAction.java
5:53 下午

frank

解决 GDSRMYZHYY-29 ：谷歌浏览器打印外来器械包标签打不出条码。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
5:52 下午

jason

解决jira问题：NYSY-28 南方医科大学附属第三医院 新华清洗机接口读取卡顿问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/SterilizerFileName.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java
5:01 下午

huang.cl

提交清远市人民医院现场的配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js
4:18 下午

frank

解决GDSRMYZHYY-27:pc端发货时将已扫的文字和数量放大显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
2:35 下午

jason

解决jira问题：NYSY-28 南方医科大学附属第三医院 新华清洗机接口读取卡顿问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java
2:23 下午

jason

解决jira问题：NYSY-28 南方医科大学附属第三医院 新华清洗机接口读取卡顿问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/nfykdxfsdsyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js
10:06 上午

kaking.lu

文件路径修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsly/spring/HERP.xml
Wednesday 20 Jan 2021
8:14 下午

jason

解决jira问题：ASSZSLY-12 中山六院 倍力曼接口数据匹配改为按时间匹配
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashDataLineChartAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
7:29 下午

zc.li

部分解决：CDSLQYQYYY-84.修复核算月报消毒物品和自定义器械包发货材料数量有时异常的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.64_4.9.65.sql
7:05 下午

shuyongfu

解决:CDSLQYQYYY-84 器械包规格大小统计报表、明细核算月报、核算月报、消毒供应中心工作量统计报表的数量不一致的问题

发货项的材料数量由对应所发的包实例的材料数量之和改为所发的包实例的包定义的材料数量

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
5:57 下午

frank

解决 ZSYY-285 - 添加灭菌记录扫描固定条码的器械包没有语音提示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
5:40 下午

frank

解决ZYYFS-147：装配界面外来器械包的“拆包”一列位置改到数量后面
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
5:19 下午

zc.li

解决：倍力曼接口数据匹配改为按时间匹配(灭菌炉部分)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
5:17 下午

frank

解决DGSFYBJY-40：历史装配记录中重新打印标签时增加确认的提示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
4:52 下午

jason

解决jira问题：NYSY-28 南方医科大学附属第三医院 新华清洗机接口读取卡顿问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/FileOfDatReader.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/nfykdxfsdsyy/config.js
3:49 下午

zc.li

解决：倍力曼接口数据匹配改为按时间匹配(灭菌炉部分代码调整)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
3:48 下午

zc.li

解决：倍力曼接口数据匹配改为按时间匹配(灭菌炉部分)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
3:48 下午

frank

解决ZYYFS-149：换谷歌浏览器缩放比例调整到125%添加灭菌记录看不到保存按钮，IE可以
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js