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

Tuesday 21 Dec 2021
10:46 上午

jason

解决jira问题：NFYY-29 增加外来器械包供应商收费功能及相应报表
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntoussecharge/action/ForeignTousseSpecificationAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/ChargeSettingVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntoussecharge/service/ForeignTousseChargeModeManager.java
  4. /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntoussecharge
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntoussecharge/ForeignTousseChargeMode.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntoussecharge/ForeignTousseSpecification.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntoussecharge/service/ForeignTousseChargeModeManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/ChargeSettingModeItemVo.java
  10. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntoussecharge
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/ForeignTousseChargeModeVo.java
  12. /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntoussecharge/action
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-disinfectsystem-service.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntoussecharge/action/ForeignTousseChargeModeAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/ChargeSettingSpecItemVo.java
  16. … 9 more files in changeset.
10:39 上午

zc.li

解决：NFYY-29 - 增加外来器械包供应商收费功能及相应报表
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/bean/ModuleOperationMapping.java
10:38 上午

zc.li

解决：NFYY-29 - 增加外来器械包供应商收费功能及相应报表
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
10:38 上午

zc.li

解决：NFYY-29 - 增加外来器械包供应商收费功能及相应报表
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
10:36 上午

zc.li

解决：NFYY-29 - 增加外来器械包供应商收费功能及相应报表
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseSupplierChargeReport.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationSummaryReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseSupplierChargeReport.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationSummaryReport_child_child.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseAppSumVO.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationDetailedReport_child.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseAppDetailedVO.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationDetailedReport_child_child.jasper
    • ?
    /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/foreignTousseApplicationDetailedReport_child_child.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ThirdColumnVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationSummaryReport_child.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationSummaryReport_child.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationDetailedReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationSummaryReport.jasper
  16. … 8 more files in changeset.
10:15 上午

frank.qiu

解决了 NFYY-29 - 增加外来器械包供应商收费功能及相应报表
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/systemset/operationDefine.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/chargeSetTable.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/chargeSetForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreignTousseChargeMode/foreignTousseChargeModeView.js
  8. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreignTousseChargeMode
    • ?
    /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/disinfectsystem/basedatamanager/foreignTousseChargeMode/foreignTousseChargeModeView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreignTousseSpecification/foreignTousseSpecificationView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreignTousseSpecification/foreignTousseSpecificationView.js
  13. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreignTousseSpecification
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreignTousseSpecification/foreignTousseSpecificationForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreignTousseChargeMode/foreignTousseChargeModeForm.js
  16. … 3 more files in changeset.
9:36 上午

shuyongfu

处理:CDSLQYQYYY-102 排查系统是否存在Apache Log4j2 远程代码执行漏洞的预警(log4j升级到2.17.0)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
Monday 20 Dec 2021
6:29 下午

frank.qiu

处理FSSDERMYY-13：增加【回收拍摄】功能之前(补充2.4 器械包信息模块的【回收记录】标签增加查看拍摄功能)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
5:46 下午

frank.qiu

解决扫描已使用的标识牌，点击拍摄会显示包实例条码的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
5:11 下午

frank.qiu

解决了 HZSRMYY-70 - 器械包信息的查询条件选择好装配任务组后查询，点击导出按钮后，导出的数据与查询出来的不一致
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
4:49 下午

frank.qiu

解决扫描已使用的标识牌，点击拍摄会显示包实例条码的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
3:52 下午

frank.qiu

解决了 FSSDERMYY-17 - 回收清点模块拍照上传，器械包名称中含有#号会一直提示上传中，无法上传图像
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.jsp
2:45 下午

huang.cl

更改配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fsfy_xcyq/config.js
10:39 上午

jason

解决jira问题：CDSLQYQYYY-101 病人使用记录列表里增加【病人所在科室】列
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/dwr/table/UseRecordTableManager.java
10:36 上午

frank.qiu

解决了 CDSLQYQYYY-101 - 病人使用记录列表里增加【病人所在科室】列
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js
10:12 上午

jason

解决jira问题：XMSFYBJY-11 病人使用记录录入时，增加读取实体卡以及扫描患者电子医保卡二维码获取门诊病人的挂号信息的功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/xmsfybjy/FindPatientInfoByTreatmentNumDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/xmsfybjy/HttpInterfaceHelper.java
Friday 17 Dec 2021
7:25 下午

jason

解决jira问题：XMSFYBJY-11 病人使用记录录入时，增加读取实体卡以及扫描患者电子医保卡二维码获取门诊病人的挂号信息的功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/xmsfybjy/FindPatientInfoByTreatmentNumDaoImpl.java
7:07 下午

jason

解决jira问题：XMSFYBJY-11 病人使用记录录入时，增加读取实体卡以及扫描患者电子医保卡二维码获取门诊病人的挂号信息的功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/xmsfybjy/FindPatientInfoByTreatmentNumDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xmsfybjy/spring/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/xmsfybjy/DatasyncConstant.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/xmsfybjy/FindPatientInfoByHospitalNumDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xmsfybjy/interfaces/ehealthcodeConfig.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/xmsfybjy/SyncOrgUnitAndUserDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/xmsfybjy/HttpInterfaceHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/xmsfybjy/UseRecordPushDaoImpl.java
6:16 下午

zc.li

解决：ZSYY-300 条码：0115894856 装配时提示“装配失败！”问题。（申请单已不存在）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
10:55 上午

frank.qiu

解决了 XMSFYBJY-11 - 病人使用记录录入时，增加读取实体卡以及扫描患者电子医保卡二维码获取门诊病人的挂号信息的功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/common/cardReaderUtils.js
Thursday 16 Dec 2021
6:26 下午

huang.cl

提交现场的配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js
5:58 下午

huang.cl

提交现场的配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fsfy_xcyq/config.js
5:53 下午

huang.cl

提交现场的配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fsfy/config.js
5:03 下午

frank.qiu

解决了 XMSFYBJY-11 - 病人使用记录录入时，增加读取实体卡以及扫描患者电子医保卡二维码获取门诊病人的挂号信息的功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xmsfybjy/config.js
4:48 下午

frank.qiu

解决了 XMSFYBJY-11 - 病人使用记录录入时，增加读取实体卡以及扫描患者电子医保卡二维码获取门诊病人的挂号信息的功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/common/cardReaderUtils.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/images/web/chargeSetting.png
2:24 下午

jason

解决jira问题：NFYY-25 通过界面输入病人ID查询病人手术信息的Web Service接口修改为通过就诊号进行2次查询
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/nfykdxnfyy/FindPatientInfoByHospitalNumDaoImpl.java
10:57 上午

jason

解决：NFYY-34 同步入库单时，单上被同步物品的【物品类型】和【类别】信息要设置默认值(代码还原)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/Inventory.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/nfykdxnfyy/InventoryDaoImpl.java
Wednesday 15 Dec 2021
2:20 下午

zc.li

取消DGSETYY-16中的旧数据升级处理的升级脚本。理由是升级脚本涉及了包实例这个大表，一些不需要此功能的医院，升级时会浪费时间。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.84_4.9.85.sql
12:31 下午

zc.li

取消DGSETYY-16中的旧数据升级处理的升级脚本。理由是升级脚本涉及了包实例这个大表，一些不需要此功能的医院，升级时会浪费时间。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.84_4.9.85.sql
12:18 下午

zc.li

取消DGSETYY-16中的旧数据升级处理的升级脚本。理由是升级脚本涉及了包实例这个大表，一些不需要此功能的医院，升级时会浪费时间。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.84_4.9.85.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java