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

controllers/sg/his_api_controller.go

 }
 func (c *HisApiController) FJ3501AND3502() {
 	ids := c.getString("ids")
-	//ids := c.getint("admin_")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 
 			struct3501.InvCnt = strconv.FormatInt(drug.StockMaxNumber, 10)
 			struct3501.ExpyEnd = time.Unix(drug.ExpiryDate, 0).Format("2006-01-02 15:04:05")
 			struct3501.FixmedinsBchno = strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(drug.ID, 10) + "-" + "3501"
-			struct3501.Memo = "入库"
+			memo := make(map[string]interface{})
+			memo["pric"] = drug.Price
+			bytesData, _ := json.Marshal(memo)
+			struct3501.Memo = string(bytesData)
 			result1, result2, result3 := service.FJyb3501(struct3501)
 			fmt.Println(result1)
 			fmt.Println(result2)
 			struct3502.SignKey = miConfig.SignKey
 			struct3502.SecretKey = miConfig.SecretKey
 
-			struct3502.InvChgType = "102"
+			struct3502.Memo = ""
+			struct3502.InvChgType = "108"
 			struct3501.FixmedinsBchno = strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(drug.ID, 10) + "-" + "3502"
 			struct3502.Cnt = strconv.FormatInt(drug.WarehousingCount, 10)
 			struct3502.Pric = fmt.Sprintf("%.2f", drug.BaseDrugLib.RetailPrice)
 			struct3502.SecretKey = miConfig.SecretKey
 			struct3502.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
 			struct3502.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
-			struct3502.InvChgType = "102"
+			struct3502.InvChgType = "108"
 
 			struct3502.Url = miConfig.Url
 			struct3502.AppId = miConfig.Cainfo
 		}
 	}
 }
-
 func (c *HisApiController) DeletePCandBG() {
 	ids := c.getString("ids")
 	id_arr := strings.Split(ids, ",")
 			var struct3507 models.Struct3507
 			struct3507.FixmedinsBchno = ""
 			struct3507.InvDataType = "1"
+			struct3507.Opter = roles.UserName
 			struct3507.OrgName = miConfig.OrgName
 			struct3507.AccessKey = miConfig.AccessKey
 			struct3507.RequestUrl = miConfig.Url
 	ids := c.getString("ids")
 	id_arr := strings.Split(ids, ",")
 	flows, _ := service.GetNewDrugFlowInfo(id_arr)
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
+
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 
 	for _, item := range flows {
 				if item.IsSale == 1 { //是否已经销售，1是   0否
 					//是否已经变更 1是  0否
 					if item.IsChange == 0 { //没变更，进行变更操作
-						ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102")
+						ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102", roles)
 					}
 				} else { //没销售，
 					//进行商品销售接口
-					SaleStock(c.GetAdminUserInfo().CurrentOrgId, prescription, item.HisDoctorAdviceInfo, miConfig, "")
+					SaleStock(c.GetAdminUserInfo().CurrentOrgId, prescription, item.HisDoctorAdviceInfo, miConfig, "", roles)
 
 					if item.IsChange == 0 { //没变更，进行变更操作
-						ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102")
+						ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102", roles)
 					}
 				}
 			} else { //还没结算
 				if item.IsChange == 0 { //没变更，进行变更操作
-					ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102")
+					ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102", roles)
 
 				}
 			}
 				if item.IsSale == 1 { //是否已经销售，1是   0否
 					//是否已经变更 1是  0否
 					if item.IsChange == 0 { //没变更，进行变更操作
-						ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102")
+						ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102", roles)
 					}
 				} else { //没销售，
 					//进行商品销售退货接口
 					CancleSaleStock(c.GetAdminUserInfo().CurrentOrgId, prescription, item.HisDoctorAdviceInfo, miConfig, "")
 					if item.IsChange == 0 { //没变更，进行变更操作
-						ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102")
+						ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102", roles)
 					}
 				}
 			} else { //还没结算
 				if item.IsChange == 0 { //没变更，进行变更操作
-					ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102")
+					ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102", roles)
 
 				}
 			}
 
 		} else { //其他方式
 			if item.IsChange == 0 { //没变更，进行变更操作
-				ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102")
+				ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102", roles)
 			}
 		}
 	}
 }
 
-func ChangeStock(count int64, drug models.HisDoctorAdviceInfo, miConfig models.MedicalInsuranceOrgConfig, chgType string) {
+func ChangeStock(count int64, drug models.HisDoctorAdviceInfo, miConfig models.MedicalInsuranceOrgConfig, chgType string, role models.UserAdminRole) {
 	var struct3502 models.Struct3502
 	struct3502.MedListCodg = drug.BaseDrugLib.MedicalInsuranceNumber
 	struct3502.FixmedinsHilistId = miConfig.Code
 	struct3502.FixmedinsHilistName = miConfig.OrgName
 	struct3502.FixmedinsCode = miConfig.Code
+	struct3502.Opter = role.UserName
 	struct3502.RxFlag = "0"
 	struct3502.InvChgTime = time.Unix(drug.CreatedTime, 0).Format("2006-01-02 15:04:05")
 	struct3502.OrgName = miConfig.OrgName
 	fmt.Println(result3)
 
 }
-func SaleStock(org_id int64, pre models.HisPrescription, drug models.HisDoctorAdviceInfo, miConfig models.MedicalInsuranceOrgConfig, chgType string) {
+func SaleStock(org_id int64, pre models.HisPrescription, drug models.HisDoctorAdviceInfo, miConfig models.MedicalInsuranceOrgConfig, chgType string, role models.UserAdminRole) {
 	var struct3505 models.Struct3505
 	struct3505.MedListCodg = drug.BaseDrugLib.MedicalInsuranceNumber
 	struct3505.FixmedinsHilistId = miConfig.Code

service/fj_service.go

 	inputData["fixmedins_bchno"] = struct3501.FixmedinsBchno        // 人员编号 （来自1101接口返回）
 	inputData["manu_date"] = struct3501.ManuDate                    // 人员编号 （来自1101接口返回）
 	inputData["expy_end"] = struct3501.ExpyEnd                      // 人员编号 （来自1101接口返回）
-	inputData["memo"] = ""                                          // 人员编号 （来自1101接口返回）
+	inputData["memo"] = struct3501.Memo                             // 人员编号 （来自1101接口返回）
 	druginputData["drug_trac_codg"] = "123"
 	//druginputData2["drugtracinfo"] = druginputData
 	inputData["drug_trac_info"] = druginputData