forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

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

Friday 30 Jul 2021
6:53 下午

jason

解决jira问题：GDSZYY-86 新增【器械包种类定义】功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentsettype/action/InstrumentSetTypeAction.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-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/InstrumentSetType_TD.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dto/TousseDefinitionParameterDto.java
  5. /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentsettype
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemoInstrumentSetType.xls
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemoInstrumentSetType_ToussePoint.xls
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentsettype/service/InstrumentSetTypeManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
  11. /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentsettype/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/action/ImportBasedataController.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentsettype/service/InstrumentSetTypeManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
  15. /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentsettype/action
  16. … 4 more files in changeset.
6:49 下午

frank.qiu

解决了 GDSZYY-86 - 新增【器械包种类定义】功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseDefinitionView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menu.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseDefinitionView.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/basedatamanager/tousse/customTousseDefinitionForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.jsp
    • ?
    /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/tousse/tousseType.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseType.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
6:41 下午

zc.li

在公告配置上配置手术室器械包使用分摊费用明细及汇总报表，外来器械包大小统计报表的配置。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
6:13 下午

zc.li

完善SZSLHQZXYY-4。手术室器械包使用分摊费用明细及汇总报表善SZSLHQZXYY-5。外来器械包大小统计报表配置项提交。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/config.js
4:19 下午

frank.qiu

优化报表控件布局
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseSizeReport.js
3:56 下午

frank.qiu

优化报表控件布局
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseSizeReport.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/operatingRoomInstrumentSetUsageAndApportionmentExpenseReport.js
3:31 下午

zc.li

完善SZSLHQZXYY-5。修改外来器械包大小统计报表中的送货厂家列名。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseSizeReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseSizeReport.jasper
2:44 下午

zc.li

修复SZSLHQZXYY-5。外来器械包大小统计报表中，开始时间改为当月第一天。供应商改为送货厂家。修复供应室控件的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseSizeReport.js
2:28 下午

zc.li

完善SZSLHQZXYY-4。更改手术室器械包使用分摊费用明细及汇总报表数据为空时，显示异常的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/noDataReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/noDataReport.jasper
2:21 下午

frank.qiu

解决了 PYQZYY-201 - 自定义的标签模板的数据源为外来器械包时，内置属性里需加上【拆分的总包数】和【拆分小包的序号】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
1:36 下午

zc.li

完善SZSLHQZXYY-4。更改手术室器械包使用分摊费用明细及汇总报表中病人所在科室的取值。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:43 上午

zc.li

完善SZSLHQZXYY-4。开始时间默认本月第一 天
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/operatingRoomInstrumentSetUsageAndApportionmentExpenseReport.js
11:13 上午

zc.li

提交SZSLHQZXYY-4。没部署在E盘会报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/operatingRoomUseRecordReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/operatingRoomUseRecordReport_child.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/operatingRoomUseRecordReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/operatingRoomUseRecordReport_child.jrxml
10:48 上午

frank.qiu

解决：清洗数据有图标，但是看不到温度曲线
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
10:43 上午

frank.qiu

解决：在IE下清洗机设备接口曲线看不到的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHua_ChangLong.jsp
10:04 上午

zc.li

解决：SZSLHQZXYY-5。增加外来器械包大小统计报表
Options
    • ?
    /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/disinfectsystem/reportforms/foreignTousseSizeReport.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseSizeReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseSizeReport.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/foreignTousseSizeReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseSizeReportBean.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
Thursday 29 Jul 2021
7:08 下午

yuandongxiao

增加旧版发货以及器械包进度条配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szszyy/config.js
6:50 下午

frank.qiu

解决了 XJJQZYY-108 - 开启了标识牌打印显示包名和编号的参数，编号不能被打印出来
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
6:29 下午

frank.qiu

解决了 SSTS-409 - 系统自带的小标签打印出现undefined字样
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
6:04 下午

frank.qiu

解决了 SSTS-410 - 在高级视图中的全部申请单和待处理申请单页面，点击外来器械申请单中的器械包条码有js报错
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
5:49 下午

jiayu.xiong

config更新
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/mmsrmyy/config.js
5:49 下午

jiayu.xiong

print更新
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/mmsrmyy/print/printConfig.js
5:36 下午

frank.qiu

解决了 XJJQZYY-108 - 开启了标识牌打印显示包名和编号的参数，编号不能被打印出来
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
3:51 下午

shuyongfu

解决:SZSDSRMYY-46 添加外来器械申请单后，要根据科室供应室设置里的器械包发货时间来决定该发货计划的显示(之前根据外来器械包实例的判断的部分业务逻辑还是需要,已恢复)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
3:18 下午

shuyongfu

解决:SZSDSRMYY-46 添加外来器械申请单后，要根据科室供应室设置里的器械包发货时间来决定该发货计划的显示(之前根据外来器械包实例的判断的部分业务逻辑已去掉不再使用)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
2:06 下午

zc.li

提交SZSLHQZXYY-4。调整手术室器械包使用分摊费用明细及汇总报表控件区域高度。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/operatingRoomInstrumentSetUsageAndApportionmentExpenseReport.js
1:42 下午

zc.li

提交SZSLHQZXYY-4。手术室器械包使用分摊费用明细及汇总报表菜单配置。SZSLHQZXYY-5.外来器械包大小统计报表菜单配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/menu/menuconfigure.js
11:55 上午

jason

解决jira问题：ZSLY-382 一次性物品接口停用，供应室需要将系统中所有一次性物品的库存进行退库处理
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
10:43 上午

frank.qiu

解决了 SSTS-408 - 外来器械申领以及装配模块拍摄照片上传后后，照片的长宽比会发生改变，导致变形
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.js
Wednesday 28 Jul 2021
6:25 下午

zc.li

解决：XJJQZYY-109。新疆定制的工作质量持续收集统计报表后台报错导致，按照整年查询每一年的数据都是一样的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java