张保健 3 years ago
parent
commit
85d32b7a81

+ 9 - 1
controllers/sz/sz_his_api_controller.go View File

2276
 						price, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", subItem.Price), 64)
2276
 						price, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", subItem.Price), 64)
2277
 						temp := strings.Split(subItem.FeedetlSn, "-")
2277
 						temp := strings.Split(subItem.FeedetlSn, "-")
2278
 						newFl := fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) + "-" + temp[1] + "-" + temp[2]
2278
 						newFl := fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) + "-" + temp[1] + "-" + temp[2]
2279
-
2279
+						fmt.Println(111111111)
2280
+						fmt.Println(subItem.BaseDrugLib.Code)
2281
+						fmt.Println(222222222)
2280
 						cus := &models.CustomDetail{
2282
 						cus := &models.CustomDetail{
2281
 							PrescriptionNumber: chrg_bchno,
2283
 							PrescriptionNumber: chrg_bchno,
2282
 							OrderType:          "1",
2284
 							OrderType:          "1",
2283
 							ChargeSerialNumber: newFl,
2285
 							ChargeSerialNumber: newFl,
2284
 							Code:               subItem.BaseDrugLib.MedicalInsuranceNumber,
2286
 							Code:               subItem.BaseDrugLib.MedicalInsuranceNumber,
2285
 							CodeName:           subItem.BaseDrugLib.DrugName,
2287
 							CodeName:           subItem.BaseDrugLib.DrugName,
2288
+							BwCode:				subItem.BaseDrugLib.Code,
2286
 							Flag:               "1",
2289
 							Flag:               "1",
2287
 							Price:              price,
2290
 							Price:              price,
2288
 							Count:              subItem.PrescribingNumber,
2291
 							Count:              subItem.PrescribingNumber,
2316
 								OrderType:          "1",
2319
 								OrderType:          "1",
2317
 								ChargeSerialNumber: newFl,
2320
 								ChargeSerialNumber: newFl,
2318
 								Code:               subItem.HisProject.MedicalCode,
2321
 								Code:               subItem.HisProject.MedicalCode,
2322
+								BwCode:				subItem.HisProject.MedicalCode,
2319
 								CodeName:           subItem.HisProject.ProjectName,
2323
 								CodeName:           subItem.HisProject.ProjectName,
2320
 								Flag:               "1",
2324
 								Flag:               "1",
2321
 								Price:              subItem.Price,
2325
 								Price:              subItem.Price,
2346
 								ChargeSerialNumber: newFl,
2350
 								ChargeSerialNumber: newFl,
2347
 								Code:               subItem.GoodInfo.MedicalInsuranceNumber,
2351
 								Code:               subItem.GoodInfo.MedicalInsuranceNumber,
2348
 								CodeName:           subItem.GoodInfo.GoodName,
2352
 								CodeName:           subItem.GoodInfo.GoodName,
2353
+								BwCode:				subItem.GoodInfo.MedicalInsuranceNumber,
2349
 								Flag:               "1",
2354
 								Flag:               "1",
2350
 								Price:              subItem.Price,
2355
 								Price:              subItem.Price,
2351
 								Count:              count,
2356
 								Count:              count,
3112
 						OrderType:          "1",
3117
 						OrderType:          "1",
3113
 						ChargeSerialNumber: newFl,
3118
 						ChargeSerialNumber: newFl,
3114
 						Code:               subItem.BaseDrugLib.MedicalInsuranceNumber,
3119
 						Code:               subItem.BaseDrugLib.MedicalInsuranceNumber,
3120
+						BwCode:				subItem.BaseDrugLib.Code,
3115
 						CodeName:           subItem.BaseDrugLib.DrugName,
3121
 						CodeName:           subItem.BaseDrugLib.DrugName,
3116
 						Flag:               "1",
3122
 						Flag:               "1",
3117
 						Price:              price,
3123
 						Price:              price,
3147
 							ChargeSerialNumber: newFl,
3153
 							ChargeSerialNumber: newFl,
3148
 							Code:               subItem.HisProject.MedicalCode,
3154
 							Code:               subItem.HisProject.MedicalCode,
3149
 							CodeName:           subItem.HisProject.ProjectName,
3155
 							CodeName:           subItem.HisProject.ProjectName,
3156
+							BwCode:				subItem.HisProject.MedicalCode,
3150
 							Flag:               "1",
3157
 							Flag:               "1",
3151
 							Price:              subItem.Price,
3158
 							Price:              subItem.Price,
3152
 							Count:              count,
3159
 							Count:              count,
3176
 							OrderType:          "1",
3183
 							OrderType:          "1",
3177
 							ChargeSerialNumber: newFl,
3184
 							ChargeSerialNumber: newFl,
3178
 							Code:               subItem.GoodInfo.MedicalInsuranceNumber,
3185
 							Code:               subItem.GoodInfo.MedicalInsuranceNumber,
3186
+							BwCode:               subItem.GoodInfo.MedicalInsuranceNumber,
3179
 							CodeName:           subItem.GoodInfo.GoodName,
3187
 							CodeName:           subItem.GoodInfo.GoodName,
3180
 							Flag:               "1",
3188
 							Flag:               "1",
3181
 							Price:              subItem.Price,
3189
 							Price:              subItem.Price,

+ 1 - 0
models/good_models.go View File

54
 	MedicalInsuranceLevel  int64     `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
54
 	MedicalInsuranceLevel  int64     `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
55
 	RetailPrice            float64   `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
55
 	RetailPrice            float64   `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
56
 	MedicalInsuranceNumber string    `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
56
 	MedicalInsuranceNumber string    `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
57
+	Code 				   string    `gorm:"column:code" json:"code" form:"code"`
57
 	IsSpecialDiseases      int64     `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
58
 	IsSpecialDiseases      int64     `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
58
 	IsRecord               int64     `gorm:"column:is_record" json:"is_record" form:"is_record"`
59
 	IsRecord               int64     `gorm:"column:is_record" json:"is_record" form:"is_record"`
59
 	StatisticsCategory     int64     `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
60
 	StatisticsCategory     int64     `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`

+ 1 - 0
models/sz_his_models.go View File

5
 	OrderType          string
5
 	OrderType          string
6
 	ChargeSerialNumber string
6
 	ChargeSerialNumber string
7
 	Code               string
7
 	Code               string
8
+	BwCode			   string
8
 	CodeName           string
9
 	CodeName           string
9
 	Flag               string
10
 	Flag               string
10
 	CustomCode         string
11
 	CustomCode         string

+ 1 - 1
service/sz_his_service.go View File

202
 		feedetailInfo["bkf500"] = item.ChargeSerialNumber
202
 		feedetailInfo["bkf500"] = item.ChargeSerialNumber
203
 		feedetailInfo["ake001"] = item.Code
203
 		feedetailInfo["ake001"] = item.Code
204
 		feedetailInfo["ake002"] = item.CodeName
204
 		feedetailInfo["ake002"] = item.CodeName
205
-		feedetailInfo["bkm017"] = item.Code
205
+		feedetailInfo["bkm017"] = item.BwCode
206
 		feedetailInfo["aka070"] = item.DoseCode
206
 		feedetailInfo["aka070"] = item.DoseCode
207
 		feedetailInfo["aka074"] = item.Spec
207
 		feedetailInfo["aka074"] = item.Spec
208
 		feedetailInfo["aka064"] = 1
208
 		feedetailInfo["aka064"] = 1