Commit Graph

Select branches

Hide Pull Requests

develop/hrl20241202_wzzps

develop/hrl20241214_tysj

develop/hrl_20241107_yztbutten

develop/hrl_20241217_fyhzjsjbyz

develop/hrl_20241219_yztxg

develop/hrl_20241220_blzd

develop/hrl_20241220_ekblhzlb

develop/hrl_20241223_syjgThread

develop/hrl_20241224_zyjszdrq

develop/hrl_20241226_bjhzcrb

develop/hrl_20250102_AutoMmsKj

develop/hrl_threadSjg

develop/lyx_20240109_hcth

develop/lyx_20241116_yzzf

develop/lyx_20241121_cfhz

develop/lyx_20241211_cfhz

develop/lyx_20241216_cfdp

develop/lyx_20241217_crb

develop/lyx_20241224_bbtj

develop/lyx_20241225_gh

develop/lyx_20241225_zfjsd

develop/lyx_20241225_zycfdp

develop/lyx_20241227_zydj

develop/lyx_20241227_zyyz

develop/lyx_20241230_crbdy

develop/lyx_20241230_zdqf

develop/lyx_20250109_hcth

develop/lyx_20250117_hcth

develop/xl_20241125_txhrgx

develop/xl_20241204_ybjm

develop/xl_20241216_blxg

develop/xl_20241217_fix

develop/xl_20241220_yztxz

develop/xl_20241225_bbxg1

develop/xl_20241225_hcpcxz

develop/xl_20241225_hnyb

develop/xl_20250102_crgbg

develop/xl_20250107_wzxg

develop/xl_20250120_hctz

master

release/20150102_1345

release/20241023_1403

release/20241120_1738

release/20241216_1413

release/20241225_1153

Mono Color

