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

Wednesday 22 May 2019
11:58 上午

shuyongfu

ZSYY-267 过期包数量太多时进行废弃导致内存溢出，废弃失败的问题

增加定时废弃的配置

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
11:55 上午

zengyuan

修复在历史回收记录中，修改篮筐以后，本身加急的物品，不能显示加急图标的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
11:53 上午

shuyongfu

ZSYY-267 过期包数量太多时进行废弃导致内存溢出，废弃失败的问题

增加定时废弃的配置

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/zsyy/timer.xml
11:52 上午

shuyongfu

ZSYY-267 过期包数量太多时进行废弃导致内存溢出，废弃失败的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js
Tuesday 21 May 2019
7:36 下午

zengyuan

新疆军区总医院 XJJQZYY-82 器械包信息模块没有显示器械的清洗参数
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
6:50 下午

zc.li

修复因为删除加急对象urgent属性造成的测试用例断言结果错误的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerTests.java
5:09 下午

zengyuan

修复刪除加急级别中的是否加急
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelForm.js
4:05 下午

zengyuan

校验一次性物品的加急数量不能大于最小申请数量补充
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
3:07 下午

zc.li

修复科室申领有时查不到申请单的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
3:03 下午

zc.li

修复有时科室申领页面查不到申请单的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
2:47 下午

zengyuan

校验一次性物品的加急数量不能大于最小申请数量
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
2:34 下午

weizhenyu

修改发货计划的申请物品明细的最高紧急程度的字段名
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
1:41 下午

zc.li

删除测试用例加急对象urgent对象的操作
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
11:57 上午

zc.li

发货管理加急后台代码；删除加急对象的urgent属性和相关操作；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/urgent/UrgentLevel.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/action/UrgentLevelAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java
10:19 上午

jason

解决jira问题：ZSYY-262 自定义发货的接收科室，只允许输入或扫描系统中的申领科室
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java
10:14 上午

weizhenyu

发货管理的加急的前端代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/common.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
Monday 20 May 2019
2:10 下午

weizhenyu

发货计划加急前端代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.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/disinfectsystem/invoice/invoicePlanExtractedView.jsp
10:05 上午

zengyuan

刪除加急级别中的是否加急
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelForm.js
9:57 上午

zc.li

GGSRMYY-84。科室供应室设置的系统参数设置添加报损器械计算科室成本下拉框，控制核算月报和明细核算月报的报损机械是否计算科室成本。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
9:42 上午

jason

解决jira问题：FJZRXYY-1 全部申请单列表中外来器械和外部代理灭菌申请单记录打印不了
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fjzrxyy/print/printConfig.js
Friday 17 May 2019
7:34 下午

zc.li

解决：GGSRMYY-84。添加科室申领配置选项控制明细核算月报和核算月报是否计算报损器械。
Options
    • ?
    /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/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.33_4.9.34.sql
4:26 下午

shuyongfu

解决Jira问题:GZZYYFY-48 定时推送明细核算月报数据给医院集成平台
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/gzzyyfy/timer.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/report/dao/ReportDao.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/report/entity/ReportDataWriteRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/gzzyyfy/report.xml
  7. /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/report/dao/gzzyyfy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/report/dao/gzzyyfy/ReportDaoImpl.java
  9. /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/report
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/report/model/DepartmentMonthDetail.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/log/model/Log.java
  12. /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/report/dao
  13. /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/report/model
  14. /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/report/entity
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
  16. /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/report/dao
  17. /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/report
10:20 上午

yanweining

注释优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalAuthorizationManagerImpl.java
9:25 上午

zengyuan

中医药附三消毒供应系统 ZYYFS-23 只增加了包装类型设置的提示，其他的已经有提示

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/systemmanage/httpOptionByValue.jsp
Thursday 16 May 2019
7:34 下午

weizhenyu

灭菌管理模块的物品从“灭菌物品列表”被删除，并回到“今天审核的待灭菌物品”的时候没有变色的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
4:47 下午

weizhenyu

灭菌管理的灭菌记录信息窗口的父子表加急的色块的换行问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/common.css
4:43 下午

weizhenyu

审核模块和灭菌装载模块的父子表的加急色块换行的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
4:11 下午

zc.li

解决：GZSDBRMYY-13。报表中材料发货的物品名称显示格式： 材料名称（包名）。如 剪刀（缝合包）。材料发货时，选择了器械包才会有（包名）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:31 下午

yk

新建项目：北京市垂杨柳医院 project=bjscylyy
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/bjscylyy/print
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/bjscylyy/dataSyncConfig.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/bjscylyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/bjscylyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/bjscylyy/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/bjscylyy/config.js
  7. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/bjscylyy/mybatis
  8. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/bjscylyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/bjscylyy/mybatis/SyncOrgUnitAndUserMapper.xml
  10. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/bjscylyy
  11. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/bjscylyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/bjscylyy/mybatis/syncFromHERP_Mapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/bjscylyy/HIS.xml
1:39 下午

zc.li

修复测试用例。UrgentLevelManagerImpl使用StrutsParamUtils导致报空指针的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/action/UrgentLevelAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java