医保对接

controllers/his_api_controller.go

@@ -626,13 +626,10 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 			var index = 0
 			for _, subItem := range item.OtherDrugWarehouseInfo {
 				if index == 0 {
-					fmt.Println(subItem.DrugId)
-					fmt.Println(subItem.RetailPrice)
 					index = index + 1
-					item.MinPrice = subItem.RetailPrice
-					fmt.Println("~~~~~~~")
-
-					fmt.Println(item.MinPrice)
+					if subItem.RetailPrice > 0 {
+						item.MinPrice = subItem.RetailPrice
+					}
 				}
 			}
 		}

controllers/his_project_api_controller.go

@@ -834,7 +834,9 @@ func (this *HisProjectApiController) GetHisProject() {
 		//处理耗材不同批号价格问题
 		for _, item := range good_info {
 			if len(item.GoodSotckInfo) > 0 {
-				item.PackingPrice = item.GoodSotckInfo[0].Price
+				if item.GoodSotckInfo[0].Price > 0 {
+					item.PackingPrice = item.GoodSotckInfo[0].Price
+				}
 			}
 		}
 	}

controllers/manager_center_api_controller.go

@@ -108,6 +108,8 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	drug_dose, _ := c.GetFloat("drug_dose")
 	drug_dose_unit, _ := c.GetInt64("drug_dose_unit")
 	medical_insurance_number := c.GetString("medical_insurance_number")
+	provinces_code := c.GetString("provinces_code")
+
 	manufacturer, _ := c.GetInt64("manufacturer")
 	pharmacology_category, _ := c.GetInt64("pharmacology_category")
 	statistics_category, _ := c.GetInt64("statistics_category")
@@ -171,6 +173,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 		DrugDose:                    drug_dose,
 		DrugDoseUnit:                drug_dose_unit,
 		MedicalInsuranceNumber:      medical_insurance_number,
+		ProvincesCode:               provinces_code,
 		Manufacturer:                manufacturer,
 		PharmacologyCategory:        pharmacology_category,
 		StatisticsCategory:          statistics_category,
@@ -262,6 +265,8 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	drug_dose, _ := c.GetFloat("drug_dose")
 	drug_dose_unit, _ := c.GetInt64("drug_dose_unit")
 	medical_insurance_number := c.GetString("medical_insurance_number")
+	provinces_code := c.GetString("provinces_code")
+
 	manufacturer, _ := c.GetInt64("manufacturer")
 	pharmacology_category, _ := c.GetInt64("pharmacology_category")
 	statistics_category, _ := c.GetInt64("statistics_category")
@@ -370,6 +375,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		PrescribingNumberUnit:       prescribing_number_unit,
 		Total:                       total,
 		SingleDose:                  drug_dose,
+		ProvincesCode:               provinces_code,
 	}
 
 	err := service.UpdateBaseDrugLib(drugLib)
@@ -1459,6 +1465,8 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 	retail_price, _ := c.GetFloat("retail_price", 0)
 	fmt.Println(retail_price)
 	medical_insurance_number := c.GetString("medical_insurance_number")
+	provinces_code := c.GetString("provinces_code")
+
 	is_special_diseases, _ := c.GetInt64("is_special_diseases", 0)
 	is_record, _ := c.GetInt64("is_record")
 	statistics_category, _ := c.GetInt64("statistics_category")
@@ -1542,6 +1550,7 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 		DefaultCountUnit:            default_count_unit,
 		MinUnit:                     min_unit,
 		RegisterNumber:              register_number,
