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

Sunday 07 Feb 2021
2:26 下午

frank

修复一次性物品出入库Ext4日期控件中选择年月就关闭picker的bug和排序时汇总也跟着排序的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/storageRecordView.js
Friday 05 Feb 2021
9:12 下午

frank

解决一次性物品出入库记录导出不了的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/storageRecordView.js
9:06 下午

frank

一次性物品出入库记录日期改为可手动输入
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/stocktakeView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/storageRecordView.js
8:29 下午

shilong.liu

提交现场配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/recyclingDetailPrintConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js
7:04 下午

zc.li

解决BJ307YY-78 显示科室的核算月报科室显示优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportShowApplicationDepart.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportShowApplicationDepart.jasper
4:26 下午

zc.li

修复:GDSZYY-70.核算月报院区显示异常的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:32 下午

zc.li

删除多余配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js
2:55 下午

frank

解决BJ307YY-74:电脑端的发货计划模块中物品列表和待发货物品列表列宽调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
2:53 下午

jason

解决jira问题：SSTS-151 自定义器械包默认装配组没有设置会导致自定义器械包申请单提交报错
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
2:30 下午

zc.li

解决BJ307YY-78新增重新打开后的需求：调整查询结果表格的列宽，科室名称列宽调小，能显示12个汉字即可；金额列的宽度调大，要能完整显示13个字符（包括数字和小数点在内）。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportShowApplicationDepart.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportShowApplicationDepart.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jasper
2:11 下午

frank

解决BJ307YY-58:一次性物品出入库增加多种查询条件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/storageRecordView.js
1:58 下午

jason

解决：保存清洗记录时报错(洁定清洗机,型号为86-series)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
1:39 下午

jason

解决jira问题：BJ307YY-58 一次性物品出入库增加多种查询条件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java
10:56 上午

zc.li

监测报表格式调整，列头过长自动换行
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/routineMonitoringSteScopeReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/routineMonitoringSteScopeReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/routineMonitoringReportOfADJ.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/routineMonitoringReportOfADJ.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jasper
10:33 上午

HHM

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/menu/menuconfigure.js
Thursday 04 Feb 2021
8:58 下午

jason

解决jira问题：GDSZYY-65 临床科室提交了外部代理灭菌申请单后就应该立即可以打印
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
8:51 下午

frank

解决因为printConfig。js没有配置hospitalName导致打印标签出现null或者undefined的情况
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js
7:46 下午

frank

解决因为printConfig。js没有配置hospitalName导致打印标签出现null或者undefined的情况
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js
7:43 下午

frank

解决因为printConfig。js没有配置hospitalName导致打印标签出现null或者undefined的情况
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
7:25 下午

frank

解决因为printConfig。js没有配置hospitalName导致打印标签出现null或者undefined的情况
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
7:15 下午

zc.li

解决：SZSDSRMYY-42。(不需要回收的器械包排除在外)历史回收记录列表的回收单，单上有物品的回收数量小于申请数量时，该回收单在所在行的背景颜色显示为黄色。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
7:00 下午

frank

解决SZSDSRMYY-42：历史回收记录列表的回收单，单上有物品的回收数量小于申请数量时，该回收单在所在行的背景颜色显示为黄色（添加配置项）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js
6:55 下午

shuyongfu

解决:SSTS-303 PDA端切换科室时，后台有报错.javax.crypto.BadPaddingException: Decryption error
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/crypto/rsa/RSAEncrypt.java
6:33 下午

zc.li

完善:GDSZYY-70.提交配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js
6:31 下午

zc.li

解决:GDSZYY-70.核算月报和明细核算月enableExcludeInvoiceItemOfDisposableGoodsApplicationBelongToSciProject不生效的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
6:22 下午

frank

解决SSTS-304：在tomcat8、IE浏览器下查询一次性物品结算报表，查询不出数据，后台有报错
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/stocktakeView.js
6:15 下午

zc.li

完善：GDSZYY-50 金额数字列的宽度要求：能完整显示13个字符（包括数字和小数点在内）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jrxml
6:12 下午

zc.li

解决：SZSDSRMYY-42。历史回收记录列表的回收单，单上有物品的回收数量小于申请数量时，该回收单在所在行的背景颜色显示为黄色。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingRecordVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
6:07 下午

frank

解决SZSDSRMYY-42：历史回收记录列表的回收单，单上有物品的回收数量小于申请数量时，该回收单在所在行的背景颜色显示为黄色
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/awaitForRecycleList.jsp
5:52 下午

frank

解决一次性物品修改申请数量时会显示不能大于最大数量，原因在于调用getMiddleAmount这个方法做了数量换算，而最大可申请数量则没有换算
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js