anthonywj
							
						 | 
						
							
							
							
							
								
							
								e7d743faa0
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								f9a09de847
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								dfe7b8769e
								
							
								
							
						 | 
						
							
							
								
								8/8 药品搜索字段以及插入字段维护
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								274aefa911
								
							
								
							
						 | 
						
							
							
								
								处方相关修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c2b8f4bf2e
								
							
								
							
						 | 
						
							
							
								
								处方分配工位修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0f1ee49172
								
							
								
							
						 | 
						
							
							
								
								预出库扫码修改,处方赋码修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								26d23af14a
								
							
								
							
						 | 
						
							
							
								
								8/02 选入收费项目
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								2860529256
								
							
								
							
						 | 
						
							
							
								
								feat: 处方下载
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								01d873f317
								
							
								
							
						 | 
						
							
							
								
								基础数据修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3bf34db4f8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								a6e0e99ec5
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								cf6978979b
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								4b6ac18da9
								
							
								
							
						 | 
						
							
							
								
								feat: 带票出入库明细
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								701d39e3ba
								
							
								
							
						 | 
						
							
							
								
								feat: 就诊卡
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								771886a42d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f1cd9fd1d6
								
							
								
							
						 | 
						
							
							
								
								四级库库存查询
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								8fdd2a487d
								
							
								
							
						 | 
						
							
							
								
								feat: 带票出入库明细
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b329488995
								
							
								
							
						 | 
						
							
							
								
								单据查看药品字典详情
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4e21a083b2
								
							
								
							
						 | 
						
							
							
								
								新增拆零队列
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0cc61f9f59
								
							
								
							
						 | 
						
							
							
								
								新增拆零队列
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								17b98d8ab0
								
							
								
							
						 | 
						
							
							
								
								药品信息编辑以及层级包装数量换算
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0ec915d253
								
							
								
							
						 | 
						
							
							
								
								平潭收费出库明细
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4409ea42e3
								
							
								
							
						 | 
						
							
							
								
								药品字典修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								791f8c09fd
								
							
								
							
						 | 
						
							
							
								
								切换分支备份,选择库存自定义界面
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								521310d144
								
							
								
							
						 | 
						
							
							
								
								切换分支备份,选择库存自定义界面
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								de18e59417
								
							
								
							
						 | 
						
							
							
								
								切换分支备份,选择库存自定义界面
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								15fe481b72
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								6d2014e1f6
								
							
								
							
						 | 
						
							
							
								
								切换分支备份,选择库存自定义界面
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ed3b454631
								
							
								
							
						 | 
						
							
							
								
								切换分支备份,选择库存自定义界面
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								cb12947cf6
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								c84ff8236c
								
							
								
							
						 | 
						
							
							
								
								7/30 药品管理
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ca74b54400
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								6cde6e6fee
								
							
								
							
						 | 
						
							
							
								
								单据删除
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d101ee2c2c
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								77f78557d6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								58a8377531
								
							
								
							
						 | 
						
							
							
								
								7/29 1.1 更改药品
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								a4a05d4756
								
							
								
							
						 | 
						
							
							
								
								feat: 药品出入库明细、汇总、入账库
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3f0bffd21a
								
							
								
							
						 | 
						
							
							
								
								收费明细多个供应商问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								08182d3d68
								
							
								
							
						 | 
						
							
							
								
								新增是否组套,单据出入库明细查询
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								eaa0c50011
								
							
								
							
						 | 
						
							
							
								
								无批次号出库默认赋予批次号
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								4d6291d1f3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_fifo_z1' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								6ab09e803f
								
							
								
							
						 | 
						
							
							
								
								7/29
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								acc2afebdf
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								147c9f3fa9
								
							
								
							
						 | 
						
							
							
								
								拆零相关修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								dfd2e2bfce
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								7b0a9dd058
								
							
								
							
						 | 
						
							
							
								
								7/27 1.1
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								878f571a3b
								
							
								
							
						 | 
						
							
							
								
								新增医保拆零,医保收费项目,中西药,中药饮品,医用耗材等
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								de0987058c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_fifo' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								502c13d74a
								
							
								
							
						 | 
						
							
							
								
								7/26 sql
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								bba7ed9e2b
								
							
								
							
						 | 
						
							
							
								
								7/26 sql
							
							
							
							
							
						 | 
						
							1 year ago |