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

Wednesday 21 Mar 2018
11:20 上午

shuyongfu

处理Jira问题:GZSZYY-6 填写申请单时处理科室的优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/model/CssdServiceDepts.java
10:38 上午

niutou_ren

成都市龙泉驿区第一人民医院CDSLQYQYYY-18(基础数据停用器械包是否可以新建一个工作表)

打开 误注释掉的“容器管理”sheet导出功能

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
10:18 上午

niutou_ren

成都市龙泉驿区第一人民医院CDSLQYQYYY-18(基础数据停用器械包是否可以新建一个工作表)

1、在basedataDemo.xls文件中，添加2个sheet，分别为:"停用器械包导出"、"停用外来器械包导出"。

2、导出时，根据器械包（器械包、敷料包、消毒物品、外部代理灭菌）是否停用，分别导出到"器械包管理"、"停用器械包导出"2个sheet中；根据外来器械包是否停用，分别导出到"外来器械包管理"、"停用外来器械包导出"2个sheet中。

3、导入时，不对"停用器械包导出"、"停用外来器械包导出"这两个sheet中的数据做处理。

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
Tuesday 20 Mar 2018
11:49 下午

shuyongfu

解决Jira问题:ZSWY-83 报表中的CSSD包装物品总包数跟总件数没将2个供应室分开显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:38 下午

shuyongfu

党万统2018-03-16日发回来的博罗县人民医院接口文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/blxrmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/blxrmyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/blxrmyy/mybatis/SyncOrgUnitAndUserMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/blxrmyy/HIS.xml
11:31 下午

shuyongfu

解决Jira问题:ZSWY-86 录入使用记录，系统提示‘’器械包没有失效日期，不能登记”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereUseRecordForm.js
11:29 下午

shuyongfu

赖家豪2018-03-09日发回来的简阳市人民医院项目现场config.js配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jysrmyy/config.js
8:01 下午

chenjiaru

满意度调查表代码的重构
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/forminstance/service/FormInstanceManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/forminstance/service/FormInstanceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableWinCustomForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/customform/formdefinition/FormDefinitionItem.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTableManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/customform/forminstance/FormInstanceItem.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/action/FormDefinitionAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/action/SatisfactionSurveyTableAction.java
7:46 下午

alan.lee

解决：消毒追溯系统V4.1稳定版SSTS-124

不追溯的外部代理灭菌包在灭菌时，扫描该包的固定条码，提示没有需要灭菌的包

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
7:26 下午

shuyongfu

欧建达2018-03-20日发回来的广东省医项目现场config.js配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
6:00 下午

alan.lee

对于虚拟篮筐的旧数据处理，增加了sql
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.14_4.9.15_sqlserver.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.14_4.9.15_oracle.sql
5:52 下午

shuyongfu

巫劲锋2018-03-20日发回来的成都龙泉项目现场config.js配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js
5:12 下午

shuyongfu

巫劲锋3月20日发回来的广州市第12人民医院现场config.js、及同步病人的接口配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/gzs12rmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/gzs12rmyy/applicationContext-his-gzs12rmyy.xml
5:11 下午

alan.lee

虚拟篮筐监控菜单权限 逻辑调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
5:00 下午

chenguina

pda版本更新至4.6.28
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.28_20180317_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.26_20180305_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
3:15 下午

alan.lee

1.虚拟篮筐监控菜单，增加config.js文件来决定是否显示

2.装配时锁定虚拟篮筐sql修改

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java
Monday 19 Mar 2018
10:53 下午

chenjiaru

解决jira问题：GZS12RMYY-12 启用器械包是否发货功能，设置为否的物品借物单无发货任务
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
9:06 下午

alan.lee

1. 虚拟篮筐初始化从999 增加到 9999.

2. 科室供应室保存时，给虚拟篮筐的供应室名和编码赋值

3. 新增4.9.15版本的sql

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/Constants.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.14_4.9.15.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java
8:34 下午

chenjiaru

满意度调查表代码的重构
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/action/SatisfactionSurveyTableAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTableManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableForm.js
6:43 下午

shuyongfu

陈国强3月19日发回来的广州市中医院现场config.js、printConfig.js及同步科室人员的接口配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/gzszyy/HIS.xml
4:31 下午

shuyongfu

陈国强3月19日发回来的广州市中医院现场config.js、printConfig.js及同步科室人员的接口配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/gzszyy/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/gzszyy/mybatis/SyncOrgUnitAndUserMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js
4:07 下午

shuyongfu

王凯3月19日发回来的深圳南山人民医院现场config.js配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/sznsrmyy/config.js
10:42 上午

jeffli

中山一院消毒供应项目ZSYY-227

快速发货功能增加消毒物品类型

Options
    • ?
    /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:36 上午

chenjiaru

对TousseItem的isTraceable属性的维护（升级脚本）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.13_4.9.14.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/Constants.java
Saturday 17 Mar 2018
3:39 下午

adairkang

回收产生的tousseItem设置是否追溯属性

回收添加的绑定物品设置是否快速发货属性

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
11:56 上午

chenjiaru

对TousseItem的isTraceable属性的维护
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
11:52 上午

yanweining

JYSRMYY-5：一次性物品删除不了
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.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/departmentapplicationtemplate/service/DepartmentAppTemplateManager.java
10:45 上午

jeffli

解决bug：

消毒物品快速发货，判断是否追溯，逻辑写反

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
Friday 16 Mar 2018
3:38 下午

adairkang

ajax请求添加时间参数，避免缓存导致未获取到绑定数据
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
2:01 下午

chenjiaru

修复修改申请单报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java