wangwei
							
						 | 
						
							
							
							
							
								
							
								11a52f4fd3
								
							
								
							
						 | 
						
							
							
								
								10/17 单据增加单据类型
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								b4586848b6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_drug' into dev_drug
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								10ca47d409
								
							
								
							
						 | 
						
							
							
								
								药品采购订单修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								11b1c70394
								
							
								
							
						 | 
						
							
							
								
								feat: 药品关联关系功能
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								bb10befc0f
								
							
								
							
						 | 
						
							
							
								
								feat: 手工关联、拼箱关联数据同步
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								qyt
							
						 | 
						
							
							
							
							
								
							
								69e256dd37
								
							
								
							
						 | 
						
							
							
								
								1、移植耗材管理编辑功能的所有相关
							
							
							
							
							
							
							
							2、sql增加字段 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								f4c9afc4f5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_drug' into dev_drug
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								036048bddd
								
							
								
							
						 | 
						
							
							
								
								10/14   yaopin
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								7ed2265dec
								
							
								
							
						 | 
						
							
							
								
								feat: 手工关联、拼箱关联数据同步
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								3d3855af70
								
							
								
							
						 | 
						
							
							
								
								feat: 手工关联、拼箱关联
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								ea4fc93a5d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_drug' into dev_drug
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								8a838e91e9
								
							
								
							
						 | 
						
							
							
								
								是否组套
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								9b9b478364
								
							
								
							
						 | 
						
							
							
								
								10/14 药品基础数据优化
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								eb22007eb4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_drug' into dev_drug
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								405e9778f9
								
							
								
							
						 | 
						
							
							
								
								是否组套
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								4316419c00
								
							
								
							
						 | 
						
							
							
								
								8/12 药品字段
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								15b093a2df
								
							
								
							
						 | 
						
							
							
								
								药品扫码流程修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								f2d7b3ab2d
								
							
								
							
						 | 
						
							
							
								
								8/8 药品管理
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								686a88991a
								
							
								
							
						 | 
						
							
							
								
								8/5 优化1.1入院药品维护,以及响应字段
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								fdaef6479a
								
							
								
							
						 | 
						
							
							
								
								8/02 1.1 药品出入库明细查询药品出入库单据
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								d1eaf16000
								
							
								
							
						 | 
						
							
							
								
								8-01 药品管理
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								09178327d6
								
							
								
							
						 | 
						
							
							
								
								feat: 选入入院药品
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								202f3c8959
								
							
								
							
						 | 
						
							
							
								
								新增是否组套,出入库明细改造,
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								b3006e5870
								
							
								
							
						 | 
						
							
							
								
								新增是否组套,出入库明细改造,
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c3898425e6
								
							
								
							
						 | 
						
							
							
								
								发票登记过滤
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								97fae0e6cb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d1aad25a7c
								
							
								
							
						 | 
						
							
							
								
								打印,包装规格,第三方产品审核等问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								5fd6f0511f
								
							
								
							
						 | 
						
							
							
								
								feat: DI选入审核时进行是否需要扫码初始化
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								3a52a67c49
								
							
								
							
						 | 
						
							
							
								
								feat: 导入入院物资修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f327aac379
								
							
								
							
						 | 
						
							
							
								
								单据校验耗材问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								9289dfa341
								
							
								
							
						 | 
						
							
							
								
								好词啊字典,发票等相关修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								51a8ef9976
								
							
								
							
						 | 
						
							
							
								
								feat: 导入入院物资修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								54e3556181
								
							
								
							
						 | 
						
							
							
								
								feat: 导入入院物资修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								9a573b35af
								
							
								
							
						 | 
						
							
							
								
								feat: 0702-扫码校验功能
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								a13a3b9fab
								
							
								
							
						 | 
						
							
							
								
								feat: 0702-扫码校验功能
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								fdfa933336
								
							
								
							
						 | 
						
							
							
								
								feat: 0701-是否需要扫码前判断单据是否为空
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								d24fe63ca5
								
							
								
							
						 | 
						
							
							
								
								feat: 0701-是否需要扫码前判断单据是否为空
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								bbf0efa461
								
							
								
							
						 | 
						
							
							
								
								5-20  sql
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								88f17f5874
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								7e14b47152
								
							
								
							
						 | 
						
							
							
								
								6/21 同步优化
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f7152439cd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
#	src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3ce3949814
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								38aec42f54
								
							
								
							
						 | 
						
							
							
								
								feat: 0606注释掉是否需要扫码
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								9648212bd8
								
							
								
							
						 | 
						
							
							
								
								feat: 0605修复
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d8e113bef1
								
							
								
							
						 | 
						
							
							
								
								发票打印问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								a33b607376
								
							
								
							
						 | 
						
							
							
								
								feat: 0604增加是否需要扫码字段
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								8388ad0412
								
							
								
							
						 | 
						
							
							
								
								feat: 0531增加是否需要扫码字段
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1b232af9b6
								
							
								
							
						 | 
						
							
							
								
								单据同步删除
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								104fd02dfa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								8a41d006cc
								
							
								
							
						 | 
						
							
							
								
								新增耗材类别校验
							
							
							
							
							
						 | 
						
							1 year ago |