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

controllers/sg/his_api_controller.go

 	beego.Router("/api/pc_bg", &HisApiController{}, "get:FJ3501AND3502")
 	//删除库盘和变更
 	beego.Router("/api/delete_pc_bg", &HisApiController{}, "get:DeletePCandBG")
-	beego.Router("/api/delete_pc_bg", &HisApiController{}, "get:DeleteXSandBG")
+	beego.Router("/api/delete_xs_bg", &HisApiController{}, "get:DeleteXSandBG")
 	//药品变更
 	beego.Router("/api/changedrug", &HisApiController{}, "get:ChangeDrug")
 
 }
 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)
+
 	id_arr := strings.Split(ids, ",")
 	drugs, _ := service.GetNewDrugWarehouseInfo(id_arr)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 			var struct3501 models.Struct3501
 			struct3501.OrgName = miConfig.OrgName
 			struct3501.AccessKey = miConfig.AccessKey
+			struct3501.Opter = roles.UserName
 			struct3501.RequestUrl = miConfig.Url
+			struct3501.Url = miConfig.Url
+			struct3501.AppId = miConfig.Cainfo
+			struct3501.AppSecret = miConfig.AppSecret
+			struct3501.Enckey = miConfig.EncKey
+			struct3501.SignKey = miConfig.SignKey
 			struct3501.SecretKey = miConfig.SecretKey
 			struct3501.MedListCodg = drug.BaseDrugLib.MedicalInsuranceNumber
 			struct3501.FixmedinsHilistId = miConfig.Code
 			struct3501.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
 			struct3501.InvCnt = strconv.FormatInt(drug.StockMaxNumber, 10)
 			struct3501.ExpyEnd = time.Unix(drug.ExpiryDate, 0).Format("2006-01-02 15:04:05")
-			//todo 批次号规则需要在咨询下保健
-			struct3501.FixmedinsBchno = ""
-			struct3501.Memo = ""
+			struct3501.FixmedinsBchno = strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(drug.ID, 10) + "-" + "3501"
+			struct3501.Memo = "入库"
 			result1, result2, result3 := service.FJyb3501(struct3501)
 			fmt.Println(result1)
 			fmt.Println(result2)
 			struct3502.FixmedinsHilistName = miConfig.OrgName
 			struct3502.FixmedinsCode = miConfig.Code
 			struct3502.RxFlag = "0"
-			struct3502.InvChgTime = time.Unix(drug.Ctime, 0).Format("2006-01-02 15:04:05")
+			struct3502.InvChgTime = time.Now().Format("2006-01-02")
 			struct3502.OrgName = miConfig.OrgName
 			struct3502.AccessKey = miConfig.AccessKey
 			struct3502.RequestUrl = miConfig.Url
 			struct3502.SecretKey = miConfig.SecretKey
 			struct3502.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
 			struct3502.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+
+			struct3502.Url = miConfig.Url
+			struct3502.AppId = miConfig.Cainfo
+			struct3502.AppSecret = miConfig.AppSecret
+			struct3502.Enckey = miConfig.EncKey
+			struct3502.SignKey = miConfig.SignKey
+			struct3502.SecretKey = miConfig.SecretKey
+
 			struct3502.InvChgType = "102"
-			struct3502.FixmedinsBchno = ""
+			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)
 			result11, result22, result33 := service.FJyb3502(struct3502)
 			struct3502.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
 			struct3502.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
 			struct3502.InvChgType = "102"
+
+			struct3502.Url = miConfig.Url
+			struct3502.AppId = miConfig.Cainfo
+			struct3502.AppSecret = miConfig.AppSecret
+			struct3502.Enckey = miConfig.EncKey
+			struct3502.SignKey = miConfig.SignKey
+			struct3502.SecretKey = miConfig.SecretKey
+
 			struct3502.FixmedinsBchno = ""
 			struct3502.Cnt = strconv.FormatInt(drug.WarehousingCount, 10)
 			struct3502.Pric = fmt.Sprintf("%.2f", drug.BaseDrugLib.RetailPrice)
 		}
 	}
 }
