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

Monday 12 Apr 2021
5:03 下午

frank.qiu

解决了 ASSGYEY-51 - 使用记录勾选多个器械包后转换申请单不正确的问题（补充开启comboTousseRegistUseRecordCanModifySubTousseAmount之后扫描聚合包的删除操作）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
4:08 下午

frank.qiu

解决ASSDGSZYY-83：科室申领列表，鼠标悬停在操作列所在的单元格时不显示申领物品的悬浮窗口，以免挡住查看发货单按钮(添加干预申请数量)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
3:53 下午

jason

解决jira问题：DYSYY-45 系统部分信息根据供应室的不同过滤只看到所属自己科室或处理科室所属信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
2:25 下午

jason

解决jira问题：DGZYY-178 灭菌炉增加按炉次提醒的灭菌程序设置(oracle的升级语句)

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.72_4.9.73_oracle.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.72_4.9.73.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.72_4.9.73_sqlserver.sql
11:54 上午

frank.qiu

解决了 DGZYY-178 - 灭菌炉增加按炉次提醒的灭菌程序设置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
11:09 上午

zc.li

解决：CDSLQYQYYY-86。明细核算月报表的单价有小数点问题，需要提供修复历史数据SQL语句。修改包定义以及材料定义的价格时，要联动修改自定义装配生成的未发货的包实例的价格
Options
    • ?
    /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/toussedefinition/service/TousseDefinitionManagerImpl.java
Saturday 10 Apr 2021
5:28 下午

frank.qiu

解决了 ZSSXLRMYY-175 - 材料图片排序不成功
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionUploadImageManager.js
3:46 下午

jason

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

frank.qiu

解决了 ASSGYEY-51 - 使用记录勾选多个器械包后转换申请单不正确的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
Friday 09 Apr 2021
6:28 下午

jason

解决jira问题：SZSLGZXYY-5 质量监测记录增加审核功能(一帆提交)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/systemset/operationDefine.xml
6:27 下午

frank.qiu

解决了 SZSLGZXYY-5 - 质量监测记录增加审核功能
Options
    • ?
    /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/qualitymonitoring/qualitymonitoringInstanceView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
5:02 下午

frank.qiu

拍照时不启用麦克风
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.js
2:16 下午

zc.li

解决：质量监测报表当监测元素没有必填项且值都为空时，数据不显示的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
1:49 下午

jason

解决：视图中用户所属科室为NULL，同步用户数据时，提示同步失败
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
1:43 下午

jason

解决jira问题：BJ307YY-85 申请还物单在回收时不应允许手工增加其它物品、申请时间不应为空、申请人不应为admin、不应被合并到待回收的申请单上的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
Thursday 08 Apr 2021
7:45 下午

frank.qiu

解决了 CDSLQYQYYY-88 - 外来器械包申请单只限制不允许随便录入供应商，应可以随便录入外来器械包名称
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
7:05 下午

frank.qiu

解决了 BJ307YY-83 - 质量监测回收申请单回收时，不应允许添加其它物品（消毒申请单不能添加固定条码）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
6:18 下午

frank.qiu

解决了 ie添加器械包后台报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
6:10 下午

frank.qiu

解决了 BJ307YY-83 - 质量监测回收申请单回收时，不应允许添加其它物品
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
5:55 下午

jason

解决jira问题：DGZYY-178 灭菌炉增加按炉次提醒的灭菌程序设置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.72_4.9.73.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/SterilizationFrequecyRemind.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java
5:48 下午

frank.qiu

解决了 DGZYY-178 - 灭菌炉增加按炉次提醒的灭菌程序设置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereRecordForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationTab1.js
5:02 下午

yuandongxiao

新建项目：深圳市龙华区中心医院

project=szslhqzxyy

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/spring/timer.xml
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/interfaces/mybatis
  4. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/print
  5. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/spring
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/spring/HIS.xml
  7. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/interfaces/dataSyncConfig.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
  10. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/interfaces
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
  12. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/menu
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/interfaces/mybatis/syncFromHERP_Mapper.xml
4:30 下午

frank.qiu

window.onbeforeunload兼容ie8
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/videoMonitor/common/heartbeatRequestCommon.js
2:15 下午

kaking.lu

现场配置文件更新
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgskhyy/config.js
2:12 下午

kaking.lu

提交错误回滚版本
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/config.js
2:05 下午

kaking.lu

现场配置项更新
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/config.js
11:57 上午

frank.qiu

解决了 GDSZYY-81 - 手术室必须查看外来器械装配时拍摄的图片才能签收和录入病人使用记录(先验证是否签收，再弹窗图片)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
11:45 上午

frank.qiu

解决了 GDSZYY-81 - 手术室必须查看外来器械装配时拍摄的图片才能签收和录入病人使用记录(先验证是否签收，再弹窗图片)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
11:22 上午

frank.qiu

解决了 GDSZYY-81 - 手术室必须查看外来器械装配时拍摄的图片才能签收和录入病人使用记录(签收版本1)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp
10:35 上午

frank.qiu

newRousseType改成newTousseType
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/recyclingErrors.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp