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

controllers/sz/sz_his_api_controller.go

@@ -3303,14 +3303,14 @@ func (c *SZHisApiController) GetDrugList() {
 
 	//获取药品剂型
 	drugs, _ := service.GetDrugDosageForm(orgId)
-	for _, item := range list {
-
-		for _, it := range drugs {
-			if item.DrugDosageForm == it.Value {
-				item.DrugDosageName = it.Name
-			}
-		}
-	}
+	// for _, item := range list {
+
+	// 	for _, it := range drugs {
+	// 		if item.DrugDosageForm == it.Value {
+	// 			item.DrugDosageName = it.Code
+	// 		}
+	// 	}
+	// }
 	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
 	var doctor_name string
 	var doctor_code string
@@ -3334,6 +3334,13 @@ func (c *SZHisApiController) GetDrugList() {
 			RetailPrice:            item.RetailPrice,
 			LastPrice:              item.LastPrice,
 			LimitRemark:            item.LimitRemark,
+
+		}
+
+		for _, it := range drugs {
+			if item.DrugDosageForm == it.Value {
+				detail.DrugDosageName = it.Code
+			}
 		}
 
 		result := service.SzybML008(doctor_name, doctor_code, miConfig.Code, detail)
@@ -3557,15 +3564,15 @@ func (c *SZHisApiController) GetRevocation() {
 			list, _ := service.GetDrugListByDetail(orgId, id)
 			//获取药品剂型
 			drugs, _ := service.GetDrugDosageForm(orgId)
-			for _, item := range list {
-				fmt.Println(item.DrugDosageForm)
-				for _, it := range drugs {
-
-					if item.DrugDosageForm == it.Value {
-						item.DrugDosageName = it.Name
-					}
-				}
-			}
+			// for _, item := range list {
+			// 	fmt.Println(item.DrugDosageForm)
+			// 	for _, it := range drugs {
+
+			// 		if item.DrugDosageForm == it.Value {
+			// 			item.DrugDosageName = it.Name
+			// 		}
+			// 	}
+			// }
 			fmt.Print("长度", len(list))
 			miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
 			var doctor_name string
@@ -3593,6 +3600,13 @@ func (c *SZHisApiController) GetRevocation() {
 					LimitRemark:                 item.LimitRemark,
 				}
 
+				for _, it := range drugs {
+
+					if item.DrugDosageForm == it.Value {
+						detail.DrugDosageName = it.Code
+					}
+				}
+
 				result := service.SzybML008(doctor_name, doctor_code, miConfig.Code, detail)
 
 				var dat map[string]interface{}

models/his_models.go

@@ -1024,6 +1024,7 @@ type XtDrugDataConfig struct {
 	Title          string    `gorm:"column:title" json:"title" form:"title"`
 	Content        string    `gorm:"column:content" json:"content" form:"content"`
 	Orders         int64     `gorm:"column:orders" json:"orders" form:"orders"`
+	Code        string    `gorm:"column:code" json:"code" form:"code"`
 }
 
 func (XtDrugDataConfig) TableName() string {