777

controllers/ah/ahyb_controller.go

@@ -64,15 +64,25 @@ func AHybRegistRouters() {
 	beego.Router("/ahyb/2406", &AHybController{}, "post:Get2406")
 	beego.Router("/ahyb/readcardcharge", &AHybController{}, "get:Readcardcharge")
 
-
-
+	beego.Router("/ahyb/3501", &AHybController{}, "post:Get3501")
+	beego.Router("/ahyb/3502", &AHybController{}, "post:Get3502")
+	beego.Router("/ahyb/3503", &AHybController{}, "post:Get3503")
+	beego.Router("/ahyb/3504", &AHybController{}, "post:Get3504")
+	beego.Router("/ahyb/3505", &AHybController{}, "post:Get3505")
+	beego.Router("/ahyb/3506", &AHybController{}, "post:Get3506")
+	beego.Router("/ahyb/3507", &AHybController{}, "post:Get3507")
+	beego.Router("/ahyb/3508", &AHybController{}, "post:Get3508")
+	beego.Router("/ahyb/3509", &AHybController{}, "post:Get3509")
+	beego.Router("/ahyb/3510", &AHybController{}, "post:Get3510")
+	beego.Router("/ahyb/3511", &AHybController{}, "post:Get3511")
+	beego.Router("/ahyb/3512", &AHybController{}, "post:Get3512")
+	beego.Router("/ahyb/3513", &AHybController{}, "post:Get3513")
 
 	beego.Router("/ahyb/2406", &AHybController{}, "post:Get2406")
 	beego.Router("/ahyb/2406", &AHybController{}, "post:Get2406")
 
-
 }
-func (c *JSybController) Get3501() {
+func (c *AHybController) Get3501() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
 	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
@@ -104,7 +114,7 @@ func (c *JSybController) Get3501() {
 	})
 
 }
-func (c *JSybController) Get3502() {
+func (c *AHybController) Get3502() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
 	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
@@ -136,7 +146,7 @@ func (c *JSybController) Get3502() {
 	})
 
 }
-func (c *JSybController) Get3503() {
+func (c *AHybController) Get3503() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
 	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
@@ -169,7 +179,7 @@ func (c *JSybController) Get3503() {
 	})
 
 }
-func (c *JSybController) Get3504() {
+func (c *AHybController) Get3504() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
 	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
@@ -201,7 +211,7 @@ func (c *JSybController) Get3504() {
 	})
 
 }
-func (c *JSybController) Get3505() {
+func (c *AHybController) Get3505() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
 	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
@@ -215,25 +225,36 @@ func (c *JSybController) Get3505() {
 		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 {
+	result, inputLog := service.AHyb3505(struct3505, struct3505.SecretKey, struct3505.RequestUrl)
+	saveJsLog(result, inputLog, "3505", "销售上传", struct3505.OrgName)
+	var response Response
+	if err := json.Unmarshal([]byte(result), &response); err != nil {
+		fmt.Println("Error decoding JSON:", err)
+		return
 	}
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+
+	if response.Code == 200 {
+		var dat2 map[string]interface{}
+		if err := json.Unmarshal([]byte(inputLog), &dat2); err == nil {
+		} else {
+
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"pre":    response.Body,
+			"log":    dat2,
+			"status": "1",
+			"msg":    "",
+		})
+
 	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"status": "0",
+			"msg":    response.Message,
+		})
 
 	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"pre":         dat,
-		"request_log": dat2,
-	})
-
 }
-func (c *JSybController) Get3506() {
+func (c *AHybController) Get3506() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
 	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
@@ -265,7 +286,7 @@ func (c *JSybController) Get3506() {
 	})
 
 }
-func (c *JSybController) Get3507() {
+func (c *AHybController) Get3507() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
 	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
@@ -297,7 +318,7 @@ func (c *JSybController) Get3507() {
 	})
 
 }
-func (c *JSybController) Get3508() {
+func (c *AHybController) Get3508() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
 	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
@@ -329,7 +350,7 @@ func (c *JSybController) Get3508() {
 	})
 
 }
-func (c *JSybController) Get3509() {
+func (c *AHybController) Get3509() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
 	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
@@ -361,7 +382,7 @@ func (c *JSybController) Get3509() {
 	})
 
 }
-func (c *JSybController) Get3510() {
+func (c *AHybController) Get3510() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
 	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
@@ -393,7 +414,7 @@ func (c *JSybController) Get3510() {
 	})
 
 }
-func (c *JSybController) Get3511() {
+func (c *AHybController) Get3511() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
 	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
@@ -425,7 +446,7 @@ func (c *JSybController) Get3511() {
 	})
 
 }
-func (c *JSybController) Get3512() {
+func (c *AHybController) Get3512() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
 	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
@@ -457,7 +478,7 @@ func (c *JSybController) Get3512() {
 	})
 
 }
-func (c *JSybController) Get3513() {
+func (c *AHybController) Get3513() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
 	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {

controllers/sg/his_api_controller.go

@@ -34,8 +34,6 @@ import (
 	"syscall"
 	"time"
 	"unsafe"
-	"github.com/go-ole/go-ole"
-
 )
 
 type HisApiController struct {
@@ -4847,6 +4845,8 @@ func (c *HisApiController) ChangeDrugTen() {
 						res.WarnMsg = res3507for10188.WarnMsg
 						infocode, _ := strconv.ParseInt(res3507for10188.Infcode, 10, 64)
 						res.Infcode = infocode
+					} else if c.GetAdminUserInfo().CurrentOrgId == 10480 {
+
 					} else {
 
 						if err := json.Unmarshal(userJSONBytes3, &res); err != nil {
@@ -5534,9 +5534,6 @@ 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
@@ -5564,6 +5561,35 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 		result, _ := json.Marshal(respJSON)
 		return string(result), ""
 
+	} else if miConfig.MdtrtareaAdmvs == "341203" {
+		data := make(map[string]interface{})
+		data["struct_3505s"] = struct3505
+		client := &http.Client{}
+		bytesData, _ := json.Marshal(data)
+		var req *http.Request
+
+		req, _ = http.NewRequest("POST", miConfig.SecretKey+"ahyb/3505", bytes.NewReader(bytesData))
+
+		resp, _ := client.Do(req)
+		defer resp.Body.Close()
+		body, ioErr := ioutil.ReadAll(resp.Body)
+		if ioErr != nil {
+			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+		}
+		var respJSON map[string]interface{}
+		if err := json.Unmarshal([]byte(body), &respJSON); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		}
+		status := respJSON["data"].(map[string]interface{})["status"].(string)
+		if status == "0" {
+			err_msg := respJSON["data"].(map[string]interface{})["msg"].(string)
+			utils.ErrorLog("接口返回数据读取失败: %v", err_msg)
+		}
+
+		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+		result, _ := json.Marshal(respJSON)
+		return string(result), ""
+
 	} else {
 		data := make(map[string]interface{})
 		data["struct_3505s"] = struct3505
@@ -26962,19 +26988,17 @@ 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{
+								} 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" {
@@ -27020,8 +27044,6 @@ func (c *HisApiController) GetRegisterInfo() {
 						//var insutypes []*ResultFive
 						var insutype string
 
-
-
 						var insutypes []*ResultFive
 
 						var is390 int = 0
@@ -27059,9 +27081,6 @@ func (c *HisApiController) GetRegisterInfo() {
 							insutype = "310"
 						}
 
-
-
-
 						if social_type > 0 {
 							insutype = strconv.FormatInt(social_type, 10)
 						}
@@ -33181,7 +33200,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 						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)