forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 43
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 43
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 15303 is being indexed.

Friday 14 Oct 2016
9:47 上午

adairkang

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/InvoiceQuery.java
9:45 上午

adairkang

发货物品查询统计报表添加物品类型过滤

发货物品查询报表，器械包的总价使用包的价格,单价用包的价格除以数量

Options
    • ?
    /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/javabeansource/InvoiceQueryItem.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/disinfectsystem/reportforms/invoiceQueryView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/InvoiceQuerySummaryService.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/util/DefaultValue.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
1:50 上午

shuyongfu

解决jira问题:DGZYY-9 HIS用户同步接口修改

同步人员去掉科室的条件,可同步所有科室下属人员

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgszyy/SyncOrgUnitAndUserDaoImpl.java
Thursday 13 Oct 2016
4:21 下午

shuyongfu

解决jira问题:DGZYY-9 HIS用户同步接口修改

东莞市中医院his接口配置文件

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgszyy/SyncOrgUnitAndUserDaoImpl.java
3:58 下午

wangyi

装配界面增加扫描灭菌人字段
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.jsp
3:48 下午

jeffli

装配时不扣减一次性物品库存
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
3:23 下午

adairkang

发货物品查询界面,物品明细添加发货员、核对员、失效日期
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_child_1.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/InvoiceQueryItem.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1.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/invoiceItemsQuery_child_1.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/invoiceItemsQuery_main_1.jrxml
12:47 下午

adairkang

核算月报一次性物品显示失效期，取消生产日期列(一直都是空,jasper直接显示空字符)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.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/DepartmentMonthDetail_child.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jrxml
12:47 下午

zengjc

导入材料的属性‘是否外来器械’不是‘是’，默认为‘否’
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
12:37 下午

zengjc

根据名称获取普通材料定义的时候，对是否外来器械增加空字符串判断.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
11:42 上午

shuyongfu

解决jira问题:DGZYY-9 HIS用户同步接口修改

东莞市中医院his接口配置文件

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/dgszyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
  2. /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgszyy
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/dgszyy/mybatis
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgszyy/SyncOrgUnitAndUserDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/dgszyy/mybatis/SyncOrgUnitAndUserMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/dgszyy/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/dgszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
10:47 上午

adairkang

明细核算月报,批次号添加别名
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
10:30 上午

zengjc

导入器械包数据，支持导入‘模板-普通中标签’、‘模板-普通小标签’.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
10:07 上午

shuyongfu

新增贵阳市第二人民医院配置
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/gysdermyy
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/gysdermyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gysdermyy/print/printConfig.js
  4. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gysdermyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/gysdermyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
  6. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gysdermyy/print
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gysdermyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/gysdermyy/mybatis/SyncOrgUnitAndUserMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/gysdermyy/dataSyncConfig.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/gysdermyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/gysdermyy/applicationContext-his.xml
  12. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/gysdermyy/mybatis
9:57 上午

adairkang

番禺区中发货单打印,打印复核员
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js
9:54 上午

adairkang

发货单查看添加责任人

隐藏发货单表格窗口中的删除按钮及保存按钮,此窗口为只读

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
9:45 上午

jeffli

优化标签调试界面
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/debug/print/printDebug.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/debug/print/print.jsp
9:39 上午

jeffli

调整省医双排标签
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
Wednesday 12 Oct 2016
7:39 下午

jeffli

调整省医双排标签
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
7:38 下午

jeffli

调整省医双排标签
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
7:34 下午

jeffli

调整省医双排标签
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
7:23 下午

adairkang

材料出库单增加一个复核员(PYQZYY-96)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
7:22 下午

jeffli

调整省医双排标签
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
7:09 下午

adairkang

外来器械添加清洗、灭菌人及科室
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/debug/print/printDebug.js
7:06 下午

adairkang

大标签、中标签、小标签、小标签2科室跟包名根据是不是手术室来分别显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
6:12 下午

zengjc

xls导入基础数据，支持器械包的加大标签、中标签2、小标签2,器械包大小支持标准包、超大包、超重包、超大超重包.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
6:09 下午

jeffli

调整省医双排标签
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
5:58 下午

shuyongfu

科室申领的是否隐藏住院号、是否隐藏加急数量的可配置项逻辑调整:

未配置时默认为隐藏,小榄是否隐藏加急数量配置改为false及复大肿瘤的是否隐藏住院号改为false

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js
5:51 下午

adairkang

大标签向灭菌日期和清洗往右移,避开黄线
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
5:44 下午

jeffli

调整省医双排标签
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js