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

Friday 19 Aug 2022
11:25 上午

jason

解决jira问题：GDSKQYY-6 【使用记录】模块的使用记录数据库表新增字段“就诊类型编码”和“就诊类型名称”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/PatientInfoVO.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gdskqyy/FindPatientInfoByHospitalNumDaoImpl.java
11:22 上午

yuandongxiao

selenium3提交测试用例：自定义发货、材料发货
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/delivery/CustomDeliveryProxy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/delivery/MaterialDeliveryPage.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/pack/PackProxy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/delivery/CustomDeliveryPage.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/delivery/CustomDeliveryHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/delivery/MaterialDeliveryProxy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/delivery/DeliveryProxy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/delivery/MaterialDeliveryHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestDelivery.java
10:34 上午

frank.qiu

解决了 GDSKQYY-6 - 【使用记录】模块的使用记录数据库表新增字段“就诊类型编码”和“就诊类型名称”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
10:20 上午

frank.qiu

解决了 GDSZYY-196 - 外来器械申请单需要增加部分终止功能，以及加大字体下表格列宽及名称统一的优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • ?
    /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/foreigntousseapplication/foreignTousseApplicationView.js
Thursday 18 Aug 2022
4:55 下午

frank.qiu

解决了 BJDXZLYY-31 - 库位管理模块增加与卡迪斯智能货柜系统进行对接功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/goodsAccess.js
4:44 下午

frank.qiu

解决了 ZSRY-9 - 【器械包定义】模块的“配包注意事项”控件改进为支持富文本编辑及弹窗提示方式改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/wangEditor.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/wangEditor.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
4:08 下午

frank.qiu

解决了 ZSRY-9 - 【器械包定义】模块的“配包注意事项”控件改进为支持富文本编辑及弹窗提示方式改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
3:51 下午

frank.qiu

解决了 DGSETYY-50 - 回收清点确认沟通功能背景颜色改进为可配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
3:27 下午

frank.qiu

解决了 DGSETYY-50 - 回收清点确认沟通功能背景颜色改进为可配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
3:16 下午

frank.qiu

解决了 DGSETYY-50 - 回收清点确认沟通功能背景颜色改进为可配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
3:04 下午

frank.qiu

解决了 GYEY-773 - 回收和装配时的扫描标识牌条码的功能，增加通过RFID阅读器来读取RFID标签中的的器械包标识牌条码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/index.html
2:45 下午

zc.li

解决：NYSY-49 外来器械和外来器械拆分小包显示调整 报表调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport_child_child.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SecondColumnVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport_child.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport_child_child.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport_child.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UrgentNeedGoodsProcessingCycle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • ?
    /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/urgentNeedGoodsProcessingCycleReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycleReport.jasper
2:18 下午

frank.qiu

解决了 GYEY-773 - 回收和装配时的扫描标识牌条码的功能，增加通过RFID阅读器来读取RFID标签中的的器械包标识牌条码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
2:16 下午

frank.qiu

解决了 GYEY-773 - 回收和装配时的扫描标识牌条码的功能，增加通过RFID阅读器来读取RFID标签中的的器械包标识牌条码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/index.html
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/setPlugInRFID.js
12:37 下午

frank.qiu

解决了 GYEY-773 - 回收和装配时的扫描标识牌条码的功能，增加通过RFID阅读器来读取RFID标签中的的器械包标识牌条码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/usb.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/connect_2_1.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • ?
    /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/1980/images/connect_1.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/connect_2_2.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
12:04 下午

shuyongfu

处理:ZJYY-108 PDA预回收功能优化：扫“手术间”、“科室”、“标识牌”条码筛选待回收的申请单、单内物品可设置排序、增加已处理物品颜色标识、物品加急标识

DGSHLYY-6 PDA【回收清点】模块在待回收列表扫描录入了使用记录的标识牌或包外唯一标签条码，可以打开对应的申请单

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.30_20220818_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.30_20220818_v4_1_nologo_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
11:29 上午

yuandongxiao

selenium3：优化高级视图点击菜单代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/enterpriseview/EnterpriseViewPage.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/enterpriseview/EnterpriseViewHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestDisposableGoodsManagement.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestMaterialStockManagement.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/enterpriseview/EnterpriseViewProxy.java
11:25 上午

frank.qiu

解决了 GYEY-773 - 回收和装配时的扫描标识牌条码的功能，增加通过RFID阅读器来读取RFID标签中的的器械包标识牌条码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/usb.png
11:22 上午

frank.qiu

解决了 GYEY-773 - 回收和装配时的扫描标识牌条码的功能，增加通过RFID阅读器来读取RFID标签中的的器械包标识牌条码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • ?
    /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.js
10:06 上午

jason

解决jira问题：ZJYY-108 PDA预回收功能优化：扫“手术间”、“科室”、“标识牌”条码筛选待回收的申请单、单内物品可设置排序、增加已处理物品颜色标识、物品加急标识
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
Wednesday 17 Aug 2022
6:29 下午

yuandongxiao

selenium3提交测试用例：扫描灭菌篮筐发货、辅助发货
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestDelivery.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/delivery/DeliveryPage.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/delivery/DeliveryHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/recycle/RecyclePage.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/pack/PackPage.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/delivery/DeliveryProxy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/autotest/config.js
5:58 下午

shuyongfu

处理:ZJYY-108 PDA预回收功能优化：扫“手术间”、“科室”、“标识牌”条码筛选待回收的申请单、单内物品可设置排序、增加已处理物品颜色标识、物品加急标识

DGSHLYY-6 PDA【回收清点】模块在待回收列表扫描录入了使用记录的标识牌或包外唯一标签条码，可以打开对应的申请单

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.30_20220817_v4_1_6p_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
5:06 下午

jason

解决jira问题：ZJYY-108 PDA预回收功能优化：扫“手术间”、“科室”、“标识牌”条码筛选待回收的申请单、单内物品可设置排序、增加已处理物品颜色标识、物品加急标识(扫描标识牌或器械包实例条码，打开包含该器械包的使用记录转换的待回收申请单)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
3:28 下午

jason

解决jira问题：ZJYY-108 PDA预回收功能优化：扫“手术间”、“科室”、“标识牌”条码筛选待回收的申请单、单内物品可设置排序、增加已处理物品颜色标识、物品加急标识(器械包种类查询条件需要包含其所有子类)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
2:09 下午

zc.li

完善：GDSZYY-182 外来器械包数据调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:23 上午

yuandongxiao

selenium3:修改用例数据
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json
11:21 上午

zc.li

完善：GDSZYY-182 外来器械包数据调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:13 上午

jason

解决jira问题： BJDXZLYY-31 库位管理模块增加与卡迪斯智能货柜系统进行对接功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageRecordManagerImpl.java
10:37 上午

jason

解决jira问题： BJDXZLYY-31 库位管理模块增加与卡迪斯智能货柜系统进行对接功能(服务器响应超时提示信息修改)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/StorageRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageRecordManagerImpl.java
10:30 上午

shuyongfu

处理:ZJYY-108 PDA预回收功能优化：扫“手术间”、“科室”、“标识牌”条码筛选待回收的申请单、单内物品可设置排序、增加已处理物品颜色标识、物品加急标识

DGSHLYY-6 PDA【回收清点】模块在待回收列表扫描录入了使用记录的标识牌或包外唯一标签条码，可以打开对应的申请单

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java