更新

controllers/sg/his_api_controller.go

@@ -3176,175 +3176,175 @@ func GetNowTime() (int64, int64) {
 //		})
 //	}
 //}
-func (c *HisApiController) ChangeDrugfour() {
-	patient_id, _ := c.GetInt64("patient_id")
-	admin_user_id, _ := c.GetInt64("admin_user_id")
-	//id_arr := strings.Split(ids, ",")
-	times := c.GetString("time", "")
-	timeLayout := "2006-01-02"
-	loc, _ := time.LoadLocation("Local")
-	var stime, etime int64
-	if times == "" {
-		stime, etime = GetNowTime()
-	} else {
-		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
-		stime = stmp.Unix()
-		etime = stime + 86399
-	}
-	advicelist, _ := service.FindeHisAdviceDocAdvice(c.GetAdminUserInfo().CurrentOrgId, patient_id, stime, etime)
-	var flows []*models.DrugFlow
-	for _, item := range advicelist {
-		flow, _ := service.GetNewDrugFlowInfoByPatient(patient_id, item.DrugId, times, c.GetAdminUserInfo().CurrentOrgId)
-		flows = append(flows, flow...)
-	}
-	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
-	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
-	var err []string
-
-	for _, item := range flows {
-		var res3 ResultSix
-		if item.ConsumableType == 3 { //3为自动出库 7为自动退库
-			prescription := service.GetHisPrescriptionByID(item.HisDoctorAdviceInfo.PrescriptionId)
-			if prescription.OrderStatus == 2 {
-				//已经结算
-				//判断是否已经销售
-				if item.IsSale == 1 { //是否已经销售，1是   0否
-					//是否已经变更 1是  0否
-					if item.IsChange == 0 { //没变更，进行变更操作
-						bg_number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3502"
-
-						result, result2 := ChangeStock(item.Count, item, miConfig, "102", roles, bg_number)
-						saveLog(result, result2, "3502", "自动出库，已经销售，未变更3502")
-						var respJSON3 map[string]interface{}
-						if err := json.Unmarshal([]byte(string(result)), &respJSON3); err != nil {
-							utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-							return
-						}
-						userJSONBytes3, _ := json.Marshal(respJSON3)
-						if err := json.Unmarshal(userJSONBytes3, &res3); err != nil {
-							utils.ErrorLog("解析失败：%v", err)
-							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-							return
-						}
-						if res3.Infcode == 0 {
-							item.IsChange = 1
-							item.BgBchno = bg_number
-							service.SaveDF2(item)
-						} else {
-
-							err = append(err, item.HisDoctorAdviceInfo.AdviceName+",销售变更失败："+res3.ErrMsg)
-						}
-					}
-				} else { //没销售，
-					var res FJ3507Result
-					var res3507for10188 FJ3507ResultFor10188
-					number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3505"
-
-					//进行商品销售接口
-					result3, result4 := SaleStock(c.GetAdminUserInfo().CurrentOrgId, prescription, item, miConfig, "", roles, number)
-					saveLog(result3, result4, "3505", "自动出库，未销售进行销售行为，3505")
-					var respJSON3 map[string]interface{}
-					if err := json.Unmarshal([]byte(string(result3)), &respJSON3); err != nil {
-						utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-					userJSONBytes3, _ := json.Marshal(respJSON3)
-					if c.GetAdminUserInfo().CurrentOrgId == 10188 || c.GetAdminUserInfo().CurrentOrgId == 10217 {
-						if err := json.Unmarshal(userJSONBytes3, &res3507for10188); err != nil {
-							utils.ErrorLog("解析失败：%v", err)
-							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-							return
-						}
-						//if res3507for10188.Infcode
-						res.InfRefmsgid = res3507for10188.InfRefmsgid
-						//res.Output = resSix10265.Output
-						res.ErrMsg = res3507for10188.ErrMsg
-						res.Cainfo = res3507for10188.Cainfo
-						res.WarnMsg = res3507for10188.WarnMsg
-						infocode, _ := strconv.ParseInt(res3507for10188.Infcode, 10, 64)
-						res.Infcode = infocode
-					} else {
-						if err := json.Unmarshal(userJSONBytes3, &res); err != nil {
-							utils.ErrorLog("解析失败：%v", err)
-							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-							return
-						}
-
-					}
-					if res.Infcode == 0 {
-						item.IsSale = 1
-						item.Bchno = number
-						item.SaleDate = time.Now().Format("2006-01-02")
-
-						err5 := service.SaveDF(item)
-						if err5 == nil {
-							if item.IsChange == 0 { //没变更，进行变更操作
-								bg_number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3502"
-
-								result, result2 := ChangeStock(item.Count, item, miConfig, "102", roles, bg_number)
-								saveLog(result, result2, "3502", "自动出库，没销售，未变更3502")
-
-								var respJSON3 map[string]interface{}
-								if err := json.Unmarshal([]byte(string(result)), &respJSON3); err != nil {
-									utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-									return
-								}
-								if c.GetAdminUserInfo().CurrentOrgId == 10188 || c.GetAdminUserInfo().CurrentOrgId == 10217 {
-									if err := json.Unmarshal(userJSONBytes3, &res3507for10188); err != nil {
-										utils.ErrorLog("解析失败：%v", err)
-										c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-										return
-									}
-									//if res3507for10188.Infcode
-									res3.InfRefmsgid = res3507for10188.InfRefmsgid
-									//res.Output = resSix10265.Output
-									res3.ErrMsg = res3507for10188.ErrMsg
-									res3.Cainfo = res3507for10188.Cainfo
-									res3.WarnMsg = res3507for10188.WarnMsg
-									infocode, _ := strconv.ParseInt(res3507for10188.Infcode, 10, 64)
-									res3.Infcode = infocode
-								} else {
-									if err := json.Unmarshal(userJSONBytes3, &res3); err != nil {
-										utils.ErrorLog("解析失败：%v", err)
-										c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-										return
-									}
-								}
-								if res3.Infcode == 0 {
-									item.IsChange = 1
-									item.BgBchno = bg_number
-									service.SaveDF2(item)
-								} else {
-
-									err = append(err, item.HisDoctorAdviceInfo.AdviceName+",销售变更失败："+res3.ErrMsg)
-								}
-							}
-						}
-					} else {
-
-						err = append(err, item.HisDoctorAdviceInfo.AdviceName+",销售失败："+res.ErrMsg)
-					}
-				}
-
-			} else { //还没结，提示用户去结算，并药品追溯上传
-				err = append(err, item.HisDoctorAdviceInfo.AdviceName+"还没结算，请结算后，在药品追溯页面上传")
-			}
-		}
-	}
-	if len(err) == 0 {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"msg": "销售变更成功",
-		})
-	} else {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"failed_code": -10,
-			"msg":         err,
-		})
-	}
-}
+//func (c *HisApiController) ChangeDrugfour() {
+//	patient_id, _ := c.GetInt64("patient_id")
+//	admin_user_id, _ := c.GetInt64("admin_user_id")
+//	//id_arr := strings.Split(ids, ",")
+//	times := c.GetString("time", "")
+//	timeLayout := "2006-01-02"
+//	loc, _ := time.LoadLocation("Local")
+//	var stime, etime int64
+//	if times == "" {
+//		stime, etime = GetNowTime()
+//	} else {
+//		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
+//		stime = stmp.Unix()
+//		etime = stime + 86399
+//	}
+//	advicelist, _ := service.FindeHisAdviceDocAdvice(c.GetAdminUserInfo().CurrentOrgId, patient_id, stime, etime)
+//	var flows []*models.DrugFlow
+//	for _, item := range advicelist {
+//		flow, _ := service.GetNewDrugFlowInfoByPatient(patient_id, item.DrugId, times, c.GetAdminUserInfo().CurrentOrgId)
+//		flows = append(flows, flow...)
+//	}
+//	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
+//	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+//	var err []string
+//
+//	for _, item := range flows {
+//		var res3 ResultSix
+//		if item.ConsumableType == 3 { //3为自动出库 7为自动退库
+//			prescription := service.GetHisPrescriptionByID(item.HisDoctorAdviceInfo.PrescriptionId)
+//			if prescription.OrderStatus == 2 {
+//				//已经结算
+//				//判断是否已经销售
+//				if item.IsSale == 1 { //是否已经销售，1是   0否
+//					//是否已经变更 1是  0否
+//					if item.IsChange == 0 { //没变更，进行变更操作
+//						bg_number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3502"
+//
+//						result, result2 := ChangeStock(item.Count, item, miConfig, "102", roles, bg_number)
+//						saveLog(result, result2, "3502", "自动出库，已经销售，未变更3502")
+//						var respJSON3 map[string]interface{}
+//						if err := json.Unmarshal([]byte(string(result)), &respJSON3); err != nil {
+//							utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+//							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//							return
+//						}
+//						userJSONBytes3, _ := json.Marshal(respJSON3)
+//						if err := json.Unmarshal(userJSONBytes3, &res3); err != nil {
+//							utils.ErrorLog("解析失败：%v", err)
+//							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//							return
+//						}
+//						if res3.Infcode == 0 {
+//							item.IsChange = 1
+//							item.BgBchno = bg_number
+//							service.SaveDF2(item)
+//						} else {
+//
+//							err = append(err, item.HisDoctorAdviceInfo.AdviceName+",销售变更失败："+res3.ErrMsg)
+//						}
+//					}
+//				} else { //没销售，
+//					var res FJ3507Result
+//					var res3507for10188 FJ3507ResultFor10188
+//					number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3505"
+//
+//					//进行商品销售接口
+//					result3, result4 := SaleStock(c.GetAdminUserInfo().CurrentOrgId, prescription, item, miConfig, "", roles, number)
+//					saveLog(result3, result4, "3505", "自动出库，未销售进行销售行为，3505")
+//					var respJSON3 map[string]interface{}
+//					if err := json.Unmarshal([]byte(string(result3)), &respJSON3); err != nil {
+//						utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+//						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//						return
+//					}
+//					userJSONBytes3, _ := json.Marshal(respJSON3)
+//					if c.GetAdminUserInfo().CurrentOrgId == 10188 || c.GetAdminUserInfo().CurrentOrgId == 10217 {
+//						if err := json.Unmarshal(userJSONBytes3, &res3507for10188); err != nil {
+//							utils.ErrorLog("解析失败：%v", err)
+//							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//							return
+//						}
+//						//if res3507for10188.Infcode
+//						res.InfRefmsgid = res3507for10188.InfRefmsgid
+//						//res.Output = resSix10265.Output
+//						res.ErrMsg = res3507for10188.ErrMsg
+//						res.Cainfo = res3507for10188.Cainfo
+//						res.WarnMsg = res3507for10188.WarnMsg
+//						infocode, _ := strconv.ParseInt(res3507for10188.Infcode, 10, 64)
+//						res.Infcode = infocode
+//					} else {
+//						if err := json.Unmarshal(userJSONBytes3, &res); err != nil {
+//							utils.ErrorLog("解析失败：%v", err)
+//							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//							return
+//						}
+//
+//					}
+//					if res.Infcode == 0 {
+//						item.IsSale = 1
+//						item.Bchno = number
+//						item.SaleDate = time.Now().Format("2006-01-02")
+//
+//						err5 := service.SaveDF(item)
+//						if err5 == nil {
+//							if item.IsChange == 0 { //没变更，进行变更操作
+//								bg_number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3502"
+//
+//								result, result2 := ChangeStock(item.Count, item, miConfig, "102", roles, bg_number)
+//								saveLog(result, result2, "3502", "自动出库，没销售，未变更3502")
+//
+//								var respJSON3 map[string]interface{}
+//								if err := json.Unmarshal([]byte(string(result)), &respJSON3); err != nil {
+//									utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+//									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//									return
+//								}
+//								if c.GetAdminUserInfo().CurrentOrgId == 10188 || c.GetAdminUserInfo().CurrentOrgId == 10217 {
+//									if err := json.Unmarshal(userJSONBytes3, &res3507for10188); err != nil {
+//										utils.ErrorLog("解析失败：%v", err)
+//										c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//										return
+//									}
+//									//if res3507for10188.Infcode
+//									res3.InfRefmsgid = res3507for10188.InfRefmsgid
+//									//res.Output = resSix10265.Output
+//									res3.ErrMsg = res3507for10188.ErrMsg
+//									res3.Cainfo = res3507for10188.Cainfo
+//									res3.WarnMsg = res3507for10188.WarnMsg
+//									infocode, _ := strconv.ParseInt(res3507for10188.Infcode, 10, 64)
+//									res3.Infcode = infocode
+//								} else {
+//									if err := json.Unmarshal(userJSONBytes3, &res3); err != nil {
+//										utils.ErrorLog("解析失败：%v", err)
+//										c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//										return
+//									}
+//								}
+//								if res3.Infcode == 0 {
+//									item.IsChange = 1
+//									item.BgBchno = bg_number
+//									service.SaveDF2(item)
+//								} else {
+//
+//									err = append(err, item.HisDoctorAdviceInfo.AdviceName+",销售变更失败："+res3.ErrMsg)
+//								}
+//							}
+//						}
+//					} else {
+//
+//						err = append(err, item.HisDoctorAdviceInfo.AdviceName+",销售失败："+res.ErrMsg)
+//					}
+//				}
+//
+//			} else { //还没结，提示用户去结算，并药品追溯上传
+//				err = append(err, item.HisDoctorAdviceInfo.AdviceName+"还没结算，请结算后，在药品追溯页面上传")
+//			}
+//		}
+//	}
+//	if len(err) == 0 {
+//		c.ServeSuccessJSON(map[string]interface{}{
+//			"msg": "销售变更成功",
+//		})
+//	} else {
+//		c.ServeSuccessJSON(map[string]interface{}{
+//			"failed_code": -10,
+//			"msg":         err,
+//		})
+//	}
+//}
 
 func (c *HisApiController) ChangeDrug() {
 	ids := c.GetString("ids")
@@ -4616,7 +4616,7 @@ func (c *HisApiController) ChangeDrugTen() {
 	//id_arr := strings.Split(ids, ",")
 	now := time.Now()
 	timestamp := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).Unix()
-	flows, _ := service.GetNewDrugFlowInforTen(timestamp)
+	flows, _ := service.GetNewDrugFlowInforTen(timestamp,c.GetAdminUserInfo().CurrentOrgId)
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
@@ -4624,7 +4624,14 @@ func (c *HisApiController) ChangeDrugTen() {
 	for _, item := range flows {
 		var res3 ResultSix
 		if item.ConsumableType == 3 { //3为自动出库 7为自动退库
+			if item.HisDoctorAdviceInfo.PrescriptionId == 0{
+				continue
+			}
+			if item.HisDoctorAdviceInfo.PrescriptionId == 0{
+				continue
+			}
 			prescription := service.GetHisPrescriptionByID(item.HisDoctorAdviceInfo.PrescriptionId)
+
 			if prescription.OrderStatus == 2 {
 				//已经结算
 				//判断是否已经销售
@@ -5059,7 +5066,7 @@ func ChangeStock(count int64, drug *models.DrugFlow, miConfig models.MedicalInsu
 	struct3502.Code = miConfig.Code
 
 	struct3502.Opter = role.UserName
-	struct3502.RxFlag = "0"
+	struct3502.RxFlag = "1"
 	struct3502.InvChgTime = time.Now().Format("2006-01-02")
 	struct3502.OrgName = miConfig.OrgName
 	struct3502.AccessKey = miConfig.AccessKey
@@ -5088,6 +5095,9 @@ func ChangeStock(count int64, drug *models.DrugFlow, miConfig models.MedicalInsu
 		result1, result2 := service.Gzyb3502(struct3502, struct3502.SecretKey)
 		return result1, result2
 
+	}else if strings.HasPrefix(miConfig.MdtrtareaAdmvs[0:3], "440")  {
+		result1, result2 := service.Gdyb3502(struct3502, struct3502.SecretKey)
+		return result1, result2
 	} else {
 		data := make(map[string]interface{})
 		data["struct_3502s"] = struct3502
@@ -5149,15 +5159,31 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 		struct3505.PharPracCertNo = "210441200001378"
 	}
 
+	if org_id == 10402 {
+		struct3505.PharName = "刘韶健"
+		struct3505.PharPracCertNo = "2015026440262015440501001198"
+	}
+
+	if org_id == 10567 {
+		struct3505.PharName = "范小兰"
+		struct3505.PharPracCertNo = "0200102079485"
+	}
 	order := service.GetHisOrderByNumber(pre.BatchNumber)
 	struct3505.SetlId = order.SetlId
 	struct3505.MdtrtSn = order.MdtrtId
 	struct3505.ManuLotnum = drug.Number
 	struct3505.ManuDate = time.Unix(drug.ProductDate, 0).Format("2006-01-02")
 	struct3505.ExpyEnd = ""
-	struct3505.RxFlag = "0"
+	struct3505.RxFlag = "1"
 	struct3505.TrdnFlag = "1"
 	struct3505.RtalDocno = order.Number
+	struct3505.PsnCertType = "01"
+
+	struct3505.CertNo = order.Certno
+	struct3505.PsnNo = order.PsnNo
+	struct3505.PsnName = order.PsnName
+
+
 	struct3505.Url = miConfig.Url
 	struct3505.AppId = miConfig.Cainfo
 	struct3505.AppSecret = miConfig.AppSecret
@@ -5188,6 +5214,9 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 	} else if miConfig.MdtrtareaAdmvs == "440100" {
 		result1, result2 := service.Gzyb3505(struct3505, struct3505.SecretKey)
 		return result1, result2
+	}else if strings.HasPrefix(miConfig.MdtrtareaAdmvs[0:3], "440")  {
+		result1, result2 := service.Gdyb3505(struct3505, struct3505.SecretKey)
+		return result1, result2
 	} else {
 		data := make(map[string]interface{})
 		data["struct_3505s"] = struct3505

models/new_stock_models.go

@@ -423,7 +423,7 @@ type DrugFlow struct {
 	LastStockMaxNumber        int64                `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
 	LastStockMinNumber        int64                `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
 	AdviceId                  int64                `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
-	HisDoctorAdviceInfo       HisDoctorAdviceInfo  `gorm:"ForeignKey:PatientID,RecordDate;AssociationForeignKey,DrugId:PatientID,SystemTime,DrugId" json:"advice"`
+	HisDoctorAdviceInfo       HisDoctorAdviceInfo  `gorm:"ForeignKey:PatientID,RecordDate,DrugId;AssociationForeignKey:PatientID,SystemTime,DrugId" json:"advice"`
 	SupplyWarehouseId         int64                `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	SupplyCancelOutId         int64                `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
 	SupplyWarehouseDetailInfo int64                `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`

service/gdyb_service.go

@@ -8477,8 +8477,8 @@ func Gzyb3502(struct3502 models.Struct3502, secret_key string) (string, string)
 	inputData["med_list_codg"] = struct3502.MedListCodg // 定点医药机构目录编号
 	inputData["inv_chg_type"] = struct3502.InvChgType   // 定点医药机构目录编号
 
-	inputData["fixmedins_hilist_id"] = struct3502.FixmedinsCode // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3502.OrgName     // 定点医药机构目录名称
+	inputData["fixmedins_hilist_id"] = struct3502.FixmedinsHilistId // 定点医药机构目录编号
+	inputData["fixmedins_hilist_name"] = struct3502.FixmedinsHilistName     // 定点医药机构目录名称
 	inputData["fixmedins_bchno"] = struct3502.FixmedinsBchno    // 人员编号 （来自1101接口返回）
 	inputData["pric"] = struct3502.Pric                         // 人员编号 （来自1101接口返回）
 	inputData["cnt"] = struct3502.Cnt                           // 人员编号 （来自1101接口返回）
@@ -8500,10 +8500,10 @@ func Gzyb3502(struct3502 models.Struct3502, secret_key string) (string, string)
 	}
 	reader := bytes.NewReader(bytesData)
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/5301"
-	gdyb_url := beego.AppConfig.String("gdyb_url")
+	//gdyb_url := beego.AppConfig.String("gdyb_url")
 	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
-	url := gdyb_url + "3502"
+	url := "http://hosp-gz.gd.hsip.gov.cn/ebus/gdyb_api/prd/hsa/hgs/" + "3502"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
@@ -8700,7 +8700,7 @@ func Gzyb3505(struct3505 models.Struct3505, secret_key string) (string, string)
 	inputMessage["infno"] = "3505"                                  // 交易编码
 	inputData["med_list_codg"] = struct3505.MedListCodg             // 定点医药机构目录编号
 	inputData["fixmedins_hilist_id"] = struct3505.FixmedinsHilistId // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3505.OrgName         // 定点医药机构目录名称
+	inputData["fixmedins_hilist_name"] = struct3505.FixmedinsHilistName         // 定点医药机构目录名称
 	inputData["fixmedins_bchno"] = struct3505.FixmedinsBchno        // 人员编号 （来自1101接口返回）
 
 	inputData["prsc_dr_cert_type"] = struct3505.PrscDrCertType // 人员编号 （来自1101接口返回）
@@ -8731,6 +8731,7 @@ func Gzyb3505(struct3505 models.Struct3505, secret_key string) (string, string)
 
 	inputData["rtal_docno"] = struct3505.RtalDocno // 人员编号 （来自1101接口返回）
 	inputData["stoout_no"] = struct3505.StooutNo   // 人员编号 （来自1101接口返回）
+	inputData["MDTRT_SETL_TYPE"] = struct3505.MdtrtSetlType                          // 人员编号 （来自1101接口返回）
 
 	inputData["bchno"] = struct3505.Bchno                          // 人员编号 （来自1101接口返回）
 	inputData["drug_trac_codg"] = struct3505.DrugTracCodg          // 人员编号 （来自1101接口返回）
@@ -8751,10 +8752,16 @@ func Gzyb3505(struct3505 models.Struct3505, secret_key string) (string, string)
 	}
 	reader := bytes.NewReader(bytesData)
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/5301"
-	gdyb_url := beego.AppConfig.String("gdyb_url")
+	//gdyb_url := ""
 	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
-	url := gdyb_url + "3505"
+	//url := "" + "3505"
+	url := "http://hosp-gz.gd.hsip.gov.cn/ebus/gdyb_api/prd/hsa/hgs/" + "3505"
+
+	fmt.Println(gdyb_paasid)
+	fmt.Println(url)
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())

service/his_service.go

@@ -612,6 +612,9 @@ type HisOrder struct {
 	PayWay                  int64   `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
 	PayPrice                float64 `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
 	PayCardNo               string  `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
+	Certno                  string    `gorm:"column:certno" json:"certno" form:"certno"`
+	PsnName                 string    `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+
 	DiscountPrice           float64 `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
 	PreferentialPrice       float64 `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
 	RealityPrice            float64 `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
@@ -1739,7 +1742,7 @@ func GetNewDrugFlowInfo(org_id int64, id_arr []string) (flows []*models.DrugFlow
 	return
 }
 
-func GetNewDrugFlowInfoByPatient(patient_id int64, advdrug_idice_id int64, time int64, org_id int64) (flows []*models.DrugFlow, err error) {
+func GetNewDrugFlowInfoByPatient(patient_id int64, drug_id int64, time int64, org_id int64) (flows []*models.DrugFlow, err error) {
 	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = ? and status = 1 and id in (?) and patinet_id = ? and drug_id = ? and system_time = ?", org_id, patient_id, drug_id, time).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Preload("BaseDrugLib", "status=1")
 	}).Preload("NewDrugWarehouseInfo", "status = 1").Find(&flows).Error
@@ -1767,9 +1770,9 @@ func GetNewDrugFlowInfothree() (flows []*models.DrugFlow, err error) {
 	return
 }
 
-func GetNewDrugFlowInforTen(system_time int64) (flows []*models.DrugFlow, err error) {
-	err = readDb.Model(&models.DrugFlow{}).Joins("join his_doctor_advice_info info on info.patient_id = xt_drug_flow.patient_id and info.drug_id = xt_drug_flow.drug_id and info.record_date = xt_drug_flow.system_time").Where("user_org_id = 10318 and status = 1 and consumable_type = 3 and is_sale = 0 and system_time = ?", system_time).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1").Preload("BaseDrugLib", "status=1")
+func GetNewDrugFlowInforTen(system_time int64,org_id int64) (flows []*models.DrugFlow, err error) {
+	err = readDb.Model(&models.DrugFlow{}).Joins("join his_doctor_advice_info info on info.patient_id = xt_drug_flow.patient_id and info.drug_id = xt_drug_flow.drug_id and info.record_date = xt_drug_flow.system_time").Where("xt_drug_flow.user_org_id = ? and xt_drug_flow.status = 1 and xt_drug_flow.consumable_type = 3 and xt_drug_flow.is_sale = 0 and xt_drug_flow.system_time = ?", org_id,system_time).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 and drug_code <> ''").Preload("BaseDrugLib", "status=1")
 	}).Preload("NewDrugWarehouseInfo", "status = 1").Find(&flows).Error
 	return
 }

service/nm_service.go

@@ -1078,7 +1078,7 @@ func NMyb3502(struct3502 models.Struct3502, secret_key string) (string, string)
 	inputData["inv_chg_type"] = struct3502.InvChgType   // 定点医药机构目录编号
 
 	inputData["fixmedins_hilist_id"] = struct3502.FixmedinsCode // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3502.OrgName     // 定点医药机构目录名称
+	inputData["fixmedins_hilist_name"] = struct3502.FixmedinsHilistName     // 定点医药机构目录名称
 	inputData["fixmedins_bchno"] = struct3502.FixmedinsBchno    // 人员编号 （来自1101接口返回）
 	inputData["pric"] = struct3502.Pric                         // 人员编号 （来自1101接口返回）
 	inputData["cnt"] = struct3502.Cnt                           // 人员编号 （来自1101接口返回）
@@ -1294,7 +1294,7 @@ func NMyb3505(struct3505 models.Struct3505, secret_key string) (string,string) {
 	inputMessage["infno"] = "3505"                                  // 交易编码
 	inputData["med_list_codg"] = struct3505.MedListCodg             // 定点医药机构目录编号
 	inputData["fixmedins_hilist_id"] = struct3505.FixmedinsHilistId // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3505.OrgName         // 定点医药机构目录名称
+	inputData["fixmedins_hilist_name"] = struct3505.FixmedinsHilistName         // 定点医药机构目录名称
 	inputData["fixmedins_bchno"] = struct3505.FixmedinsBchno        // 人员编号 （来自1101接口返回）
 
 	inputData["prsc_dr_cert_type"] = struct3505.PrscDrCertType // 人员编号 （来自1101接口返回）