更新

controllers/nm/nm_controller.go

@@ -78,281 +78,275 @@ func NmybRegistRouters() {
 	beego.Router("/nmyb/3512", &NmController{}, "get:Post3512")
 	beego.Router("/nmyb/3513", &NmController{}, "get:Post3513")
 
-	beego.Router("/nmyb/001", &NmController{}, "get:Post001")
-	beego.Router("/nmyb/002", &NmController{}, "get:Post002")
-	beego.Router("/nmyb/003", &NmController{}, "get:Post003")
-	beego.Router("/nmyb/004", &NmController{}, "get:Post004")
-	beego.Router("/nmyb/005", &NmController{}, "get:Post005")
-	beego.Router("/nmyb/006", &NmController{}, "get:Post006")
-	beego.Router("/nmyb/007", &NmController{}, "get:Post007")
-	beego.Router("/nmyb/008", &NmController{}, "get:Post008")
-
-}
-func (c *NmController) Post001() {
-	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
-	var respJSON map[string]interface{}
-	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-		return
-	}
-
-	userJSONBytes, _ := json.Marshal(respJSON["struct_001"])
-	var struct3501 models.CFYLJG001
-	if err := json.Unmarshal(userJSONBytes, &struct3501); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		return
-	}
-
-	result, request_log := service.GetAHCFYLJG001("")
-	saveJsLog(result, request_log, "3501", "库存盘点", struct3501.OrgName)
-	var dat2 map[string]interface{}
-	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
-	} else {
-	}
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-	} else {
-
-	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"pre":         dat,
-		"request_log": dat2,
-	})
-
-}
-func (c *NmController) Post002() {
-
-	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
-	var respJSON map[string]interface{}
-	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-		return
-	}
-
-	userJSONBytes, _ := json.Marshal(respJSON["struct_3501s"])
-	var struct3501 models.Struct3501
-	if err := json.Unmarshal(userJSONBytes, &struct3501); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		return
-	}
-
-	result, request_log := service.NMyb3501(struct3501, struct3501.SecretKey)
-	saveJsLog(result, request_log, "3501", "库存盘点", struct3501.OrgName)
-	var dat2 map[string]interface{}
-	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
-	} else {
-	}
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-	} else {
-
-	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"pre":         dat,
-		"request_log": dat2,
-	})
-
-}
-
-func (c *NmController) Post003() {
-	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
-	var respJSON map[string]interface{}
-	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-		return
-	}
-
-	userJSONBytes, _ := json.Marshal(respJSON["struct_3501s"])
-	var struct3501 models.Struct3501
-	if err := json.Unmarshal(userJSONBytes, &struct3501); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		return
-	}
-
-	result, request_log := service.NMyb3501(struct3501, struct3501.SecretKey)
-	saveJsLog(result, request_log, "3501", "库存盘点", struct3501.OrgName)
-	var dat2 map[string]interface{}
-	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
-	} else {
-	}
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-	} else {
-
-	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"pre":         dat,
-		"request_log": dat2,
-	})
-
-}
-
-func (c *NmController) Post004() {
-	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
-	var respJSON map[string]interface{}
-	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-		return
-	}
-
-	userJSONBytes, _ := json.Marshal(respJSON["struct_3501s"])
-	var struct3501 models.Struct3501
-	if err := json.Unmarshal(userJSONBytes, &struct3501); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		return
-	}
-
-	result, request_log := service.NMyb3501(struct3501, struct3501.SecretKey)
-	saveJsLog(result, request_log, "3501", "库存盘点", struct3501.OrgName)
-	var dat2 map[string]interface{}
-	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
-	} else {
-	}
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-	} else {
-
-	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"pre":         dat,
-		"request_log": dat2,
-	})
-
-}
-
-func (c *NmController) Post005() {
-	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
-	var respJSON map[string]interface{}
-	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-		return
-	}
-
-	userJSONBytes, _ := json.Marshal(respJSON["struct_3501s"])
-	var struct3501 models.Struct3501
-	if err := json.Unmarshal(userJSONBytes, &struct3501); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		return
-	}
-
-	result, request_log := service.NMyb3501(struct3501, struct3501.SecretKey)
-	saveJsLog(result, request_log, "3501", "库存盘点", struct3501.OrgName)
-	var dat2 map[string]interface{}
-	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
-	} else {
-	}
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-	} else {
-
-	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"pre":         dat,
-		"request_log": dat2,
-	})
-
-}
-
-func (c *NmController) Post006() {
-	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
-	var respJSON map[string]interface{}
-	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-		return
-	}
-
-	userJSONBytes, _ := json.Marshal(respJSON["struct_3501s"])
-	var struct3501 models.Struct3501
-	if err := json.Unmarshal(userJSONBytes, &struct3501); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		return
-	}
-
-	result, request_log := service.NMyb3501(struct3501, struct3501.SecretKey)
-	saveJsLog(result, request_log, "3501", "库存盘点", struct3501.OrgName)
-	var dat2 map[string]interface{}
-	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
-	} else {
-	}
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-	} else {
-
-	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"pre":         dat,
-		"request_log": dat2,
-	})
-
-}
-
-func (c *NmController) Post007() {
-
-	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
-	var respJSON map[string]interface{}
-	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-		return
-	}
-
-	userJSONBytes, _ := json.Marshal(respJSON["struct_3501s"])
-	var struct3501 models.Struct3501
-	if err := json.Unmarshal(userJSONBytes, &struct3501); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		return
-	}
-
-	result, request_log := service.NMyb3501(struct3501, struct3501.SecretKey)
-	saveJsLog(result, request_log, "3501", "库存盘点", struct3501.OrgName)
-	var dat2 map[string]interface{}
-	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
-	} else {
-	}
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-	} else {
-
-	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"pre":         dat,
-		"request_log": dat2,
-	})
-
-}
-
-func (c *NmController) Post008() {
-
-	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
-	var respJSON map[string]interface{}
-	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-		return
-	}
-
-	userJSONBytes, _ := json.Marshal(respJSON["struct_3501s"])
-	var struct3501 models.Struct3501
-	if err := json.Unmarshal(userJSONBytes, &struct3501); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		return
-	}
-
-	result, request_log := service.NMyb3501(struct3501, struct3501.SecretKey)
-	saveJsLog(result, request_log, "3501", "库存盘点", struct3501.OrgName)
-	var dat2 map[string]interface{}
-	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
-	} else {
-	}
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-	} else {
-
-	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"pre":         dat,
-		"request_log": dat2,
-	})
-
-}
+	//beego.Router("/nmyb/001", &NmController{}, "get:Post001")
+	//beego.Router("/nmyb/002", &NmController{}, "get:Post002")
+	//beego.Router("/nmyb/003", &NmController{}, "get:Post003")
+	//beego.Router("/nmyb/004", &NmController{}, "get:Post004")
+	//beego.Router("/nmyb/005", &NmController{}, "get:Post005")
+	//beego.Router("/nmyb/006", &NmController{}, "get:Post006")
+	//beego.Router("/nmyb/007", &NmController{}, "get:Post007")
+	//beego.Router("/nmyb/008", &NmController{}, "get:Post008")
+
+}
+//func (c *NmController) Post001() {
+//	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
+//	var respJSON map[string]interface{}
+//	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+//		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+//		return
+//	}
+//
+//	userJSONBytes, _ := json.Marshal(respJSON["struct_001"])
+//	var struct3501 models.CFYLJG001
+//	if err := json.Unmarshal(userJSONBytes, &struct3501); err != nil {
+//		utils.ErrorLog("解析失败：%v", err)
+//		return
+//	}
+//
+//	result, request_log := service.GetAHCFYLJG001("")
+//	saveJsLog(result, request_log, "3501", "库存盘点", struct3501.OrgName)
+//	var dat2 map[string]interface{}
+//	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+//	} else {
+//	}
+//	var dat map[string]interface{}
+//	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//	} else {
+//
+//	}
+//	c.ServeSuccessJSON(map[string]interface{}{
+//		"pre":         dat,
+//		"request_log": dat2,
+//	})
+//
+//}
+//func (c *NmController) Post002() {
+//
+//	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
+//	var respJSON map[string]interface{}
+//	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+//		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+//		return
+//	}
+//
+//	userJSONBytes, _ := json.Marshal(respJSON["struct_3501s"])
+//	var struct3501 models.Struct3501
+//	if err := json.Unmarshal(userJSONBytes, &struct3501); err != nil {
+//		utils.ErrorLog("解析失败：%v", err)
+//		return
+//	}
+//
+//	result, request_log := service.NMyb3501(struct3501, struct3501.SecretKey)
+//	saveJsLog(result, request_log, "3501", "库存盘点", struct3501.OrgName)
+//	var dat2 map[string]interface{}
+//	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+//	} else {
+//	}
+//	var dat map[string]interface{}
+//	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//	} else {
+//
+//	}
+//	c.ServeSuccessJSON(map[string]interface{}{
+//		"pre":         dat,
+//		"request_log": dat2,
+//	})
+//
+//}
+//func (c *NmController) Post003() {
+//	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
+//	var respJSON map[string]interface{}
+//	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+//		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+//		return
+//	}
+//
+//	userJSONBytes, _ := json.Marshal(respJSON["struct_3501s"])
+//	var struct3501 models.Struct3501
+//	if err := json.Unmarshal(userJSONBytes, &struct3501); err != nil {
+//		utils.ErrorLog("解析失败：%v", err)
+//		return
+//	}
+//
+//	result, request_log := service.NMyb3501(struct3501, struct3501.SecretKey)
+//	saveJsLog(result, request_log, "3501", "库存盘点", struct3501.OrgName)
+//	var dat2 map[string]interface{}
+//	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+//	} else {
+//	}
+//	var dat map[string]interface{}
+//	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//	} else {
+//
+//	}
+//	c.ServeSuccessJSON(map[string]interface{}{
+//		"pre":         dat,
+//		"request_log": dat2,
+//	})
+//
+//}
+//func (c *NmController) Post004() {
+//	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
+//	var respJSON map[string]interface{}
+//	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+//		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+//		return
+//	}
+//
+//	userJSONBytes, _ := json.Marshal(respJSON["struct_3501s"])
+//	var struct3501 models.Struct3501
+//	if err := json.Unmarshal(userJSONBytes, &struct3501); err != nil {
+//		utils.ErrorLog("解析失败：%v", err)
+//		return
+//	}
+//
+//	result, request_log := service.NMyb3501(struct3501, struct3501.SecretKey)
+//	saveJsLog(result, request_log, "3501", "库存盘点", struct3501.OrgName)
+//	var dat2 map[string]interface{}
+//	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+//	} else {
+//	}
+//	var dat map[string]interface{}
+//	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//	} else {
+//
+//	}
+//	c.ServeSuccessJSON(map[string]interface{}{
+//		"pre":         dat,
+//		"request_log": dat2,
+//	})
+//
+//}
+//func (c *NmController) Post005() {
+//	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
+//	var respJSON map[string]interface{}
+//	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+//		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+//		return
+//	}
+//
+//	userJSONBytes, _ := json.Marshal(respJSON["struct_3501s"])
+//	var struct3501 models.Struct3501
+//	if err := json.Unmarshal(userJSONBytes, &struct3501); err != nil {
+//		utils.ErrorLog("解析失败：%v", err)
+//		return
+//	}
+//
+//	result, request_log := service.NMyb3501(struct3501, struct3501.SecretKey)
+//	saveJsLog(result, request_log, "3501", "库存盘点", struct3501.OrgName)
+//	var dat2 map[string]interface{}
+//	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+//	} else {
+//	}
+//	var dat map[string]interface{}
+//	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//	} else {
+//
+//	}
+//	c.ServeSuccessJSON(map[string]interface{}{
+//		"pre":         dat,
+//		"request_log": dat2,
+//	})
+//
+//}
+//func (c *NmController) Post006() {
+//	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
+//	var respJSON map[string]interface{}
+//	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+//		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+//		return
+//	}
+//
+//	userJSONBytes, _ := json.Marshal(respJSON["struct_3501s"])
+//	var struct3501 models.Struct3501
+//	if err := json.Unmarshal(userJSONBytes, &struct3501); err != nil {
+//		utils.ErrorLog("解析失败：%v", err)
+//		return
+//	}
+//
+//	result, request_log := service.NMyb3501(struct3501, struct3501.SecretKey)
+//	saveJsLog(result, request_log, "3501", "库存盘点", struct3501.OrgName)
+//	var dat2 map[string]interface{}
+//	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+//	} else {
+//	}
+//	var dat map[string]interface{}
+//	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//	} else {
+//
+//	}
+//	c.ServeSuccessJSON(map[string]interface{}{
+//		"pre":         dat,
+//		"request_log": dat2,
+//	})
+//
+//}
+//func (c *NmController) Post007() {
+//
+//	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
+//	var respJSON map[string]interface{}
+//	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+//		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+//		return
+//	}
+//
+//	userJSONBytes, _ := json.Marshal(respJSON["struct_3501s"])
+//	var struct3501 models.Struct3501
+//	if err := json.Unmarshal(userJSONBytes, &struct3501); err != nil {
+//		utils.ErrorLog("解析失败：%v", err)
+//		return
+//	}
+//
+//	result, request_log := service.NMyb3501(struct3501, struct3501.SecretKey)
+//	saveJsLog(result, request_log, "3501", "库存盘点", struct3501.OrgName)
+//	var dat2 map[string]interface{}
+//	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+//	} else {
+//	}
+//	var dat map[string]interface{}
+//	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//	} else {
+//
+//	}
+//	c.ServeSuccessJSON(map[string]interface{}{
+//		"pre":         dat,
+//		"request_log": dat2,
+//	})
+//
+//}
+//func (c *NmController) Post008() {
+//
+//	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
+//	var respJSON map[string]interface{}
+//	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+//		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+//		return
+//	}
+//
+//	userJSONBytes, _ := json.Marshal(respJSON["struct_3501s"])
+//	var struct3501 models.Struct3501
+//	if err := json.Unmarshal(userJSONBytes, &struct3501); err != nil {
+//		utils.ErrorLog("解析失败：%v", err)
+//		return
+//	}
+//
+//	result, request_log := service.NMyb3501(struct3501, struct3501.SecretKey)
+//	saveJsLog(result, request_log, "3501", "库存盘点", struct3501.OrgName)
+//	var dat2 map[string]interface{}
+//	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+//	} else {
+//	}
+//	var dat map[string]interface{}
+//	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//	} else {
+//
+//	}
+//	c.ServeSuccessJSON(map[string]interface{}{
+//		"pre":         dat,
+//		"request_log": dat2,
+//	})
+//
+//}
 
 func (c *NmController) Post3501() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)

