浏览代码

医保对接

csx 3 年前
父节点
当前提交
1824158045
共有 2 个文件被更改,包括 2 次插入7 次删除
  1. 1 7
      controllers/his_api_controller.go
  2. 1 0
      service/his_service.go

+ 1 - 7
controllers/his_api_controller.go 查看文件

628
 				if index == 0 {
628
 				if index == 0 {
629
 					if subItem.StockMaxNumber*item.MinNumber+subItem.StockMinNumber > 0 {
629
 					if subItem.StockMaxNumber*item.MinNumber+subItem.StockMinNumber > 0 {
630
 						index = index + 1
630
 						index = index + 1
631
-						item.MinPrice = subItem.Price
631
+						item.MinPrice = subItem.RetailPrice
632
 					}
632
 					}
633
 				}
633
 				}
634
 			}
634
 			}
635
 		}
635
 		}
636
 	}
636
 	}
637
-
638
 	manufacturers, _ := service.GetAllManufacturerList(adminInfo.CurrentOrgId)
637
 	manufacturers, _ := service.GetAllManufacturerList(adminInfo.CurrentOrgId)
639
-
640
 	drugways, _, _ := service.GetDrugWayDics(adminInfo.CurrentOrgId)
638
 	drugways, _, _ := service.GetDrugWayDics(adminInfo.CurrentOrgId)
641
 	efs, _, _ := service.GetExecutionFrequencyDics(adminInfo.CurrentOrgId)
639
 	efs, _, _ := service.GetExecutionFrequencyDics(adminInfo.CurrentOrgId)
642
 	doctors, _ := service.GetHisAdminUserDoctors(adminInfo.CurrentOrgId)
640
 	doctors, _ := service.GetHisAdminUserDoctors(adminInfo.CurrentOrgId)
643
 	//获取所有科室信息
641
 	//获取所有科室信息
644
 	department, _ := service.GetAllDepartMent(adminInfo.CurrentOrgId)
642
 	department, _ := service.GetAllDepartMent(adminInfo.CurrentOrgId)
645
-
646
 	//获取诊断信息
643
 	//获取诊断信息
647
-
648
 	sick, _ := service.FindAllSick(adminInfo.CurrentOrgId)
644
 	sick, _ := service.FindAllSick(adminInfo.CurrentOrgId)
649
-
650
 	diagnose, _ := service.FindAllDiagnose(adminInfo.CurrentOrgId)
645
 	diagnose, _ := service.FindAllDiagnose(adminInfo.CurrentOrgId)
651
-
652
 	additions, _ := service.FindAllAddition(adminInfo.CurrentOrgId)
646
 	additions, _ := service.FindAllAddition(adminInfo.CurrentOrgId)
653
 
647
 
654
 	c.ServeSuccessJSON(map[string]interface{}{
648
 	c.ServeSuccessJSON(map[string]interface{}{

+ 1 - 0
service/his_service.go 查看文件

596
 	StockMaxNumber   int64   `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
596
 	StockMaxNumber   int64   `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
597
 	StockMinNumber   int64   `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
597
 	StockMinNumber   int64   `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
598
 	Price            float64 `gorm:"column:price" json:"price" form:"price"`
598
 	Price            float64 `gorm:"column:price" json:"price" form:"price"`
599
+	RetailPrice      float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
599
 }
600
 }
600
 
601
 
601
 func (OtherDrugWarehouseInfo) TableName() string {
602
 func (OtherDrugWarehouseInfo) TableName() string {