• 8f83434675 develop/xl_20250120_hctz release/20150102_1345 Xiao Ye 2025-01-20 11:08:43 +0800
• 48c2e14f8c develop/xl_20250120_hctz Xiao Ye 2025-01-20 11:08:32 +0800
• 04a6376791 查询日期范围增加“上年”：收费员工作量统计 develop/xl_20250120_hctz Xiao Ye 2025-01-20 10:29:27 +0800
• c861cc8ade develop/lyx_20250117_hcth Xiao Ye 2025-01-20 09:39:48 +0800
• 2ac9b2ae8b 1.物资耗材系统-采购退货-物资退货制单：已审核单据增加取消完成限制 2.药事系统-退货-退货制单：已审核单据增加取消完成限制 develop/lyx_20250117_hcth lxx 2025-01-17 10:21:36 +0800
• 550589000d develop/hrl_20250102_AutoMmsKj Xiao Ye 2025-01-16 17:21:07 +0800
• c8d8ec7134 develop/lyx_20250109_hcth Xiao Ye 2025-01-16 16:53:38 +0800
• 9f3da1ca18 住院物资自动扣减 develop/hrl_20250102_AutoMmsKj hrl_081 2025-01-15 18:13:11 +0800
• 45dccf6f89 1.物资耗材系统-采购退货：调拨耗材无法退货问题 2.物资耗材系统-采购退货：退库单无法取消完成问题 develop/lyx_20250109_hcth lxx 2025-01-13 13:44:12 +0800
• 2f60acfdd4 1.物资耗材系统-采购退货：调拨耗材无法退货问题 lxx 2025-01-10 14:35:24 +0800
• fed89ea96c Merge remote-tracking branch 'origin/release/20241225_1153' into develop/lyx_20250109_hcth lxx 2025-01-09 16:21:13 +0800
• 304c7bb853 1.物资耗材系统-采购退货：调拨耗材无法退货问题 develop/lyx_20240109_hcth lxx 2025-01-09 16:14:33 +0800
• e26dfdf28e develop/lyx_20241230_crbdy Xiao Ye 2025-01-09 11:28:49 +0800
• d18a67d9b2 develop/xl_20250102_crgbg Xiao Ye 2025-01-09 11:21:35 +0800
• 0812804bc8 develop/xl_20250102_crgbg release/20241225_1153 Xiao Ye 2025-01-09 11:17:19 +0800
• 512bb05e11 1 develop/lyx_20241230_crbdy lxx 2025-01-09 10:30:10 +0800
• ee3770504e 备份 hrl_081 2025-01-07 15:14:46 +0800
• 50fd158b3a 1.传染病报卡打印 lxx 2025-01-07 11:31:55 +0800
• 21fa8df933 调整收入分类统计业务逻辑，以符合其他报表。 develop/xl_20250102_crgbg Xiao Ye 2025-01-06 16:44:50 +0800
• 81a891f584 医嘱耗材无法选择医嘱单位 hrl_081 2025-01-02 14:16:00 +0800
• 1017107c48 三医监管代码修改 hrl_081 2025-01-02 14:05:08 +0800
• 356922e6ca develop/lyx_20241230_zdqf Xiao Ye 2025-01-02 13:59:28 +0800
• ecbeb2bf2b develop/lyx_20241227_zydj Xiao Ye 2025-01-02 13:48:44 +0800
• f0eff4b9ef 合并分支release/20241225_1153 master develop/xl_20250107_wzxg Xiao Ye 2025-01-02 13:44:31 +0800
• 282978d1e4 1.住院收费工作站-住院患者收费-重点欠费 非重点人群金额显示调整 develop/lyx_20241230_zdqf lxx 2024-12-31 14:21:29 +0800
• 8ed245b71f Merge remote-tracking branch 'origin/release/20241225_1153' into develop/lyx_20241230_crbdy lxx 2024-12-31 11:11:01 +0800
• e126a9fdfc 2 develop/hrl_20241223_syjgThread hrl_081 2024-12-30 23:17:20 +0800
• face40c683 医嘱耗材无法选择医嘱单位 hrl_081 2024-12-30 23:13:00 +0800
• 7dfeb464e8 1.修正住院登记修改界面-缴押金无票据报null问题 develop/lyx_20241227_zydj lxx 2024-12-27 17:03:38 +0800
• 2088b57307 develop/lyx_20241227_zyyz Xiao Ye 2024-12-27 16:13:13 +0800
• 53914e1437 develop/hrl_20241226_bjhzcrb Xiao Ye 2024-12-27 16:11:39 +0800
• 6767e89ab7 develop/lyx_20241225_zycfdp Xiao Ye 2024-12-27 16:09:12 +0800
• 7cb79a5c06 1.住院医嘱SQL优化 develop/lyx_20241227_zyyz lxx 2024-12-27 16:00:08 +0800
• 3a172b9d8d 1 develop/lyx_20241225_gh lxx 2024-12-27 15:54:46 +0800
• 2adcdf9736 通许调用暂时OK develop/xl_20241225_hnyb Xiao Ye 2024-12-26 18:54:20 +0800
• f3b37ae17d 住院退药单查询页面 病区过滤不生效 develop/hrl_20241226_bjhzcrb hrl_081 2024-12-26 16:35:10 +0800
• 68966ce09a 暂存 Xiao Ye 2024-12-26 14:59:45 +0800
• e2e4d6264b 河南医保暂存 Xiao Ye 2024-12-26 14:18:59 +0800
• d88e59d31c 门诊日志统计,艾滋/梅毒/乙肝 阳性变红 hrl_081 2024-12-26 14:18:06 +0800
• 5e3ced6014 就诊患者艾滋/梅毒/乙肝记录 hrl_081 2024-12-26 11:07:52 +0800
• d55c4b738b Merge remote-tracking branch 'origin/release/20241225_1153' into develop/lyx_20241225_zycfdp develop/lyx_20241225_zycfdp lxx 2024-12-26 10:47:54 +0800
• 55e512847a 1.住院医嘱点评调整：只查询出院患者、增加医嘱类型、同组号、停止医嘱时间、皮试结果 lxx 2024-12-26 10:47:14 +0800
• 16da021625 develop/lyx_20241225_zfjsd Xiao Ye 2024-12-25 17:55:33 +0800
• 2cfd43c53b develop/lyx_20241225_zfjsd Xiao Ye 2024-12-25 17:55:25 +0800
• b793104c0f develop/xl_20241225_hcpcxz Xiao Ye 2024-12-25 17:52:31 +0800
• 1bf21fd8f7 耗材盘存入库单位帐盘数以允许小数 develop/xl_20241225_hcpcxz Xiao Ye 2024-12-25 17:50:37 +0800
• b5b6b04338 河南测试暂存 Xiao Ye 2024-12-25 16:55:22 +0800
• 0ebce096c7 1.增加自费结算单模板 develop/lyx_20241225_zfjsd lxx 2024-12-25 16:50:59 +0800
• c1ddde0b1f Merge remote-tracking branch 'origin/release/20241225_1153' into develop/lyx_20241225_zycfdp lxx 2024-12-25 15:59:58 +0800
• e3d9087860 修正回.classpath Xiao Ye 2024-12-25 15:41:15 +0800
• c1abcbe478 develop/xl_20241225_bbxg1 Xiao Ye 2024-12-25 15:33:30 +0800
• deb9e6dbd7 通许医保暂存 Xiao Ye 2024-12-25 15:31:49 +0800
• 8b478b41bf 门诊日志统计：增加科室医生过滤条件、乙梅爱注释 develop/xl_20241225_bbxg1 lxx 2024-12-25 15:24:21 +0800
• e7b17405ff 门诊日志统计：增加乙梅爱标识 Xiao Ye 2024-12-25 14:42:59 +0800
• d241d76ba6 1 lxx 2024-12-25 14:42:47 +0800
• 44065e2c4c develop/lyx_20241224_bbtj Xiao Ye 2024-12-25 13:42:43 +0800
• b5fd016dfc develop/hrl_20241224_zyjszdrq Xiao Ye 2024-12-25 13:32:18 +0800
• 9345fd3a1b develop/hrl_20241223_syjgThread Xiao Ye 2024-12-25 12:36:12 +0800
• 013d90d3f3 develop/hrl_20241220_blzd Xiao Ye 2024-12-25 12:35:03 +0800
• 48481a818b Merge remote-tracking branch 'origin/release/20241216_1413' develop/xl_20241216_blxg Xiao Ye 2024-12-25 11:53:19 +0800
• ebbc1cc298 1.平台自动任务his处方信息汇总调整 2.报表统计方式调整优化 药事系统-查询统计-科室抗生素使用量统计 药事系统-查询统计-抗生素使用比例表 药事系统-查询统计-全院抗生素药品使用统计 药事系统-查询统计-医生抗菌药物合理用药情况表 药事系统-查询统计-医生抗生素药品使用统计 药事系统-查询统计-科室抗菌药物合理用药情况表 药事系统-查询统计-特殊药品处方查询 药事系统-查询统计-抗菌药品综合统计 药事系统-查询统计-基本药品综合统计 药事系统-查询统计-抗菌类药品汇总统计 药事系统-查询统计-抗菌类药品明细查询 develop/lyx_20241224_bbtj lxx 2024-12-24 17:43:48 +0800
• 23361f3ac0 重点人群页面颜色修改，重点人群费用上传增加限制 develop/hrl_20241224_zyjszdrq hrl_081 2024-12-24 15:06:18 +0800
• edc23aba23 1.平台自动任务his处方信息汇总调整 develop/lyx_20241211_cfhz lxx 2024-12-24 14:55:10 +0800
• d1d3259aa4 三监管xml提交 hrl_081 2024-12-24 11:36:53 +0800
• b9f2e5c7cd 医保结算单模板增加自费/医保 宏定义 hrl_081 2024-12-23 17:50:01 +0800
• 370a79f02e 三医监管调整2 hrl_081 2024-12-23 16:38:53 +0800
• 087a2b4d25 三医监管自动任务 hrl_081 2024-12-23 16:10:41 +0800
• 854cb483f7 三监管定时任务 hrl_081 2024-12-23 15:55:25 +0800
• df91c22906 病历诊断宏定义赋值修改 develop/hrl_20241220_blzd hrl_081 2024-12-20 17:01:35 +0800
• 5399fbb39e 1.平台自动任务his处方信息汇总调整 lxx 2024-12-20 15:52:03 +0800
• 348622857a develop/xl_20241220_yztxz release/20241216_1413 Xiao Ye 2024-12-20 14:48:28 +0800
• b36dadcca4 develop/hrl_20241220_ekblhzlb Xiao Ye 2024-12-20 14:46:13 +0800
• 62dd346c10 住院医嘱录入界面：增加“管理医嘱套”功能，与“另存为医嘱套”同一界面，只是默认不弹出新增界面。 另存为医嘱套、管理医嘱套界面：去除医嘱明细新增、修改功能，保留删除、保存功能。 修改后：医嘱只能另存为新医嘱套，不能修改医嘱套明细。 develop/xl_20241220_yztxz Xiao Ye 2024-12-20 14:43:37 +0800
• f910a15989 儿科病历患者类型修改 develop/hrl_20241220_ekblhzlb hrl_081 2024-12-20 11:33:45 +0800
• f3e7a20e7e 医嘱套修改 develop/hrl_20241219_yztxg hrl_081 2024-12-19 12:11:46 +0800
• cf1c00a35d 1 hrl_081 2024-12-18 16:26:53 +0800
• edad4524b5 develop/xl_20241217_fix Xiao Ye 2024-12-18 15:51:30 +0800
• e63848fc83 develop/hrl20241214_tysj Xiao Ye 2024-12-18 15:50:21 +0800
• 763c51b971 修改：门诊药房处方点评版面优化下，要能显示整个处方页面 develop/xl_20241217_fix Xiao Ye 2024-12-18 15:33:00 +0800
• 3add616972 1.平台自动任务his处方信息汇总调整 lxx 2024-12-18 14:19:08 +0800
• 428b666db7 修改：住院药房医嘱点评界面，增加按患者名字或住院号等搜索功能，方便查询某个患者 Xiao Ye 2024-12-18 10:43:04 +0800
• 68ed35f68c 退药无显示什么时间产生的退药单 develop/hrl20241214_tysj hrl_081 2024-12-18 10:18:16 +0800
• d8e59c00db 修改：药事系统/药品库存效期查询里面没有药品单价，需添加药品单价。 Xiao Ye 2024-12-18 10:07:22 +0800
• 6690cb6322 develop/hrl_20241217_fyhzjsjbyz Xiao Ye 2024-12-18 09:23:59 +0800
• e93bf40589 develop/lyx_20241217_crb Xiao Ye 2024-12-18 09:22:45 +0800
• 9ebb36d2d5 修改打包脚本乱码 Xiao Ye 2024-12-17 18:22:41 +0800
• 52ba2ae377 门诊/住院药房查询/发药统计查询中的发药汇总的进价和售价不一致，已发药明细会一致 develop/hrl_20241217_fyhzjsjbyz hrl_081 2024-12-17 17:46:35 +0800
• 59a7ea11c2 1.传染病报卡选项增加再次点击取消选择 develop/lyx_20241217_crb lxx 2024-12-17 14:43:40 +0800
• c4f09ba0ce 1 hrl_081 2024-12-17 11:21:07 +0800
• c9fc7b37a0 1 develop/hrl_threadSjg hrl_081 2024-12-17 11:17:19 +0800
• 0e81d1b744 Merge branch 'master' of http://47.118.41.58:3000/kljk/klhis.git into develop/hrl_threadSjg hrl_081 2024-12-17 11:13:33 +0800
• 8206034f1e develop/lyx_20241216_cfdp Xiao Ye 2024-12-16 18:17:28 +0800
• de62e6e64e develop/lyx_20241216_cfdp Xiao Ye 2024-12-16 18:17:21 +0800
• aa8fa34174 develop/xl_20241216_blxg Xiao Ye 2024-12-16 18:16:39 +0800
• eb6cc22b23 1.传染病报卡-密接者有无相同症状：再次点击取消选择 develop/lyx_20241216_cfdp lxx 2024-12-16 17:18:51 +0800
• 2c565fc675 2.处方点评统计优化 lxx 2024-12-16 15:41:11 +0800
• 264bf7d638 Revert "就诊信息中已出院病人的床位信息使用出院床位" Xiao Ye 2024-12-16 15:13:47 +0800
• a2b7d5ff15 Merge remote-tracking branch 'origin/release/20241216_1413' into develop/lyx_20241216_cfdp lxx 2024-12-16 15:12:24 +0800
• 0069bacc1c 2.处方点评统计优化 lxx 2024-12-16 15:11:40 +0800
• 6db5dcaf70 处方汇总 lxx 2024-12-16 15:09:53 +0800