forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 59
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 59
Total Lines of Code (LoC): 4,711,364
Net change in LoC this week: 3,161

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

Subversion Details

1 property
  • svn:global-ignores = .gradle .settings bin build rebel.xml
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Tuesday 21 May 2019
11:57 上午

zc.li

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

jason

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

weizhenyu

发货管理的加急的前端代码
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.jsp
    • -1
    • +5
    /ssts-web/src/main/webapp/common/common.css
    • -4
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
Monday 20 May 2019
2:10 下午

weizhenyu

发货计划加急前端代码
Options
    • -5
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp
10:05 上午

zengyuan

刪除加急级别中的是否加急
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelView.js
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelForm.js
9:57 上午

zc.li

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

jason

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

zc.li

解决：GGSRMYY-84。添加科室申领配置选项控制明细核算月报和核算月报是否计算报损器械。
Options
    • -0
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • -0
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
    • -1
    • +1
    /forgon-tools/src/main/java/com/forgon/Constants.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.33_4.9.34.sql
4:26 下午

shuyongfu

解决Jira问题:GZZYYFY-48 定时推送明细核算月报数据给医院集成平台
Options
    • -2
    • +24
    /ssts-web/src/main/resources/spring/projects/gzzyyfy/timer.xml
    • -0
    • +172
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/report/dao/gzzyyfy/ReportDaoImpl.java
    • -0
    • +22
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/report/dao/ReportDao.java
    • -0
    • +7
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
  5. /ssts-datasync/src/main/java/com/forgon/disinfectsystem/report/dao
  6. /ssts-datasync/src/main/java/com/forgon/disinfectsystem/report
  7. /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/report
    • -0
    • +179
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/report/model/DepartmentMonthDetail.java
    • -0
    • +4
    /build.gradle
  10. /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/report/dao/gzzyyfy
    • -0
    • +151
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/report/entity/ReportDataWriteRecord.java
  12. /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/report/dao
    • -0
    • +3
    /forgon-core/src/main/java/com/forgon/log/model/Log.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
  15. /ssts-datasync/src/main/java/com/forgon/disinfectsystem/report/entity
    • -0
    • +22
    /ssts-web/src/main/resources/spring/projects/gzzyyfy/report.xml
  17. /ssts-datasync/src/main/java/com/forgon/disinfectsystem/report/model
10:20 上午

yanweining

注释优化
Options
    • -5
    • +4
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalAuthorizationManagerImpl.java
9:25 上午

zengyuan

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

Options
    • -1
    • +23
    /ssts-web/src/main/webapp/systemmanage/httpOptionByValue.jsp
Thursday 16 May 2019
7:34 下午

weizhenyu

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

weizhenyu

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

weizhenyu

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

zc.li

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

yk

新建项目：北京市垂杨柳医院 project=bjscylyy
Options
    • -0
    • +22
    /ssts-web/src/main/resources/config/bjscylyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • -0
    • +119
    /ssts-web/src/main/resources/spring/projects/bjscylyy/HIS.xml
    • -0
    • +26
    /ssts-web/src/main/resources/config/bjscylyy/mybatis/SyncOrgUnitAndUserMapper.xml
  4. /ssts-web/src/main/resources/spring/projects/bjscylyy
    • -0
    • +102
    /ssts-web/src/main/webapp/disinfectsystem/config/bjscylyy/config.js
    • -0
    • +1172
    /ssts-web/src/main/webapp/disinfectsystem/config/bjscylyy/print/printConfig.js
  7. /ssts-web/src/main/webapp/disinfectsystem/config/bjscylyy
  8. /ssts-web/src/main/webapp/disinfectsystem/config/bjscylyy/print
    • -0
    • +15
    /ssts-web/src/main/resources/config/bjscylyy/dataSyncConfig.json
    • -0
    • +111
    /ssts-web/src/main/resources/config/bjscylyy/mybatis/syncFromHERP_Mapper.xml
    • -0
    • +39
    /ssts-web/src/main/resources/config/bjscylyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
  12. /ssts-web/src/main/resources/config/bjscylyy/mybatis
  13. /ssts-web/src/main/resources/config/bjscylyy