controllers/sg/his_api_controller.go

@@ -34,6 +34,7 @@ import (
 	"syscall"
 	"time"
 	"unsafe"
+	"github.com/go-ole/go-ole"
 )
 
 type HisApiController struct {
@@ -1806,7 +1807,7 @@ func (c *HisApiController) DeletePCandBG() {
 	var err []string
 	for _, item := range drugs {
 		if item.IsPc == 1 {
-			var res FJ3502Result
+			var res FJ3507Result
 
 			var struct3507 models.Struct3507
 			struct3507.FixmedinsBchno = item.Bchno
@@ -28917,6 +28918,11 @@ func (c *HisApiController) GetUploadInfo() {
 	pay_ways := c.GetString("pay_ways")
 	oth_desc := c.GetString("oth_desc")
 
+
+	pack_num, _ := c.GetInt64("pack_num")
+	good_pack_num, _ := c.GetInt64("good_pack_num")
+
+
 	pay_price, _ := c.GetFloat("pay_price")
 	pay_card_no := c.GetString("pay_card_no")
 
@@ -30265,7 +30271,7 @@ func (c *HisApiController) GetUploadInfo() {
 								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&pack_num=" + strconv.FormatInt(pack_num, 10)+ "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 							resp, requestErr := http.Get(api)
 							if requestErr != nil {
@@ -30325,7 +30331,7 @@ func (c *HisApiController) GetUploadInfo() {
 								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag+ "&pack_num=" + strconv.FormatInt(pack_num, 10)+ "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 							resp, requestErr := http.Get(api)
 							if requestErr != nil {
@@ -30385,7 +30391,7 @@ func (c *HisApiController) GetUploadInfo() {
 								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag+ "&pack_num=" + strconv.FormatInt(pack_num, 10)+ "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 							resp, requestErr := http.Get(api)
 							if requestErr != nil {
@@ -30445,7 +30451,7 @@ func (c *HisApiController) GetUploadInfo() {
 								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag+ "&pack_num=" + strconv.FormatInt(pack_num, 10)+ "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 							resp, requestErr := http.Get(api)
 							if requestErr != nil {
@@ -30532,7 +30538,7 @@ func (c *HisApiController) GetUploadInfo() {
 											"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 											"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 											"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-											"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType
+											"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType+ "&pack_num=" + strconv.FormatInt(pack_num, 10)+ "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 									} else if miConfig.MdtrtareaAdmvs == "320921" {
 										api = "http://192.168.2.3:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
 											his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
@@ -30540,7 +30546,7 @@ func (c *HisApiController) GetUploadInfo() {
 											"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 											"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 											"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-											"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType
+											"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType+ "&pack_num=" + strconv.FormatInt(pack_num, 10)+ "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 									} else {
 										api = "http://192.168.5.251:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
 											his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
@@ -30548,7 +30554,7 @@ func (c *HisApiController) GetUploadInfo() {
 											"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 											"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 											"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-											"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType
+											"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType+ "&pack_num=" + strconv.FormatInt(pack_num, 10)+ "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 									}
 
@@ -30611,7 +30617,7 @@ func (c *HisApiController) GetUploadInfo() {
 								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType + "&verify_number=" + verify_number
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType + "&verify_number=" + verify_number + "&pack_num=" + strconv.FormatInt(pack_num, 10)+ "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 							resp, requestErr := http.Get(api)
 							if requestErr != nil {
@@ -30653,12 +30659,12 @@ func (c *HisApiController) GetUploadInfo() {
 							if his.IdCardType == 4 {
 								psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 								cert_no = psn_info.VerifyNumber
-								result2, src_resquest, _ = service.FJyb2207ForToken(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+								result2, src_resquest, _ = service.FJyb2207ForToken(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey,tempOrder.PackNum,tempOrder.GoodPackNum)
 
 							} else if his.IdCardType == 1 {
 								psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 								cert_no = strings.Split(psn_info.CardInfo, "|")[0]
-								result2, src_resquest, _ = service.FJyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+								result2, src_resquest, _ = service.FJyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey,tempOrder.PackNum,tempOrder.GoodPackNum)
 							}
 
 							//result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, acct_used_flag)