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

Wednesday 12 Aug 2020
1:32 下午

shuyongfu

处理:ZJJSRM-22 辅助发货界面的核对员改进为可通过配置项控制输入框的显示、是否必填以及是否记住

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js
11:44 上午

frank

解决ZSWY-134:自定义发货界面的保存按钮在谷歌浏览器下不能正常显示的问题（开启showInvoicePersonInCharge配置项后也能正常显示）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js
Tuesday 11 Aug 2020
8:18 下午

shuyongfu

处理复杂场景的一次性物品发货的问题，主要针对复大肿瘤几个问题(ASSFDZLYY-30,ASSFDZLYY-30)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
6:55 下午

frank

解決回收页面删除器械包后保存结果为部分回收的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
6:19 下午

zc.li

解决:PYQZYY-184。业务修改:回收时未入框就删除器械包,申请数量不为0的申请项tousseItem会被删除改回以前的为0的才删除。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
5:25 下午

frank

解決回收页面删除器械包后保存结果为部分回收的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
3:38 下午

frank

解決先打印外來器械再打印自定义器械包后会报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
2:31 下午

shuyongfu

解决:DGSDBZXYY-74 标签名称是大孔巾，但是扫条码显示的是手术衣

针对器械包定义修改名称时,增加对外部代理灭菌项表的器械包名称的联动修改

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
2:03 下午

frank

解决FSDERMYY-2:器械包明细在水洗标签中打印的字体与布局进行改进(表格居中)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/sdqdermyy/print/printConfig.js
1:48 下午

frank

解决DGSDBZXYY-79：

IE6个人桌面无法看到功能图标（装配同步刷新引起的）

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/portalPage.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
11:21 上午

yuandongxiao

新建项目：深圳禾正医院

project=szhzyy

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/print/printConfig.js
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/interfaces
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
  4. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/print
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/spring/HIS.xml
  8. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/menu
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
  10. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szhzyy
  11. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/spring
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/interfaces/dataSyncConfig.json
  13. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/interfaces/mybatis
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/interfaces/mybatis/syncFromHERP_Mapper.xml
11:10 上午

frank

解决FSDERMYY-2：器械包明细在水洗标签中打印的字体与布局进行改进（材料名称添加规格）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/sdqdermyy/print/printConfig.js
11:02 上午

frank

解决FSDERMYY-2：器械包明细在水洗标签中打印的字体与布局进行改进（IE打印预览空白的问题）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/sdqdermyy/print/printConfig.js
10:21 上午

jason

解决jira问题：FSDERMYY-2 佛山市顺德区第二人民医院 器械包明细在水洗标签中打印的字体与布局进行改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
10:19 上午

frank

解决ZJJSRM-12：打印回收汇总单增加打印代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zjjsrmyy/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
8:25 上午

liwei

按现场需求更改配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zjjsrmyy/config.js
Monday 10 Aug 2020
8:58 下午

zc.li

解决:ZJJSRM-12.打印回收汇总单初始格式新增数量是否优先取回收数量.
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
7:53 下午

jason

优化ZSWY-135：增加清洗机定时完成清洗功能(添加默认值)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/rinser/Rinser.java
7:37 下午

terrykwan

提交现场的配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/cssdsyy/spring/his.xml
7:35 下午

zc.li

完善：NYSY-12;修复急用物品处理周期统计报表汇总行有时会异常换页显示的问题;
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycle.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycle.jrxml
7:08 下午

shuyongfu

处理:ASSFDZLYY-31 核算月报与明细核算月报中“四病区”的7月22号当天一次性物品结算总金额相差7元

处理一次性物品发货后invoice,invoiceItem,DiposableGoodsItem三个表的数量和价格不一致的问题

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
7:02 下午

shuyongfu

处理:ASSFDZLYY-30 供应室发出去的高值耗材在供应室退货后，库存没有增加

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
6:55 下午

frank

解决ZJJSRM-21：标识牌回收时要允许从设置了物品科室共用配置的科室回收
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
5:48 下午

frank

优化ZSWY-135：增加清洗机定时完成清洗功能(添加默认值)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js
5:43 下午

zc.li

解决ZSYY-273：消毒供应中心未完成工作功能的优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/vo/ToBeShippedGoodsVO.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/action/SupplyRoomControlAction.java
5:41 下午

frank

解决ZSYY-273：消毒供应中心未完成工作功能的优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js
5:36 下午

frank

解决ZSYY-273：消毒供应中心未完成工作功能的优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/supplyRoomUnfinishedWork.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js
5:33 下午

yeah.lin

添加字符
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/cssdsyy/spring/his.xml
5:32 下午

yeah.lin

缺少字符
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/cssdsyy/spring/his.xml
4:53 下午

yeah.lin

修改路径
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/cssdsyy/spring/his.xml