1:39 下午

zc.li

修复测试用例。UrgentLevelManagerImpl使用StrutsParamUtils导致报空指针的问题。
Options
    • -0
    • +22
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/action/UrgentLevelAction.java
    • -20
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java
11:22 上午

zengyuan

删除重复的加急配置项
Options
    • -2
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
10:04 上午

zc.li

修复回收生成装配任务时，产生的装配任务不合理的问题。如一个回收项回收3个，其中一个是特急，会生成加急数量为1，特急的装配任务和2个加急数量为0但是却是特急的装配任务。
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
Wednesday 15 May 2019
4:45 下午

zc.li

no_comment
Options
    • -1
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js
4:44 下午

zc.li

解决：GDSRMYY-493。定制无菌包质量抽查登记表。
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/routineMonitoringReportOfADJ.jasper
    • -151
    • +4
    /ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -3
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • -1
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js
    • -0
    • +478
    /ssts-web/src/main/webapp/jasperRtp/routineMonitoringReportOfADJ.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jasper
3:43 下午

zengyuan

加急级别是都默认 默认值修改为否
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelForm.js
3:27 下午

weizhenyu

加急： 灭菌装载，灭菌管理
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingView.jsp
    • -2
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • -6
    • +99
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
3:05 下午

weizhenyu

加急：审核打包
Options
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp
    • -7
    • +90
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
3:03 下午

weizhenyu

加急，部分公共样式以及js
Options
    • -20
    • +60
    /ssts-web/src/main/webapp/common/common.css
    • -0
    • +33
    /ssts-web/src/main/webapp/js/common.js
2:42 下午

zengyuan

加急功能：加急级别，科室申领，回收，装配，以及其他config.js的配置项修改
Options
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • -2
    • +0
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/config.js
    • -13
    • +104
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelView.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/dgskhyy/config.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • -2
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • -8
    • +189
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
    • -14
    • +104
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • -29
    • +169
    /ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js
    • -2
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • -33
    • +70
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelView.jsp
    • -2
    • +153
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelForm.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
2:08 下午

zc.li

解决：GZYKDXFSKQ-48，GZZYYFY-52。新增限制入筐的消毒物品不能修改消毒物品材料，要先把要修改的消毒物品从篮筐中删除才可以修改。

保存回收记录的时候，修改包的材料定义。

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -2
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp
1:51 下午

zc.li

提交后台代码
Options
    • -1
    • +8
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java
    • -3
    • +53
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/action/UrgentLevelAction.java
    • -1
    • +28
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
    • -1
    • +4
    /ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
    • -3
    • +5
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
    • -0
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java
    • -0
    • +11
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java
    • -0
    • +33
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/InvoicePlanVo.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -3
    • +4
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -1
    • +2
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -0
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/urgent/UrgentLevel.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
  16. … 16 more files in changeset.
9:53 上午

yanweining

加急功能：

1）审核打包后台获得加急信息

2）灭菌装载后台获得加急信息

3）灭菌管理后台获得加急信息

4）灭菌记录增加、删除加急器械包时，需要联动修改灭菌记录的加急状态。干预灭菌记录时，如果该记录关联的加急包有变化，也需要修改灭菌记录的加急状态

Options
    • -8
    • +17
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -1
    • +10
    /ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -7
    • +17
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
    • -3
    • +10
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -0
    • +18
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManager.java
    • -0
    • +35
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java
9:28 上午

yanweining

加急功能：器械包实例,灭菌记录添加关联加急对象
Options
    • -4
    • +33
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
    • -0
    • +58
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/vo/UrgentLevelVo.java
    • -0
    • +16
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -3
    • +15
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseSimpleVO.java
    • -0
    • +14
    /ssts-stockmanage/src/main/java/com/forgon/disinfectsystem/stockmanage/departmentstock/vo/TousseInstanceVo.java
  6. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/vo