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

Thursday 24 Jun 2021
5:13 下午

zc.li

注释修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
5:09 下午

zc.li

解决：SZSLHQZXYY-8.开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode后，扫包实例条码回收消毒物品会多出申请项，导致单状态变成部分回收的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
3:57 下午

jason

解决jira问题：ZSYKZX-148 科室干预里导入文件最终报错(检查导入文件里的新科室编码是否在系统里存在)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
3:53 下午

frank.qiu

解决了 SSTS-393 - 开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode后，连续扫描同一固定条码回收，回收数量和装载数量没有实现+1的效果
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
3:39 下午

zc.li

解决：SZSLHQZXYY-8.开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode后，扫包实例条码回收消毒物品会多出申请项，导致单状态变成部分回收的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Wednesday 23 Jun 2021
8:06 下午

frank.qiu

解决了 SZSLHQZXYY-8 - 开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode后，扫包实例条码回收消毒物品会多出申请项，导致单状态变成部分回收的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
8:02 下午

frank.qiu

解决了 SZSLHQZXYY-8 - 开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode后，扫包实例条码回收消毒物品会多出申请项，导致单状态变成部分回收的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
7:55 下午

frank.qiu

解决了 SSTS-392 - 设备接口定义中设备类型和设备型号的下拉框增加一个空的选项，要允许选择为空
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js
7:23 下午

frank.qiu

解决了 SSTS-392 - 设备接口定义中设备类型和设备型号的下拉框增加一个空的选项，要允许选择为空
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js
7:00 下午

frank.qiu

解决了 SZSLHQZXYY-8 - 开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode后，扫包实例条码回收消毒物品会多出申请项，导致单状态变成部分回收的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
6:58 下午

jason

解决jira问题：KSDQDYRMYY-2 基于CAS原生包的单点登录接口开发
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/spring/security-standard/applicationContext-acegi-security.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/logonSSOForKsdqdyrmyy.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
6:18 下午

jason

解决jira问题：XKYY-219 启用按照申请材料数量计算外来器械包积分及对所有包定义的“积分系数”进行赋值(外来器械包的积分系数默认取祖先包定义的积分系数)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
6:08 下午

yuandongxiao

更新张家界市人民医院个性化菜单：解决在tomcat8+IE浏览器下有些菜单报The valid characters are defined in RFC 7230 and RFC 3986错误的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zjjsrmyy/menu/menuconfigure.js
3:18 下午

zc.li

解决：SZSLHQZXYY-8。开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode后，扫包实例条码回收消毒物品会多出申请项，导致单状态变成部分回收的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
3:17 下午

frank.qiu

解决了 SZSLHQZXYY-8 - 开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode后，扫包实例条码回收消毒物品会多出申请项，导致单状态变成部分回收的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
11:02 上午

jason

解决：福建石狮市医院的灭菌炉清洗机打印口的bean定义移动到applicationContext-disinfectsystem-service.xml中
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-disinfectsystem-service.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fjsssyy/spring/HIS.xml
10:26 上午

frank.qiu

解决了 ZSLY-381 - 取消灭菌装载物品时，篮筐内还存在未发货物品的提示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsly/config.js
Tuesday 22 Jun 2021
5:49 下午

frank.qiu

解决了 SZYK-5 - 待灭菌物品增加灭菌方式的过滤条件（格式化）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
5:48 下午

frank.qiu

解决了 SZYK-5 - 待灭菌物品增加灭菌方式的过滤条件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
5:07 下午

zc.li

解决：KLMYSRMYY-15。洁定灭菌炉(HS6620)设备接口排重机制判断依据修改为按照【机器号+开始时间】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java
4:58 下午

LQC

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/config.js
4:27 下午

zc.li

解决：MMSRMYY-7。包定义是否打印标签设置否，自定义装配条码全是重复相同。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
4:11 下午

yuandongxiao

更新个性化菜单模板：解决在tomcat8+IE浏览器下有些菜单报The valid characters are defined in RFC 7230 and RFC 3986错误的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/standardProjectTemplate/menu/menuconfigure.js
3:52 下午

linnansheng

新沟桥个性化菜单提交
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/menu/menuconfigure.js
1:47 下午

jason

解决jira问题：XKYY-219 启用按照申请材料数量计算外来器械包积分及对所有包定义的“积分系数”进行赋值(消毒物品的积分系数默认取祖先包定义的积分系数)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
10:35 上午

zc.li

旧数据升级。ZJJSRM-46：器械包定义中【是否灭菌】值为空和null的器械包定义，给【是否灭菌】赋值为是。
Options
    • ?
    /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.77_4.9.78.sql
10:22 上午

linnansheng

新建项目:新沟桥街社区服务中心 project=xgqjsqfwzx
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/interfaces/dataSyncConfig.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
  5. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/interfaces
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/spring/HIS.xml
  7. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/menu
  8. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/interfaces/mybatis
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/print/printConfig.js
  10. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/spring
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
  12. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/print
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
  14. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx
Monday 21 Jun 2021
2:51 下午

zc.li

解决：ZJJSRM-46。包定义是否装配为否的物品灭菌方式为空的问题.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
2:46 下午

jason

解决jira问题：ZJJSRM-46 包定义是否装配为否的物品灭菌方式为空的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
2:03 下午

frank.qiu

解决了 SSTS-390 - 不开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode，扫包实例条码回收物品，入筐后在篮筐下看不到包实例条码，并且回收后该包实例也没有变成已回收状态
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js