Merge remote-tracking branch 'origin/20230223_xt_api_new_branch' into 20230223_xt_api_new_branch

controllers/stock_in_api_controller.go

@@ -3556,6 +3556,7 @@ func (this *StockManagerApiController) AddGoodInformation() {
 
 		retail_prices := goodNameM["retail_price"].(string)
 		retail_price, _ := strconv.ParseFloat(retail_prices, 64)
+
 		if retail_price <= 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
 				LogType:    5,

service/pharmacy_service.go

@@ -1438,15 +1438,15 @@ func ReplacementDrugs(orgid int64, special bool) (list []*models.ReplacementDrug
 	for _, v := range lib {
 		v := v
 		g.Go(func() error {
-			var tmp models.Manufacturer
-			err := readDb.Model(&models.Manufacturer{}).Where("id = ?", v.Manufacturer).Find(&tmp).Error
-			if err != nil {
-				return err
-			}
+			//var tmp models.Manufacturer
+			//err := readDb.Model(&models.Manufacturer{}).Where("id = ?", v.Manufacturer).Find(&tmp).Error
+			//if err != nil {
+			//	return err
+			//}
 			lock.Lock()
 			list = append(list, &models.ReplacementDrugs{
 				Id:   v.ID,
-				Name: v.DrugName + " " + v.Dose + v.DoseUnit + "*" + config.ToString(v.MinNumber) + v.MinUnit + "/" + v.MaxUnit + " " + tmp.ManufacturerName,
+				Name: v.DrugName + " " + v.Dose + v.DoseUnit + "*" + config.ToString(v.MinNumber) + v.MinUnit + "/" + v.MaxUnit + " " + v.Number,
 			})
 			lock.Unlock()
 			return err
@@ -1467,15 +1467,15 @@ func ReplacementDrugsT(orgid int64) (list []*models.ReplacementDrugs, err error)
 		return
 	}
 	for _, v := range lib {
-		var tmp models.Manufacturer
-		err = readDb.Model(&models.Manufacturer{}).Where("id = ?", v.Manufacturer).Find(&tmp).Error
-		if err != nil {
-			return
-		}
+		//var tmp models.Manufacturer
+		//err = readDb.Model(&models.Manufacturer{}).Where("id = ?", v.Manufacturer).Find(&tmp).Error
+		//if err != nil {
+		//	return
+		//}
 
 		list = append(list, &models.ReplacementDrugs{
 			Id:   v.ID,
-			Name: v.DrugName + " " + v.Dose + v.DoseUnit + "*" + config.ToString(v.MinNumber) + v.MinUnit + "/" + v.PrescribingNumberUnit + " " + tmp.ManufacturerName,
+			Name: v.DrugName + " " + v.Dose + v.DoseUnit + "*" + config.ToString(v.MinNumber) + v.MinUnit + "/" + v.PrescribingNumberUnit + " " + v.Number,
 		})
 	}
 	return

zzz.json

@@ -0,0 +1,582 @@
+[
+  {
+    "one": "",
+    "two": "1835",
+    "three": "2190"
+  },
+  {
+    "one": "国械注进20182152235",
+    "two": "2361",
+    "three": "3531"
+  },
+  {
+    "one": "",
+    "two": "2066",
+    "three": "2992"
+  },
+  {
+    "one": "国械注准20153142380",
+    "two": "2066",
+    "three": "3721"
+  },
+  {
+    "one": "国械注进20192022136",
+    "two": "1968",
+    "three": "2443"
+  },
+  {
+    "one": "国械注进20153453111",
+    "two": "1654",
+    "three": "1922"
+  },
+  {
+    "one": "国械注进20153103111",
+    "two": "1654",
+    "three": "2184"
+  },
+  {
+    "one": "国械注进20193101928",
+    "two": "1654",
+    "three": "2185"
+  },
+  {
+    "one": "国械注进20193101928",
+    "two": "1654",
+    "three": "2186"
+  },
+  {
+    "one": "国械注进20163452908",
+    "two": "1654",
+    "three": "3011"
+  },
+  {
+    "one": "国械注进20163452908",
+    "two": "1654",
+    "three": "3012"
+  },
+  {
+    "one": "国械注准20153100873",
+    "two": "2099",
+    "three": "3105"
+  },
+  {
+    "one": "国械注准20183101889",
+    "two": "2099",
+    "three": "3110"
+  },
+  {
+    "one": "国械注准20183101889",
+    "two": "2099",
+    "three": "3111"
+  },
+  {
+    "one": "国械注准20143101831",
+    "two": "1654",
+    "three": "3163"
+  },
+  {
+    "one": "国械注准20143101831",
+    "two": "1654",
+    "three": "3164"
+  },
+  {
+    "one": "国械注进20153103111",
+    "two": "1654",
+    "three": "3465"
+  },
+  {
+    "one": "国械注进20153101907",
+    "two": "1654",
+    "three": "3579"
+  },
+  {
+    "one": "国械注进20173100232",
+    "two": "1654",
+    "three": "4162"
+  },
+  {
+    "one": "国械注进20173450233",
+    "two": "2074",
+    "three": "3016"
+  },
+  {
+    "one": "国械注进20193101929",
+    "two": "1675",
+    "three": "1948"
+  },
+  {
+    "one": "国械注进20193101929",
+    "two": "1675",
+    "three": "2262"
+  },
+  {
+    "one": "国械注准20213100155",
+    "two": "2151",
+    "three": "3261"
+  },
+  {
+    "one": "国械注准20213100155",
+    "two": "1675",
+    "three": "3283"
+  },
+  {
+    "one": "国械注进20153451695",
+    "two": "2151",
+    "three": "3625"
+  },
+  {
+    "one": "国械注进20213100252",
+    "two": "1675",
+    "three": "3649"
+  },
+  {
+    "one": "国械注准2015314002",
+    "two": "2728",
+    "three": "3914"
+  },
+  {
+    "one": "国械注准20153451633",
+    "two": "2538",
+    "three": "3672"
+  },
+  {
+    "one": "国械注进20173451861",
+    "two": "1886",
+    "three": "2263"
+  },
+  {
+    "one": "国械准字20193100310",
+    "two": "1886",
+    "three": "3128"
+  },
+  {
+    "one": "国械注准20203100169",
+    "two": "1886",
+    "three": "3542"
+  },
+  {
+    "one": "",
+    "two": "2089",
+    "three": "3080"
+  },
+  {
+    "one": "湘械注准20172220337",
+    "two": "2089",
+    "three": "3263"
+  },
+  {
+    "one": "浙械注准20162220827",
+    "two": "2089",
+    "three": "3394"
+  },
+  {
+    "one": "浙械注准20232221139",
+    "two": "2089",
+    "three": "4043"
+  },
+  {
+    "one": "国械注进20192220480",
+    "two": "2089",
+    "three": "4146"
+  },
+  {
+    "one": "国械注进20192400519",
+    "two": "1804",
+    "three": "2130"
+  },
+  {
+    "one": "国械注准20162402313",
+    "two": "2088",
+    "three": "3079"
+  },
+  {
+    "one": "湘械注准20162400156",
+    "two": "2088",
+    "three": "3393"
+  },
+  {
+    "one": "湘械注准20152400113",
+    "two": "2088",
+    "three": "3962"
+  },
+  {
+    "one": "浙械注准20232221139",
+    "two": "2088",
+    "three": "4044"
+  },
+  {
+    "one": "浙械注准20162400927",
+    "two": "2088",
+    "three": "4045"
+  },
+  {
+    "one": "国械注准20183101801",
+    "two": "2080",
+    "three": "3035"
+  },
+  {
+    "one": "国械注准20193101882",
+    "two": "1652",
+    "three": "1920"
+  },
+  {
+    "one": "国械注准20173104247",
+    "two": "1652",
+    "three": "3202"
+  },
+  {
+    "one": "国械注准20173104247",
+    "two": "1652",
+    "three": "3437"
+  },
+  {
+    "one": "国械注准20173104247",
+    "two": "1652",
+    "three": "3438"
+  },
+  {
+    "one": "国械注准20213100947",
+    "two": "1652",
+    "three": "3439"
+  },
+  {
+    "one": "国械注准20173100505",
+    "two": "1652",
+    "three": "3540"
+  },
+  {
+    "one": "国械注准20213100515",
+    "two": "1652",
+    "three": "3902"
+  },
+  {
+    "one": "国械注进20143105627",
+    "two": "1653",
+    "three": "1921"
+  },
+  {
+    "one": "国械注进20163452183",
+    "two": "1653",
+    "three": "2980"
+  },
+  {
+    "one": "国械注准20163100473",
+    "two": "1653",
+    "three": "3541"
+  },
+  {
+    "one": "国械注进20163151629",
+    "two": "1656",
+    "three": "1924"
+  },
+  {
+    "one": "国械注准20173154167",
+    "two": "1656",
+    "three": "3166"
+  },
+  {
+    "one": "国械注准20143142113",
+    "two": "1656",
+    "three": "3415"
+  },
+  {
+    "one": "国械注进20143105618",
+    "two": "2059",
+    "three": "2976"
+  },
+  {
+    "one": "苏械注准20182081749",
+    "two": "1714",
+    "three": "1993"
+  },
+  {
+    "one": "苏械注准20162080521",
+    "two": "1714",
+    "three": "3213"
+  },
+  {
+    "one": "苏械注准20162080020",
+    "two": "1714",
+    "three": "3553"
+  },
+  {
+    "one": "苏械注准20182560598",
+    "two": "1714",
+    "three": "3559"
+  },
+  {
+    "one": "苏械注准20172081724",
+    "two": "1714",
+    "three": "3702"
+  },
+  {
+    "one": "国械注准20173660838",
+    "two": "1962",
+    "three": "2433"
+  },
+  {
+    "one": "国械注准20173664565",
+    "two": "1962",
+    "three": "3817"
+  },
+  {
+    "one": "国械注准20173144565",
+    "two": "1962",
+    "three": "4083"
+  },
+  {
+    "one": "国械注准20183661606",
+    "two": "1877",
+    "three": "2249"
+  },
+  {
+    "one": "",
+    "two": "1681",
+    "three": "1955"
+  },
+  {
+    "one": "粤械注准20192140744",
+    "two": "1681",
+    "three": "3682"
+  },
+  {
+    "one": "国械注准20163100663",
+    "two": "2239",
+    "three": "3400"
+  },
+  {
+    "one": "国械注准20163100663",
+    "two": "2239",
+    "three": "3401"
+  },
+  {
+    "one": "国械注准20163220454",
+    "two": "1774",
+    "three": "2095"
+  },
+  {
+    "one": "苏械注准20152220174",
+    "two": "1774",
+    "three": "3392"
+  },
+  {
+    "one": "苏械注准20152220174",
+    "two": "1774",
+    "three": "3539"
+  },
+  {
+    "one": "国械注准20153220967",
+    "two": "1774",
+    "three": "3703"
+  },
+  {
+    "one": "津械注准20192220126",
+    "two": "1774",
+    "three": "3963"
+  },
+  {
+    "one": "国械注准20153222149",
+    "two": "1774",
+    "three": "4082"
+  },
+  {
+    "one": "国械注准20153141539",
+    "two": "1731",
+    "three": "2030"
+  },
+  {
+    "one": "国械注准20153152019",
+    "two": "1731",
+    "three": "3705"
+  },
+  {
+    "one": "国械注准20153141002",
+    "two": "2062",
+    "three": "2984"
+  },
+  {
+    "one": "",
+    "two": "1608",
+    "three": "1808"
+  },
+  {
+    "one": "",
+    "two": "1608",
+    "three": "3279"
+  },
+  {
+    "one": "",
+    "two": "1607",
+    "three": "1807"
+  },
+  {
+    "one": "",
+    "two": "1607",
+    "three": "2338"
+  },
+  {
+    "one": "浙械注准20152140323",
+    "two": "2199",
+    "three": "3323"
+  },
+  {
+    "one": "",
+    "two": "1609",
+    "three": "1809"
+  },
+  {
+    "one": "",
+    "two": "1609",
+    "three": "1810"
+  },
+  {
+    "one": "",
+    "two": "1609",
+    "three": "1811"
+  },
+  {
+    "one": "",
+    "two": "1609",
+    "three": "2250"
+  },
+  {
+    "one": "",
+    "two": "1609",
+    "three": "2540"
+  },
+  {
+    "one": "",
+    "two": "1609",
+    "three": "3692"
+  },
+  {
+    "one": "",
+    "two": "1896",
+    "three": "2281"
+  },
+  {
+    "one": "国械注准20193100567",
+    "two": "1676",
+    "three": "3173"
+  },
+  {
+    "one": "国械注准20163101181",
+    "two": "1676",
+    "three": "3212"
+  },
+  {
+    "one": "国械注准20193101759",
+    "two": "1676",
+    "three": "3214"
+  },
+  {
+    "one": "国械注准20193100567",
+    "two": "1676",
+    "three": "3414"
+  },
+  {
+    "one": "苏械注准20162410527",
+    "two": "1770",
+    "three": "2091"
+  },
+  {
+    "one": "苏械注准20162410527",
+    "two": "1770",
+    "three": "2577"
+  },
+  {
+    "one": "冀械注准20202220473",
+    "two": "1770",
+    "three": "3363"
+  },
+  {
+    "one": "冀械注准20202220473",
+    "two": "1770",
+    "three": "3364"
+  },
+  {
+    "one": "国械注进20153030477",
+    "two": "2098",
+    "three": "3104"
+  },
+  {
+    "one": "湘械注准20152140153",
+    "two": "1687",
+    "three": "1964"
+  },
+  {
+    "one": "湘械注准20152140153",
+    "two": "1687",
+    "three": "2415"
+  },
+  {
+    "one": "国械注准20173450509",
+    "two": "1655",
+    "three": "1923"
+  },
+  {
+    "one": "国械注准20143452021",
+    "two": "1655",
+    "three": "3598"
+  },
+  {
+    "one": "国械注进20173452111",
+    "two": "1674",
+    "three": "1947"
+  },
+  {
+    "one": "国械注准20203100791",
+    "two": "1674",
+    "three": "3165"
+  },
+  {
+    "one": "国械注进20173102111",
+    "two": "1674",
+    "three": "3464"
+  },
+  {
+    "one": "国械注准20143102122",
+    "two": "1674",
+    "three": "3600"
+  },
+  {
+    "one": "国械注准20193140761",
+    "two": "1763",
+    "three": "2064"
+  },
+  {
+    "one": "国械注进20163152061",
+    "two": "1763",
+    "three": "3398"
+  },
+  {
+    "one": "国械注进20173151271",
+    "two": "1763",
+    "three": "3546"
+  },
+  {
+    "one": "国械注准20153141779",
+    "two": "1763",
+    "three": "3552"
+  },
+  {
+    "one": "国械注准20153151779",
+    "two": "1763",
+    "three": "4028"
+  },
+  {
+    "one": "国械注进20153030061",
+    "two": "2076",
+    "three": "3026"
+  },
+  {
+    "one": "津械注准20192140103",
+    "two": "1725",
+    "three": "2022"
+  },
+  {
+    "one": "津械注准20142150021",
+    "two": "1725",
+    "three": "3399"
+  }
+]