forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 40
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 40
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
Wednesday 23 Sep 2020
2:51 下午

frank

优化在1280*1024、1280*800这两个分辨率下，回收时间的弹出框还是看不太全的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
2:25 下午

huang.cl

现场timer文件拿回来替换
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/spring/timer.xml
10:51 上午

yuandongxiao

新建广西中医药附一（仙湖院区）项目文件路径。

注：广西中医药附一有两个院区——东葛院区（总院区）和仙葫院区（新院区），由于这两个院区用的是两套不同的代码，配置文件也不同，但是svn上只有一个项目路径，维护起来不方便，因此现在将这两个院区分开维护。

Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/spring
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/menu
  4. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/interfaces/mybatis
  5. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/interfaces
  6. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1_xhyq/print
10:44 上午

frank

解决ZJJSRM-34：基数管理功能优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/departmentStock/departmentStockInputView.jsp
10:40 上午

jason

修改项目个性化的web.xml文件夹名称
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/web-xml-standard
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/web-xml
10:07 上午

zc.li

解决：ZYYFS-138。回收清点里添加回收申请单，科室选择消毒供应中心，添加消毒物品进去，保存时提示非临床科室回收单不允许添加消毒物品。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
10:05 上午

zc.li

解决 ZJJSRM-34 - 基数管理功能需求增加.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.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-stockmanage/src/main/java/com/forgon/disinfectsystem/stockmanage/departmentstock/service/DepartmentStockManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
9:47 上午

jason

修改注释
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
Tuesday 22 Sep 2020
10:08 下午

shuyongfu

解决:SSTS-211 一次性物品录入使用记录时，双击修改不了数量
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
6:23 下午

frank

解决SSTS-210：科室申领模板填写一次性物品的默认申请数量，然后按回车键会保存到非法数字
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateForm.js
5:32 下午

jason

解决申请物品小计切换科室后数量有误的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
3:55 下午

frank

解决申请物品小计切换科室后数量有误的问题（单价暂时不改）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
3:04 下午

frank

解决申请物品小计切换科室后数量有误的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
2:35 下午

zc.li

解决：DGSDBZXYY-105。十八项指标分析报表里的处理敷料总件数增加对器械包内的一次性物品的统计
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
1:46 下午

jason

解决申请物品小计切换科室后数量有误的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
8:36 上午

terrykwan

提交将条码类型修改为二维码QRCode的配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js
Monday 21 Sep 2020
7:59 下午

frank

解决：保存自定义器械包申请单的时候trim报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js
7:54 下午

zc.li

解决：ZJJSRM-33.灭菌炉参数信息在折线图下增加详细的参数表显示。增加对灭菌结束阶段数据的保存和显示；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jysrmyy/config.js
7:53 下午

frank

解决：申请单小计切换科室后数量有误的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
7:52 下午

zc.li

解决：ZJJSRM-33.灭菌炉参数信息在折线图下增加详细的参数表显示。增加对灭菌结束阶段数据的保存和显示；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java
7:41 下午

jason

解决jira问题：JMSZXYY-89 江门市中心医院 自定义器械包申请单增加是否回收清洗选择
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.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-tousse/src/main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemManagerImpl.java
6:57 下午

frank

把：改成:
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
6:18 下午

frank

解决申请外部代理灭菌包IE8打不开的问题以及自定义器械包是否回收点击看见代码的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js
6:05 下午

shuyongfu

解决:SSTS-176 pda端添加灭菌记录的一些场景的提示不正确

HBSXKYY-17 PDA按钮颜色改进

DGSDBZXYY-48 PDA的退货功能的改进

GGSRMYY-137 pda添加灭菌记录，选择好灭菌程序，扫描灭菌框，如果灭菌框没有设置灭菌方式，会拦截，无法灭菌

SSTS-178 PDA访问数据较多的模块，出现访问失败，并且系统出现假死状态

SSTS-208 一些PDA上的预回收修改回收数量时，数量点删除或输数字都没有反应

pda版本由4.7.02调整为4.7.03

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.03_20200921_v4_1_nologo_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManagerImpl.java
    • ?
    /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/mobileClient/SterileSupplySystem_Android_V4.7.03_20200921_v4_1_6p_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.03_20200921_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
4:53 下午

shuyongfu

解决:SZSDSRMYY-16 申请单合并以及使用记录转申请单的物品加急的问题

新增加一个测试用例类

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/AllTests.java
3:46 下午

shuyongfu

处理:GGSRMYY-137 pda添加灭菌记录，选择好灭菌程序，扫描灭菌框，如果灭菌框没有设置灭菌方式，会拦截，无法灭菌。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
2:44 下午

frank

解决JMSZXYY-89：自定义器械包申请单增加是否回收清洗选择
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseDefinitionForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js
2:36 下午

zc.li

解决：JYSRMYY-15。二级供应室回收本科室的物品要产生回收申请单并能正常发货。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/jysrmyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
2:28 下午

shuyongfu

解决:GDSZYY-18 科室申领填写申请单时，申领模板支持默认不选择任何模板以及页面布局优化(前后台传参的参数名调整)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
2:28 下午

frank

解决GDSZYY-18：科室申领填写申请单时，申领模板支持默认不选择任何模板以及页面布局优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js