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

Friday 10 Mar 2017
2:10 下午

shuyongfu

手术预约管理和手术预约发货增加配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
10:52 上午

jeffli

新功能：JMSRMYY-29

消毒物品退货功能

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.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-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
10:25 上午

zhonghaowen

ZSYY-27:修改桌面的灭菌员图标
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/themes/portalPage/img/customInvoiceForm.jpg
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/themes/portalPage/img/customInvoiceForm.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/systemset/portalPage.xml
Thursday 09 Mar 2017
6:42 下午

shuyongfu

中大附一手术预约接口调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/operationSchedule/service/OperationScheduleManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/net/gzsums/www/esb/MessageServiceSoapImpl.java
6:00 下午

zhonghaowen

解决ZSYY-27:个人桌面增加自定义发货功能按钮
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/portalPage.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/systemset/portalPage.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
5:51 下午

shuyongfu

解决jira问题:ZSYY-19 手术预约管理列表内容调整

1.手术预约管理列表增加改动：1、隐藏图中没有勾选的列；2、预约单排序改成列名“手术台次”正序为主。

2.手术预约推送的数据暂不写备注

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/operationSchedule/service/OperationScheduleManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js
5:27 下午

cherry

增加成都市龙泉驿区第一人民医院的配置
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/cdlqyq1yy/mybatis
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/cdlqyq1yy
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/cdlqyq1yy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/cdlqyq1yy/mybatis/FindPatientInfoByHospitalNumMapper.xml
  5. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/cdlqyq1yy/dataSyncConfig.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/print/printConfig.js
  8. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/print
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/cdlqyq1yy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/cdlqyq1yy/mybatis/SyncOrgUnitAndUserMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/cdlqyq1yy/applicationContext-his.xml
5:04 下午

shuyongfu

陈国强发回来新的回收清单打印配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/recyclingDetailPrintConfig.js
4:34 下午

adairkang

手术预约打印表格调左一点
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
4:32 下午

zhonghaowen

修复科室申领提示不能添加同一物品的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsAppHelper.js
4:09 下午

adairkang

ZSYY-26 手术预约管理增加打印功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/vo/OperationReservationVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManager.java
  3. /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/vo
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/StrutsResponseUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
3:07 下午

shuyongfu

解决连接新数据库启动系统时,登录失败的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
2:15 下午

zhonghaowen

修改器械包信息弹窗大小
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
11:42 上午

wangyi

修复快速回收页面篮筐上限未限制住问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
10:44 上午

chenguina

PDA 版本更新至4.5.38 （添加灭菌记录列表，单独添加的器械包，可以配置默认展开）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.36_20170303.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.38_20170309.apk
10:27 上午

zhonghaowen

修改材料盘点管理弹窗窗口大小
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js
10:13 上午

zhonghaowen

修改一次性物品盘点管理弹窗大小
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js
9:58 上午

shuyongfu

解决jira问题:DYSYY-25 与HIS系统在PC端的对接

目前已经整合到通用的模块,现惠州和德阳采用url传递登录名的方式实现单点登录

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/.project
9:39 上午

adairkang

ZSYY-23 PDA灭菌扫描器械包列表改成默认展开
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
Wednesday 08 Mar 2017
5:58 下午

zhonghaowen

调整一次性物品管理-添加弹框大小
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
5:00 下午

jeffli

解决bug：

自定义装配不追溯的消毒物品，打印出来的不是固定条码

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
3:59 下午

zhonghaowen

CSSZXYY-75:修改判断终止逻辑
Options
    • ?
    /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
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/util/IntegerUtils.java
3:11 下午

adairkang

使用记录，器械包是否真正使用属性的修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
11:58 上午

wangyi

完成：DYSYY-30，外来器械拆分小包显示总拆包数量
Options
    • ?
    /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/config/hdqrmyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dysyy/config.js
11:31 上午

chenjiaru

加强器械包告警导出Excel表格的功能，（现：支持只导出用户选择的记录）
Options
    • ?
    /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/assestManagement/tousseGoods/tousseGoodsWarningView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/action/SystemWarningAction.java
11:19 上午

jeffli

解决bug：

自定义装配和普通装备，打印出来的消毒物品不一致

Options
    • ?
    /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/common/cssdUtils.js
10:40 上午

zhonghaowen

解决DYSYY-28:系统多个页面显示不全的问额
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
10:13 上午

jeffli

解决bug：

自定义装配和普通装备，打印出来的消毒物品不一致

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
9:47 上午

chenjiaru

解决：器械包告警那里，查所有科室的视图和单独查看某一科室视图，同一科室数量对上的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
Tuesday 07 Mar 2017
11:47 下午

shuyongfu

解决jira问题:DYSYY-25 与HIS系统在PC端的对接

目前已经整合到通用的模块,现惠州和德阳采用url传递登录名的方式实现单点登录

Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem
  2. /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/.settings/gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/build.gradle
  4. /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/.classpath
  6. /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main
  7. /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/resources
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/filter/UrlParametersAuthenticationFilter.java
  9. /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/.settings
  10. /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon
  11. /SterileSupplySystem/branches/V4.1.0/ssts-client-misc
  12. /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src
  13. /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/test/resources
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/handler/AuthenticationSuccessHandlerForDysyy.java
  15. /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/test/java
  16. … 12 more files in changeset.