+		ProvincesCode:               provinces_code,
 	}
 	err, goodInfos := service.AddSigleGoodInfo(&goodInfo)
 	if err == nil {
@@ -1568,6 +1577,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 	stock_warn_count, _ := c.GetInt64("stock_warn_count", 0)
 	is_reuse, _ := c.GetInt64("is_reuse", 0)
 	code := c.GetString("good_code")
+	provinces_code := c.GetString("provinces_code")
 
 	good_name := c.GetString("good_name")
 	pinyin := c.GetString("pinyin")
@@ -1577,6 +1587,8 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 	retail_price, _ := c.GetFloat("retail_price", 0)
 	fmt.Println(retail_price)
 	medical_insurance_number := c.GetString("medical_insurance_number")
+	//provinces_code := c.GetString("provinces_code")
+
 	is_special_diseases, _ := c.GetInt64("is_special_diseases", 0)
 	is_record, _ := c.GetInt64("is_record")
 	statistics_category, _ := c.GetInt64("statistics_category")
@@ -1630,6 +1642,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 		Wubi:                        wubi,
 		GoodKind:                    good_kind,
 		MedicalInsuranceNumber:      medical_insurance_number,
+		ProvincesCode:               provinces_code,
 		IsSpecialDiseases:           is_special_diseases,
 		IsRecord:                    is_record,
 		StatisticsCategory:          statistics_category,

models/drug.go

@@ -1,35 +1,37 @@
 package models
 
 type BaseDrugLib struct {
-	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
-	DrugName                    string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
-	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
-	DrugAlias                   string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
-	DrugAliasPinyin             string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
-	DrugAliasWubi               string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
-	DrugCategory                int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
-	DrugSpec                    string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugType                    int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
-	DrugStockLimit              string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
-	DrugOriginPlace             string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
-	DrugDosageForm              int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
-	MedicalInsuranceLevel       int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
-	MaxUnit                     string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinNumber                   int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Dose                        float64 `gorm:"column:dose" json:"dose" form:"dose"`
-	DoseUnit                    string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
-	MinPrice                    float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
-	UnitMatrixing               string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
-	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	LastPrice                   float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	DrugControl                 int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
-	Number                      string  `gorm:"column:number" json:"number" form:"number"`
-	DrugClassify                string  `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
-	DrugDose                    float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
-	DrugDoseUnit                int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
-	MedicalInsuranceNumber      string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName               string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Pinyin                 string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                   string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	DrugAlias              string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
+	DrugAliasPinyin        string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
+	DrugAliasWubi          string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
+	DrugCategory           int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
+	DrugSpec               string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType               int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit         string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugOriginPlace        string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	DrugDosageForm         int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
+	MedicalInsuranceLevel  int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	MaxUnit                string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber              int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit                string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose                   float64 `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit               string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	MinPrice               float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	UnitMatrixing          string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
+	RetailPrice            float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	LastPrice              float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	DrugControl            int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
+	Number                 string  `gorm:"column:number" json:"number" form:"number"`
+	DrugClassify           string  `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
+	DrugDose               float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
+	DrugDoseUnit           int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
+	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	ProvincesCode          string  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
+
 	Manufacturer                int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
 	PharmacologyCategory        int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
 	StatisticsCategory          int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`

models/good_models.go

@@ -22,35 +22,37 @@ func (GoodsType) TableName() string {
 }
 
 type GoodInfo struct {
-	ID                          int64                `gorm:"column:id" json:"id" form:"id"`
-	GoodCode                    string               `gorm:"column:good_code" json:"good_code" form:"good_code"`
-	SpecificationName           string               `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	GoodTypeId                  int64                `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
-	GoodUnit                    int64                `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
-	BuyPrice                    float64              `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
-	SellPrice                   float64              `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
-	Remark                      string               `gorm:"column:remark" json:"remark" form:"remark"`
-	Ctime                       int64                `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                       int64                `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Manufacturer                int64                `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer                      int64                `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	ExpiryDateWarnDayCount      int64                `gorm:"column:expiry_date_warn_day_count" json:"expiry_date_warn_day_count" form:"expiry_date_warn_day_count"`
-	StockWarnCount              int64                `gorm:"column:stock_warn_count" json:"stock_warn_count" form:"stock_warn_count"`
-	IsReuse                     int64                `gorm:"column:is_reuse" json:"is_reuse" form:"is_reuse"`
-	Status                      int64                `gorm:"column:status" json:"status" form:"status"`
-	FilmArea                    string               `gorm:"column:film_area" json:"film_area" form:"film_area"`
-	IsUse                       int64                `gorm:"column:is_use" json:"is_use" form:"is_use"`
-	FilmMaterialQuality         string               `gorm:"column:film_material_quality" json:"film_material_quality" form:"film_material_quality"`
-	OrgId                       int64                `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Modifier                    int64                `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Creater                     int64                `gorm:"column:creater" json:"creater" form:"creater"`
-	GoodName                    string               `gorm:"column:good_name" json:"good_name" form:"good_name"`
-	Pinyin                      string               `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
-	Wubi                        string               `gorm:"column:wubi" json:"wubi" form:"wubi"`
-	GoodKind                    int64                `gorm:"column:good_kind" json:"good_kind" form:"good_kind"`
-	MedicalInsuranceLevel       int64                `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
-	RetailPrice                 float64              `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	MedicalInsuranceNumber      string               `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
+	GoodCode               string  `gorm:"column:good_code" json:"good_code" form:"good_code"`
+	SpecificationName      string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodTypeId             int64   `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	GoodUnit               int64   `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
+	BuyPrice               float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	SellPrice              float64 `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
+	Remark                 string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime                  int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Manufacturer           int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                 int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	ExpiryDateWarnDayCount int64   `gorm:"column:expiry_date_warn_day_count" json:"expiry_date_warn_day_count" form:"expiry_date_warn_day_count"`
+	StockWarnCount         int64   `gorm:"column:stock_warn_count" json:"stock_warn_count" form:"stock_warn_count"`
+	IsReuse                int64   `gorm:"column:is_reuse" json:"is_reuse" form:"is_reuse"`
+	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
+	FilmArea               string  `gorm:"column:film_area" json:"film_area" form:"film_area"`
+	IsUse                  int64   `gorm:"column:is_use" json:"is_use" form:"is_use"`
+	FilmMaterialQuality    string  `gorm:"column:film_material_quality" json:"film_material_quality" form:"film_material_quality"`
+	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Modifier               int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Creater                int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	GoodName               string  `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	Pinyin                 string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                   string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	GoodKind               int64   `gorm:"column:good_kind" json:"good_kind" form:"good_kind"`
+	MedicalInsuranceLevel  int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	RetailPrice            float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	ProvincesCode          string  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
+
 	IsSpecialDiseases           int64                `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
 	IsRecord                    int64                `gorm:"column:is_record" json:"is_record" form:"is_record"`
 	StatisticsCategory          int64                `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`

service/stock_service.go

@@ -247,6 +247,7 @@ func ModifyGoodInfo(goodInfo *models.GoodInfo) (error, *models.GoodInfo) {
 		"default_count_unit":             goodInfo.DefaultCountUnit,
 		"min_unit":                       goodInfo.MinUnit,
 		"register_number":                goodInfo.RegisterNumber,
+		"provinces_code":                 goodInfo.ProvincesCode,
 	}).Error
 
 	writeDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND org_id = ?", goodInfo.ID, goodInfo.OrgId).Updates(map[string]interface{}{"good_type_id": goodInfo.GoodTypeId})