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

controllers/ah/ahyb_controller.go

@@ -29,19 +29,19 @@ type AHybController struct {
 }
 
 type Body struct {
-	ErrMsg   string  `json:"err_msg"`
-	InfRefMsgID string `json:"inf_refmsgid"`
-	InfCode  int     `json:"infcode"`
+	ErrMsg      string                 `json:"err_msg"`
+	InfRefMsgID string                 `json:"inf_refmsgid"`
+	InfCode     int                    `json:"infcode"`
 	Output      map[string]interface{} `json:"output"`
 }
 
 type Response struct {
-	Body     Body `json:"body"`
-	Code     int  `json:"code"`
-	CSBCode  int  `json:"csbCode"`
-	Message  string `json:"message"`
-	RequestID string `json:"requestId"`
-	State    struct{} `json:"state"`
+	Body      Body     `json:"body"`
+	Code      int      `json:"code"`
+	CSBCode   int      `json:"csbCode"`
+	Message   string   `json:"message"`
+	RequestID string   `json:"requestId"`
+	State     struct{} `json:"state"`
 }
 
 func AHybRegistRouters() {
@@ -64,7 +64,6 @@ func AHybRegistRouters() {
 	beego.Router("/ahyb/2406", &AHybController{}, "post:Get2406")
 	beego.Router("/ahyb/readcardcharge", &AHybController{}, "get:Readcardcharge")
 
-
 }
 
 func (c *AHybController) Readcardcharge() {
@@ -79,59 +78,54 @@ func (c *AHybController) Readcardcharge() {
 	cainfo := c.GetString("cainfo")
 	operator_id := c.GetString("operator_id")
 	operator := c.GetString("operator")
-		_, pBusiCardInfo := c.GetELeCertInfoThree(fixmedins_code, operator_id, operator)
-		fmt.Println(pBusiCardInfo)
-		pBusiCardInfo = Remove0000(pBusiCardInfo)
-		var ele ELeCertData
-		err := json.Unmarshal([]byte(pBusiCardInfo), &ele)
-		if err != nil {
-			utils.ErrorLog("解析失败：%v", err)
+	_, pBusiCardInfo := c.GetELeCertInfoThree(fixmedins_code, operator_id, operator)
+	fmt.Println(pBusiCardInfo)
+	pBusiCardInfo = Remove0000(pBusiCardInfo)
+	var ele ELeCertData
+	err := json.Unmarshal([]byte(pBusiCardInfo), &ele)
+	if err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+	}
+	token := ele.Data.EcToken
+	fmt.Println(token)
+	if len(token) > 0 {
+		userName := ele.Data.UserName
+		fmt.Println(userName)
+		userName = Remove0000(userName)
+		userName = DeleteExtraSpace(userName)
+		fmt.Println(userName)
+		enc := mahonia.NewEncoder("gbk")
+		fmt.Println(enc.ConvertString(userName))
+		result, _ := service.AHyb1101ForEleCert(org_name, doctor, fixmedins_code, ele.Data.InsuOrg, mdtrtarea_admvs, secret_key, url, ak, token, cainfo, ele.Data.IDNo, userName)
+
+		var response Response
+		if err := json.Unmarshal([]byte(result), &response); err != nil {
+			fmt.Println("Error decoding JSON:", err)
+			return
 		}
-		token := ele.Data.EcToken
-		fmt.Println(token)
-		if len(token) > 0 {
-			userName := ele.Data.UserName
-			fmt.Println(userName)
-			userName = Remove0000(userName)
-			userName = DeleteExtraSpace(userName)
-			fmt.Println(userName)
-			enc := mahonia.NewEncoder("gbk")
-			fmt.Println(enc.ConvertString(userName))
-			result, _ := service.AHyb1101ForEleCert(org_name, doctor, fixmedins_code, ele.Data.InsuOrg, mdtrtarea_admvs, secret_key, url, ak, token, cainfo, ele.Data.IDNo, userName)
-
-
-			var response Response
-			if err := json.Unmarshal([]byte(result), &response); err != nil {
-				fmt.Println("Error decoding JSON:", err)
-				return
-			}
-
-			if  response.Code == 200{
-				c.ServeSuccessJSON(map[string]interface{}{
-					"status":"1",
-					"card_info":      "",
-					"busi_card_info": pBusiCardInfo,
-					"token":          token,
-					"result":         response.Body,
-				})
-			}else{
-				c.ServeSuccessJSON(map[string]interface{}{
-					"status":"0",
-					"msg":response.Message,
-				})
-			}
-
 
+		if response.Code == 200 {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status":         "1",
+				"card_info":      "",
+				"busi_card_info": pBusiCardInfo,
+				"token":          token,
+				"result":         response.Body,
+			})
 		} else {
 			c.ServeSuccessJSON(map[string]interface{}{
-				"status": "-1",
+				"status": "0",
+				"msg":    response.Message,
 			})
-
 		}
-}
-
 
+	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"status": "-1",
+		})
 
+	}
+}
 
 func (c *AHybController) Get9001() {
 	url := c.GetString("url")
@@ -143,7 +137,7 @@ func (c *AHybController) Get9001() {
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
 	secret_key := c.GetString("secret_key")
 	cainfo := c.GetString("cainfo")
-	result, inputLog := service.AHyb9001(org_name, opera_name,fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, opera_id,url,cainfo,"")
+	result, inputLog := service.AHyb9001(org_name, opera_name, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, opera_id, url, cainfo, "")
 	fmt.Println(result)
 	fmt.Println(inputLog)
 	saveJsLog(result, inputLog, "9001", "签到", org_name)
@@ -153,29 +147,27 @@ func (c *AHybController) Get9001() {
 		fmt.Println("Error decoding JSON:", err)
 		return
 	}
-	if  response.Code == 200{
+	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":"",
+			"pre":    response.Body,
+			"log":    dat2,
+			"status": "1",
+			"msg":    "",
 		})
-	}else{
+	} else {
 		c.ServeSuccessJSON(map[string]interface{}{
-			"status":"0",
-			"msg":response.Message,
+			"status": "0",
+			"msg":    response.Message,
 		})
 	}
 
-
 }
 
-
 func (c *AHybController) Get5301() {
 	psn_no := c.GetString("psn_no")
 	org_name := c.GetString("org_name")
@@ -198,8 +190,7 @@ func (c *AHybController) Get5301() {
 		return
 	}
 
-
-	if  response.Code == 200{
+	if response.Code == 200 {
 
 		var dat2 map[string]interface{}
 		if err := json.Unmarshal([]byte(inputLog), &dat2); err == nil {
@@ -207,18 +198,17 @@ func (c *AHybController) Get5301() {
 
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"pre": response.Body,
-			"log": dat2,
-			"status":"1",
-			"msg":"",
+			"pre":    response.Body,
+			"log":    dat2,
+			"status": "1",
+			"msg":    "",
 		})
 
-
-	}else{
+	} else {
 
 		c.ServeSuccessJSON(map[string]interface{}{
-			"status":"0",
-			"msg":response.Message,
+			"status": "0",
+			"msg":    response.Message,
 		})
 
 	}
@@ -238,8 +228,7 @@ func (c *AHybController) PostOne() {
 	token := c.GetString("token")
 	name := c.GetString("name")
 
-
-	result, inputLog := service.AHyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, id_card_type, card_sn, certificates, url, name,token)
+	result, inputLog := service.AHyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, id_card_type, card_sn, certificates, url, name, token)
 	fmt.Println(result)
 	fmt.Println(inputLog)
 	saveJsLog(result, inputLog, "1101", "查询个人信息", org_name)
@@ -250,8 +239,7 @@ func (c *AHybController) PostOne() {
 		return
 	}
 
-
-	if  response.Code == 200{
+	if response.Code == 200 {
 
 		var dat2 map[string]interface{}
 		if err := json.Unmarshal([]byte(inputLog), &dat2); err == nil {
@@ -259,25 +247,23 @@ func (c *AHybController) PostOne() {
 
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"pre": response.Body,
-			"log": dat2,
-			"status":"1",
-			"msg":"",
+			"pre":    response.Body,
+			"log":    dat2,
+			"status": "1",
+			"msg":    "",
 		})
 
-
-	}else{
+	} else {
 
 		c.ServeSuccessJSON(map[string]interface{}{
-			"status":"0",
-			"msg":response.Message,
+			"status": "0",
+			"msg":    response.Message,
 		})
 
 	}
 
 }
 
-
 func (c *AHybController) PostTwo() {
 	psnNo := c.GetString("psn_no")
 	insutype := c.GetString("insutype")
@@ -304,21 +290,15 @@ func (c *AHybController) PostTwo() {
 	doctor_name := c.GetString("doctor_name")
 	cainfo := c.GetString("cainfo")
 	card_sn := c.GetString("card_sn")
-	fmt.Println("Error decoding JSON:", verify_number)
-	fmt.Println("Error decoding JSON:", certNo)
-
-
 
-
-	result, inputLog := service.AHyb2201(psnNo, insutype, certNo, org_name, opera, ipt_otp_no, dept, fixmedins_code, dept_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, doctor_name, url, ak, verify_number, cainfo,card_sn)
+	result, inputLog := service.AHyb2201(psnNo, insutype, certNo, org_name, opera, ipt_otp_no, dept, fixmedins_code, dept_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, doctor_name, url, ak, verify_number, cainfo, card_sn)
 	var response Response
 	if err := json.Unmarshal([]byte(result), &response); err != nil {
 		fmt.Println("Error decoding JSON:", err)
 		return
 	}
 
-
-	if  response.Code == 200{
+	if response.Code == 200 {
 
 		var dat2 map[string]interface{}
 		if err := json.Unmarshal([]byte(inputLog), &dat2); err == nil {
@@ -326,18 +306,17 @@ func (c *AHybController) PostTwo() {
 
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"pre": response.Body,
-			"log": dat2,
-			"status":"1",
-			"msg":"",
+			"pre":    response.Body,
+			"log":    dat2,
+			"status": "1",
+			"msg":    "",
 		})
 
-
-	}else{
+	} else {
 
 		c.ServeSuccessJSON(map[string]interface{}{
-			"status":"0",
-			"msg":response.Message,
+			"status": "0",
+			"msg":    response.Message,
 		})
 
 	}
@@ -365,8 +344,7 @@ func (c *AHybController) PostThree() {
 		return
 	}
 
-
-	if  response.Code == 200{
+	if response.Code == 200 {
 
 		var dat2 map[string]interface{}
 		if err := json.Unmarshal([]byte(inputLog), &dat2); err == nil {
@@ -374,18 +352,17 @@ func (c *AHybController) PostThree() {
 
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"pre": response.Body,
-			"log": dat2,
-			"status":"1",
-			"msg":"",
+			"pre":    response.Body,
+			"log":    dat2,
+			"status": "1",
+			"msg":    "",
 		})
 
-
-	}else{
+	} else {
 
 		c.ServeSuccessJSON(map[string]interface{}{
-			"status":"0",
-			"msg":response.Message,
+			"status": "0",
+			"msg":    response.Message,
 		})
 
 	}
@@ -428,11 +405,9 @@ func (c *AHybController) PostFour() {
 	doctor_name := respJSON["doctor_name"].(string)
 	doctor_number := respJSON["doctor_number"].(string)
 
-
-
 	//cainfo := c.GetString("cainfo")
 
-	result, inputLog := service.AHyb2203(psnNo, mdtrtId, operator, department, org_name, med_type, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, sick_code, sick_name, config, url, begin_time, cainfo,doctor_name, doctor_number)
+	result, inputLog := service.AHyb2203(psnNo, mdtrtId, operator, department, org_name, med_type, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, sick_code, sick_name, config, url, begin_time, cainfo, doctor_name, doctor_number)
 	saveJsLog(result, inputLog, "2203", "上传就诊信息", org_name)
 
 	var response Response
@@ -441,8 +416,7 @@ func (c *AHybController) PostFour() {
 		return
 	}
 
-
-	if  response.Code == 200{
+	if response.Code == 200 {
 
 		var dat2 map[string]interface{}
 		if err := json.Unmarshal([]byte(inputLog), &dat2); err == nil {
@@ -450,25 +424,23 @@ func (c *AHybController) PostFour() {
 
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"pre": response.Body,
-			"log": dat2,
-			"status":"1",
-			"msg":"",
+			"pre":    response.Body,
+			"log":    dat2,
+			"status": "1",
+			"msg":    "",
 		})
 
-
-	}else{
+	} else {
 
 		c.ServeSuccessJSON(map[string]interface{}{
-			"status":"0",
-			"msg":response.Message,
+			"status": "0",
+			"msg":    response.Message,
 		})
 
 	}
 
 }
 
-
 func (c *AHybController) Get2406() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
@@ -490,7 +462,7 @@ func (c *AHybController) Get2406() {
 	mdtrtarea_admvs := respJSON["mdtrtarea_admvs"].(string)
 	url := respJSON["url"].(string)
 
-	result, inputLog := service.AHyb2406(psnNo, mdtrtId, cert_no, psn_name, operator, ipt_otp_no,ipt_psn_sp_flag_type, ipt_psn_sp_flag,org_name,fixmedins_code, insuplc_admdvs, mdtrtarea_admvs,url)
+	result, inputLog := service.AHyb2406(psnNo, mdtrtId, cert_no, psn_name, operator, ipt_otp_no, ipt_psn_sp_flag_type, ipt_psn_sp_flag, org_name, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url)
 	saveJsLog(result, inputLog, "2406", "上传2406信息", org_name)
 	var response Response
 	if err := json.Unmarshal([]byte(result), &response); err != nil {
@@ -498,8 +470,7 @@ func (c *AHybController) Get2406() {
 		return
 	}
 
-
-	if  response.Code == 200{
+	if response.Code == 200 {
 
 		var dat2 map[string]interface{}
 		if err := json.Unmarshal([]byte(inputLog), &dat2); err == nil {
@@ -507,25 +478,23 @@ func (c *AHybController) Get2406() {
 
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"pre": response.Body,
-			"log": dat2,
-			"status":"1",
-			"msg":"",
+			"pre":    response.Body,
+			"log":    dat2,
+			"status": "1",
+			"msg":    "",
 		})
 
-
-	}else{
+	} else {
 
 		c.ServeSuccessJSON(map[string]interface{}{
-			"status":"0",
-			"msg":response.Message,
+			"status": "0",
+			"msg":    response.Message,
 		})
 
 	}
 
 }
 
-
 type All struct {
 	HisPrescription HisPrescription
 	mdtrt_id        string
@@ -566,7 +535,6 @@ func (c *AHybController) PostFive() {
 	result, inputLog := service.AHyb2204(respJSON["psn_no"].(string), respJSON["mdtrt_id"].(string), hp, respJSON["chrg_bchno"].(string), respJSON["org_name"].(string),
 		respJSON["doctor"].(string), respJSON["dept"].(string), respJSON["fixmedins_code"].(string), respJSON["dept_code"].(string), respJSON["doctor_id"].(string), respJSON["insuplc_admdvs"].(string), respJSON["mdtrtarea_admvs"].(string), respJSON["secret_key"].(string), respJSON["balance_accounts_type"].(string), respJSON["diag_code"].(string), respJSON["url"].(string), respJSON["ak"].(string), respJSON["new_doctor_name"].(string), "", respJSON["cainfo"].(string), respJSON["opter"].(string))
 
-
 	saveJsLog(result, inputLog, "2204", "上传明细", respJSON["org_name"].(string))
 	var response Response
 	if err := json.Unmarshal([]byte(result), &response); err != nil {
@@ -574,8 +542,7 @@ func (c *AHybController) PostFive() {
 		return
 	}
 
-
-	if  response.Code == 200{
+	if response.Code == 200 {
 
 		var dat2 map[string]interface{}
 		if err := json.Unmarshal([]byte(inputLog), &dat2); err == nil {
@@ -583,18 +550,17 @@ func (c *AHybController) PostFive() {
 
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"pre": response.Body,
-			"log": dat2,
-			"status":"1",
-			"msg":"",
+			"pre":    response.Body,
+			"log":    dat2,
+			"status": "1",
+			"msg":    "",
 		})
 
-
-	}else{
+	} else {
 
 		c.ServeSuccessJSON(map[string]interface{}{
-			"status":"0",
-			"msg":response.Message,
+			"status": "0",
+			"msg":    response.Message,
 		})
 
 	}
@@ -624,8 +590,7 @@ func (c *AHybController) PostSix() {
 		return
 	}
 
-
-	if  response.Code == 200{
+	if response.Code == 200 {
 
 		var dat2 map[string]interface{}
 		if err := json.Unmarshal([]byte(inputLog), &dat2); err == nil {
@@ -633,18 +598,17 @@ func (c *AHybController) PostSix() {
 
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"pre": response.Body,
-			"log": dat2,
-			"status":"1",
-			"msg":"",
+			"pre":    response.Body,
+			"log":    dat2,
+			"status": "1",
+			"msg":    "",
 		})
 
-
-	}else{
+	} else {
 
 		c.ServeSuccessJSON(map[string]interface{}{
-			"status":"0",
-			"msg":response.Message,
+			"status": "0",
+			"msg":    response.Message,
 		})
 
 	}
@@ -684,8 +648,7 @@ func (c *AHybController) PostSeven() {
 		return
 	}
 
-
-	if  response.Code == 200{
+	if response.Code == 200 {
 
 		var dat2 map[string]interface{}
 		if err := json.Unmarshal([]byte(inputLog), &dat2); err == nil {
@@ -693,18 +656,17 @@ func (c *AHybController) PostSeven() {
 
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"pre": response.Body,
-			"log": dat2,
-			"status":"1",
-			"msg":"",
+			"pre":    response.Body,
+			"log":    dat2,
+			"status": "1",
+			"msg":    "",
 		})
 
-
-	}else{
+	} else {
 
 		c.ServeSuccessJSON(map[string]interface{}{
-			"status":"0",
-			"msg":response.Message,
+			"status": "0",
+			"msg":    response.Message,
 		})
 
 	}
@@ -736,7 +698,6 @@ func (c *AHybController) PostEight() {
 	var result string
 	var inputLog string
 
-
 	result, inputLog = service.AHyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, acct_used_flag, url, ak, verify_number, cainfo, mdtrt_grp_type)
 
 	saveJsLog(result, inputLog, "2207", "结算", org_name)
@@ -746,8 +707,7 @@ func (c *AHybController) PostEight() {
 		return
 	}
 
-
-	if  response.Code == 200{
+	if response.Code == 200 {
 
 		var dat2 map[string]interface{}
 		if err := json.Unmarshal([]byte(inputLog), &dat2); err == nil {
@@ -755,18 +715,17 @@ func (c *AHybController) PostEight() {
 
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"pre": response.Body,
-			"log": dat2,
-			"status":"1",
-			"msg":"",
+			"pre":    response.Body,
+			"log":    dat2,
+			"status": "1",
+			"msg":    "",
 		})
 
-
-	}else{
+	} else {
 
 		c.ServeSuccessJSON(map[string]interface{}{
-			"status":"0",
-			"msg":response.Message,
+			"status": "0",
+			"msg":    response.Message,
 		})
 
 	}
@@ -793,25 +752,24 @@ func (c *AHybController) PostNine() {
 		return
 	}
 
-
-	if  response.Code == 200{
+	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":"",
+			"pre":    response.Body,
+			"log":    dat2,
+			"status": "1",
+			"msg":    "",
 		})
 
-	}else{
+	} else {
 
 		c.ServeSuccessJSON(map[string]interface{}{
-			"status":"0",
-			"msg":response.Message,
+			"status": "0",
+			"msg":    response.Message,
 		})
 
 	}
@@ -856,8 +814,7 @@ func (c *AHybController) PostTen() {
 		return
 	}
 
-
-	if  response.Code == 200{
+	if response.Code == 200 {
 
 		var dat2 map[string]interface{}
 		if err := json.Unmarshal([]byte(inputLog), &dat2); err == nil {
@@ -865,18 +822,17 @@ func (c *AHybController) PostTen() {
 
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"pre": response.Body,
-			"log": dat2,
-			"status":"1",
-			"msg":"",
+			"pre":    response.Body,
+			"log":    dat2,
+			"status": "1",
+			"msg":    "",
 		})
 
-
-	}else{
+	} else {
 
 		c.ServeSuccessJSON(map[string]interface{}{
-			"status":"0",
-			"msg":response.Message,
+			"status": "0",
+			"msg":    response.Message,
 		})
 
 	}
@@ -932,8 +888,7 @@ func (c *AHybController) Get3201() {
 		return
 	}
 
-
-	if  response.Code == 200{
+	if response.Code == 200 {
 
 		var dat2 map[string]interface{}
 		if err := json.Unmarshal([]byte(inputLog), &dat2); err == nil {
@@ -941,18 +896,17 @@ func (c *AHybController) Get3201() {
 
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"pre": response.Body,
-			"log": dat2,
-			"status":"1",
-			"msg":"",
+			"pre":    response.Body,
+			"log":    dat2,
+			"status": "1",
+			"msg":    "",
 		})
 
-
-	}else{
+	} else {
 
 		c.ServeSuccessJSON(map[string]interface{}{
-			"status":"0",
-			"msg":response.Message,
+			"status": "0",
+			"msg":    response.Message,
 		})
 
 	}
@@ -991,8 +945,6 @@ type ELeCertData struct {
 	Message string `json:"message"`
 }
 
-
-
 func (c *AHybController) ReadCard() {
 	fixmedins_code := c.GetString("fixmedins_code")
 	secret_key := c.GetString("secret_key")
@@ -1027,24 +979,23 @@ func (c *AHybController) ReadCard() {
 		if len(pCardInfo) > 0 {
 			result, _ := service.AHyb1101A(basNumber, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type_int, card_sn, "1", url, ak, id_card_no, cainfo)
 
-
 			var response Response
 			if err := json.Unmarshal([]byte(result), &response); err != nil {
 				fmt.Println("Error decoding JSON:", err)
 				return
 			}
-			if  response.Code == 200{
+			if response.Code == 200 {
+
 				c.ServeSuccessJSON(map[string]interface{}{
-					"status":         "0",
-					"card_info":      pCardInfo,
-					"result":         response.Body,
-					"type":           "1",
+					"status":    "0",
+					"card_info": pCardInfo,
+					"result":    response.Body,
+					"type":      "1",
 				})
-			}else{
-
+			} else {
 				c.ServeSuccessJSON(map[string]interface{}{
-					"status":"0",
-					"msg":response.Message,
+					"status": "0",
+					"msg":    response.Message,
 				})
 
 			}
@@ -1114,34 +1065,31 @@ func (c *AHybController) ReadCard() {
 			fmt.Println(enc.ConvertString(userName))
 			result, _ := service.AHyb1101ForEleCert(org_name, doctor, fixmedins_code, ele.Data.InsuOrg, mdtrtarea_admvs, secret_key, url, ak, token, cainfo, ele.Data.IDNo, userName)
 
-
 			var response Response
 			if err := json.Unmarshal([]byte(result), &response); err != nil {
 				fmt.Println("Error decoding JSON:", err)
 				return
 			}
 
-
-			if  response.Code == 200{
+			if response.Code == 200 {
 
 				c.ServeSuccessJSON(map[string]interface{}{
-					"status":"1",
+					"status":         "1",
 					"card_info":      "",
 					"busi_card_info": pBusiCardInfo,
 					"token":          token,
 					"result":         response.Body,
 				})
 
-			}else{
+			} else {
 
 				c.ServeSuccessJSON(map[string]interface{}{
-					"status":"0",
-					"msg":response.Message,
+					"status": "0",
+					"msg":    response.Message,
 				})
 
 			}
 
-
 		} else {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"status": "-1",
@@ -1195,7 +1143,7 @@ func (c *AHybController) TestGetBasBaseInit(code string, secret_key string, ak s
 	//initFlag = 1
 	return
 }
-func (c *AHybController) GetBasBaseInfo() (string) {
+func (c *AHybController) GetBasBaseInfo() string {
 	DllDef := syscall.MustLoadDLL("SSCardDriver.dll")
 	readCard := DllDef.MustFindProc("iReadCardBas")
 	fmt.Println(readCard)
@@ -1436,10 +1384,6 @@ func (c *AHybController) GetELeCertInfoThree(code string, operator_id string, op
 	return "", string(receivedMessage)
 }
 
-
-
-
-
 func IntPtr(n int) uintptr {
 	return uintptr(n)
 }
@@ -1586,8 +1530,7 @@ func (c *AHybController) Get3101() {
 		return
 	}
 
-
-	if  response.Code == 200{
+	if response.Code == 200 {
 
 		var dat2 map[string]interface{}
 		if err := json.Unmarshal([]byte(inputLog), &dat2); err == nil {
@@ -1595,18 +1538,17 @@ func (c *AHybController) Get3101() {
 
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"pre": response.Body,
-			"log": dat2,
-			"status":1,
-			"msg":"",
+			"pre":    response.Body,
+			"log":    dat2,
+			"status": 1,
+			"msg":    "",
 		})
 
-
-	}else{
+	} else {
 
 		c.ServeSuccessJSON(map[string]interface{}{
-			"status":0,
-			"msg":response.Message,
+			"status": 0,
+			"msg":    response.Message,
 		})
 
 	}
@@ -1665,19 +1607,18 @@ func (c *AHybController) Get3102() {
 		return
 	}
 
-	if  response.Code == 200{
+	if response.Code == 200 {
 		c.ServeSuccessJSON(map[string]interface{}{
-			"pre": response.Body,
-			"status":1,
-			"msg":"",
+			"pre":    response.Body,
+			"status": 1,
+			"msg":    "",
 		})
 
-
-	}else{
+	} else {
 
 		c.ServeSuccessJSON(map[string]interface{}{
-			"status":0,
-			"msg":response.Message,
+			"status": 0,
+			"msg":    response.Message,
 		})
 
 	}
@@ -1711,8 +1652,7 @@ func (c *AHybController) Get4101() {
 		return
 	}
 
-
-	if  response.Code == 200{
+	if response.Code == 200 {
 
 		var dat2 map[string]interface{}
 		if err := json.Unmarshal([]byte(inputLog), &dat2); err == nil {
@@ -1720,18 +1660,17 @@ func (c *AHybController) Get4101() {
 
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"pre": response.Body,
-			"log": dat2,
-			"status":1,
-			"msg":"",
+			"pre":    response.Body,
+			"log":    dat2,
+			"status": 1,
+			"msg":    "",
 		})
 
-
-	}else{
+	} else {
 
 		c.ServeSuccessJSON(map[string]interface{}{
-			"status":0,
-			"msg":response.Message,
+			"status": 0,
+			"msg":    response.Message,
 		})
 
 	}

controllers/sg/his_api_controller.go

@@ -9,8 +9,6 @@ import (
 	//"github.com/tjfoc/gmsm/sm3"
 	"math"
 
-
-
 	"strings"
 	//"crypto/x509/pkix"
 	"encoding/json"
@@ -41,8 +39,6 @@ import (
 	"syscall"
 	"time"
 	"unsafe"
-	"github.com/go-ole/go-ole"
-
 )
 
 type HisApiController struct {
@@ -217,12 +213,12 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/3201", &HisApiController{}, "get:Get3201")
 
 }
-func (c *HisApiController)Get3201(){
+func (c *HisApiController) Get3201() {
 	adminUser := c.GetAdminUserInfo()
 
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 
-	result, _ := service.AHyb3201(932, 0, 571536.19, 543283.9, "2024-10-01", "2024-10-31", "340699", "11", "390", miConfig.OrgName, "王幸子",  miConfig.Code,"360399", "360399",  miConfig.Url,  miConfig.AccessKey,  miConfig.SecretKey, miConfig.Cainfo)
+	result, _ := service.AHyb3201(932, 0, 571536.19, 543283.9, "2024-10-01", "2024-10-31", "340699", "11", "390", miConfig.OrgName, "王幸子", miConfig.Code, "340399", "340399", miConfig.Url, miConfig.AccessKey, miConfig.SecretKey, miConfig.Cainfo)
 
 	var response Response
 	if err := json.Unmarshal([]byte(result), &response); err != nil {
@@ -230,12 +226,8 @@ func (c *HisApiController)Get3201(){
 		return
 	}
 
-
-
 }
 
-
-
 func (c *HisApiController) TestNet() {
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg": "成功",
@@ -3199,6 +3191,7 @@ func (c *HisApiController) ChangeDrugfour() {
 		})
 	}
 }
+
 //func (c *HisApiController) ChangeDrugfour() {
 //	patient_id, _ := c.GetInt64("patient_id")
 //	admin_user_id, _ := c.GetInt64("admin_user_id")
@@ -4653,7 +4646,7 @@ func (c *HisApiController) ChangeDrugTen() {
 	recordEndTime := theEndTime.Unix()
 
 	//timestamp := int64(1729612800)
-	flows, _ := service.GetNewDrugFlowInforTenone(recordStartTime,recordEndTime,c.GetAdminUserInfo().CurrentOrgId)
+	flows, _ := service.GetNewDrugFlowInforTenone(recordStartTime, recordEndTime, c.GetAdminUserInfo().CurrentOrgId)
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
@@ -4673,35 +4666,35 @@ func (c *HisApiController) ChangeDrugTen() {
 				//已经结算
 				//判断 是否已经销售
 				//if item.IsSale == 1 { //是否已经销售，1是   0否
-					////是否已经变更 1是  0否
-					//if item.IsChange == 0 { //没变更，进行变更操作
-					//	bg_number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3502"
-					//
-					//	result, result2 := ChangeStock(item.Count, item, miConfig, "102", roles, bg_number)
-					//	saveLog(result, result2, "3502", "自动出库，已经销售，未变更3502")
-					//	var respJSON3 map[string]interface{}
-					//	if err := json.Unmarshal([]byte(string(result)), &respJSON3); err != nil {
-					//		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-					//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					//		return
-					//	}
-					//	userJSONBytes3, _ := json.Marshal(respJSON3)
-					//	if err := json.Unmarshal(userJSONBytes3, &res3); err != nil {
-					//		utils.ErrorLog("解析失败：%v", err)
-					//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					//		return
-					//	}
-					//	if res3.Infcode == 0 {
-					//		item.IsChange = 1
-					//		item.BgBchno = bg_number
-					//		service.SaveDF2(item)
-					//	} else {
-					//		err = append(err, item.HisDoctorAdviceInfo.AdviceName+",销售变更失败："+res3.ErrMsg)
-					//	}
-					//}
+				////是否已经变更 1是  0否
+				//if item.IsChange == 0 { //没变更，进行变更操作
+				//	bg_number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3502"
+				//
+				//	result, result2 := ChangeStock(item.Count, item, miConfig, "102", roles, bg_number)
+				//	saveLog(result, result2, "3502", "自动出库，已经销售，未变更3502")
+				//	var respJSON3 map[string]interface{}
+				//	if err := json.Unmarshal([]byte(string(result)), &respJSON3); err != nil {
+				//		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				//		return
+				//	}
+				//	userJSONBytes3, _ := json.Marshal(respJSON3)
+				//	if err := json.Unmarshal(userJSONBytes3, &res3); err != nil {
+				//		utils.ErrorLog("解析失败：%v", err)
+				//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				//		return
+				//	}
+				//	if res3.Infcode == 0 {
+				//		item.IsChange = 1
+				//		item.BgBchno = bg_number
+				//		service.SaveDF2(item)
+				//	} else {
+				//		err = append(err, item.HisDoctorAdviceInfo.AdviceName+",销售变更失败："+res3.ErrMsg)
+				//	}
+				//}
 
 				//} else
-				if item.IsSale == 0{ //没销售，
+				if item.IsSale == 0 { //没销售，
 					var res FJ3507Result
 					var res3507for10188 FJ3507ResultFor10188
 					number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3505"
@@ -5037,15 +5030,14 @@ func (c *HisApiController) ChangeDrugTen() {
 	}
 }
 
-
-func  ChangeDrugTenone() {
+func ChangeDrugTenone() {
 
 	//ids := c.GetString("ids")
 	//id_arr := strings.Split(ids, ",")
 	now := time.Now()
 	timestamp := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).Unix()
 	//timestamp := int64(1729612800)
-	flows, _ := service.GetNewDrugFlowInforTen(timestamp,10188)
+	flows, _ := service.GetNewDrugFlowInforTen(timestamp, 10188)
 
 	admin_user_id := int64(2463)
 	roles, _ := service.GetAdminUserInfoByID(10188, admin_user_id)
@@ -5107,7 +5099,7 @@ func  ChangeDrugTenone() {
 						return
 					}
 					userJSONBytes3, _ := json.Marshal(respJSON3)
-					 {
+					{
 						if err := json.Unmarshal(userJSONBytes3, &res3507for10188); err != nil {
 							utils.ErrorLog("解析失败：%v", err)
 							return
@@ -5142,7 +5134,7 @@ func  ChangeDrugTenone() {
 									return
 								}
 
-							  {
+								{
 									if err := json.Unmarshal(userJSONBytes3, &res3507for10188); err != nil {
 										utils.ErrorLog("解析失败：%v", err)
 										return
@@ -5179,7 +5171,6 @@ func  ChangeDrugTenone() {
 
 }
 
-
 func ChangeStock(count int64, drug *models.DrugFlow, miConfig models.MedicalInsuranceOrgConfig, chgType string, role models.UserAdminRole, number string) (string, string) {
 	var struct3502 models.Struct3502
 	struct3502.MedListCodg = drug.HisDoctorAdviceInfo.BaseDrugLib.MedicalInsuranceNumber
@@ -5438,14 +5429,11 @@ func SaleStock10217(org_id int64, pre models.HisPrescription, drug *models.DrugF
 		struct3505.PharPracCertNo = "2015026440262015440501001198"
 	}
 
-
-
 	if org_id == 9919 {
 		struct3505.PharName = "周君权"
 		struct3505.PharPracCertNo = "089644396094401375"
 	}
 
-
 	if org_id == 10644 {
 		struct3505.PharName = "陈金娣"
 		struct3505.PharPracCertNo = "20181441500320100066"
@@ -5511,11 +5499,11 @@ func SaleStock10217(org_id int64, pre models.HisPrescription, drug *models.DrugF
 	} else if strings.HasPrefix(miConfig.MdtrtareaAdmvs[0:3], "440") {
 		result1, result2 := service.Gdyb3505(struct3505, struct3505.SecretKey)
 		return result1, result2
-	}else if strings.HasPrefix(miConfig.MdtrtareaAdmvs[0:3], "361") {
-		result1, result2 := service.JXyb3505(struct3505, struct3505.SecretKey,struct3505.AccessKey,struct3505.RequestUrl)
+	} 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 == "340699" {
-		result1, result2 := service.AHyb3505(struct3505, struct3505.SecretKey,struct3505.RequestUrl)
+	} else if miConfig.MdtrtareaAdmvs == "340699" {
+		result1, result2 := service.AHyb3505(struct3505, struct3505.SecretKey, struct3505.RequestUrl)
 		return result1, result2
 	} else {
 		data := make(map[string]interface{})
@@ -14532,7 +14520,6 @@ func (c *HisApiController) ReadCard() {
 
 		} else if miConfig.MdtrtareaAdmvs == "361025" {
 
-
 			basStr := c.GetBasBaseInfo1111()
 			fmt.Println(basStr)
 
@@ -15293,13 +15280,13 @@ func (c *HisApiController) ReadCard() {
 
 					respJSON = respJSON["data"].(map[string]interface{})["result"].(map[string]interface{})
 					result, _ := json.Marshal(respJSON)
-
+					fmt.Println(result)
 					if err := json.Unmarshal([]byte(result), &res); err != nil {
 						utils.ErrorLog("解析失败：%v", err)
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 						return
 					}
-
+					fmt.Println(res)
 				} else {
 					token = respJSON["data"].(map[string]interface{})["token"].(string)
 					respJSON = respJSON["data"].(map[string]interface{})["result"].(map[string]interface{})
@@ -15337,14 +15324,14 @@ func (c *HisApiController) ReadCard() {
 								PatientId: patient.ID,
 								Certno:    res.Output.Baseinfo.Certno,
 
-								Gend:         res.Output.Baseinfo.Gend,
-								Naty:         res.Output.Baseinfo.Naty,
-								PsnCertType:  res.Output.Baseinfo.PsnCertType,
-								PsnName:      res.Output.Baseinfo.PsnName,
-								Idetinfo:     idetinfoStr,
-								Insuinfo:     infoStr,
-								UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
-								CardInfo:     card_info,
+								Gend:        res.Output.Baseinfo.Gend,
+								Naty:        res.Output.Baseinfo.Naty,
+								PsnCertType: res.Output.Baseinfo.PsnCertType,
+								PsnName:     res.Output.Baseinfo.PsnName,
+								Idetinfo:    idetinfoStr,
+								Insuinfo:    infoStr,
+								UserOrgId:   c.GetAdminUserInfo().CurrentOrgId,
+								CardInfo:    card_info,
 								//VerifyNumber: busi_card_info,
 							}
 							service.CreateHisPsn(psn)
@@ -15430,7 +15417,7 @@ func (c *HisApiController) ReadCard() {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
 				return
 			}
-		}  else {
+		} else {
 			if initFlag == 0 {
 				c.TestGetBasBaseInit()
 			}
@@ -18759,8 +18746,6 @@ func (c *HisApiController) GetBasBaseInfo() string {
 	str1 := make([]byte, 1024)
 	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), uintptr(1024), (uintptr)(unsafe.Pointer(&str1[0])), uintptr(1024))
 
-
-
 	fmt.Println(string(str1))
 	fmt.Println(string(str))
 	fmt.Println(":", ConvertToString(string(str1), "gbk", "utf-8"))
@@ -18769,14 +18754,9 @@ func (c *HisApiController) GetBasBaseInfo() string {
 		return ""
 	}
 
-
-
-
-
 	return string(str)
 }
 
-
 type Program struct {
 	FunctionID string `xml:"function_id"`
 	CardInfo   string `xml:"cardinfo"`
@@ -18798,11 +18778,9 @@ func (c *HisApiController) GetBasBaseInfo1111() string {
 		readCard2 = DllDef.MustFindProc("ReadCardInfo")
 	}
 
-
 	str := make([]byte, 1024)
 	str1 := make([]byte, 1024)
-	 readCard.Call((uintptr)(unsafe.Pointer(&str[0])), (uintptr)(unsafe.Pointer(&str1[0])))
-
+	readCard.Call((uintptr)(unsafe.Pointer(&str[0])), (uintptr)(unsafe.Pointer(&str1[0])))
 
 	str3 := make([]byte, 1024)
 	str4 := make([]byte, 1024)
@@ -18853,21 +18831,14 @@ func (c *HisApiController) GetBasBaseInfo1111() string {
 	//fmt.Printf("  <user>%s</user>\n", lastProgram.User)
 	//fmt.Printf("</program>\n")
 
-
-
 	fmt.Println(":", ConvertToString(string(str1), "gbk", "utf-8"))
 	fmt.Println(":", ConvertToString(string(str), "gbk", "utf-8"))
 	fmt.Println(":", ConvertToString(string(str3), "gbk", "utf-8"))
 	fmt.Println(":", ConvertToString(string(str4), "gbk", "utf-8"))
 
-
-
 	return ConvertToString(string(str), "gbk", "utf-8")
 }
 
-
-
-
 func (c *HisApiController) GetahBasBaseInfo() string {
 	DllDef := syscall.MustLoadDLL("SSCardDriver.dll")
 	readCard := DllDef.MustFindProc("iReadCardBas")
@@ -18880,8 +18851,6 @@ func (c *HisApiController) GetahBasBaseInfo() string {
 	str1 := make([]byte, 1024)
 	ret2, _, _ := readCard.Call(uintptr(3), (uintptr)(unsafe.Pointer(&str1[0])))
 
-
-
 	//file, err := os.Open("C:\\Users\\Administrator\\Desktop\\11\\Power-Card\\SSCardDriver\\api.log")
 	//if err != nil {
 	//	fmt.Println("Error opening file:", err)
@@ -18927,7 +18896,6 @@ func (c *HisApiController) GetahBasBaseInfo() string {
 	//fmt.Printf("  <user>%s</user>\n", lastProgram.User)
 	//fmt.Printf("</program>\n")
 
-
 	fmt.Println(string(str1))
 	fmt.Println(":", ConvertToString(string(str1), "gbk", "utf-8"))
 
@@ -18935,12 +18903,9 @@ func (c *HisApiController) GetahBasBaseInfo() string {
 		return ""
 	}
 
-
 	return string(str1)
 }
 
-
-
 func (c *HisApiController) GetFjBasBaseInfo() (string, string, string, string, string) {
 	DllDef := syscall.MustLoadDLL("chs_fjs_standard.dll")
 	readCard := DllDef.MustFindProc("read_cardinfo")
@@ -25194,7 +25159,7 @@ func (c *HisApiController) GetRegisterInfo() {
 
 			}
 
-		} else if miConfig.MdtrtareaAdmvs == "341203" ||  miConfig.MdtrtareaAdmvs == "340699" {
+		} else if miConfig.MdtrtareaAdmvs == "341203" || miConfig.MdtrtareaAdmvs == "340699" {
 			psn_info, _ := service.GetPsnByPatientId(id)
 			PsnNo = psn_info.PsnNo
 			PsnCertType = psn_info.PsnCertType
@@ -25977,7 +25942,7 @@ func (c *HisApiController) GetRegisterInfo() {
 				if id_card_type == 1 {
 					bas := strings.Split(psn_info.CardInfo, "|")
 					basNumber := bas[2]
-					card_sn :=""
+					card_sn := ""
 
 					result, requestLog = service.Jxyb2201(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, miConfig.Url, miConfig.AccessKey, basNumber, "", card_sn, "01", IdCardNo, "15", psn_info.PsnName)
 					saveLog(result, requestLog, "2201A", "挂号")