forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 59
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 59
Total Lines of Code (LoC): 4,711,364
Net change in LoC this week: 3,161

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

Subversion Details

1 property
  • svn:global-ignores = .gradle .settings bin build rebel.xml
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Friday 26 Aug 2022
11:35 上午

linnansheng

selenium3提交：灭菌测试用例（质量监测:监测范围为：材料）
Options
    • -6
    • +15
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/personaldesktop/PersonalDesktopProxy.java
    • -0
    • +96
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestQualityMonitoring.java
    • -0
    • +25
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json
  4. /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/qualitymonitoring
    • -0
    • +62
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/qualitymonitoring/QualityMonitoringProxy.java
    • -0
    • +18
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/personaldesktop/PersonalDesktopPage.java
    • -0
    • +123
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/qualitymonitoring/QualityMonitoringHandle.java
    • -0
    • +148
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/qualitymonitoring/QualityMonitoringPage.java
    • -0
    • +14
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/personaldesktop/PersonalDesktopHandle.java
10:49 上午

zc.li

注释提交
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
10:46 上午

zc.li

完善(清洗机)：DGSETYY-54 当tomcat重启后，处于灭菌中的灭菌记录不能定时完成灭菌
Options
    • -1
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
10:46 上午

zc.li

完善(清洗机)：DGSETYY-54 当tomcat重启后，处于灭菌中的灭菌记录不能定时完成灭菌
Options
    • too large
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
10:42 上午

zc.li

解决：GDSZYY-163 标识牌器械包装配审核后，对应回收申请单删除此器械包后重新通过标识牌添加，保存回收单后器械包卡死在已回收状态
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
10:26 上午

jason

解决jira问题：GYEY-775 增加一个新的病人信息获取接口，使用记录及外来器械包申请模块更换使用该新接口
Options
    • -1
    • +1
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gyey/WebServiceClientHelper.java
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/applicationContext-his-gyey.xml
Thursday 25 Aug 2022
9:27 下午

yuandongxiao

selenium3:增加测试类
Options
    • -1
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/AllTests.java
9:20 下午

frank.qiu

解决了 GYEY-773 - 回收和装配时的扫描标识牌条码的功能，增加通过RFID阅读器来读取RFID标签中的的器械包标识牌条码
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • -23
    • +24
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
    • -21
    • +394
    /ssts-web/src/main/webapp/disinfectsystem/packing/setPlugInRFID.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp
    • -957
    • +1185
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
7:20 下午

yuandongxiao

selenium3提交测试用例：外来器械干预(对已装配的外来器械重新拆包)、一次性物品退货、器械包退货、审核前修改包实例信息、代理灭菌流程、借物流程
Options
    • -0
    • +124
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/interventionmanagement/ForeignTousseInterventionManagerPage.java
    • -0
    • +154
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/returngoods/ReturnGoodsPage.java
  3. /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/sterilize
    • -0
    • +114
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/review/ReviewPage.java
    • -0
    • +113
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/interventionmanagement/ForeignTousseInterventionManagerHandle.java
    • -0
    • +16
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/personaldesktop/PersonalDesktopProxy.java
    • -0
    • +22
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestReview.java
  8. /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/interventionmanagement
    • -0
    • +50
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/sterilize/AgentSterilizeHandle.java
    • -0
    • +99
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/review/ReviewHandle.java
    • -0
    • +30
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/delivery/DeliveryHandle.java
    • -0
    • +49
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/interventionmanagement/ForeignTousseInterventionManagerProxy.java
  13. /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/borrowmanagement
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestSterilize.java
    • -0
    • +107
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestReturnGoods.java
  16. … 35 more files in changeset.
6:17 下午

terry.kwan

版权信息修改为2022
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
Tuesday 23 Aug 2022
5:23 下午

frank.qiu

解决了 GYEY-773 - 回收和装配时的扫描标识牌条码的功能，增加通过RFID阅读器来读取RFID标签中的的器械包标识牌条码
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -316
    • +60
    /ssts-web/src/main/webapp/disinfectsystem/packing/setPlugInRFID.js
    • -346
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/packing/index.html
    • -9
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • -84
    • +48
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
3:59 下午

frank.qiu

解决了 SZYK-66 - PC端灭菌记录保存时新增确认保存并提示灭菌程序功能
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
2:19 下午

frank.qiu

解决了 SZYK-66 - PC端灭菌记录保存时新增确认保存并提示灭菌程序功能
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/config.js
2:07 下午

zc.li

完善：DGSETYY-24 回滚发货会清空回收加急的代码
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
2:04 下午

zc.li

完善：DGSETYY-24
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Monday 22 Aug 2022
6:07 下午

zc.li

