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

models/good_models.go

@@ -71,6 +71,7 @@ type GoodInfo struct {
 	GoodNumber         string    `gorm:"column:good_number" json:"good_number" form:"good_number"`
 	GoodsType          GoodsType `gorm:"ForeignKey:ID;AssociationForeignKey:GoodTypeId" json:"type"`
 	IsUser             int64     `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	PackingUnit        string    `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 }
 
 func (GoodInfo) TableName() string {

service/fj_service.go

@@ -290,6 +290,7 @@ func FJyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 						MedListCodg:      subItem.BaseDrugLib.MedicalInsuranceNumber,
 						HospApprFlag:     subItem.BaseDrugLib.HospApprFlag,
 						FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
+						Unit:             subItem.PrescribingNumberUnit,
 					}
 
 					customs = append(customs, cus)
@@ -313,6 +314,7 @@ func FJyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 							MedListCodg:      subItem.HisProject.MedicalCode,
 							HospApprFlag:     -1,
 							FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
+							Unit:             subItem.HisProject.Unit,
 						}
 						customs = append(customs, cus)
 					}
@@ -329,6 +331,7 @@ func FJyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 							MedListCodg:      subItem.GoodInfo.MedicalInsuranceNumber,
 							HospApprFlag:     -1,
 							FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
+							Unit:             subItem.GoodInfo.PackingUnit,
 						}
 						customs = append(customs, cus)
 					}
@@ -389,6 +392,8 @@ func FJyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["acord_dept_name"] = ""                        // 受单科室名称
 		feedetailInfo["orders_dr_code"] = ""                         // 受单医生编码
 		feedetailInfo["orders_dr_name"] = ""                         // 受单医生姓名
+		feedetailInfo["exp_content"] = item.Unit                     // 中药使用方式
+
 		if balance_accounts_type == "8" {
 			feedetailInfo["hosp_appr_flag"] = "2" // 医院审批标志
 		} else {

service/gdyb_service.go

@@ -791,6 +791,7 @@ type Custom struct {
 	ProvinceGoodMedListCodg string
 	IsUser                  int64
 	FeeOcurTime             string
+	Unit                    string
 }
 
 type RequestResult struct {