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

Saturday 07 May 2022
10:24 上午

yuandongxiao

引入测试报告框架allure
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
10:21 上午

yuandongxiao

selenium提交：优化自动化测试代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
Friday 06 May 2022
6:48 下午

frank.qiu

解决了 GDSZYY-153 - 器械包定义所属科室添加方式从搜索添加更改为可通过树状结构方式多选添加
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/changeDepartment.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/changeDepartment.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/setDepartOrgUnitForm.js
5:09 下午

jason

解决jira问题：BJ307YY-98 外来器械包只有植入物的情况下，填写使用记录后，转换申请单时不进行转换的改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
2:01 下午

jason

解决jira问题：ZJYY-84 待回收列表和历史回收记录列表的表格列改进为可配置(使用记录转申请单时，申请单上记录病人姓名)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
11:52 上午

frank.qiu

解决了 BJ307YY-98 - 外来器械包只有植入物的情况下，填写使用记录后，转换申请单时不进行转换的改进（兼容enableForeignTousseApplyDepartment）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
11:45 上午

frank.qiu

解决了 GDSZYY-164 - 按省中医要求重新定制【消毒供应中心工作量统计报表】(兼容IE浏览器)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/report/cssdWorkloadReport/cssdWorkloadReport.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/report/cssdWorkloadReport/cssdWorkloadReport.js
11:34 上午

frank.qiu

解决了 GDSZYY-164 - 按省中医要求重新定制【消毒供应中心工作量统计报表】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/report/cssdWorkloadReport/cssdWorkloadReport.jsp
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/report/cssdWorkloadReport
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/report/cssdWorkloadReport/cssdWorkloadReport.js
Thursday 05 May 2022
6:33 下午

frank.qiu

解决了 CDSLQYQYYY-108 - 灭菌记录里选择【灭菌方式】过滤后，加急器械包不显示加急的标识
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
5:35 下午

zc.li

解决：CDSLQYQYYY-108 灭菌记录里选择【灭菌方式】过滤后，加急器械包不显示加急的标识
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
5:35 下午

frank.qiu

解决了 CDSLQYQYYY-108 - 灭菌记录里选择【灭菌方式】过滤后，加急器械包不显示加急的标识
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
5:30 下午

frank.qiu

解决了 CDSLQYQYYY-108 - 灭菌记录里选择【灭菌方式】过滤后，加急器械包不显示加急的标识
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereRecordForm.js
3:09 下午

frank.qiu

解决了 BJ307YY-98 - 外来器械包只有植入物的情况下，填写使用记录后，转换申请单时不进行转换的改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
3:02 下午

frank.qiu

解决了 CDSLQYQYYY-108 - 灭菌记录里选择【灭菌方式】过滤后，加急器械包不显示加急的标识
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
2:58 下午

shuyongfu

处理:NFYY-62 PDA发货任务模块增加【借物单发货】功能，能把借物单和非借物单分开进行发货
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
2:41 下午

frank.qiu

优化了 ZJYY-84 - 待回收列表和历史回收记录列表的表格列改进为可配置
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/awaitForRecycleList.js
11:17 上午

frank.qiu

优化了 ZJYY-84 - 待回收列表和历史回收记录列表的表格列改进为可配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
11:14 上午

jason

解决jira问题：BJ307YY-98 外来器械包只有植入物的情况下，填写使用记录后，转换申请单时不进行转换的改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.90_4.9.91.sql
    • ?
    /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/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
Friday 29 Apr 2022
6:16 下午

li.wei

根据现场实际配置项，更新公司内的config.js文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js
3:39 下午

jason

解决jira问题：DGZYY-185 患者信息接口修改队列名称
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/dgszyy/MQHelper.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/dgszyy/MQDataDaoImpl.java
2:49 下午

frank.qiu

完善 NFYY-62 - 发货计划模块增加【借物单发货】功能，能把借物单和非借物单分开进行发货
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/portalPage.js
2:35 下午

zc.li

解决：BJ307YY-105 明细核算月报的查询条件增加【显示发货日期】查询条件，可在查询结果报表中增加【发货日期】列的显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailShowSendTime.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailSupplierNameAndSendTime.jasper
    • ?
    /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/DepartmentMonthDetailDiscountPriceAndSendTime.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailDiscountPriceAndSendTime_child.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailShowSendTime_child.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailSupplierNameAndSendTime.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailIntegralShowSendTime.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailShowMaterialsAmountAndSendTime_child.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailDiscountPriceAndSendTime_child.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailIntegralShowSendTime.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailSupplierNameAndDiscountPriceAndSendTime.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailSupplierNameAndDiscountPriceAndSendTime_child.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetailSupplierNameAndSendTime_child.jasper
  16. … 15 more files in changeset.
2:11 下午

frank.qiu

完善 NFYY-62 - 发货计划模块增加【借物单发货】功能，能把借物单和非借物单分开进行发货
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/portalPage.js
1:53 下午

frank.qiu

解决了 ZJYY-84 - 待回收列表和历史回收记录列表的表格列改进为可配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/styleForWaitList.css
11:41 上午

zc.li

修复：ZJYY-84 删除多余代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
11:30 上午

frank.qiu

解决了 NFYY-62 - 发货计划模块增加【借物单发货】功能，能把借物单和非借物单分开进行发货
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/portalPage.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/portalPage.jsp
10:53 上午

shuyongfu

处理:NFYY-62 PDA发货任务模块增加【借物单发货】功能，能把借物单和非借物单分开进行发货
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
10:16 上午

frank.qiu

解决了 ZJYY-84 - 待回收列表和历史回收记录列表的表格列改进为可配置(开启序号后样式错乱的问题)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
10:13 上午

zc.li

修复：ZJYY-84 历史回收记录中的申请单号显示值为空。 历史回收记录中的物品清单只能显示一种包。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
9:45 上午

zc.li

解决新增需求： BJ307YY-104 红色部分新需求
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/sterilizationAreaWorkLoad.jasper
    • ?
    /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/sterilizationAreaWorkLoad.jrxml