anthonywj
							
						 | 
						
							
							
							
							
								
							
								fa6aaa0fe6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/20231126-yw' into 20231126-yw
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								65cd5b0ec5
								
							
								
							
						 | 
						
							
							
								
								合并冲突
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								7a74235bcd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								04f790caf8
								
							
								
							
						 | 
						
							
							
								
								单据重复上传问题,东山第三方产品信息新增库房代码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								6b22bfb862
								
							
								
							
						 | 
						
							
							
								
								第三方产品信息过滤问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								7ffe727deb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								04534e3f43
								
							
								
							
						 | 
						
							
							
								
								第三方产品信息过滤问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								805c82e972
								
							
								
							
						 | 
						
							
							
								
								新增生产企业字典维护
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1ed3360997
								
							
								
							
						 | 
						
							
							
								
								新增第三方生产企业
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3f06c5a1dd
								
							
								
							
						 | 
						
							
							
								
								审核人问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4854df1f7f
								
							
								
							
						 | 
						
							
							
								
								申购问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0a0155a967
								
							
								
							
						 | 
						
							
							
								
								1:东山nginx转发问题(头部参数修改);
							
							
							
							
							
							
							
							2:再次领用;再次申购问题;
3.生成内部码是否以最小使用单元问题 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c065ed3a6d
								
							
								
							
						 | 
						
							
							
								
								集采拆单问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d970162fca
								
							
								
							
						 | 
						
							
							
								
								库存对比修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								640e3ed137
								
							
								
							
						 | 
						
							
							
								
								校验后处方结果保存
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								bc4b627077
								
							
								
							
						 | 
						
							
							
								
								患者信息远程下载,提供中医院设备查询界面
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								b73e4a3826
								
							
								
							
						 | 
						
							
							
								
								预验收补单多个供应商带入不同产品
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3ff1367628
								
							
								
							
						 | 
						
							
							
								
								协调平台查询出入库新增序列号查询
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								77525665e9
								
							
								
							
						 | 
						
							
							
								
								设备入库,变更,销毁等修改,自定义汇总统修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5fad9e2835
								
							
								
							
						 | 
						
							
							
								
								新增自定义库存明细汇总
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4508e48438
								
							
								
							
						 | 
						
							
							
								
								患者往来单位问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f6ecc65386
								
							
								
							
						 | 
						
							
							
								
								患者处方相关修改优化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d345794cdb
								
							
								
							
						 | 
						
							
							
								
								患者处方相关修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								270410daea
								
							
								
							
						 | 
						
							
							
								
								s设备标签打印问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c73e2bf1f2
								
							
								
							
						 | 
						
							
							
								
								第三方接口修改,第三接口容错处理,患者信息相关修改,单据类型患者相关修改,临床出库患者信息选择,是否对照处方等相关配置
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5f110bea39
								
							
								
							
						 | 
						
							
							
								
								患者处方相关修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								1df50657b0
								
							
								
							
						 | 
						
							
							
								
								设备相关
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								33676f7c2f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_price' into dev_price
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								27cc68ff98
								
							
								
							
						 | 
						
							
							
								
								新增库存出库模式,总库库存,上级库存,当前库存
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								45bd2c8e1e
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								b5108288a5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								e8a0c53057
								
							
								
							
						 | 
						
							
							
								
								集成动态表单
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								be1475a5da
								
							
								
							
						 | 
						
							
							
								
								新增库存出库模式,总库库存,上级库存,当前库存
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								ba23b3e90e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								b382a19fc4
								
							
								
							
						 | 
						
							
							
								
								出入库单管理配置
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								6d0090c058
								
							
								
							
						 | 
						
							
							
								
								长泰新增配送产品,物资分类问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								508e93bb91
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								9b4ac353f7
								
							
								
							
						 | 
						
							
							
								
								单据管理
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f79458bb45
								
							
								
							
						 | 
						
							
							
								
								长泰新增配送产品,物资分类问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								a0f90b9653
								
							
								
							
						 | 
						
							
							
								
								库存显示数量
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1372f4d92f
								
							
								
							
						 | 
						
							
							
								
								第三方产品信息上传
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e7cdbf7140
								
							
								
							
						 | 
						
							
							
								
								第三方产品信息上传
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								81a57129f8
								
							
								
							
						 | 
						
							
							
								
								价格问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								7ef66921cf
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d17110bcaf
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_price' into dev_price
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								9dba332648
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								498c3be047
								
							
								
							
						 | 
						
							
							
								
								出入库单管理配置
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								6502b3a7a7
								
							
								
							
						 | 
						
							
							
								
								出入库单管理配置
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								91b6e4ff2f
								
							
								
							
						 | 
						
							
							
								
								采购订单管理配置
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								0d2eb0d69c
								
							
								
							
						 | 
						
							
							
								
								计划管理配置
							
							
							
							
							
						 | 
						
							2 years ago |