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

controllers/ah/ahyb_controller.go

@@ -64,8 +64,431 @@ func AHybRegistRouters() {
 	beego.Router("/ahyb/2406", &AHybController{}, "post:Get2406")
 	beego.Router("/ahyb/readcardcharge", &AHybController{}, "get:Readcardcharge")
 
+
+
+
+	beego.Router("/ahyb/2406", &AHybController{}, "post:Get2406")
+	beego.Router("/ahyb/2406", &AHybController{}, "post:Get2406")
+
+
+}
+func (c *JSybController) Get3501() {
+	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.Jsyb3501(struct3501)
+	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 *JSybController) Get3502() {
+	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_3502s"])
+	var struct3502s models.Struct3502
+	if err := json.Unmarshal(userJSONBytes, &struct3502s); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.Jsyb3502(struct3502s)
+	saveJsLog(result, request_log, "3502", "库存变更", struct3502s.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 *JSybController) Get3503() {
+	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_3503s"])
+	var struct3503 models.Struct3503
+	if err := json.Unmarshal(userJSONBytes, &struct3503); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+	fmt.Println(struct3503)
+
+	result, request_log := service.Jsyb3503(struct3503)
+	saveJsLog(result, request_log, "3503", "库存采购", struct3503.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 *JSybController) Get3504() {
+	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_3504s"])
+	var struct3504 []models.Struct3504
+	if err := json.Unmarshal(userJSONBytes, &struct3504); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.Jsyb3504(struct3504[0])
+	saveJsLog(result, request_log, "3504", "库存盘点", struct3504[0].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 *JSybController) Get3505() {
+	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_3505s"])
+	var struct3505 models.Struct3505
+	if err := json.Unmarshal(userJSONBytes, &struct3505); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.Jsyb3505(struct3505)
+	saveJsLog(result, request_log, "3505", "销售", struct3505.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 *JSybController) Get3506() {
+	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_3506s"])
+	var struct3506 models.Struct3506
+	if err := json.Unmarshal(userJSONBytes, &struct3506); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.Jsyb3506(struct3506)
+	saveJsLog(result, request_log, "3506", "销售退库", struct3506.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 *JSybController) Get3507() {
+	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_3507s"])
+	var struct3507 models.Struct3507
+	if err := json.Unmarshal(userJSONBytes, &struct3507); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.Jsyb3507(struct3507)
+	saveJsLog(result, request_log, "3507", "库存盘点", struct3507.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 *JSybController) Get3508() {
+	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_3508s"])
+	var struct3508 models.Struct3508
+	if err := json.Unmarshal(userJSONBytes, &struct3508); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.Jsyb3508(struct3508)
+	saveJsLog(result, request_log, "3508", "库存查询", struct3508.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 *JSybController) Get3509() {
+	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_3509s"])
+	var struct3509 models.Struct3509
+	if err := json.Unmarshal(userJSONBytes, &struct3509); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.Jsyb3509(struct3509)
+	saveJsLog(result, request_log, "3509", "库存查询", struct3509.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 *JSybController) Get3510() {
+	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_3510s"])
+	var struct3510 models.Struct3510
+	if err := json.Unmarshal(userJSONBytes, &struct3510); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.Jsyb3510(struct3510)
+	saveJsLog(result, request_log, "3510", "库存盘点", struct3510.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 *JSybController) Get3511() {
+	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_3511s"])
+	var struct3511 models.Struct3511
+	if err := json.Unmarshal(userJSONBytes, &struct3511); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.Jsyb3511(struct3511)
+	saveJsLog(result, request_log, "3511", "库存查询", struct3511.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 *JSybController) Get3512() {
+	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_3512s"])
+	var struct3512 models.Struct3512
+	if err := json.Unmarshal(userJSONBytes, &struct3512); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	result, request_log := service.Jsyb3512(struct3512)
+	saveJsLog(result, request_log, "3512", "3512查询", struct3512.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 *JSybController) Get3513() {
+	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_3513s"])
+	var struct3513 models.Struct3513
+	if err := json.Unmarshal(userJSONBytes, &struct3513); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
 
+	result, request_log := service.Jsyb3513(struct3513)
+	saveJsLog(result, request_log, "3513", "库存盘点", struct3513.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 *AHybController) Readcardcharge() {
 	fixmedins_code := c.GetString("fixmedins_code")
 	secret_key := c.GetString("secret_key")

controllers/js/jsyb_controller.go

@@ -1078,7 +1078,6 @@ func (c *JSybController) Get3507() {
 	})
 
 }
-
 func (c *JSybController) Get3508() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}

controllers/sg/his_api_controller.go

@@ -34,6 +34,8 @@ import (
 	"syscall"
 	"time"
 	"unsafe"
+	"github.com/go-ole/go-ole"
+
 )
 
 type HisApiController struct {
@@ -228,11 +230,11 @@ func (c *HisApiController) Get3201() {
 }
 
 func (c *HisApiController) TestNet() {
-	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	return
-	//c.ServeSuccessJSON(map[string]interface{}{
-	//	"msg": "成功",
-	//})
+	//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//return
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "成功",
+	})
 }
 
 func (c *HisApiController) Get3508() {
@@ -5460,6 +5462,11 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 		struct3505.PharName = "资美红"
 		struct3505.PharPracCertNo = "D440904006635"
 	}
+
+	if org_id == 10480 {
+		struct3505.PharName = "陈思"
+		struct3505.PharPracCertNo = "30220240434110010470"
+	}
 	order := service.GetHisOrderByNumber(pre.BatchNumber)
 	struct3505.SetlId = order.SetlId
 	struct3505.MdtrtSn = order.MdtrtId
@@ -5527,6 +5534,9 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 	} 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 == "341203" {
+		result1, result2 := service.AHyb3505(struct3505, struct3505.SecretKey, struct3505.RequestUrl)
+		return result1, result2
 	} else if miConfig.MdtrtareaAdmvs == "340699" {
 		result1, result2 := service.AHyb3505(struct3505, struct3505.SecretKey, struct3505.RequestUrl)
 		return result1, result2
@@ -26952,6 +26962,19 @@ func (c *HisApiController) GetRegisterInfo() {
 
 								fmt.Println(record_time_two)
 
+
+								if his.IdCardType == 2 {
+									IdCardNo = psn_info.Certno
+									psn_info.VerifyNumber = psn_info.Certno
+								} else if his.IdCardType == 4 {
+									IdCardNo = psn_info.Certno
+								}else{
+									bas := strings.Split(psn_info.CardInfo, "|")
+									IdCardNo = bas[2]
+
+								}
+
+
 								result, requestLog = service.Gdyb2201A(psn_info.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_info.DoctorNumber, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, record_time_two, psn_info.VerifyNumber, admin_user_id)
 								saveLog(result, requestLog, "2201A", "挂号")
 								if miConfig.Code == "H15049901371" {
@@ -26996,6 +27019,49 @@ func (c *HisApiController) GetRegisterInfo() {
 						json.Unmarshal([]byte(psn_info.Insuinfo), &rf)
 						//var insutypes []*ResultFive
 						var insutype string
+
+
+
+						var insutypes []*ResultFive
+
+						var is390 int = 0
+						var is310 int = 0
+
+						for _, item := range rf {
+							if (item.Insutype == "390" && item.PsnInsuStas == "1") || (item.Insutype == "310" && item.PsnInsuStas == "1") {
+								insutypes = append(insutypes, item)
+							}
+						}
+
+						if len(insutypes) == 1 {
+							insutype = insutypes[0].Insutype
+							//insuplc_admdvs = insutypes[0].InsuplcAdmdvs
+						} else {
+							for _, i := range insutypes {
+								if i.Insutype == "390" {
+									is390 = 1
+								}
+
+								if i.Insutype == "310" {
+									is310 = 1
+								}
+							}
+						}
+						if is390 == 1 {
+							insutype = "390"
+						}
+
+						if is310 == 1 {
+							insutype = "310"
+						}
+
+						if len(insutypes) == 0 {
+							insutype = "310"
+						}
+
+
+
+
 						if social_type > 0 {
 							insutype = strconv.FormatInt(social_type, 10)
 						}
@@ -33113,8 +33179,9 @@ func (c *HisApiController) GetPreUploadInfo() {
 						var result string
 						var request_log string
 						if his.IdCardType == 2 {
+							insutype = strconv.FormatInt(his.SocialType, 10)
 
-							result, request_log = service.Jxyb2206(his.PsnNo, his.Number, chrg_bchno, his.IdCardNo, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, miConfig.Url, miConfig.AccessKey, his.IdCardNo, "")
+							result, request_log = service.Jxyb2206(his.PsnNo, his.Number, chrg_bchno, his.IdCardNo,insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, miConfig.Url, miConfig.AccessKey, his.IdCardNo, "")
 
 						} else if his.IdCardType == 1 {
 							psn_info, _ := service.GetPsnByPatientId(his.PatientId)
@@ -33130,6 +33197,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 									psn_type = item.PsnType
 								}
 							}
+							insutype = strconv.FormatInt(his.SocialType, 10)
 
 							result, request_log = service.Jxyb2206Two(his.PsnNo, his.Number, chrg_bchno, psn_info.VerifyNumber, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, miConfig.Url, miConfig.AccessKey, basNumber, "", card_sn, his.PsnCertType, his.Certno, psn_type, his.PsnName)
 
@@ -33147,6 +33215,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 									psn_type = item.PsnType
 								}
 							}
+							insutype = strconv.FormatInt(his.SocialType, 10)
 
 							//psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 							result, request_log = service.Jxyb2206Two(his.PsnNo, his.Number, chrg_bchno, psn_info.VerifyNumber, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, miConfig.Url, miConfig.AccessKey, psn_info.VerifyNumber, "", "", his.PsnCertType, his.Certno, psn_type, his.PsnName)
@@ -33171,6 +33240,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 						var result string
 						var request_log string
 						if his.IdCardType == 2 {
+							insutype = strconv.FormatInt(his.SocialType, 10)
 
 							result, request_log = service.Jxyb2206(his.PsnNo, his.Number, chrg_bchno, his.IdCardNo, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, miConfig.Url, miConfig.AccessKey, his.IdCardNo, "")
 
@@ -33188,6 +33258,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 									psn_type = item.PsnType
 								}
 							}
+							insutype = strconv.FormatInt(his.SocialType, 10)
 
 							result, request_log = service.Jxyb2206Two(his.PsnNo, his.Number, chrg_bchno, psn_info.VerifyNumber, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, miConfig.Url, miConfig.AccessKey, basNumber, "", card_sn, his.PsnCertType, his.Certno, psn_type, his.PsnName)
 
@@ -33796,6 +33867,14 @@ func (c *HisApiController) GetPreUploadInfo() {
 										if his.IdCardType == 4 {
 											result, request_log = service.Gdyb2206(his.PsnNo, his.Number, chrg_bchno, psn_info.VerifyNumber, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, admin_user_id)
 										} else {
+											if his.IdCardType == 2 {
+												cert_no = psn_info.Certno
+												psn_info.VerifyNumber = psn_info.Certno
+											} else {
+												bas := strings.Split(psn_info.CardInfo, "|")
+												cert_no = bas[2]
+
+											}
 											result, request_log = service.Gdyb2206(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, 0, 0, 0, 0, his.IdType, admin_user_id)
 
 										}
@@ -33819,6 +33898,15 @@ func (c *HisApiController) GetPreUploadInfo() {
 								if his.IdCardType == 4 {
 									result, request_log = service.Gdyb2206(his.PsnNo, his.Number, chrg_bchno, psn_info.VerifyNumber, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, admin_user_id)
 								} else {
+
+									if his.IdCardType == 2 {
+										cert_no = psn_info.Certno
+										psn_info.VerifyNumber = psn_info.Certno
+									} else {
+										bas := strings.Split(psn_info.CardInfo, "|")
+										cert_no = bas[2]
+
+									}
 									result, request_log = service.Gdyb2206(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, 0, 0, 0, 0, his.IdType, admin_user_id)
 
 								}

service/gdyb_service.go

@@ -7068,7 +7068,7 @@ func Gdyb3505(struct3505 models.Struct3505, secret_key string) (string, string)
 	inputData["MDTRT_SETL_TYPE"] = struct3505.MdtrtSetlType // 人员编号 （来自1101接口返回）
 
 	inputData["bchno"] = struct3505.Bchno                          // 人员编号 （来自1101接口返回）
-	inputData["drug_trac_codg"] = struct3505.DrugTracCodg          // 人员编号 （来自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接口返回）