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

Sunday 12 Jun 2016
2:53 下午

jeffli

使用记录转申请单，备注里面增加器械包数量。

中山五院ZSWY-8

Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/recyclingapplication
  2. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
2:50 下午

jeffli

解决bug：

供应室科室设置页面，科室申领配置移动最下面的项报错

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
2:50 下午

jeffli

器械包定义中,增加材料排序功能：

广东省人民医院GDSRMYY-34

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
2:49 下午

jeffli

器械包定义中,增加材料排序功能：

广东省人民医院GDSRMYY-34

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
2:47 下午

jeffli

器械包定义中,增加材料排序功能：

广东省人民医院GDSRMYY-34

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DiposableGoodsInstance.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialinstance/MaterialInstance.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinitionMaterial.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
10:22 上午

zengjc

解决灭菌失败要点两次才生效的问题，Jira上的问题PYQZYY-14.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
Saturday 11 Jun 2016
10:48 下午

shuyongfu

解决清洗保存不成功的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
Wednesday 08 Jun 2016
6:08 下午

adairkang

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
5:58 下午

wangyi

核算月报报损sql修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
5:53 下午

shuyongfu

解决审核统计、审核入筐器械包、灭菌单今天已审核的待灭菌物品的数据显示问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
5:43 下午

adairkang

发货单打印(同名称、同消毒日期、同失效日期、同价格的合并)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
5:37 下午

wangyi

修复核算月报统计自定义器械包按包数量，明细核算月报统计按材料数量统计导致两边对不上bug
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
5:35 下午

shuyongfu

解决审核统计、审核入筐器械包、灭菌单今天已审核的待灭菌物品的数据显示问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
3:21 下午

wangyi

结算记录修复高值耗材无标识号bug
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/service/StockTakeRecordManagerImpl.java
3:19 下午

shuyongfu

审核页面待审核列表器械包数据过滤功能调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java
2:47 下午

terrykwan

解决了一个用户属于多个科室时，视图列表搜索出现多行的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/UserTableManager.java
1:01 下午

wangyi

材料名称加注释
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialinstance/MaterialInstance.java
12:53 下午

wangyi

修复材料有规格的报错不了
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
10:30 上午

shuyongfu

解决jira问题:广东省人民医院 GDSRMYY-31 优化灭菌物品装载功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
10:27 上午

shuyongfu

解决jira问题:广东省人民医院 GDSRMYY-31 优化灭菌物品装载功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
10:16 上午

jeffli

解决bug：

发货时报空指针异常

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
9:50 上午

shuyongfu

解决jira问题:广东省人民医院 GDSRMYY-31 优化灭菌物品装载功能
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/TousseInstanceManagerImpl.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-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
Tuesday 07 Jun 2016
6:19 下午

jeffli

改造标识牌补充界面，改为ext4.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext/js/common.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardFormExt4.js
6:16 下午

jeffli

去掉申请单和发货单的关联删除和更新。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
5:02 下午

adairkang

签收界面的语音（ZSWY-12）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp
3:45 下午

shuyongfu

省医独立模块代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/gdsy/dao/HisMaterialVo.java
  2. /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/com
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/jetsuncrm/webservice/svrwebservice/WebServiceHttpPostImpl.java
  4. /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/gdsy/dao
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/gdsy/dao/FindPatientInfoByHospitalNumDao.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/jetsuncrm/webservice/svrwebservice/WebServiceHttpPost_WebServiceHttpPost_Client.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/jetsuncrm/webservice/svrwebservice/WebServiceHttpGet_WebServiceHttpGet_Server.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/jetsuncrm/webservice/svrwebservice/HISWebServiceResponse.java
  9. /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/build.gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/jetsuncrm/webservice/svrwebservice/WebServiceSoap12Impl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/jetsuncrm/webservice/svrwebservice/WebServiceSoap_WebServiceSoap12_Client.java
  13. /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/.classpath
  15. /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc
  16. … 41 more files in changeset.
2:32 下午

adairkang

打印借物单报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.jsp
1:30 下午

shuyongfu

省医的同步科室与人员暂时注释,4.1环境弄好再放开
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/gdsy/HIS.xml
10:58 上午

zengjc

灭菌记录增加上传图片功能。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/showSterilizationUploadIamge.js
    • ?
    /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/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/imagefilemanager/ImageFile.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
9:01 上午

shuyongfu

4.0代码同步至4.1
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-cxf.xml