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

Wednesday 06 Jan 2021
7:23 下午

liwei

增加接口队列配置文件
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/bjscylyy/interfaces/mqConfig
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/bjscylyy/interfaces/mqConfig/esbmq-config.xml
7:16 下午

frank

解决装配聚合包只装配一个时会报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
4:52 下午

shuyongfu

解决:ASSZDFY-82 SQL查询速度优化

SQL1对应的功能模块-"全部申请单"的优化

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/urgent/UrgentLevel.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
4:48 下午

frank

优化GDSRMYZHYY-28:装配界面左下角勾选需要装配的物品，选择包装类型为棉布，装配打印后还是无纺布。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
2:41 下午

zc.li

修复核算月报按灭菌方式统计，查询到器械材料发货时，报错的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
2:33 下午

frank

解决灭菌炉使用次数统计报表IEjs报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountView.jsp
2:29 下午

shuyongfu

解决:GDSZYY-57 科研项目耗材申领（一次性物品申领）功能开发

完善科研项目与指标数据检查业务及提示信息调整

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/project/service/gdszyy/ProjectManagerImpl.java
2:20 下午

shuyongfu

解决:GDSZYY-57 科研项目耗材申领（一次性物品申领）功能开发

申请与发货时回写的两个中间表增加proj_id和detail_id两个字段

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/queryAndWriteProject_Mapper.xml
1:53 下午

zc.li

解决装配任务模块业务调整后，原来的断言不再适用的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java
11:57 上午

jason

解决jira问题：KLMYSRMYY-4 克拉玛依市人民医院 申请单没有回收前不能打印发货计划单的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
11:49 上午

frank

优化GDSZYY-53:装配完成后补充该包的丢失器械，重新打印的标签上不应有【菱形◆和 】信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.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/print/print.js
11:34 上午

jason

解决jira问题：KLMYSRMYY-4 克拉玛依市人民医院 申请单没有回收前不能打印发货计划单的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
11:32 上午

frank

住院号的配置项被注释了
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
11:31 上午

zc.li

修复测试用例，当包定义的祖先id为null时，回收保存报错的问题；正常情况下包定义的祖先id不会为null
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
11:25 上午

frank

解决SSTS-256：IE浏览器下，在使用记录模块扫描带出一个同时登记了丢失和报损的器械包，但是鼠标移到丢失或者报损按钮上悬浮框显示出了丢失和报损的所有信息，而没有分别显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
10:52 上午

jason

解决jira问题：KLMYSRMYY-4 克拉玛依市人民医院 申请单没有回收前不能打印发货计划单的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
10:19 上午

jason

解决jira问题：KLMYSRMYY-4 克拉玛依市人民医院 申请单没有回收前不能打印发货计划单的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
1:00 上午

terrykwan

提交webServiceManager的bean定义，用junit test
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/spring/tests/applicationContext-disinfectsystem-cxf.xml
Tuesday 05 Jan 2021
6:22 下午

frank

解决ZJYY-21:在IE8浏览器下，打印灭菌炉设备接口参数有js报错
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js
5:48 下午

shuyongfu

解决:BJCYLYY-42 中国移动的PDA适配 版本调整到4.7.12
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.12_20210105_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.12_20210105_v4_1_6p_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.12_20210105_v4_1_nologo_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
4:58 下午

frank

解决GDSRMYZHYY-28:装配界面左下角勾选需要装配的物品，选择包装类型为棉布，装配打印后还是无纺布。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
4:39 下午

frank

解决自定义入筐修改数量时js报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp
3:54 下午

frank

解决GDSZYY-47:装配器械包时打印出来的标签与器械包定义中设置的标签纸类型不一致
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
3:10 下午

zc.li

解决：GGSRMYY-153。核算月报选择按一次性物品类型统计，数量合计列负数数量不能合计的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportGroupBySterilizationMode.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthIntegralReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportGroupBySterilizationMode.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthIntegralReport.jasper
1:56 下午

frank

解决GDSZYY-47:装配器械包时打印出来的标签与器械包定义中设置的标签纸类型不一致
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateForm.js
1:53 下午

frank

解决GDSZYY-47:装配器械包时打印出来的标签与器械包定义中设置的标签纸类型不一致
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateForm.js
11:52 上午

frank

解决GDSZYY-53:装配完成后补充该包的丢失器械，重新打印的标签上不应有【菱形◆和 】信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
11:49 上午

zc.li

解决：GDSZYY-53装配完成后补充该包的丢失器械，重新打印的标签上不应有【菱形◆和 】信息。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java
11:47 上午

zc.li

解决：GGSRMYY-153。核算月报选择按一次性物品类型统计，数量合计列累计起来不正常的问题；(退货统计异常的问题)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:07 上午

shuyongfu

解决:GDSZYY-57 科研项目耗材申领（一次性物品申领）功能开发
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/project/service/gdszyy/ProjectManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/project.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/project/service/zsykzx/ProjectManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/project/service/BaseProjectManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/project/service/ProjectManager.java