Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sz/sz_his_api_controller.go

@@ -2276,13 +2276,16 @@ func (c *SZHisApiController) GetSettleInfo() {
 						price, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", subItem.Price), 64)
 						temp := strings.Split(subItem.FeedetlSn, "-")
 						newFl := fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) + "-" + temp[1] + "-" + temp[2]
-
+						fmt.Println(111111111)
+						fmt.Println(subItem.BaseDrugLib.Code)
+						fmt.Println(222222222)
 						cus := &models.CustomDetail{
 							PrescriptionNumber: chrg_bchno,
 							OrderType:          "1",
 							ChargeSerialNumber: newFl,
 							Code:               subItem.BaseDrugLib.MedicalInsuranceNumber,
 							CodeName:           subItem.BaseDrugLib.DrugName,
+							BwCode:				subItem.BaseDrugLib.Code,
 							Flag:               "1",
 							Price:              price,
 							Count:              subItem.PrescribingNumber,
@@ -2316,6 +2319,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 								OrderType:          "1",
 								ChargeSerialNumber: newFl,
 								Code:               subItem.HisProject.MedicalCode,
+								BwCode:				subItem.HisProject.MedicalCode,
 								CodeName:           subItem.HisProject.ProjectName,
 								Flag:               "1",
 								Price:              subItem.Price,
@@ -2346,6 +2350,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 								ChargeSerialNumber: newFl,
 								Code:               subItem.GoodInfo.MedicalInsuranceNumber,
 								CodeName:           subItem.GoodInfo.GoodName,
+								BwCode:				subItem.GoodInfo.MedicalInsuranceNumber,
 								Flag:               "1",
 								Price:              subItem.Price,
 								Count:              count,
@@ -3112,6 +3117,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 						OrderType:          "1",
 						ChargeSerialNumber: newFl,
 						Code:               subItem.BaseDrugLib.MedicalInsuranceNumber,
+						BwCode:				subItem.BaseDrugLib.Code,
 						CodeName:           subItem.BaseDrugLib.DrugName,
 						Flag:               "1",
 						Price:              price,
@@ -3147,6 +3153,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 							ChargeSerialNumber: newFl,
 							Code:               subItem.HisProject.MedicalCode,
 							CodeName:           subItem.HisProject.ProjectName,
+							BwCode:				subItem.HisProject.MedicalCode,
 							Flag:               "1",
 							Price:              subItem.Price,
 							Count:              count,
@@ -3176,6 +3183,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 							OrderType:          "1",
 							ChargeSerialNumber: newFl,
 							Code:               subItem.GoodInfo.MedicalInsuranceNumber,
+							BwCode:               subItem.GoodInfo.MedicalInsuranceNumber,
 							CodeName:           subItem.GoodInfo.GoodName,
 							Flag:               "1",
 							Price:              subItem.Price,

models/good_models.go

@@ -54,6 +54,7 @@ type GoodInfo struct {
 	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"`
+	Code 				   string    `gorm:"column:code" json:"code" form:"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"`

models/sz_his_models.go

@@ -5,6 +5,7 @@ type CustomDetail struct {
 	OrderType          string
 	ChargeSerialNumber string
 	Code               string
+	BwCode			   string
 	CodeName           string
 	Flag               string
 	CustomCode         string

service/sz_his_service.go

@@ -202,7 +202,7 @@ func SzybFY001(doctor string, doctor_code string, fixmedins_code string, datas [
 		feedetailInfo["bkf500"] = item.ChargeSerialNumber
 		feedetailInfo["ake001"] = item.Code
 		feedetailInfo["ake002"] = item.CodeName
-		feedetailInfo["bkm017"] = item.Code
+		feedetailInfo["bkm017"] = item.BwCode
 		feedetailInfo["aka070"] = item.DoseCode
 		feedetailInfo["aka074"] = item.Spec
 		feedetailInfo["aka064"] = 1