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

controllers/sg/his_api_controller.go

@@ -3598,7 +3598,7 @@ func (c *HisApiController) GetUploadInfo() {
 			data["doctor"] = roles.UserName
 			data["department"] = department.Name
 			data["org_name"] = miConfig.OrgName
-			data["med_type"] = med_type
+			data["med_type"] = strconv.FormatInt(reg_type, 10)
 			data["doctor_id"] = strconv.FormatInt(doctor_info.AdminUserId, 10)
 			data["fixmedins_code"] = miConfig.Code
 			data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
@@ -4226,7 +4226,7 @@ func (c *HisApiController) GetUploadInfo() {
 								"&insuplc_admdvs=" + miConfig.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=" + med_type + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber + "&verify_number=" + psn_info.VerifyNumber
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber + "&verify_number=" + psn_info.VerifyNumber
 
 							resp, requestErr := http.Get(api)
 							if requestErr != nil {
@@ -4607,7 +4607,7 @@ func (c *HisApiController) GetUploadInfo() {
 					"&insuplc_admdvs=" + miConfig.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=" + med_type + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber + "&verify_number=" + psn_info.VerifyNumber
+					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber + "&verify_number=" + psn_info.VerifyNumber
 
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
@@ -5463,7 +5463,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 		data["doctor"] = roles.UserName
 		data["department"] = department.Name
 		data["org_name"] = miConfig.OrgName
-		data["med_type"] = med_type
+		data["med_type"] = strconv.FormatInt(reg_type, 10)
 		data["doctor_id"] = strconv.FormatInt(doctor_info.AdminUserId, 10)
 		data["fixmedins_code"] = miConfig.Code
 		data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
@@ -6030,7 +6030,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 							"&insuplc_admdvs=" + miConfig.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=" + med_type + "&verify_number=" + psn_info.VerifyNumber + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
+							"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&verify_number=" + psn_info.VerifyNumber + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
 						resp, requestErr := http.Get(api)
 						if requestErr != nil {
 							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)