forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

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

Thursday 04 Jun 2020
10:11 上午

zc.li

解决：ZYYFS-126 修复系统内的指定报表导出后有数据列合并的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/deviceMaintenance.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/EOGoods_main_1.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/disinfectionFractionDefective.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1AddSupplierName.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/statisticalWorkload.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/materialTypeWorkloadReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailSupplierName_child.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/statisticalWorkload.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_childAddSupplierName.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/stocktakereportZYYFS.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/deviceMaintenance.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_mainAddSupplierName.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/packingUnqualifieReport.jasper
  16. … 35 more files in changeset.
10:09 上午

zc.li

解决：FJSSSYY-3回收时如果有新的申请单合并到当前正在回收的申请单后，保存时刷新页面会把已经入筐的物品清除入筐的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
9:51 上午

jason

外来器械申请单页面，器械包名称下拉框改成分页显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/SearchTousseDefinitionParams.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
9:50 上午

zengyuan

解决:福建石狮市医院FJSSSYY-3 回收时如果有新的申请单合并到当前正在回收的申请单后，保存时刷新页面会把已经入筐的物品清除入筐的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
9:41 上午

LQC

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js
9:20 上午

shuyongfu

解决:SSTS-146 不追溯的消毒物品退货重发扫描消毒物品提示库存不足
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Wednesday 03 Jun 2020
7:58 下午

zengyuan

解决:东莞中医院DGZYY-164 【审核打包】名称改为【包装管理】
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/homepage/supplyRoomUnfinishedWork.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js
3:25 下午

zengyuan

东莞中医院DGZYY-168 发货窗口的保存按钮没有显示完整，且发货窗口展开申请单信息列表后，保存按钮没有移动到左边 只是解决了保存按钮显示不完整的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
2:14 下午

shuyongfu

解决:SSTS-146 不追溯的消毒物品退货重发扫描消毒物品提示库存不足
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
11:22 上午

zc.li

类注释补充
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/LowTempSterilizerRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/LowTempStageDetails.java
11:12 上午

zc.li

处理ZSWY-120:质量元素合计变更；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:09 上午

zengyuan

解决:东莞中医院DGZYY-164 【审核打包】名称改为【包装管理】后面测试同事提出要修改的地方
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereReviewView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroupOption/departmentgroupOptionForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/modifyTousseInstances.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroupOption/departmentgroupOptionView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroupOption/departmentgroupOptionView.js
11:08 上午

jason

解决jira问题：DGZYY-164东莞中医院 【审核打包】名称改为【包装管理】(质量监测定义责任环节，【审核打包】名称改为【包装管理】)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoringconfig/QualityMonitoringDefinition.java
10:39 上午

frank

还原增大字体后，退货页面看不到按钮的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext/fontSize12/styles/common.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext/fontSize15/styles/common.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext/fontSize17/styles/common.css
10:20 上午

frank

优化回收界面弹窗位置兼容性的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
9:55 上午

frank

解决添加器械包js报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
9:39 上午

frank

解决DGSDBZXYY-23增大字体后，退货页面看不到按钮（window窗口统一修改了）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext/fontSize15/styles/common.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext/fontSize12/styles/common.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext/fontSize17/styles/common.css
Tuesday 02 Jun 2020
6:09 下午

frank

解决回收界面位置的问题和修改数量没有改变颜色的问题
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/touchScreen/recycle/updateAmount.jsp
4:15 下午

frank

解决质量检测界面js报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp
3:44 下午

zc.li

完善dgzyy-166:运作监控模块增加【物品预约单】发货信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/IpRoomControlHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
3:19 下午

jason

解决jira问题：FJSSSYY-1福建石狮市医院 清洗机灭菌炉打印口获取设备数据
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImplForFJSSSYY.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/ChangLongDataManagerImplFJSSSYY.java
2:11 下午

frank

解决DGSDBZXYY-19：回收时，修改回收数量为0，再修改为1后，装载数量底色应改为白色
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
10:44 上午

jason

解决jira问题：SZSDSRMYY-17 深圳市第三人民医院 添加使用记录时，可以通过扫描病人手腕带读取病人信息(参数名称修改)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szsdsrmyy/FindPatientInfoByHospitalNumDaoImpl.java
10:37 上午

zengyuan

解决:东莞市东部中心医院DGSDBZXYY-26 签收版本的配置项signModuleVersion配成2，从高级视图的物品签收入口进来依然显示是版本1的签收
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/portal.js
9:50 上午

frank

解决SZSDSRMYY-23：在培训管理模块下创建汉字名称的文件名显示乱码，上传的视频可以打开播放，但是只能听到声音，无法显示画面
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/networkdisk/addFolder.jsp
Monday 01 Jun 2020
11:44 下午

shuyongfu

解决:GXZYYFY-60 退过一次货再重发到其他科室的器械包无法正常进行第二次退货。

由原按结算科室退货改为按所在位置退货(先按位置2,如果位置2没有值再按位置)

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
6:37 下午

frank

解决SSTS-122：登录页的用户名密码输入框及按钮没对齐及样式等问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/themes/portalPage/css/login.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/logon.jsp
3:38 下午

jason

解决jira问题：SZSDSRMYY-17 深圳市第三人民医院 添加使用记录时，可以通过扫描病人手腕带读取病人信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szsdsrmyy/FindPatientInfoByTreatmentNumDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szsdsrmyy/WebServiceClientHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szsdsrmyy/FindPatientInfoByHospitalNumDaoImpl.java
3:18 下午

zengyuan

解决:东莞中医院DGZYY-164 【审核打包】名称改为【包装管理】不包含：权限管理和个人桌面
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/useRecord/tabs/tousseInstanceInfoTab.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/portalPage.js
3:07 下午

shuyongfu

解决:DGZYY-164 【审核打包】名称改为【包装管理】

后台解析portalPage.xml和operationDefinition.xml的处理代码已提交

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/portal/action/PortalPageAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/dao/OperationDefineDaoImpl.java