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 | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								899f71188e
								
							
								
							
						 | 
						
							
							
								
								feat: sql更新
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								1ca947ba0a
								
							
								
							
						 | 
						
							
							
								
								feat: sql更新、设备管理迁移、小程序接口暴露
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								b108828b54
								
							
								
							
						 | 
						
							
							
								
								feat: sql更新
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								45d8c20e40
								
							
								
							
						 | 
						
							
							
								
								5-20  三张保养相关表
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								2b74cbd33a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_test1.0' into dev_ksck
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/resources/schemas/schema_v2.3.sql 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								629f9ca983
								
							
								
							
						 | 
						
							
							
								
								5-20  设备数据
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b952f02c2b
								
							
								
							
						 | 
						
							
							
								
								5-20 数据同步 1.3 修改sql语句
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								003fbc5205
								
							
								
							
						 | 
						
							
							
								
								第三方产品信息导入
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								fe0beef80d
								
							
								
							
						 | 
						
							
							
								
								5-10 数据同步 1.2
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								54f9289737
								
							
								
							
						 | 
						
							
							
								
								5-10 数据同步 更改 设备管理
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								ffe4a8013e
								
							
								
							
						 | 
						
							
							
								
								feat: 增加耗材类别编辑
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f28f4cccfb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								21bd1841c8
								
							
								
							
						 | 
						
							
							
								
								修改登录权限验证等
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								4fd81d62c5
								
							
								
							
						 | 
						
							
							
								
								feat: 代码加注释
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								bec388063b
								
							
								
							
						 | 
						
							
							
								
								资质预警相关修改,医保编码判空
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								6dc4bcf6d9
								
							
								
							
						 | 
						
							
							
								
								feat: 新增业务单据加上单据类型过滤物资录入
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								b9794887a9
								
							
								
							
						 | 
						
							
							
								
								feat: 校验产品采购类型修复
							
							
							
							
							
						 | 
						
							2 years ago |