解决：DGSETYY-54 当tomcat重启后，处于灭菌中的灭菌记录不能定时完成灭菌
Options
    • -0
    • +7
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • -4
    • +3
    /ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
    • too large
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -0
    • +42
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
6:03 下午

jason

解决jira问题：ZJYY-95 申请单增加独立填写物品申领备注功能，以及该备注信息在回收和装配模块进行流转(自定义发货的一次性物品发货单打印报undefine)
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
12:00 下午

yuandongxiao

selenium3：解决点击高级视图图标不稳定的问题
Options
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/personaldesktop/PersonalDesktopHandle.java
    • -3
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestSupplyRoomConsume.java
11:52 上午

yuandongxiao

selenium3提交测试用例：自定义装配、消毒供应中心物品领用
Options
    • -0
    • +31
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/pack/CustomPackProxy.java
    • -0
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/recycle/RecycleHandle.java
    • -1
    • +23
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestPack.java
    • -0
    • +83
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestSupplyRoomConsume.java
    • -2
    • +15
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/enterpriseview/EnterpriseViewHandle.java
    • -0
    • +60
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/pack/CustomPackPage.java
  7. /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/supplyroomconsume
    • -0
    • +142
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/supplyroomconsume/SupplyRoomConsumePage.java
    • -0
    • +36
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json
    • -1
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/AllTests.java
    • -0
    • +53
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/pack/CustomPackHandle.java
    • -3
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/enterpriseview/EnterpriseViewProxy.java
    • -0
    • +82
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/supplyroomconsume/SupplyRoomConsumeProxy.java
    • -2
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/enterpriseview/EnterpriseViewPage.java
    • -0
    • +121
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/supplyroomconsume/SupplyRoomConsumeHandle.java
11:48 上午

jason

解决jira问题：GYEY-777【灭菌目的设置】模块界面以及存储方式改进(联动修改灭菌记录的灭菌目的)
Options
    • -2
    • +13
    /forgon-core/src/main/java/com/forgon/systemsetting/action/HttpOptionAction.java
    • -3
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
    • -1
    • +2
    /forgon-core/src/main/java/com/forgon/systemsetting/service/HttpOptionManager.java
Friday 19 Aug 2022
6:34 下午

zc.li

删除无用代码
Options
    • -12
    • +0
    /ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
6:32 下午

zc.li

解决：DGSETYY-54 当tomcat重启后，处于灭菌中的灭菌记录不能定时完成灭菌
Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -0
    • +6
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • -3
    • +113
    /ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
    • too large
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -1
    • +7
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
4:42 下午

jason

解决jira问题：GDSZYY-196 外来器械申请单需要增加部分终止功能，以及加大字体下表格列宽及名称统一的优化
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
4:09 下午

jason

解决jira问题：GDSZYY-196 外来器械申请单需要增加部分终止功能，以及加大字体下表格列宽及名称统一的优化
Options
    • -0
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
4:08 下午

frank.qiu

解决了 GDSZYY-196 - 外来器械申请单需要增加部分终止功能，以及加大字体下表格列宽及名称统一的优化
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
3:39 下午

GuanYuanJian

同步东莞市横沥医院服务器上的配置。
Options
    • -1
    • +34
    /ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/spring/HIS.xml
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/print/printConfig.js
    • -25
    • +31
    /ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/interfaces/mybatis/syncFromHERP_Mapper.xml
    • -43
    • +52
    /ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/config.js
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/menu/menuconfigure.js
    • -20
    • +24
    /ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
3:32 下午

frank.qiu

解决了 SSTS-558 - 配置项printLabelWhenReviewing配置为true时，在装配页面，标识牌装配完成时的提示不准确
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
3:06 下午

jason

解决jira问题：GYEY-775 增加一个新的病人信息获取接口，使用记录及外来器械包申请模块更换使用该新接口
Options
    • -0
    • +37
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gyey/FindPatientInfoByTreatmentNumDaoImpl.java
    • -0
    • +160
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gyey/WebServiceClientHelper.java
  3. /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gyey
    • -0
    • +31
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gyey/DatasyncConstant.java
    • -0
    • +43
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gyey/FindPatientInfoByHospitalNumDaoImpl.java
    • -22
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/applicationContext-his-gyey.xml
2:48 下午

jason

解决jira问题：ZSSXLRMYY-217 包定义的是否装配字段为否的物品，录入清洗记录后，器械包信息的清洗记录应可查到回收及清洗信息(保存清洗记录时，联动修改不装配的器械包实例上的清洗信息)
Options
    • -0
    • +6
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.98_4.9.99_sqlserver.sql
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
    • -0
    • +10
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.98_4.9.99_oracle.sql
1:52 下午

shuyongfu

处理:DGSHLYY-5 打印发货单时，作为器械包包内材料的一次性物品不用打印出发货单
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/config.js
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java