+
 func (c *HisApiController) DeletePCandBG() {
 	ids := c.getString("ids")
 	id_arr := strings.Split(ids, ",")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
+
 	drugs, _ := service.GetNewDrugWarehouseInfo(id_arr)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 	for _, item := range drugs {
 			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
 			struct3507.SecretKey = miConfig.SecretKey
 			struct3507.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
 			struct3507.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+
+			struct3507.Url = miConfig.Url
+			struct3507.AppId = miConfig.Cainfo
+			struct3507.AppSecret = miConfig.AppSecret
+			struct3507.Enckey = miConfig.EncKey
+			struct3507.SignKey = miConfig.SignKey
+			struct3507.SecretKey = miConfig.SecretKey
 			service.FJyb3507(struct3507)
 
 			var struct3507_2 models.Struct3507
 			struct3507_2.SecretKey = miConfig.SecretKey
 			struct3507_2.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
 			struct3507_2.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+
+			struct3507_2.Url = miConfig.Url
+			struct3507_2.AppId = miConfig.Cainfo
+			struct3507_2.AppSecret = miConfig.AppSecret
+			struct3507_2.Enckey = miConfig.EncKey
+			struct3507_2.SignKey = miConfig.SignKey
+			struct3507_2.SecretKey = miConfig.SecretKey
+
 			struct3507_2.FixmedinsBchno = ""
 			struct3507_2.InvDataType = "2"
 			service.FJyb3507(struct3507_2)
 			struct3507.SecretKey = miConfig.SecretKey
 			struct3507.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
 			struct3507.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+
+			struct3507.Url = miConfig.Url
+			struct3507.AppId = miConfig.Cainfo
+			struct3507.AppSecret = miConfig.AppSecret
+			struct3507.Enckey = miConfig.EncKey
+			struct3507.SignKey = miConfig.SignKey
+			struct3507.SecretKey = miConfig.SecretKey
 			struct3507.FixmedinsBchno = ""
 			struct3507.InvDataType = "1"
 			service.FJyb3507(struct3507)
 func (c *HisApiController) DeleteXSandBG() {
 	ids := c.getString("ids")
 	id_arr := strings.Split(ids, ",")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
+
 	drugs, _ := service.GetNewDrugWarehouseInfo(id_arr)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 	for _, item := range drugs {
-		if item.is == 1 && item.IsBg == 1 {
+		if item.IsPc == 1 && item.IsBg == 1 {
 			var struct3507 models.Struct3507
 			struct3507.FixmedinsBchno = ""
 			struct3507.InvDataType = "1"
 			struct3507.SecretKey = miConfig.SecretKey
 			struct3507.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
 			struct3507.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+
+			struct3507.Url = miConfig.Url
+			struct3507.AppId = miConfig.Cainfo
+			struct3507.AppSecret = miConfig.AppSecret
+			struct3507.Enckey = miConfig.EncKey
+			struct3507.SignKey = miConfig.SignKey
+			struct3507.SecretKey = miConfig.SecretKey
+			struct3507.FixmedinsBchno = ""
+			struct3507.InvDataType = "1"
+
 			service.FJyb3507(struct3507)
 
 			var struct3507_2 models.Struct3507
 			struct3507_2.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
 			struct3507_2.FixmedinsBchno = ""
 			struct3507_2.InvDataType = "2"
+
+			struct3507_2.Url = miConfig.Url
+			struct3507_2.AppId = miConfig.Cainfo
+			struct3507_2.AppSecret = miConfig.AppSecret
+			struct3507_2.Enckey = miConfig.EncKey
+			struct3507_2.SignKey = miConfig.SignKey
+			struct3507_2.SecretKey = miConfig.SecretKey
+			struct3507_2.FixmedinsBchno = ""
+			struct3507_2.InvDataType = "1"
 			service.FJyb3507(struct3507_2)
 		}
 		if item.IsPc == 1 && item.IsBg == 0 {
 	struct3502.SecretKey = miConfig.SecretKey
 	struct3502.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
 	struct3502.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+
+	struct3502.Url = miConfig.Url
+	struct3502.AppId = miConfig.Cainfo
+	struct3502.AppSecret = miConfig.AppSecret
+	struct3502.Enckey = miConfig.EncKey
+	struct3502.SignKey = miConfig.SignKey
+	struct3502.SecretKey = miConfig.SecretKey
+
 	struct3502.InvChgType = chgType
 	struct3502.FixmedinsBchno = ""
 	struct3502.Cnt = strconv.FormatInt(count, 10)
 	struct3505.ExpyEnd = ""
 	struct3505.RxFlag = "0"
 	struct3505.TrdnFlag = "1"
+
+	struct3505.Url = miConfig.Url
+	struct3505.AppId = miConfig.Cainfo
+	struct3505.AppSecret = miConfig.AppSecret
+	struct3505.Enckey = miConfig.EncKey
+	struct3505.SignKey = miConfig.SignKey
+	struct3505.SecretKey = miConfig.SecretKey
+
 	struct3505.RtalDocno = order.Number
 	strValue := fmt.Sprintf("%.2f", drug.PrescribingNumber)
 	struct3505.SelRetnCnt = strValue
 	struct3506.SecretKey = miConfig.SecretKey
 	struct3506.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
 	struct3506.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+
+	struct3506.Url = miConfig.Url
+	struct3506.AppId = miConfig.Cainfo
+	struct3506.AppSecret = miConfig.AppSecret
+	struct3506.Enckey = miConfig.EncKey
+	struct3506.SignKey = miConfig.SignKey
+	struct3506.SecretKey = miConfig.SecretKey
+
 	result1, result2, result3 := service.FJyb3506(struct3506)
 	fmt.Println(result1)
 	fmt.Println(result2)

models/models_3501.go

 	PurcRetnCnt         string
 	PurcRetnStoinTime   string
 	PurcRetnOpterName   string
+	Url                 string
+	AppId               string
+	AppSecret           string
+	SignKey             string
+	Enckey              string
 }
 type Struct3502 struct {
 	MedListCodg         string
 	RequestUrl          string
 	AccessKey           string
 	Cainfo              string
+	Url                 string
+	AppId               string
+	AppSecret           string
+	SignKey             string
+	Enckey              string
 }
 type Struct3503 struct {
 	MedListCodg         string
 	RequestUrl          string
 	AccessKey           string
 	Cainfo              string
+	Url                 string
+	AppId               string
+	AppSecret           string
+	SignKey             string
+	Enckey              string
 }
 type Struct3504 struct {
 	MedListCodg         string
 	RequestUrl          string
 	AccessKey           string
 	Cainfo              string
+	Url                 string
+	AppId               string
+	AppSecret           string
+	SignKey             string
+	Enckey              string
 }
 type Struct3505 struct {
 	MedListCodg         string
 	AccessKey           string
 	Cainfo              string
 	MdtrtSetlType       string
+	Url                 string
+	AppId               string
+	AppSecret           string
+	SignKey             string
+	Enckey              string
 }
 type Struct3506 struct {
 	MedListCodg         string
 	AccessKey           string
 	Cainfo              string
 	MdtrtSn             string
+	Url                 string
+	AppId               string
+	AppSecret           string
+	SignKey             string
+	Enckey              string
 }
 type Struct3507 struct {
 	FixmedinsBchno string
 	RequestUrl     string
 	AccessKey      string
 	Cainfo         string
+	Url            string
+	AppId          string
+	AppSecret      string
+	SignKey        string
+	Enckey         string
 }
 
 type XtDrugInventory struct {

service/fj_service.go

 
 }
 
-//
-//func GetLastPsnByInsOrg(patient_id int64) (psn models.HisPsn, err error){
-//	err := readDb.Model(&models.HisPsn{}).Where("patient_id = ? AND insuplc_admdvs <> ''",patient_id).Last(&psn).Error
-//	return
-//}
-
 func FJyb3501(struct3501 models.Struct3501) (string, string, string) {
 	timestamp := time.Now().Unix()
+	nonce := GetRandomString(32)
+
 	// 生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, struct3501.OrgName, struct3501.Opter, struct3501.FixmedinsHilistId, struct3501.InsuplcAdmdvs, struct3501.MdtrtareaAdmvs, struct3501.Cainfo)
+	//SetFjInputMessage
+	inputMessage := SetFjInputMessage(nonce, timestamp, struct3501.OrgName, struct3501.Opter, struct3501.FixmedinsHilistId, struct3501.InsuplcAdmdvs, struct3501.MdtrtareaAdmvs, struct3501.Url, struct3501.AppId, struct3501.AppSecret, struct3501.SignKey, struct3501.Enckey)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	druginputData := make(map[string]interface{})
-	druginputData2 := make(map[string]interface{})
+	//druginputData2 := make(map[string]interface{})
 
 	inputMessage["infno"] = "3501"                                  // 交易编码
 	inputData["med_list_codg"] = struct3501.MedListCodg             // 定点医药机构目录编号
 	inputData["manu_date"] = struct3501.ManuDate                    // 人员编号 （来自1101接口返回）
 	inputData["expy_end"] = struct3501.ExpyEnd                      // 人员编号 （来自1101接口返回）
 	inputData["memo"] = ""                                          // 人员编号 （来自1101接口返回）
-	druginputData["drug_trac_codg"] = ""
-	druginputData2["drugtracinfo"] = druginputData
-	inputData["drug_trac_info"] = druginputData2
+	druginputData["drug_trac_codg"] = "123"
+	//druginputData2["drugtracinfo"] = druginputData
+	inputData["drug_trac_info"] = druginputData
 	input["invinfo"] = inputData
 	inputMessage["input"] = input //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 
 	return output, requestLog, err_msg
 }
+
 func FJyb3502(struct3502 models.Struct3502) (string, string, string) {
 	timestamp := time.Now().Unix()
+	nonce := GetRandomString(32)
+	inputMessage := SetFjInputMessage(nonce, timestamp, struct3502.OrgName, struct3502.Opter, struct3502.FixmedinsHilistId, struct3502.InsuplcAdmdvs, struct3502.MdtrtareaAdmvs, struct3502.Url, struct3502.AppId, struct3502.AppSecret, struct3502.SignKey, struct3502.Enckey)
+
+	//inputMessage := SetInputMessag/**/e(nonce, timestamp, struct3502.OrgName, struct3502.Opter, struct3502.FixmedinsHilistId, struct3502.InsuplcAdmdvs, struct3502.MdtrtareaAdmvs)
+
 	// 生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, struct3502.OrgName, struct3502.Opter, struct3502.FixmedinsCode, struct3502.InsuplcAdmdvs, struct3502.MdtrtareaAdmvs, struct3502.Cainfo)
+	//inputMessage := SetJSInputMessage(timestamp, struct3502.OrgName, struct3502.Opter, struct3502.FixmedinsCode, struct3502.InsuplcAdmdvs, struct3502.MdtrtareaAdmvs, struct3502.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	druginputData := make(map[string]interface{})
 	return output, requestLog, err_msg
 
 }
+
 func FJyb3505(struct3505 models.Struct3505) (string, string, string) {
 	timestamp := time.Now().Unix()
+	nonce := GetRandomString(32)
+	//inputMessage := SetInputMessage(nonce, timestamp, struct3505.OrgName, struct3505.Opter, struct3505.FixmedinsHilistId, struct3505.InsuplcAdmdvs, struct3505.MdtrtareaAdmvs)
+
+	inputMessage := SetFjInputMessage(nonce, timestamp, struct3505.OrgName, struct3505.Opter, struct3505.FixmedinsHilistId, struct3505.InsuplcAdmdvs, struct3505.MdtrtareaAdmvs, struct3505.Url, struct3505.AppId, struct3505.AppSecret, struct3505.SignKey, struct3505.Enckey)
+
 	// 生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, struct3505.OrgName, struct3505.Opter, struct3505.FixmedinsHilistId, struct3505.InsuplcAdmdvs, struct3505.MdtrtareaAdmvs, struct3505.Cainfo)
+	//inputMessage := SetJSInputMessage(timestamp, struct3505.OrgName, struct3505.Opter, struct3505.FixmedinsHilistId, struct3505.InsuplcAdmdvs, struct3505.MdtrtareaAdmvs, struct3505.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	druginputData := make(map[string]interface{})
 	return output, requestLog, err_msg
 
 }
+
 func FJyb3506(struct3506 models.Struct3506) (string, string, string) {
 	timestamp := time.Now().Unix()
+	nonce := GetRandomString(32)
+	//inputMessage := SetInputMessage(nonce, timestamp, struct3506.OrgName, struct3506.Opter, struct3506.FixmedinsHilistId, struct3506.InsuplcAdmdvs, struct3506.MdtrtareaAdmvs)
+	inputMessage := SetFjInputMessage(nonce, timestamp, struct3506.OrgName, struct3506.Opter, struct3506.FixmedinsHilistId, struct3506.InsuplcAdmdvs, struct3506.MdtrtareaAdmvs, struct3506.Url, struct3506.AppId, struct3506.AppSecret, struct3506.SignKey, struct3506.Enckey)
+
 	// 生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, struct3506.OrgName, struct3506.Opter, struct3506.FixmedinsCode, struct3506.InsuplcAdmdvs, struct3506.MdtrtareaAdmvs, struct3506.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	druginputData := make(map[string]interface{})
 	return output, requestLog, err_msg
 
 }
+
 func FJyb3507(struct3507 models.Struct3507) (string, string, string) {
 	timestamp := time.Now().Unix()
-	// 生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, struct3507.OrgName, struct3507.Opter, struct3507.FixmedinsCode, struct3507.InsuplcAdmdvs, struct3507.MdtrtareaAdmvs, struct3507.Cainfo)
+	nonce := GetRandomString(32)
+	inputMessage := SetFjInputMessage(nonce, timestamp, struct3507.OrgName, struct3507.Opter, struct3507.FixmedinsCode, struct3507.InsuplcAdmdvs, struct3507.MdtrtareaAdmvs, struct3507.Url, struct3507.AppId, struct3507.AppSecret, struct3507.SignKey, struct3507.Enckey)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3507"                          // 交易编码