forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

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

Wednesday 26 Aug 2020
7:39 下午

shuyongfu

解决:

DGZYY-169 高低温物品入筐或入炉时强制告警提示

BJ307YY-3 PDA接口开发

BJ307YY-2 在软件中去掉公司相关的logo和说明

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.01_20200826_v4_1_6p_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.01_20200826_v4_1_nologo_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.01_20200826_v4_1_release.apk
7:19 下午

shuyongfu

解决:HZSRMYY-50 自定义发货保存时，增加检查是否满足所有物品的限制发货科室的要求
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
5:56 下午

jason

解决jira问题：HZSRMYY-51 惠州市中心人民医院 更改科室名称时，科室所属仓库名称联动修改(器械包信息模块的所属仓库也要联动修改)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
4:05 下午

jason

解决jira问题：HZSRMYY-51惠州市中心人民医院 更改科室名称时，科室所属仓库名称联动修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseView.js
2:52 下午

zc.li

注释完善
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
2:08 下午

zc.li

解决：ASSFDZLYY-37 二级供应室南院供应室查询退货统计报表要允许选择全部科室;修复了2级供应室登录时，科室下拉框只有2级供应室的问题；修复了2级供应室登录时，查询的数据没有过滤处理科室，查询到了别的处理科室处理的数据的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/returnGoodsDetailView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
Tuesday 25 Aug 2020
4:16 下午

yuandongxiao

新建项目 : 解放军总医院第五医学中心

project = jfjzyydwyxzx

Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/interfaces/mybatis
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/spring
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/config.js
  5. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/spring/HIS.xml
  8. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/interfaces
  9. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/print
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/interfaces/dataSyncConfig.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
3:49 下午

zc.li

修复:NYSY-12 急用物品处理周期统计报表，加急物品汇总数量有时会翻倍的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:48 下午

zc.li

修复:NYSY-12 急用物品处理周期统计报表，加急物品汇总数量有时会翻倍的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UrgentNeedGoodsProcessingCycle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
3:10 下午

jason

解决jira问题：ZJJSRM-26 张家界市人民医院 灭菌炉循环次数自动累加不准确的问题(清洗记录下次循环次数的获取方式，改为取只取清洗记录的最大循环次数，然后加1作为新添加的清洗记录的循环次数)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
2:26 下午

zc.li

解决：ZJJSRM-26。修改获取下一次循环次数的取值方式;改为灭菌炉产生的灭菌记录最大的循环次数+1；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
2:19 下午

jason

解决jira问题：JMSZXYY-86 江门市中心医院 培训管理功能优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/model/Vo/ReadRecordVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/model/Vo/TrainingRecordVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/service/KnowledgeFileManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/service/TrainingRecordManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-disinfectsystem-service.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/action/TrainingRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/service/KnowledgeFileManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/model/ReadRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/service/TrainingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/model/TrainingRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/action/ReadRecordAction.java
  12. /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/model/Vo
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/model/TrainingParticipant.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-knowledge/src/main/java/com/forgon/knowledge/controller/KnowledgeFileController.java
2:03 下午

frank

解决了JMSZXYY-86:培训管理功能优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/networkdisk/addFile.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/knowledge/viewExt.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/knowledge/viewExt.jsp
11:15 上午

jason

解决jira问题：JMSZXYY-88 江门市中心医院 器械包定义增加【签收后录入使用记录】字段(没有开启配置项时，包定义中【签收后录入使用记录】设置为默认值“否”)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
Monday 24 Aug 2020
8:26 下午

yuandongxiao

提交中大五院现场打印配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
5:33 下午

shilong.liu

提交现场的修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
3:59 下午

shuyongfu

解决:一次性物品发货时,新插入的一次性物品库存表数据的仓库名称与五笔码的值相反的处理
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
3:35 下午

frank

添加回收申请单不启动自动入筐时扫描条码数量会累加的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
2:40 下午

frank

解决DGZYY-171:消毒物品在回收模块删除后又添加进来的bug
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
10:37 上午

frank

解决PYQZYY-190：在待回收列表里点开一张回收单，扫描包外标签添加器械包时应该允许不自动入筐
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
10:09 上午

frank

解决打印外来器械包中标签添加预览的功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js
12:11 上午

terrykwan

将页面底部的版权所有文字，增强为可以通过config.js的参数companyName来设定。完成BJ307YY-2。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/footer.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/logon.jsp
Saturday 22 Aug 2020
11:26 上午

zc.li

解决：ZSWY-136。器械包工作量统计报表的发货数量统计指标的改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseWorkLoadChildVO.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad_child.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad_child.jasper
10:57 上午

shuyongfu

解决:ASSFDZLYY-30 供应室发出去的高值耗材在供应室退货后，库存没有增加

退货记录查看时,如果是退的高值耗材,则显示为高值耗材条码(之前为显示的一次性物品批次条码)

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
Friday 21 Aug 2020
6:20 下午

frank

解决中大五院打印中标签会显示代码的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
5:12 下午

frank

解决回收页面扫描器械包后保存的数量跟历史回收数量不一致的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
2:40 下午

jason

解决：不能正常查看监测项为“无”的质量监测记录的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java
2:04 下午

frank

解决PYQZYY-191：添加质量监测记录保存后抽检器械重复显示。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
10:33 上午

jason

解决jira问题：ZSWY-89 中大五院 任务组删除限制以及改名的联动修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
10:20 上午

jason

代zc.li提交.解决:ZSWY-140.装配器械包的灭菌日期取了客户端时间的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java