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

Tuesday 01 Apr
6:22 下午

zc.li

解决 GZSDBRMYY-38 【回收清点】新增允许二次回收仅包含植入物材料且材料数量为0的外来器械包
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
6:20 下午

jason

解决jira问题：MMSRMYY-20 组织机构、人员、病人接口服务器ip变更
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/mmsrmyy/DatasyncConstant.java
6:17 下午

jason

解决jira问题：XMDXFSXAYY-13 his系统切换，需要开发新接口，且需要新旧接口同时运行一段时间
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xmdxfsxayy/interfaces/dataSyncConfig.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xmdxfsxayy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xmdxfsxayy/spring
  4. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/patient/xmdxfsxayy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/xmdxfsxayy/HIPMessageWebServiceV2Impl.java
  6. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xmdxfsxayy/interfaces
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xmdxfsxayy/interfaces/mybatis/syncFromHERP_Mapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/xmdxfsxayy/HIPMessageWebServiceV2.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/patient/PatientBasicInfo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xmdxfsxayy/spring/webservice-cxf.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xmdxfsxayy/spring/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/patient/xmdxfsxayy/OperationApplyXmdxfsxayy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xmdxfsxayy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
  14. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xmdxfsxayy/interfaces/mybatis
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xmdxfsxayy/interfaces/mybatis/FindPatientInfoByHospitalNumOperationApplyMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/patient/xmdxfsxayy/OperationXmdxfsxayy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xmdxfsxayy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
4:55 下午

frank.qiu

解决了 GMQRMYY-38 - 在装配界面勾选包内材料登记质量监测时，需正确获取对应的器械包名称和包内材料名称
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
4:44 下午

frank.qiu

解决了 GMQRMYY-38 - 在装配界面勾选包内材料登记质量监测时，需正确获取对应的器械包名称和包内材料名称
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
Monday 31 Mar
5:34 下午

frank.qiu

解决了 DGSETYY-78 - 【器械包管理】新增设置器械包“可选清洗程序”功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp
4:54 下午

nanlin.zeng

提交现场最新配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fssdermyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fssdermyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fssdermyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fssdermyy/spring/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fssdermyy/print/printConfig.js
3:41 下午

shuyongfu

处理:HNSETYY-9 【PDA】新增【一次性物品入库管理 】功能模块
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/GodownEntryItemVO.java
3:22 下午

shuyongfu

处理:GDSZYY-261 【发货计划】发货发出单张一次性物品申请单速度优化 测试用例调整与完善
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/com/forgon/disinfectsystem/invoice/service/InvoiceOptimizeManagerTest.java
2:08 下午

frank.qiu

解决了 FSSDERMYY-36 - 【外部代理灭菌】新增待发货的外部代理灭菌单可追加物品
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
1:54 下午

frank.qiu

解决了 SZSDSRMYY-190 - 器械包退货重装后灭菌发货，再次登记质量监测重装会提示清洗未完成
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
Saturday 29 Mar
12:29 下午

jason

GDSRMYY-628

聚力康-外来器械 录入使用记录时，保存提示:" 强生腰椎融合四4-2JLKPK4006010022外来器械包还有其它拆分的部分器械包未发货！"

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
Friday 28 Mar
6:57 下午

shuyongfu

处理自定义发货报空指针异常的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
4:21 下午

zc.li

一处代码完善 不至于在编译器中报错
Options
  1. /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/reflect
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/reflect/ReflectObject.java
4:01 下午

zc.li

一处代码完善 不至于在编译器中报错
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java
1:58 下午

shuyongfu

处理:GDSZYY-261 【发货计划】发货发出单张一次性物品申请单速度优化 解决pda端旧版发货，点“一键扫描”后提示“批次定义id参数不存在”的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
11:42 上午

shuyongfu

处理:GDSZYY-261 【发货计划】发货发出单张一次性物品申请单速度优化 物品库存数量为0时，点"一键扫描一次性物品按钮时"后台接口不返回此一次性物品信息至前端
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
Thursday 27 Mar
7:06 下午

shuyongfu

处理:GDSZYY-261 【发货计划】发货发出单张一次性物品申请单速度优化

另外解决以下几个细节问题:1.旧版发货保存时提示"缺少物品批次定义id参数"、2.新版发货如果发货数量超过库存时未提示但会按库存数量发出 3.点击“批量扫描一次性物品时”数量未除以单位转换系数

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
6:35 下午

jason

解决jira问题：GZSZYY-110【在线考试管理】新增“试卷模板”固定题目模式
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/onlineexams/examdefinition/service/ExamDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/onlineexams/examdefinition/service/ExamQuestionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/onlineexams/examdefinition/vo/ExamQuestionExportVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/onlineexams/examdefinition/controller/ExamDefinitionFormController.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/onlineexams/examdefinition/vo/QuestionOptionExportVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/onlineexams/examdefinition/service/ExamQuestionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/onlineexams/examdefinition/service/ExamDefinitionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/examDefinitionTemplate.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/onlineexams/examdefinition/vo/ExamDefinitionExportVo.java
  10. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/onlineexams/examdefinition/vo
5:58 下午

frank.qiu

删除重复的模块（在线考试模块）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/menu/menuconfigure.js
5:53 下午

zc.li

解决 ZSWY-258 信息隐藏条件变更
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/RealTimeBulletinBoardWorkloadHelper.java
5:49 下午

zc.li

解决 ZSWY-258 信息隐藏条件变更
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/RealTimeBulletinBoardWorkloadHelper.java
5:07 下午

frank.qiu

解决了 GZSZYY-110 - 【在线考试管理】新增“试卷模板”固定题目模式
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/onlineExams/examsDefinition/examsDefinitionView.js
4:56 下午

frank.qiu

解决了 GZSZYY-110 - 【在线考试管理】新增“试卷模板”固定题目模式
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/onlineExams/examsDefinition/examsDefinitionForm.js
4:46 下午

frank.qiu

解决了 GZSZYY-110 - 【在线考试管理】新增“试卷模板”固定题目模式
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/onlineExams/examsDefinition/examsDefinitionView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/onlineExams/examsDefinition/examsDefinitionForm.js
1:55 下午

zc.li

解决 ZSWY-258 信息隐藏条件变更
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/RealTimeBulletinBoardWorkloadHelper.java
12:01 下午

zc.li

注释补充
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDao.java
11:41 上午

frank.qiu

解决了 ZSWY-259 - 【外来器械申请单】的外来器械申请单打印新增字段【备注】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
Wednesday 26 Mar
5:15 下午

zc.li

注释保存
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDao.java
4:00 下午

frank.qiu

解决了 ZSWY-257 - 【科室申请】的打印发货计划和【发货管理】的批量打印的打印模版需要改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js