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

Friday 01 Mar 2019
2:26 下午

weizhenyu

深圳市肿瘤医院SZSZLYY-17

灭菌框装载时增加灭菌篮筐的灭菌方式限制（PDA优先）

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerView.js
11:29 上午

weizhenyu

深圳市肿瘤医院SZSZLYY-17 灭菌框装载时增加灭菌篮筐的灭菌方式限制（PDA优先） pc端 容器管理弹窗的灭菌方式的下拉框
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerView.js
10:52 上午

LiHaiFeng

修改快速入筐保存之后返回页面
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.js
10:31 上午

shuyongfu

SZSZLYY-17 灭菌框装载时增加灭菌篮筐的灭菌方式限制（PDA优先

增加灭菌方式选择项的数据源接口

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/systemsetting/controller/HttpOptionController.java
10:30 上午

LiHaiFeng

修改自定义器械包不能做清点确认，点击快速入筐取消按钮不能关闭页面
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
10:01 上午

zengyuan

广州医科大学附属口腔医院 GZYKDXFSKQ-39 发货计划模块，查看待发物品界面，增加返回按钮 修复
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/canInvoiceTousseList.js
9:58 上午

zengyuan

广州医科大学附属口腔医院 GZYKDXFSKQ-39 发货计划模块，查看待发物品界面，增加返回按钮 修复
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
Thursday 28 Feb 2019
9:09 下午

shuyongfu

SZSZLYY-17 灭菌框装载时增加灭菌篮筐的灭菌方式限制（PDA优先

pc和pda经测试均已解决

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
7:47 下午

zc.li

完善：XJJQZYY-41; 修改每天装配时间过滤条件样式，查询更加灵活。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/reports/foreignTousseApplicationReport.js
7:14 下午

yanweining

GZZYYFY-28:自定义器械包增加包定义的默认值设置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
7:11 下午

yanweining

GZZYYFY-28:自定义器械包增加包定义的默认值设置

隐藏：自定义器械包是否回收选项（改为固定为是）

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
7:04 下午

yanweining

导出基础数据：增加判空
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
5:10 下午

LiHaiFeng

广医口腔 打开待回收或者部分回收的申请单，点击回收科室的名字，可以加载该科室绑定的清洗篮筐
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
5:00 下午

zc.li

解决：XJJQZYY-41。添加每天装配时间过滤。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/reports/foreignTousseApplicationReport.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java
3:30 下午

yanweining

同步现场：

广州中医药附一医院:一次性物品固定条码打印字体修改

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
3:21 下午

shuyongfu

SZSZLYY-18 灭菌记录添加时增加BD程序提示（PDA优先）

灭菌炉po实体类增加"需要提示的灭菌程序"字段、补充相应的注释

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java
3:20 下午

zc.li

解决：GZZYYFY-29。自定义器械包申请单页面修改，允许同时申请多个自定义器械包。部分属性取科室供应室配置设置的自定义器械参数值。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
3:17 下午

yanweining

GZZYYFY-28：自定义器械包增加包定义的默认值设置

科室供应室设置

增加属性：包装类型、灭菌程序、是否审核、标签模板、是否回收、打印科室来源

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
3:17 下午

shuyongfu

SZSZLYY-17 灭菌框装载时增加灭菌篮筐的灭菌方式限制（PDA优先）

容器管理po实体类增加注释

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/container/Container.java
2:37 下午

shuyongfu

SZSZLYY-17 灭菌框装载时增加灭菌篮筐的灭菌方式限制（PDA优先）

容器管理po实体类增加灭菌方式字段

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/container/Container.java
11:37 上午

zengyuan

广州医科大学附属口腔医院 GZYKDXFSKQ-39 发货计划模块，查看待发物品界面，增加返回按钮
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
11:34 上午

zengyuan

广州医科大学附属口腔医院 GZYKDXFSKQ-39 发货计划模块，查看待发物品界面，增加返回按钮
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/canInvoiceTousseList.js
11:12 上午

weizhenyu

pc的发货计划的扫码后，申请单的物品的一个状态，未扫码不变，为黄色，扫码但未扫满为蓝色，扫码扫满为绿色
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/common.css
11:12 上午

weizhenyu

pc的发货计划的扫码后，申请单的物品的一个状态，未扫码不变，为黄色，扫码但未扫满为蓝色，扫码扫满为绿色
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
10:42 上午

shuyongfu

解决Jira问题:ASSPYQZYY-16 IP绑定科室后，登录时还是默认上一次的科室
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/ipandorgunitmapping/service/IpAndOrgUnitMappingManagerImpl.java
10:29 上午

shuyongfu

解决Jira问题:ASSPYQZYY-16 IP绑定科室后，登录时还是默认上一次的科室
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/controller/WashAndDisinfectRecordController.java
10:20 上午

yanweining

GZZYYFY-28：自定义器械包增加包定义的默认值设置

科室供应室设置

增加属性：包装类型、灭菌程序、是否审核、标签模板、是否回收、打印科室来源

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
10:04 上午

shuyongfu

解决Jira问题:ASSPYQZYY-16 IP绑定科室后，登录时还是默认上一次的科室
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
Wednesday 27 Feb 2019
6:30 下午

yanweining

珠江医院：新华灭菌参数打印
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChart.jsp
6:07 下午

LiHaiFeng

修改键盘样式
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css