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

Thursday 02 Apr 2020
7:32 下午

zc.li

修复质量监测报表材料过滤和器械包过滤无效的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
6:05 下午

jason

解决jira问题：GYEY-745 广医二院消毒供应项目 新旧组织机构代码切换任务
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/UserTableManager.java
5:50 下午

jason

解决jira问题：GYEY-745 广医二院消毒供应项目 新旧组织机构代码切换任务(同一个人导入多个科室，只在一个科室显示出来)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/UserTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/service/UserManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
4:50 下午

jason

解决jira问题：GYEY-745 广医二院消毒供应项目 新旧组织机构代码切换任务(同一个人导入多个科室，只在一个科室显示出来)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/UserTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
2:43 下午

shuyongfu

解决chrome浏览器用条码登录系统时,输完条码后按回车密码框没有自动赋值的兼容性问题(偶然性、非必然每次出现)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/logon.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/logonForExpensiveGoods.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/logonSSOForCszxyy.jsp
1:59 下午

zc.li

解决：DGZYY-161。质量监测报表改造。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/util/SqlUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MonitoringItemBean.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SterilizationRecordItenBean.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/sterilizationRecordReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/sterilizationRecordReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
10:50 上午

jason

解决jira问题：广东省人民医院GDSRMYY-513 通过省医集成平台和大成手麻做器械包字典信息接口和消毒包使用信息接口，用webservice方式和大成手麻系统做消毒包信息接口(消息添加平台自定义的消息头，增加日志输出)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gdsy/WebSphereMQDaoImpl.java
10:33 上午

jason

解决jira问题：ZSYY-261 中山一院消毒供应项目 灭菌记录增加扫描监测包功能(今天审核的待灭菌物品增加是否植入物判断)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
Wednesday 01 Apr 2020
8:29 下午

frank

解决ZSYY-261:灭菌记录修改的时候也要验证是否有植入物
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
4:28 下午

jason

解决jira问题：GYEY-744 广医二院消毒供应项目 自动签收发货单增加签收人文本框设置
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-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.41_4.9.42.sql
3:41 下午

frank

解决消息发布管理IE选择科室获取不到返回值的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/message/messageForm.js
3:15 下午

zc.li

修复只显示价格模式的核算月报底部没有合计行的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReport.jrxml
11:38 上午

frank

解决ZSYY-261:灭菌记录修改了打印效果
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
Tuesday 31 Mar 2020
9:51 下午

shuyongfu

解决:CSSZXYY-152用户登录验证失败

ASSCSZXYY-25HIS系统单点登录没有成功登录到系统个人桌面。

支持两种登录入口三种登录方式:

1.追溯系统登录页面登录

1.1 条码登录(正常合法的用户条码可以登录成功、否则将登录不成功并提示)

1.2 帐号登录(通过平台认证的则进入主页,否则提示认证失败)

2.单点登录平台登录

链接地址改为http://ip:port/openSystemMainPage.jsp?un=帐号

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/build.gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/web-cszxyy.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-cszxyy.xml.back
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/handler/AuthenticationSuccessHandlerForCszxyy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/logonSSOForCszxyy.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/security/userdetails/DaoUserDetailSSTSImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/cszxyy/applicationContext-disinfectsystem-project-specific.xml
6:31 下午

yuandongxiao

新建项目：顺德区第二人民医院

project=sdqdermyy

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/sdqdermyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/sdqdermyy/print
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/sdqdermyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/sdqdermyy/dataSyncConfig.json
  5. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/sdqdermyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/sdqdermyy/print/printConfig.js
  7. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/sdqdermyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/sdqdermyy/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/sdqdermyy/mybatis/syncFromHERP_Mapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/sdqdermyy/config.js
  11. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/sdqdermyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/sdqdermyy/mybatis/SyncOrgUnitAndUserMapper.xml
  13. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/sdqdermyy/mybatis
5:59 下午

jason

解决jira问题：SSTS-130 用户管理-新增：所属部门改为必填项，否则会出现下图所示的错误信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/systemmanage/userFormExt.js
5:01 下午

jason

解决jira问题：GYEY-745 广医二院消毒供应项目 新旧组织机构代码切换任务
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
3:42 下午

frank

解决GYEY-732：优化拍照跟录像的功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
2:26 下午

frank

解决GYEY-732：优化拍照跟录像的功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js
2:11 下午

zengyuan

东莞中医院DGZYY-161 质量监测报表增加回收情况、清洗情况、灭菌情况，对小袁测试出的问题进行修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
10:26 上午

frank

解决ZSYY-261:灭菌记录修改了生物监测包的内置属性
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource2.js
9:53 上午

jason

解决jira问题：DGZYY-161 东莞中医院 质量监测报表增加回收情况、清洗情况、灭菌情况
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java
9:53 上午

terrykwan

提交售前演示项目的配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/config.js
Monday 30 Mar 2020
10:26 下午

jason

解决jira问题：GYEY-745 广医二院消毒供应项目 新旧组织机构代码切换任务
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/directory/service/SysUserManagerImpl.java
10:23 下午

jason

解决jira问题：DGZYY-161 东莞中医院 质量监测报表增加回收情况、清洗情况、灭菌情况
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java
10:22 下午

zengyuan

东莞中医院DGZYY-161 质量监测报表增加回收情况、清洗情况、灭菌情况，对小袁测试出的问题进行修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
8:51 下午

frank

解决ZSYY-261:灭菌记录修改的时候也要验证是否已扫描
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js
8:38 下午

zc.li

修复：ZSYKZX-119。器械包定义里的是否审核将是改成否后，自定义装配后会显示在待审核列表中。(创建消毒物品定义时,当已存在材料材料md5值,包名,包类型与祖先包的一致,并且包定义没有关联申请单的时候,会使用已存在的包定义。所以当已经存在这样的包定义时,修改祖先包的属性,新的消毒物品使用的包定义也只会使用已存在的。就现在这个问题简单来说：新建的包，使用的并不是页面修改的包定义。)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
5:55 下午

jason

解决jira问题：GYEY-745 广医二院消毒供应项目 新旧组织机构代码切换任务
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/model/User.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/service/UserManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/UserVo.java
5:16 下午

frank

解决ASSZDFY-38:回收列表、回收清点界面和自定义入筐页面布局优化为自适应屏幕分辨率
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp