更新

controllers/sg/his_api_controller.go

@@ -3787,7 +3787,7 @@ func (c *HisApiController) ChangeDrugtwo() {
 
 	//ids := c.GetString("ids")
 	//id_arr := strings.Split(ids, ",")
-	flows, _ := service.GetNewDrugFlowInfotwo()
+	flows, _ := service.GetNewDrugFlowInfothree123()
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
@@ -3799,40 +3799,42 @@ func (c *HisApiController) ChangeDrugtwo() {
 			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 { //没销售，
+				//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)
+					result3, result4 := SaleStock10217(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 {
@@ -3870,60 +3872,61 @@ func (c *HisApiController) ChangeDrugtwo() {
 						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)
-								}
-							}
-						}
+						 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 { //还没结算
+			} else
+			{ //还没结算
 				var res3507for10188 FJ3507ResultFor10188
 
 				if item.IsChange == 0 { //没变更，进行变更操作
@@ -3964,212 +3967,6 @@ func (c *HisApiController) ChangeDrugtwo() {
 
 					}
 
-					if res3.Infcode == 0 {
-						item.IsChange = 1
-						item.BgBchno = bg_number
-						service.SaveDF2(item)
-					} else {
-						err = append(err, item.HisDoctorAdviceInfo.AdviceName+",销售变更失败："+res3.ErrMsg)
-					}
-				}
-			}
-		} else if item.ConsumableType == 7 {
-			var res3507for10188 FJ3507ResultFor10188
-
-			prescription := service.GetHisPrescriptionByID(item.HisDoctorAdviceInfo.PrescriptionId)
-			order := service.GetHisOrderByNumber(prescription.BatchNumber)
-			if order.OrderStatus == 2 || order.OrderStatus == 1 { //已经结算
-				//判断是否已经销售
-				if item.IsSale == 2 { //是否已经销售，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, "101", 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 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 { //没销售，
-					//进行商品销售退货接口
-					number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3506"
-
-					result111, result222 := CancleSaleStock(c.GetAdminUserInfo().CurrentOrgId, prescription, item, miConfig, "", roles, number)
-					saveLog(result111, result222, "3506", "销售退货")
-					var res7 FJ3507Result
-
-					//进行商品销售接口
-					//result3, result4 := SaleStock(c.GetAdminUserInfo().CurrentOrgId, prescription, item, miConfig, "", roles,number)
-					//saveLog(result3, result4, "3506", "自动退库，未销售退货进行销售退货行为，3505")
-					var respJSON3 map[string]interface{}
-					if err := json.Unmarshal([]byte(string(result111)), &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
-						res7.InfRefmsgid = res3507for10188.InfRefmsgid
-						//res.Output = resSix10265.Output
-						res7.ErrMsg = res3507for10188.ErrMsg
-						res7.Cainfo = res3507for10188.Cainfo
-						res7.WarnMsg = res3507for10188.WarnMsg
-						infocode, _ := strconv.ParseInt(res3507for10188.Infcode, 10, 64)
-						res7.Infcode = infocode
-					} else {
-
-						if err := json.Unmarshal(userJSONBytes3, &res7); err != nil {
-							utils.ErrorLog("解析失败：%v", err)
-							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-							return
-						}
-
-					}
-					if res7.Infcode == 0 {
-						item.IsSale = 2
-						item.SaleDate = item.SaleDate
-						item.Bchno = number
-						service.SaveDF(item)
-						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, "101", 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 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+",销售变更失败："+res7.ErrMsg)
-					}
-				}
-			} else { //还没结算
-				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, "101", 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 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
@@ -4180,6 +3977,213 @@ func (c *HisApiController) ChangeDrugtwo() {
 				}
 			}
 		}
+		//if item.ConsumableType == 7 {
+		//	var res3507for10188 FJ3507ResultFor10188
+		//
+		//	prescription := service.GetHisPrescriptionByID(item.HisDoctorAdviceInfo.PrescriptionId)
+		//	order := service.GetHisOrderByNumber(prescription.BatchNumber)
+		//	if order.OrderStatus == 2 || order.OrderStatus == 1 { //已经结算
+		//		//判断是否已经销售
+		//		if item.IsSale == 2 { //是否已经销售，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, "101", 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 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 { //没销售，
+		//			//进行商品销售退货接口
+		//			number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3506"
+		//
+		//			result111, result222 := CancleSaleStock(c.GetAdminUserInfo().CurrentOrgId, prescription, item, miConfig, "", roles, number)
+		//			saveLog(result111, result222, "3506", "销售退货")
+		//			var res7 FJ3507Result
+		//
+		//			//进行商品销售接口
+		//			//result3, result4 := SaleStock(c.GetAdminUserInfo().CurrentOrgId, prescription, item, miConfig, "", roles,number)
+		//			//saveLog(result3, result4, "3506", "自动退库，未销售退货进行销售退货行为，3505")
+		//			var respJSON3 map[string]interface{}
+		//			if err := json.Unmarshal([]byte(string(result111)), &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
+		//				res7.InfRefmsgid = res3507for10188.InfRefmsgid
+		//				//res.Output = resSix10265.Output
+		//				res7.ErrMsg = res3507for10188.ErrMsg
+		//				res7.Cainfo = res3507for10188.Cainfo
+		//				res7.WarnMsg = res3507for10188.WarnMsg
+		//				infocode, _ := strconv.ParseInt(res3507for10188.Infcode, 10, 64)
+		//				res7.Infcode = infocode
+		//			} else {
+		//
+		//				if err := json.Unmarshal(userJSONBytes3, &res7); err != nil {
+		//					utils.ErrorLog("解析失败：%v", err)
+		//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//					return
+		//				}
+		//
+		//			}
+		//			if res7.Infcode == 0 {
+		//				item.IsSale = 2
+		//				item.SaleDate = item.SaleDate
+		//				item.Bchno = number
+		//				service.SaveDF(item)
+		//				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, "101", 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 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+",销售变更失败："+res7.ErrMsg)
+		//			}
+		//		}
+		//	} else { //还没结算
+		//		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, "101", 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 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)
+		//			}
+		//		}
+		//	}
+		//}
 	}
 	if len(err) == 0 {
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -5254,9 +5258,11 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 	struct3505.FixmedinsHilistName = drug.HisDoctorAdviceInfo.BaseDrugLib.DrugName
 	struct3505.FixmedinsBchno = number
 	struct3505.Opter = role.UserName
-
+	struct3505.Bchno = "---"
 	struct3505.FixmedinsCode = miConfig.Code
 	struct3505.Code = miConfig.Code
+	struct3505.FinlTrnsPric =  drug.HisDoctorAdviceInfo.Price
+
 
 	roles, _ := service.GetAdminUserInfoByID(org_id, pre.Creator)
 	struct3505.PrscDrName = roles.UserName
@@ -5315,9 +5321,9 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 	struct3505.MdtrtSn = order.MdtrtId
 	struct3505.ManuLotnum = drug.Number
 	struct3505.ManuDate = time.Unix(drug.ProductDate, 0).Format("2006-01-02")
-	struct3505.ExpyEnd = ""
+	struct3505.ExpyEnd = time.Unix(drug.ExpireDate, 0).Format("2006-01-02")
 	struct3505.RxFlag = "1"
-	struct3505.TrdnFlag = "1"
+	struct3505.TrdnFlag = "0"
 	struct3505.RtalDocno = order.Number
 	struct3505.PsnCertType = "01"
 
@@ -5392,6 +5398,153 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 
 	}
 
+}
+
+func SaleStock10217(org_id int64, pre models.HisPrescription, drug *models.DrugFlow, miConfig models.MedicalInsuranceOrgConfig, chgType string, role models.UserAdminRole, number string) (string, string) {
+	var struct3505 models.Struct3505
+	struct3505.MedListCodg = drug.HisDoctorAdviceInfo.BaseDrugLib.MedicalInsuranceNumber
+	struct3505.FixmedinsHilistId = drug.HisDoctorAdviceInfo.BaseDrugLib.MedicalInsuranceNumber
+	struct3505.FixmedinsHilistName = drug.HisDoctorAdviceInfo.BaseDrugLib.DrugName
+	struct3505.FixmedinsBchno = number
+	struct3505.Opter = role.UserName
+
+	struct3505.FixmedinsCode = miConfig.Code
+	struct3505.Code = miConfig.Code
+
+	roles, _ := service.GetAdminUserInfoByID(org_id, pre.Creator)
+	struct3505.PrscDrName = roles.UserName
+	if org_id == 10191 {
+		struct3505.PharName = "刘水山"
+		struct3505.PharPracCertNo = "2015026350260000002611351127"
+	}
+
+	if org_id == 10188 {
+		struct3505.PharName = "李汉清"
+		struct3505.PharPracCertNo = "30220200932022010034"
+	}
+
+	if org_id == 10217 {
+		struct3505.PharName = "张敏"
+		struct3505.PharPracCertNo = "30220230432090100108"
+	}
+
+	if org_id == 10318 {
+		struct3505.PharName = "邹刘阳"
+		struct3505.PharPracCertNo = "210441200001378"
+	}
+
+	if org_id == 10402 {
+		struct3505.PharName = "刘韶健"
+		struct3505.PharPracCertNo = "2015026440262015440501001198"
+	}
+
+
+
+	if org_id == 9919 {
+		struct3505.PharName = "周君权"
+		struct3505.PharPracCertNo = "089644396094401375"
+	}
+
+
+	if org_id == 10644 {
+		struct3505.PharName = "陈金娣"
+		struct3505.PharPracCertNo = "20181441500320100066"
+	}
+
+	if org_id == 10567 {
+		struct3505.PharName = "范小兰"
+		struct3505.PharPracCertNo = "0200102079485"
+	}
+	if org_id == 10721 {
+		struct3505.PharName = "孙莉侠"
+		struct3505.PharPracCertNo = "060399"
+	}
+	if org_id == 10726 {
+		struct3505.PharName = "彭建福"
+		struct3505.PharPracCertNo = "D445281006261"
+	}
+	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 = time.Unix(drug.ExpireDate, 0).Format("2006-01-02")
+	struct3505.RxFlag = "1"
+	struct3505.TrdnFlag = "0"
+	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
+	struct3505.Enckey = miConfig.EncKey
+	struct3505.SignKey = miConfig.SignKey
+	struct3505.SecretKey = miConfig.SecretKey
+	strValue := fmt.Sprintf("%.2f", drug.HisDoctorAdviceInfo.PrescribingNumber)
+	struct3505.SelRetnCnt = strValue
+	struct3505.SelRetnTime = time.Unix(drug.HisDoctorAdviceInfo.CreatedTime, 0).Format("2006-01-02 15:04:05")
+	struct3505.SelRetnOpterName = role.UserName
+	if order.IsMedicineInsurance == 1 {
+		struct3505.MdtrtSetlType = "1"
+	} else {
+		struct3505.MdtrtSetlType = "2"
+	}
+	struct3505.OrgName = miConfig.OrgName
+	struct3505.AccessKey = miConfig.AccessKey
+	struct3505.RequestUrl = miConfig.Url
+	struct3505.SecretKey = miConfig.SecretKey
+	struct3505.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+	struct3505.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+	struct3505.Cainfo = miConfig.Cainfo
+	struct3505.DrugTracCodg = drug.DrugCode
+
+	if miConfig.MdtrtareaAdmvs == "350500" {
+		result1, result2, _ := service.FJyb3505(struct3505)
+		return result1, result2
+	} 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 if strings.HasPrefix(miConfig.MdtrtareaAdmvs[0:3], "361") {
+		result1, result2 := service.JXyb3505(struct3505, struct3505.SecretKey,struct3505.AccessKey,struct3505.RequestUrl)
+		return result1, result2
+	}else if miConfig.MdtrtareaAdmvs == "340699" {
+		result1, result2 := service.AHyb3505(struct3505, struct3505.SecretKey,struct3505.RequestUrl)
+		return result1, result2
+	} else {
+		data := make(map[string]interface{})
+		data["struct_3505s"] = struct3505
+		client := &http.Client{}
+		bytesData, _ := json.Marshal(data)
+		var req *http.Request
+		if miConfig.MdtrtareaAdmvs == "320921" {
+			req, _ = http.NewRequest("POST", "http://192.168.2.3:9532/"+"jsyb/3505", bytes.NewReader(bytesData))
+		} else {
+			req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/3505", bytes.NewReader(bytesData))
+		}
+		resp, _ := client.Do(req)
+		defer resp.Body.Close()
+		body, ioErr := ioutil.ReadAll(resp.Body)
+		if ioErr != nil {
+			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+		}
+		var respJSON map[string]interface{}
+		if err := json.Unmarshal([]byte(body), &respJSON); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		}
+		//var resSix10265 ResultSix10265 //1101结果
+		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+		result, _ := json.Marshal(respJSON)
+		return string(result), ""
+
+	}
+
 }
 func CancleSaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow, miConfig models.MedicalInsuranceOrgConfig, chgType string, role models.UserAdminRole, number string) (string, string) {
 	var struct3506 models.Struct3506
@@ -25856,8 +26009,9 @@ func (c *HisApiController) GetRegisterInfo() {
 					bas := strings.Split(psn_info.CardInfo, "|")
 					cert_no = bas[2]
 				} else if id_card_type == 4 {
-					cert_no = IdCardNo
+					cert_no = psn_info.VerifyNumber
 					psn_info.VerifyNumber = psn_info.VerifyNumber
+					IdCardNo = psn_info.VerifyNumber
 				} else {
 					cert_no = IdCardNo
 					psn_info.VerifyNumber = cert_no
@@ -25918,8 +26072,9 @@ func (c *HisApiController) GetRegisterInfo() {
 					bas := strings.Split(psn_info.CardInfo, "|")
 					cert_no = bas[2]
 				} else if id_card_type == 4 {
-					cert_no = IdCardNo
+					cert_no = psn_info.VerifyNumber
 					psn_info.VerifyNumber = psn_info.VerifyNumber
+					IdCardNo = psn_info.VerifyNumber
 				} else {
 					cert_no = IdCardNo
 					psn_info.VerifyNumber = cert_no
@@ -29290,7 +29445,7 @@ func (c *HisApiController) GetUploadInfo() {
 					psn_info.VerifyNumber = his.Certno + "|" + psn_info.VerifyNumber
 				} else if his.IdCardType == 4 {
 					psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
-					cert_no = his.Certno
+					cert_no =psn_info.VerifyNumber
 					psn_info.VerifyNumber = psn_info.VerifyNumber
 				} else {
 					cert_no = his.Certno
@@ -32491,7 +32646,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 
 						if his.IdCardType == 4 {
 							psn_info.VerifyNumber = psn_info.VerifyNumber
-							cert_no = psn_info.Certno
+							cert_no = psn_info.VerifyNumber
 						} else if his.IdCardType == 2 {
 							cert_no = psn_info.Certno
 							psn_info.VerifyNumber = psn_info.Certno

controllers/zh/zh_his_api_controller.go

@@ -1495,7 +1495,7 @@ func (c *ZHHisApiController) GetZHPatientInfo() {
 			saveLog(result_log, request_log, "1101", "人员基本信息获取")
 
 		} else if miConfig.MdtrtareaAdmvs == "360399" ||  miConfig.MdtrtareaAdmvs == "361025" {
-			result, request_log = service.JxybZY1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, "", miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 2, "", 0, miConfig.Url, miConfig.AccessKey, "", patient.IdCardNo, "")
+			result, request_log = service.JxybZY1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code,  miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 2, "", 0, miConfig.Url, miConfig.AccessKey, patient.Name, patient.IdCardNo, patient.Name)
 			saveLog(result_log, request_log, "1101", "人员基本信息获取")
 		}else if miConfig.MdtrtareaAdmvs == "341203"{
 			var insuplc_admdvs string

main.go

@@ -705,225 +705,226 @@ type ResultSeventeen struct {
 //}GetAllHisOrder10138
 //
 //
-func GetblBatchSettleList() {
-	org_id, _ := beego.AppConfig.Int64("org_id")
-	var orders []*models.HisOrder
-	//var orders []*models.HisOrderError
-	orders, _ = service.GetAllHisOrder10138()
-	for _, item := range orders {
-		order_id := item.ID
-		order, _ := service.GetHisOrderByIDTwo(order_id)
-		if order.MedType == "14" {
-			his, _ := service.GetHisPatientByNumber(order.MdtrtId)
-			var patientPrescription models.HisPrescriptionInfo
-			patientPrescription, _ = service.FindLastPatientPrescriptionInfo(order.UserOrgId, order.PatientId, order.SettleAccountsDate)
-			doctor_info, _ := service.GetAdminUserInfoByID(order.UserOrgId, patientPrescription.DoctorId)
-			department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
-			miConfig, _ := service.FindMedicalInsuranceInfo(order.UserOrgId)
-			var configTwo []*models.HisXtDiagnoseConfig
-			diagnosis_idstwo := strings.Split(his.Diagnosis, ",")
-			curRoles, _ := service.GetAdminUserInfoByID(org_id, 2185)
-			for _, item := range diagnosis_idstwo {
-				id, _ := strconv.ParseInt(item, 10, 64)
-				diagnosisConfig, _ := service.FindDiagnoseById(id)
-				configTwo = append(configTwo, &diagnosisConfig)
-			}
-			patient, _ := service.GetPatientByIDTwo(10138, order.PatientId)
-
-			sickConfig, _ := service.FindSickById(his.SickType)
-			//if order.MedType == "1111" || order.MedType == "1112" {
-			//	order.MedType = "11"
-			//}
-			service.Gdyb2203d(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, "14", doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, curRoles.UserName, configTwo, time.Unix(his.RecordDate, 0).Format("2006-01-02 15:04:05"))
-
-			depart, _ := service.GetDepartMentDetail(curRoles.DepartmentId)
-			pre, _ := service.GetNewHisPrescriptionByNumber(order.Number)
-			doctor, _ := service.GetAdminUserInfoByID(org_id, pre.Creator)
-			if order.ID == 0 {
-				return
-			}
-			if his.BalanceAccountsType == 2 {
-				continue
-			}
-			struct4101 := service.Struct4101{
-				PsnNo:          order.PsnNo,
-				MdtrtId:        order.MdtrtId,
-				SetlId:         order.SetlId,
-				PsnName:        order.PsnName,
-				Gend:           order.Gend,
-				Brdy:           his.Brdy,
-				Age:            his.Age,
-				Naty:           order.Naty,
-				PatnCertType:   order.PsnCertType,
-				Certno:         order.Certno,
-				Prfs:           "90",
-				ConerName:      "",
-				PatnRlts:       "",
-				ConerAddr:      "",
-				ConerTel:       "",
-				HiType:         order.Insutype,
-				Insuplc:        his.InsuplcAdmdvs,
-				MaindiagFlag:   "1",
-				BillCode:       order.SetlId,
-				BillNo:         order.SetlId,
-				BizSn:          order.Number,
-				PsnSelfPay:     order.PsnPartAmt,
-				PsnOwnPay:      order.PsnPartAmt,
-				AcctPay:        order.AcctPay,
-				PsnCashpay:     order.PsnCashPay,
-				HiPaymtd:       "1",
-				Hsorg:          his.InsuplcAdmdvs,
-				HsorgOpter:     his.InsuplcAdmdvs,
-				MedinsFillPsn:  curRoles.UserName,
-				MedinsFillDept: depart.Name,
-				IptMedType:     "2",
-				CurAddr:        patient.HomeAddress,
-			}
-
-			struct4101.SetlBegnDate = order.SetlTime
-			struct4101.SetlEndDate = order.SetlTime
-
-			var rf []CustomFundPay
-			json.Unmarshal([]byte(order.SetlDetail), &rf)
-
-			//var tempFunPays []service.CustomStruct
-			//var tempFunPay610100 service.CustomStruct
-
-			//for _, item := range rf {
-			//	if item.FundPayType == "610100" {
-			//		tempFunPay610100.FundPayamt, _ = decimal.NewFromFloat(tempFunPay610100.FundPayamt).Add(decimal.NewFromFloat(item.FundPayamt)).Float64()
-			//		tempFunPay610100.FundPayType = item.FundPayType
-			//	} else {
-			//		var tempFunPay service.CustomStruct
-			//		tempFunPay.FundPayamt = item.FundPayamt
-			//		tempFunPay.FundPayType = item.FundPayType
-			//		tempFunPays = append(tempFunPays, tempFunPay)
-			//	}
-			//}
-			//tempFunPays = append(tempFunPays, tempFunPay610100)
-			//struct4101.CustomStruct = tempFunPays
-
-			var tempDiaginfos []service.DiaginfoStructTwo
-			var tempOpspdiseinfo2 service.OpspdiseinfoStruct
-			var tempOpspdiseinfos []service.OpspdiseinfoStruct
-
-			diagnosis_ids := strings.Split(his.Diagnosis, ",")
-			var config []*models.HisXtDiagnoseConfig
-			for _, item := range diagnosis_ids {
-				id, _ := strconv.ParseInt(item, 10, 64)
-				if id == 24 {
-
-					diagnosisConfig, _ := service.FindDiagnoseById(id)
-					config = append(config, &diagnosisConfig)
-				}
-
-			}
-
-			for _, item := range diagnosis_ids {
-
-				id, _ := strconv.ParseInt(item, 10, 64)
-				if id != 24 {
-					diagnosisConfig, _ := service.FindDiagnoseById(id)
-					config = append(config, &diagnosisConfig)
-				}
-
-			}
-
-			for index, item := range config {
-				if index == 0 {
-					var tempDiaginfo service.DiaginfoStructTwo
-					tempDiaginfo.DiagCode = item.CountryCode
-					tempDiaginfo.DiagName = item.CountryContentName
-					tempDiaginfo.DiagType = "1"
-					tempDiaginfo.MaindiagFlag = "1"
-					tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
-				} else {
-
-					var tempDiaginfo service.DiaginfoStructTwo
-					tempDiaginfo.DiagCode = item.CountryCode
-					tempDiaginfo.DiagName = item.CountryContentName
-					tempDiaginfo.DiagType = "1"
-					tempDiaginfo.MaindiagFlag = "0"
-					tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
-				}
-			}
-			struct4101.Diseinfo = tempDiaginfos
-			sickConfigTwo, _ := service.FindSickById(his.SickType)
-			tempOpspdiseinfo2.DiagCode = sickConfigTwo.ContentCode
-			tempOpspdiseinfo2.DiagName = sickConfigTwo.CountryContentName
-			tempOpspdiseinfo2.OprnOprtCode = ""
-			tempOpspdiseinfo2.OprnOprtName = ""
-			tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo2)
-			struct4101.OpspdiseinfoStruct = tempOpspdiseinfos
-			time_arr := strings.Split(order.SetlTime, " ")
-			struct4101.AdmTime = time_arr[0]
-			struct4101.AdmEndTime = time_arr[0]
-			struct4101.DoctorName = doctor.UserName
-			struct4101.DoctorCode = doctor.DoctorNumber
-
-			struct4101.Ntly = "CHN"
-			struct4101.AdmCaty = "A03.06"
-			var res ResultSeventeen
-
-			result, request := service.Gdyb4101For10138(struct4101, miConfig.SecretKey, miConfig.OrgName, curRoles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, org_id)
-			fmt.Println(result)
-			saveLog(result, request, "4101A", "清单上传")
-			var dat map[string]interface{}
-			if err := json.Unmarshal([]byte(result), &dat); err == nil {
-				fmt.Println(dat)
-			} else {
-				fmt.Println(err)
-			}
-			userJSONBytes, _ := json.Marshal(dat)
-			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-				//utils.ErrorLog("解析失败：%v", err)
-				//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				//adminUser := c.GetAdminUserInfo()
-				errlog := &models.HisOrderError{
-					UserOrgId: org_id,
-					Ctime:     time.Now().Unix(),
-					Mtime:     time.Now().Unix(),
-					ErrMsg:    res.ErrMsg + "解析失败",
-					Status:    1,
-					PatientId: order_id,
-					Stage:     10138600,
-				}
-				service.CreateErrMsgLog(errlog)
-				continue
-			}
-
-			if res.Infcode != 0 {
-				//adminUser := c.GetAdminUserInfo()
-				errlog := &models.HisOrderError{
-					UserOrgId: org_id,
-					Ctime:     time.Now().Unix(),
-					Mtime:     time.Now().Unix(),
-					ErrMsg:    res.ErrMsg,
-					Status:    1,
-					PatientId: order_id,
-					Stage:     10138600,
-				}
-				service.CreateErrMsgLog(errlog)
-				continue
-			} else {
-				hisFundSettleListResult := &models.HisFundSettleListResult{
-					Number:    res.Output.SetlListId,
-					Status:    1,
-					Ctime:     time.Now().Unix(),
-					Mtime:     time.Now().Unix(),
-					UserOrgId: org_id,
-					IsUpload:  1,
-					OrderId:   order_id,
-				}
-				service.CreateUploadRecord(hisFundSettleListResult)
-				continue
-			}
-		}
-	}
-}
+//func GetblBatchSettleList() {
+//	org_id, _ := beego.AppConfig.Int64("org_id")
+//	var orders []*models.HisOrder
+//	//var orders []*models.HisOrderError
+//	orders, _ = service.GetAllHisOrder10138()
+//	for _, item := range orders {
+//		order_id := item.ID
+//		order, _ := service.GetHisOrderByIDTwo(order_id)
+//		if order.MedType == "14" {
+//			his, _ := service.GetHisPatientByNumber(order.MdtrtId)
+//			var patientPrescription models.HisPrescriptionInfo
+//			patientPrescription, _ = service.FindLastPatientPrescriptionInfo(order.UserOrgId, order.PatientId, order.SettleAccountsDate)
+//			doctor_info, _ := service.GetAdminUserInfoByID(order.UserOrgId, patientPrescription.DoctorId)
+//			department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
+//			miConfig, _ := service.FindMedicalInsuranceInfo(order.UserOrgId)
+//			var configTwo []*models.HisXtDiagnoseConfig
+//			diagnosis_idstwo := strings.Split(his.Diagnosis, ",")
+//			curRoles, _ := service.GetAdminUserInfoByID(org_id, 5320)
+//			for _, item := range diagnosis_idstwo {
+//				id, _ := strconv.ParseInt(item, 10, 64)
+//				diagnosisConfig, _ := service.FindDiagnoseById(id)
+//				configTwo = append(configTwo, &diagnosisConfig)
+//			}
+//			patient, _ := service.GetPatientByIDTwo(10028, order.PatientId)
+//
+//			sickConfig, _ := service.FindSickById(his.SickType)
+//			//if order.MedType == "1111" || order.MedType == "1112" {
+//			//	order.MedType = "11"
+//			//}
+//			service.Gdyb2203d(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, "14", doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, curRoles.UserName, configTwo, time.Unix(his.RecordDate, 0).Format("2006-01-02 15:04:05"))
+//
+//			depart, _ := service.GetDepartMentDetail(curRoles.DepartmentId)
+//			pre, _ := service.GetNewHisPrescriptionByNumber(order.Number)
+//			doctor, _ := service.GetAdminUserInfoByID(org_id, pre.Creator)
+//			if order.ID == 0 {
+//				return
+//			}
+//			if his.BalanceAccountsType == 2 {
+//				continue
+//			}
+//			struct4101 := service.Struct4101{
+//				PsnNo:          order.PsnNo,
+//				MdtrtId:        order.MdtrtId,
+//				SetlId:         order.SetlId,
+//				PsnName:        order.PsnName,
+//				Gend:           order.Gend,
+//				Brdy:           his.Brdy,
+//				Age:            his.Age,
+//				Naty:           order.Naty,
+//				PatnCertType:   order.PsnCertType,
+//				Certno:         order.Certno,
+//				Prfs:           "90",
+//				ConerName:      "",
+//				PatnRlts:       "",
+//				ConerAddr:      "",
+//				ConerTel:       "",
+//				HiType:         order.Insutype,
+//				Insuplc:        his.InsuplcAdmdvs,
+//				MaindiagFlag:   "1",
+//				BillCode:       order.SetlId,
+//				BillNo:         order.SetlId,
+//				BizSn:          order.Number,
+//				PsnSelfPay:     order.PsnPartAmt,
+//				PsnOwnPay:      order.PsnPartAmt,
+//				AcctPay:        order.AcctPay,
+//				PsnCashpay:     order.PsnCashPay,
+//				HiPaymtd:       "1",
+//				Hsorg:          his.InsuplcAdmdvs,
+//				HsorgOpter:     his.InsuplcAdmdvs,
+//				MedinsFillPsn:  curRoles.UserName,
+//				MedinsFillDept: depart.Name,
+//				IptMedType:     "2",
+//				CurAddr:        patient.HomeAddress,
+//			}
+//
+//			struct4101.SetlBegnDate = order.SetlTime
+//			struct4101.SetlEndDate = order.SetlTime
+//
+//			var rf []CustomFundPay
+//			json.Unmarshal([]byte(order.SetlDetail), &rf)
+//
+//			//var tempFunPays []service.CustomStruct
+//			//var tempFunPay610100 service.CustomStruct
+//
+//			//for _, item := range rf {
+//			//	if item.FundPayType == "610100" {
+//			//		tempFunPay610100.FundPayamt, _ = decimal.NewFromFloat(tempFunPay610100.FundPayamt).Add(decimal.NewFromFloat(item.FundPayamt)).Float64()
+//			//		tempFunPay610100.FundPayType = item.FundPayType
+//			//	} else {
+//			//		var tempFunPay service.CustomStruct
+//			//		tempFunPay.FundPayamt = item.FundPayamt
+//			//		tempFunPay.FundPayType = item.FundPayType
+//			//		tempFunPays = append(tempFunPays, tempFunPay)
+//			//	}
+//			//}
+//			//tempFunPays = append(tempFunPays, tempFunPay610100)
+//			//struct4101.CustomStruct = tempFunPays
+//
+//			var tempDiaginfos []service.DiaginfoStructTwo
+//			var tempOpspdiseinfo2 service.OpspdiseinfoStruct
+//			var tempOpspdiseinfos []service.OpspdiseinfoStruct
+//
+//			diagnosis_ids := strings.Split(his.Diagnosis, ",")
+//			var config []*models.HisXtDiagnoseConfig
+//			for _, item := range diagnosis_ids {
+//				id, _ := strconv.ParseInt(item, 10, 64)
+//				if id == 24 {
+//
+//					diagnosisConfig, _ := service.FindDiagnoseById(id)
+//					config = append(config, &diagnosisConfig)
+//				}
+//
+//			}
+//
+//			for _, item := range diagnosis_ids {
+//
+//				id, _ := strconv.ParseInt(item, 10, 64)
+//				if id != 24 {
+//					diagnosisConfig, _ := service.FindDiagnoseById(id)
+//					config = append(config, &diagnosisConfig)
+//				}
+//
+//			}
+//
+//			for index, item := range config {
+//				if index == 0 {
+//					var tempDiaginfo service.DiaginfoStructTwo
+//					tempDiaginfo.DiagCode = item.CountryCode
+//					tempDiaginfo.DiagName = item.CountryContentName
+//					tempDiaginfo.DiagType = "1"
+//					tempDiaginfo.MaindiagFlag = "1"
+//					tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
+//				} else {
+//
+//					var tempDiaginfo service.DiaginfoStructTwo
+//					tempDiaginfo.DiagCode = item.CountryCode
+//					tempDiaginfo.DiagName = item.CountryContentName
+//					tempDiaginfo.DiagType = "1"
+//					tempDiaginfo.MaindiagFlag = "0"
+//					tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
+//				}
+//			}
+//			struct4101.Diseinfo = tempDiaginfos
+//			sickConfigTwo, _ := service.FindSickById(his.SickType)
+//			tempOpspdiseinfo2.DiagCode = sickConfigTwo.ContentCode
+//			tempOpspdiseinfo2.DiagName = sickConfigTwo.CountryContentName
+//			tempOpspdiseinfo2.OprnOprtCode = ""
+//			tempOpspdiseinfo2.OprnOprtName = ""
+//			tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo2)
+//			struct4101.OpspdiseinfoStruct = tempOpspdiseinfos
+//			time_arr := strings.Split(order.SetlTime, " ")
+//			struct4101.AdmTime = time_arr[0]
+//			struct4101.AdmEndTime = time_arr[0]
+//			struct4101.DoctorName = doctor.UserName
+//			struct4101.DoctorCode = doctor.DoctorNumber
+//
+//			struct4101.Ntly = "CHN"
+//			struct4101.AdmCaty = "A03.06"
+//			var res ResultSeventeen
+//
+//			result, request := service.Gdyb4101For10138(struct4101, miConfig.SecretKey, miConfig.OrgName, curRoles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, org_id)
+//			fmt.Println(result)
+//			saveLog(result, request, "4101A", "清单上传")
+//			var dat map[string]interface{}
+//			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//				fmt.Println(dat)
+//			} else {
+//				fmt.Println(err)
+//			}
+//			userJSONBytes, _ := json.Marshal(dat)
+//			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+//				//utils.ErrorLog("解析失败：%v", err)
+//				//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//				//adminUser := c.GetAdminUserInfo()
+//				errlog := &models.HisOrderError{
+//					UserOrgId: org_id,
+//					Ctime:     time.Now().Unix(),
+//					Mtime:     time.Now().Unix(),
+//					ErrMsg:    res.ErrMsg + "解析失败",
+//					Status:    1,
+//					PatientId: order_id,
+//					Stage:     10138600,
+//				}
+//				service.CreateErrMsgLog(errlog)
+//				continue
+//			}
+//
+//			if res.Infcode != 0 {
+//				//adminUser := c.GetAdminUserInfo()
+//				errlog := &models.HisOrderError{
+//					UserOrgId: org_id,
+//					Ctime:     time.Now().Unix(),
+//					Mtime:     time.Now().Unix(),
+//					ErrMsg:    res.ErrMsg,
+//					Status:    1,
+//					PatientId: order_id,
+//					Stage:     10138600,
+//				}
+//				service.CreateErrMsgLog(errlog)
+//				continue
+//			} else {
+//				hisFundSettleListResult := &models.HisFundSettleListResult{
+//					Number:    res.Output.SetlListId,
+//					Status:    1,
+//					Ctime:     time.Now().Unix(),
+//					Mtime:     time.Now().Unix(),
+//					UserOrgId: org_id,
+//					IsUpload:  1,
+//					OrderId:   order_id,
+//				}
+//				service.CreateUploadRecord(hisFundSettleListResult)
+//				continue
+//			}
+//		}
+//	}
+//}
 
 func GetblbrBatchSettleList() {
 	org_id, _ := beego.AppConfig.Int64("org_id")
+	org_id = 10278
 	var orders []*models.HisOrder
 	//var orders []*models.HisOrderError
 	orders, _ = service.GetAllHisOrder10278()
@@ -939,7 +940,7 @@ func GetblbrBatchSettleList() {
 			miConfig, _ := service.FindMedicalInsuranceInfo(order.UserOrgId)
 			var configTwo []*models.HisXtDiagnoseConfig
 			diagnosis_idstwo := strings.Split(his.Diagnosis, ",")
-			curRoles, _ := service.GetAdminUserInfoByID(org_id, 2185)
+			curRoles, _ := service.GetAdminUserInfoByID(org_id, 2791)
 			for _, item := range diagnosis_idstwo {
 				id, _ := strconv.ParseInt(item, 10, 64)
 				diagnosisConfig, _ := service.FindDiagnoseById(id)

models/models_3501.go

@@ -84,7 +84,7 @@ type Struct3503 struct {
 	Aprvno              string
 	ManuDate            string
 	ExpyEnd             string
-	FinlTrnsPric        string
+	FinlTrnsPric        float64
 	PurcRetnCnt         string
 	PurcInvoCodg        string
 	PurcInvoNo          string
@@ -121,7 +121,7 @@ type Struct3504 struct {
 	SplerPmtno          string
 	ManuDate            string
 	ExpyEnd             string
-	FinlTrnsPric        string
+	FinlTrnsPric        float64
 	PurcRetnCnt         string
 	PurcInvoCodg        string
 	PurcInvoNo          string
@@ -173,7 +173,7 @@ type Struct3505 struct {
 	ExpyEnd             string
 	RxFlag              string
 	TrdnFlag            string
-	FinlTrnsPric        string
+	FinlTrnsPric        float64
 	Rxno                string
 	RxCircFlag          string
 	RtalDocno           string
@@ -220,7 +220,7 @@ type Struct3506 struct {
 	ExpyEnd             string
 	RxFlag              string
 	TrdnFlag            string
-	FinlTrnsPric        string
+	FinlTrnsPric        float64
 	SelTrnsPric         string
 	SelRetnCnt          string
 	SelRetnTime         string

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,DrugId;AssociationForeignKey:PatientID,SystemTime,DrugId" json:"advice"`
+	HisDoctorAdviceInfo       HisDoctorAdviceInfo  `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" 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/ahyb_service.go

@@ -3468,7 +3468,7 @@ func AHyb3505(struct3505 models.Struct3505, secret_key string,request_url string
 
 	inputData["phar_name"] = struct3505.PharName               // 人员编号 （来自1101接口返回）
 	inputData["phar_prac_cert_no"] = struct3505.PharPracCertNo // 人员编号 （来自1101接口返回）
-	inputData["hi_feesetl_type"] = struct3505.HiFeesetlType    // 人员编号 （来自1101接口返回）
+	inputData["hi_feesetl_type"] = "1"    // 人员编号 （来自1101接口返回）
 	inputData["setl_id"] = struct3505.SetlId                   // 人员编号 （来自1101接口返回）
 	inputData["mdtrt_sn"] = struct3505.MdtrtSn                 // 人员编号 （来自1101接口返回）
 	inputData["psn_no"] = struct3505.PsnNo                     // 人员编号 （来自1101接口返回）
@@ -3483,14 +3483,14 @@ func AHyb3505(struct3505 models.Struct3505, secret_key string,request_url string
 	inputData["trdn_flag"] = struct3505.TrdnFlag // 人员编号 （来自1101接口返回）
 
 	inputData["finl_trns_pric"] = struct3505.FinlTrnsPric // 人员编号 （来自1101接口返回）
-	inputData["rxno"] = struct3505.Rxno                   // 人员编号 （来自1101接口返回）
-	inputData["rx_circ_flag"] = struct3505.RxCircFlag     // 人员编号 （来自1101接口返回）
+	inputData["rxno"] = "---"                  // 人员编号 （来自1101接口返回）
+	inputData["rx_circ_flag"] = "---"     // 人员编号 （来自1101接口返回）
 
 	inputData["rtal_docno"] = struct3505.RtalDocno // 人员编号 （来自1101接口返回）
-	inputData["stoout_no"] = struct3505.StooutNo   // 人员编号 （来自1101接口返回）
+	inputData["stoout_no"] = "---"   // 人员编号 （来自1101接口返回）
 
-	inputData["bchno"] = struct3505.Bchno                          // 人员编号 （来自1101接口返回）
-	inputData["drug_trac_codg"] = struct3505.DrugTracCodg          // 人员编号 （来自1101接口返回）
+	inputData["bchno"] = "---"                          // 人员编号 （来自1101接口返回）
+	//inputData["drug_trac_codg"] = ""         // 人员编号 （来自1101接口返回）
 	inputData["drug_prod_barc"] = struct3505.DrugProdBarc          // 人员编号 （来自1101接口返回）
 	inputData["shelf_posi"] = struct3505.ShelfPosi                 // 人员编号 （来自1101接口返回）
 	inputData["sel_retn_cnt"] = struct3505.SelRetnCnt              // 人员编号 （来自1101接口返回）
@@ -3505,9 +3505,11 @@ func AHyb3505(struct3505 models.Struct3505, secret_key string,request_url string
 
 	codes := strings.Split(struct3505.DrugTracCodg, ",")
 	for _, item := range codes {
-		druginputData := make(map[string]interface{})
-		druginputData["drug_trac_codg"] = item
-		feedetail = append(feedetail, druginputData)
+		if len(item) > 0 {
+			druginputData := make(map[string]interface{})
+			druginputData["drug_trac_codg"] = item
+			feedetail = append(feedetail, druginputData)
+		}
 	}
 	inputData["drugtracinfo"] = feedetail
 	input["selinfo"] = inputData
@@ -3527,7 +3529,7 @@ func AHyb3505(struct3505 models.Struct3505, secret_key string,request_url string
 	//gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
 	//url := gdyb_url + "3505"
-	request_url = request_url + "1101"
+	request_url = request_url + "3505"
 
 	request, err := http.NewRequest("POST", request_url, reader)
 	if err != nil {

service/his_service.go

@@ -1560,7 +1560,7 @@ func GetAllHisOrder10106(org_id int64) (his []*models.HisOrder, err error) {
 	return
 }
 func GetAllHisOrder10138() (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10138  AND status = 1  AND  order_status = 2 AND  setl_id <> ''  AND setl_time >= '2024-04-01 00:00:00' and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10028  AND status = 1  AND  order_status = 2 AND  setl_id <> '' AND setl_time >= '2024-01-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
@@ -1570,7 +1570,7 @@ func GetOrderError10138() (order []*models.HisOrderError, err error) {
 }
 
 func GetAllHisOrder10278() (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where(" user_org_id = 10278  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND setl_time >= '2024-04-01 00:00:00' AND setl_time <= '2024-09-30 23:00:00' and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where(" user_org_id = 10278  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND setl_time >= '2024-10-01 00:00:00' AND setl_time <= '2024-10-31 23:00:00' and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
@@ -1770,6 +1770,13 @@ func GetNewDrugFlowInfothree() (flows []*models.DrugFlow, err error) {
 	return
 }
 
+func GetNewDrugFlowInfothree123() (flows []*models.DrugFlow, err error) {
+	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = 10217 and status = 1 and length(drug_code) > 0   and consumable_type = 3 and is_sale = 0").Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1").Preload("BaseDrugLib", "status=1")
+	}).Preload("NewDrugWarehouseInfo", "status = 1").Find(&flows).Error
+	return
+}
+
 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")

service/jx_service.go

@@ -1127,7 +1127,7 @@ func JxybZY1101(certNo string, org_name string, doctor string, fixmedins_code st
 	}
 
 	inputData["begntime"] = "" // 开始时间
-	inputData["psn_name"] = "" // 人员姓名
+	inputData["psn_name"] = cainfo // 人员姓名
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入