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

Wednesday 10 Jan 2024
6:06 下午

frank.qiu

解决了 BJDXZLYY-46 - 【卡迪斯货柜】【手术预约发货】新增可库位模糊查询功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousseAssociation/tousseAssociationView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousseAssociation/tousseAssociationView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
  8. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousseAssociation
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousseAssociation/tousseAssociationForm.js
5:02 下午

zc.li

历史代码调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java
11:30 上午

linnansheng

提交东莞儿童个性化菜单，一些逗号没删掉，导致IE打开高级视图有报错。

灭菌炉分组采用新的

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/menu/menuconfigure.js
Tuesday 09 Jan 2024
5:02 下午

jason

解决jira问题：BJDXZLYY-45 - 【卡迪斯货柜】【手术预约管理】新增联动改进(快速跳转到库位查看，可终止手术预约单，调整默认日期)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
4:59 下午

frank.qiu

解决了 BJDXZLYY-45 - 【卡迪斯货柜】【手术预约管理】新增联动改进(快速跳转到库位查看，可终止手术预约单，调整默认日期)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.jsp
11:35 上午

jason

解决jira问题：BJDXZLYY-44 【库位管理】【卡迪斯货柜】进行多项联动改进(可共用库房和存取物品、库房查看新增可存入和取出)
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-storagelocation/src/test/java
  2. /SterileSupplySystem/branches/V4.1.0/ssts-storagelocation/src/test/resources
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-storagelocation/build.gradle
  4. /SterileSupplySystem/branches/V4.1.0/ssts-storagelocation/src/test/resources/org/gradle
  5. /SterileSupplySystem/branches/V4.1.0/ssts-storagelocation/src/main/java/com/forgon/disinfectsystem/basedatamanager/storagelocation/goodsaccess/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-storagelocation/src/test/resources/org/gradle/test-resource.xml
  8. /SterileSupplySystem/branches/V4.1.0/ssts-storagelocation/src/main/java/com/forgon/disinfectsystem/basedatamanager
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-storagelocation/.classpath
    • ?
    /SterileSupplySystem/branches/V4.1.0/settings.gradle
  12. /SterileSupplySystem/branches/V4.1.0/ssts-storagelocation/src/main/java/com
  13. /SterileSupplySystem/branches/V4.1.0/ssts-storagelocation
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-storagelocation/src/main/java/com/forgon/disinfectsystem/basedatamanager/storagelocation/goodsaccess/action/StorageLocationGoodsAccessAction.java
  15. /SterileSupplySystem/branches/V4.1.0/ssts-storagelocation/src/main/java
  16. … 26 more files in changeset.
Monday 08 Jan 2024
6:23 下午

frank.qiu

解决了 BJDXZLYY-44 - 【库位管理】【卡迪斯货柜】进行多项联动改进(可共用库房和存取物品、库房查看新增可存入和取出)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js
5:42 下午

zc.li

注释补充
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoringInstance.java
5:25 下午

zc.li

解决： DGSETYY-82 质量监测报表中定期监测项【湿包抽查(周六外来器械】查询异常
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/QualityMonitoringHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js
5:17 下午

zc.li

解决： DGSETYY-82 质量监测报表中定期监测项【湿包抽查(周六外来器械】查询异常
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/QualityMonitoringHelper.java
2:29 下午

frank.qiu

解决：SZSDSRMYY-138：没有配置指定的打印机，设置为默认打印机
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
10:38 上午

shuyongfu

处理 GDSRMYY-589 请对省医手术室新款PDA（EDA56-1）进行适配(补充说明:pda的追溯系统app版本需要在v4.7.37-beta6或以上)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/scanner.txt
10:35 上午

shuyongfu

处理 GDSRMYY-589 请对省医手术室新款PDA（EDA56-1）进行适配(pda的追溯系统app版本需要在v4.7.37-beta6或以上)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/scanner.txt
Friday 05 Jan 2024
11:42 上午

jason

解决jira问题：SZSSKRMYY-61 聚合包在发货后，应支持扫描包外标签条码进行退货，以及退货后可以再次扫描条码进行二次发货
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
11:30 上午

zc.li

解决 DGSETYY-71 自定义表单的查询统计的表格的登记日期列的值应只显示日期，不应显示出小时和分钟信息。导出的excel文件的登记日期列也应只显示日期
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DeviceMaintenanceHelper.java
11:24 上午

frank.qiu

解决了 ZJYY-114 - 同一批装配的多个物品，改进为允许其中的一个或者多个物品包含备注信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
Thursday 04 Jan 2024
4:41 下午

frank.qiu

解决了 SZSDSRMYY-140 - 【使用记录】改进第三方嵌入的使用记录接口支持查看、编辑和添加并同步最新的功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/buttjoint/useRecord/useRecordViewForm.js
4:20 下午

frank.qiu

解决了 SZSDSRMYY-140 - 【使用记录】改进第三方嵌入的使用记录接口支持查看、编辑和添加并同步最新的功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/buttjoint/useRecord/useRecordViewForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/buttjoint/useRecord/useRecordView.js
4:05 下午

frank.qiu

解决了 SZSDSRMYY-140 - 【使用记录】改进第三方嵌入的使用记录接口支持查看、编辑和添加并同步最新的功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/buttjoint/useRecord/useRecordViewForm.js
4:03 下午

frank.qiu

解决了 SZSDSRMYY-140 - 【使用记录】改进第三方嵌入的使用记录接口支持查看、编辑和添加并同步最新的功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/buttjoint/useRecord/useRecordViewForm.js
3:46 下午

frank.qiu

解决了 SZSDSRMYY-140 - 【使用记录】改进第三方嵌入的使用记录接口支持查看、编辑和添加并同步最新的功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/buttjoint/useRecord/useRecordView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/buttjoint/useRecord/useRecordViewForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/spring/security-standard/applicationContext-acegi-security.xml
2:41 下午

jason

解决jira问题：GMQRMYY-34 【物品绑定】通过使用记录转换的申请单，单内绑定生成的敷料包发货后，器械包没有发货，申请单的状态变为已发货，其他器械回收后无发货计划生成的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
Wednesday 03 Jan 2024
6:43 下午

zc.li

提交后台代码ZSYY-341 消毒供应中心员工工作量统计报表的查询速度优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/5.0.17_5.0.18.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packaging/PackagingRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/vo/ReportQueryParams.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/StatisticalWorkloadHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packaging/service/PackagingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifiedItem.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/db/InitDbConnection.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
5:58 下午

zc.li

代码完善 修复一个回收记录回收一种物品的，数量为多个，丢失其中的一个，装配任务会合并显示的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
5:25 下午

zc.li

提交后台代码 ZJYY-114 同一批装配的多个物品，改进为允许其中的一个或者多个物品包含备注信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
5:00 下午

frank.qiu

解决了 SSTS-463 - 登记使用记录使用 聚合包时，保存提示“id与barcode参数不能都为空!”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
4:52 下午

zc.li

提交后台代码 ZJYY-114 同一批装配的多个物品，改进为允许其中的一个或者多个物品包含备注信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/PackingPara.java
4:18 下午

frank.qiu

修复回收页面修改丢失报损误差数量报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setMaterialRecycleAmount.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.js
4:05 下午

zc.li

修复一个回收记录回收一种物品的，数量为多个，丢失其中的一个，装配任务会合并显示的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
3:37 下午

frank.qiu

解决了 ZJYY-114 - 同一批装配的多个物品，改进为允许其中的一个或者多个物品包含备注信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js