forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 59
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 59
Total Lines of Code (LoC): 4,711,364
Net change in LoC this week: 3,161

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

Subversion Details

1 property
  • svn:global-ignores = .gradle .settings bin build rebel.xml
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Tuesday 30 Jun 2020
4:23 下午

zc.li

解决:FJSSSYY-8.新华高温灭菌炉打印口获取设备数据;
Options
    • -0
    • +21
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java
    • -0
    • +97
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/HighTempStageDetails.java
    • -0
    • +718
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/HighTemperatureManagerImpl.java
    • -0
    • +274
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/highSterilizerLineChart.jsp
    • -1
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/config/fjsssyy/spring/HIS.xml
    • -0
    • +246
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/HighTempSterilizerRecord.java
    • -0
    • +8
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • -1
    • +30
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js
    • -0
    • +48
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • -1
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.js
    • -1
    • +9
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImplForFJSSSYY.java
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
3:23 下午

jason

解决jira问题：FJSSSYY-10 福建石狮市医院 科室申领中的查询条件：开始日期和结束日期精确到时分(申领界面上的开始日期和结束日期的输入框，日期时间格式不受config.js配置项timeSearchFmt控制)
Options
    • -14
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java
10:06 上午

LQC

新开启配置项：

//允许部分回收

enablePartRecycle:true,

//不同灭菌方式的提示方式。PC端和PDA端都用相同的提示方式

alertModeOfDiffSterileMethod:2,

//灭菌装载页面如果第二个及后面的器械包的灭菌程序与第一个包的不一致时,是否提示

isNoticeWhenScanDifferentSterileTypeTousseBarcode:true,

//申领界面不显示整包申请的消毒物品的材料明细

hideMaterialsListOfDisinfectionGoodsApplyEntire:true

Options
    • -1
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js
Monday 29 Jun 2020
6:08 下午

shuyongfu

解决:XJJQZYY-101 二次发货的物品进行器械流转的时候提示“只能扫描发货到流转科室的器械包！”
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
5:20 下午

shuyongfu

解决:XJJQZYY-100 在发货管理进行二次退货提示“退货科室不一致！”

二次发货几个字段设值的调整

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
4:47 下午

shuyongfu

解决:XJJQZYY-100 在发货管理进行二次退货提示“退货科室不一致！”
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
4:10 下午

shuyongfu

解决:XJJQZYY-100 在发货管理进行二次退货提示“退货科室不一致！”
Options
    • -4
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoice.js
    • -4
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
3:48 下午

shuyongfu

解决:XJJQZYY-100 在发货管理进行二次退货提示“退货科室不一致！”
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
2:41 下午

shuyongfu

解决:XJJQZYY-100 在发货管理进行二次退货提示“退货科室不一致！”

只改了发货部分的代码逻辑,退货的不做调整

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
10:36 上午

shuyongfu

解决：pda自定义发货失败的问题.将申领发货与其它发货(比如自定义发货等)分开处理
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
10:28 上午

shuyongfu

解决发货管理-查看发货单里二次发货的包实例未显示出来的问题
Options
    • -0
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
10:11 上午

frank

解决DGSDBZXYY-35：使用记录转申请单后，通过IE浏览器在待回收列表扫描包外标签条码不能打开对应的申请单
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/showTousseImage/showTousseIamge.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionGoodsRecycleForTouchScreen.jsp
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/showExpensiveGoodsBillUploadIamge.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/handover/handoverView.jsp
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinition.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/staffArchives/staffArchiveForm.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.js
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/showSterilizationUploadIamge.js
  16. … 20 more files in changeset.
Sunday 28 Jun 2020
5:04 下午

shuyongfu

去掉未使用的变量
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
4:44 下午

frank

解决GZYKDXFSKQ-64：修改历史回收单中的物品的回收数量的问题（处理扫描标识牌绑定篮筐的问题）
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
4:09 下午

shuyongfu

解决:XJJQZYY-100 在发货管理进行二次退货提示“退货科室不一致！”
Options
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoice.js
    • -0
    • +7
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
4:08 下午

frank

解决GZYKDXFSKQ-64：修改历史回收单中的物品的回收数量的问题（处理非整包时的数量问题）
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
3:40 下午

zengyuan

解决:福建石狮市医院FJSSSYY-10 科室申领中的查询条件：开始日期和结束日期精确到时分,和产品沟通以后，科室运作监控和消毒供应中心运作监控的时间也修改了
Options
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperate.js
    • -0
    • +4
    /ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
3:39 下午

jason

解决jira问题：FJSSSYY-10 福建石狮市医院 科室申领中的查询条件：开始日期和结束日期精确到时分
Options
    • -0
    • +22
    /forgon-core/src/main/java/com/forgon/servertime/action/ServerTimeAction.java
    • -0
    • +29
    /forgon-tools/src/main/java/com/forgon/tools/date/DateTools.java
2:23 下午

CCT

统一更改his文件
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/spring/HIS.xml
2:23 下午

zc.li

修复:ASSZDFY-74 运作监控中发货信息的任务组过滤,会把有符合条件的申请物品的申请单内的所有物品都查询出来的问题;
Options
    • -9
    • +12
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
    • -2
    • +1
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/IpRoomControlHelper.java
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
11:47 上午

zc.li

修复:GZYKDXFSKQ-64 修改历史回收数量自动刷新装配页面有时页面报错的问题;
Options
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
11:24 上午

frank

解决GZYKDXFSKQ-64：修改历史回收单中的物品的回收数量的问题（先添加数量后减少数量时数据有问题）
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
10:39 上午

zc.li

修复:GZYKDXFSKQ-64 修改历史回收数量自动刷新装配页面有时页面报错的问题;
Options
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
Wednesday 24 Jun 2020
6:18 下午

frank

解决GZYKDXFSKQ-64：修改历史回收单中的物品的回收数量的问题（刚添加的器械包减少为0的时候删除器械包的数据）
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
4:44 下午

zc.li

修复向已入有其他外来器械包的篮筐中,加入外来器械包提示不正常的问题;
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
4:41 下午

zc.li

解决:GZYKDXFSKQ-64修改历史回收单中的物品的回收数量的问题
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -1
    • +16
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • -0
    • +10
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
4:25 下午

zc.li

解决:ASSZDFY-74运作监控中查询与导出增加器械包任务组过滤
Options
    • -7
    • +14
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManager.java
    • -2
    • +2
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
    • -2
    • +2
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/IpRoomControlHelper.java
    • -2
    • +2
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java
    • -25
    • +46
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
    • -30
    • +60
    /ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
    • -2
    • +2
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java
    • -2
    • +2
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/PkRoomControlHelper.java
    • -2
    • +2
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RvRoomControlHelper.java
    • -1
    • +2
    /ssts-web/src/main/webapp/homepage/exportOperateData.jsp
4:21 下午

zc.li

解决:SSTS-150运作监控查询与导出的各个时间精确到秒
Options
    • -15
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseOperate.java
4:16 下午

frank

解决GZYKDXFSKQ-64：修改历史回收单中的物品的回收数量的问题
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -1
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
4:08 下午

zengyuan

解决:消毒追溯系统V4.1稳定版SSTS-150 运作监控模块的时间显示要精确到秒，查询条件中的时间精确到分钟。缩小查询结果表格的高度。
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/supplyRoomOperate.jsp
    • -4
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperate.js
    • -19
    • +27
    /ssts-web/src/main/webapp/homepage/supplyRoomOperate.js