1111

controllers/sz/sz_his_api_controller.go

@@ -3340,14 +3340,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
@@ -3365,7 +3365,7 @@ func (c *SZHisApiController) GetDrugList() {
 			Code:             item.Code,
 			DrugName:         item.DrugName,
 			DrugSpec:         item.DrugSpec,
-			DrugDosageName:   item.DrugDosageName,
+			// DrugDosageName:   item.DrugDosageName,
 			ManufacturerName: item.ManufacturerName,
 			MinUnit:          item.MinUnit,
 			RetailPrice:      item.RetailPrice,
@@ -3373,6 +3373,12 @@ func (c *SZHisApiController) GetDrugList() {
 			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{}
@@ -3594,15 +3600,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
@@ -3630,6 +3636,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 {

service/sz_his_service.go

@@ -689,44 +689,43 @@ func SzybML008(doctor string, doctor_code string, fixmedins_code string, basedru
 	return str
 }
 
-// 生成基础报文
 func SetSZDrugMessage(doctor string, doctor_code string, fixmedins_code string) map[string]interface{} {
 	month := time.Unix(1557042972, 0).Format("1")
 	year := time.Now().Format("2006")
 	month = time.Now().Format("01")
 	day := time.Now().Format("02")
-
+   
 	hour := time.Now().Format("15")
 	min := time.Now().Format("04")
 	sec := time.Now().Format("05")
-
+   
 	msec := time.Now().Format("000")
-
+   
 	//生成输入报文
 	inputMessage := make(map[string]interface{})
 	//
-
+   
 	inputMessage["cardArea"] = "440300" // 发卡地行政区划代码
 	inputMessage["extendDeviceId"] = ""
 	inputMessage["extendSerialNumber"] = ""
 	inputMessage["extendUserId"] = ""
-	inputMessage["hospitalCode"] = "G5540"     // 协议机构编码
+	inputMessage["hospitalCode"] = fixmedins_code     // 协议机构编码
 	inputMessage["operatorCode"] = doctor_code // 操作员编码
 	inputMessage["operatorName"] = doctor      // 操作员名字
 	inputMessage["operatorPass"] = ""          // 定点协议机构操作人员编码
-	//inputMessage["serialNumber"] = "G5540" + year + month + day +
-	//  fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
-	inputMessage["serialNumber"] = "G554020210406" + fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
+	inputMessage["serialNumber"] = fixmedins_code + year + month + day +
+	 fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
+	//inputMessage["serialNumber"] = "G554020210406" + fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
 	inputMessage["verifyCode"] = "000000|8ec5b7745a5cc45b631f23b4bf1e417e"
-
+   
 	inputMessage["transReturnCode"] = ""                                           //
 	inputMessage["transReturnMessage"] = ""                                        //
 	inputMessage["transTime"] = year + month + day + hour + min + sec + ":" + msec //
-	inputMessage["transVersion"] = "V0.3"                                          //   //
+	inputMessage["transVersion"] = "V0.2"                                          //   //
 	inputMessage["transChannel"] = "10"                                            //
-
+   
 	return inputMessage
-}
+   }
 
 func SzybML009(doctor string, doctor_code string, fixmedins_code string, pro *models.MyHisProject) string {
 	//生成输入报文
@@ -750,6 +749,7 @@ func SzybML009(doctor string, doctor_code string, fixmedins_code string, pro *mo
 
 	fmt.Println("feeedDetal2333333333", feedetail)
 	inputData["inputlist"] = feedetail
+	inputData["listsize"] = 1
 	inputMessage["transBody"] = inputData
 
 	bytesData, err := json.Marshal(inputMessage)