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
Thursday 14 Sep 2017
12:50 下午

yanweining

gyey:根据hl7记录患者入院信息
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/gyey
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/gyey/PatientAdmissionInfo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/goodwillcis/HL7V2ServiceImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/gyey/applicationContext-his-gyey.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/gyey/PatientAdmissionInfoManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/gyey/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/HL7ToXmlConverter.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/gyey/PatientAdmissionInfoManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
  11. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/gyey
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/goodwillcis/SysUserAndOrgServiceImpl.java
11:40 上午

adairkang

外来器械合并到通用申请单，回收时的回收数量问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
11:16 上午

shuyongfu

解决器械包定义的材料清单不能录入一次性物品的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBaseDataFromZipManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
10:53 上午

jeffli

广东省人民医院GDSRMYY-365

一次性物品申请单需要打印后才产生发货计划

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
10:53 上午

jeffli

广东省人民医院GDSRMYY-365

一次性物品申请单需要打印后才产生发货计划

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
10:37 上午

adairkang

GDSRMYY-366 增加配置项：‘一次性物品申请单发货计划单条码配置’
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
Wednesday 13 Sep 2017
8:41 下午

chenjiaru

修改注释
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
8:29 下午

chenjiaru

解决jira问题： ZSYY-109 申请单部分终止功能改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
8:07 下午

chenjiaru

解决jira问题： ZSYY-109 申请单部分终止功能改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/log/enums/ApplicationLogStatusEnum.java
    • ?
    /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/recyclingApplication/goodsApplicationForm.js
6:17 下午

shuyongfu

广医二院的配置去掉多余的部分
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/gyey/webservice-cxf.xml
5:53 下午

zengjc

修复jira问题DGZYY-128，器械清洗工作量及不合格率月报，外来器械二次清洗总数统计不对的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:12 下午

jeffli

广东省人民医院GDSRMYY-344

发货时，如果选择的单有物品待发数量未等于实发数量则扫描保存条码时弹出提示框

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
3:09 下午

adairkang

外来器械二次回收的判断逻辑
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java
11:03 上午

chenjiaru

增加注释
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
10:42 上午

adairkang

DGZYY-127 转化过来的回收申请单，无法添加器械包
Options
    • ?
    /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/recycleForTouchScreen.jsp
Tuesday 12 Sep 2017
9:58 下午

shuyongfu

省医回写功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/inventorymanagement/gdsy/dao/WriteBackInventoryDaoImpl.java
6:02 下午

cherry

增加自定义装配敷料包和消毒物品场景
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
4:15 下午

jeffli

成都市五冶医院CDSWYYY-4

标签模板管理功能-普通器械包增加器械总件数属性

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
3:50 下午

shuyongfu

陈国强发回来的东莞中医院现场配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/recyclingDetailPrintConfig.js
10:47 上午

cherry

清洗选择删除按钮优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java
9:59 上午

jeffli

新增测试用例，一个申请单上多个外来器械发货
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestMultiForeignTousseInvoiceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
Monday 11 Sep 2017
8:05 下午

liuliben

补：基础导入同器械包列值修改问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
6:40 下午

yanweining

gyey:新增单点登陆功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-standard.xml.back
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/logonSSOForGyey.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/security/applicationContext-acegi-security.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-settlement-gyey-impl/src/main/java/com/bjgoodwill/jhipwebsvc/JhipSsoWebsvcProxy.java
5:00 下午

cherry

清洗、灭菌的优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java
4:55 下午

liuliben

补基础数据导出是否申请转换物品列
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
3:35 下午

shuyongfu

增加广医二院科室人员接口
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/gyey/webservice-cxf.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-cxf.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/goodwillcis/SysUserAndOrgServiceImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/goodwillcis/SysUserAndOrgService.java
2:17 下午

shuyongfu

广医二院单点登录webservice的wsdl文件定义与客户端代码开发
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-settlement-gyey-impl/src/main/java/com/bjgoodwill/jhipwebsvc/JhipSsoWebsvcProxy.java
2:10 下午

shuyongfu

广医二院单点登录webservice的wsdl文件定义与客户端代码开发
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-settlement-gyey-impl/src/main/java/com/bjgoodwill/jhipwebsvc/JhipSsoWebsvcImplServiceLocator.java
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/wsdl/gyey
  3. /SterileSupplySystem/branches/V4.1.0/ssts-datasync-settlement-gyey-impl/src/main/java/com/bjgoodwill
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-settlement-gyey-impl/src/main/java/com/bjgoodwill/jhipwebsvc/JhipSsoWebsvcImplService.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-settlement-gyey-impl/src/main/java/com/bjgoodwill/jhipwebsvc/JhipSsoWebsvc.java
  6. /SterileSupplySystem/branches/V4.1.0/ssts-datasync-settlement-gyey-impl/src/main/java/com/forgon/disinfectsystem/constant
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-settlement-gyey-impl/src/main/java/com/bjgoodwill/jhipwebsvc/JhipSsoWebsvcImplServiceSoapBindingStub.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-settlement-gyey-impl/src/main/java/com/bjgoodwill/jhipwebsvc/JhipSsoWebsvcProxy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/wsdl/gyey/sso.wsdl
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-settlement-gyey-impl/src/main/java/com/forgon/disinfectsystem/constant/Constant.java
  11. /SterileSupplySystem/branches/V4.1.0/ssts-datasync-settlement-gyey-impl/src/main/java/com/bjgoodwill/jhipwebsvc
  12. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/wsdl
2:08 下午

shuyongfu

优化4.8.5升级到4.8.6的质量监测旧数据升级性能

质量监测明细记录与质量监测记录在many增加对one端的属性定义并设置为延迟加载,以提高性能和代码运行效率

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoringInstance.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoringGoods.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManager.java
2:02 下午

shuyongfu

申请单字段长度调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java