更新

controllers/ah/ahyb_controller.go

@@ -304,6 +304,10 @@ 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)
@@ -562,6 +566,7 @@ 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 {
@@ -1021,18 +1026,29 @@ 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 dat map[string]interface{}
-			if err := json.Unmarshal([]byte(result), &dat); err == nil {
-				fmt.Println(dat)
-			} else {
-				fmt.Println(err)
+
+
+			var response Response
+			if err := json.Unmarshal([]byte(result), &response); err != nil {
+				fmt.Println("Error decoding JSON:", err)
+				return
 			}
-			c.ServeSuccessJSON(map[string]interface{}{
-				"status":         "0",
-				"card_info":      pCardInfo,
-				"result":         dat,
-				"type":           "1",
-			})
+			if  response.Code == 200{
+				c.ServeSuccessJSON(map[string]interface{}{
+					"status":         "0",
+					"card_info":      pCardInfo,
+					"result":         response.Body,
+					"type":           "1",
+				})
+			}else{
+
+				c.ServeSuccessJSON(map[string]interface{}{
+					"status":"0",
+					"msg":response.Message,
+				})
+
+			}
+
 		} else {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"status": "-1",

controllers/sg/his_api_controller.go

@@ -25851,6 +25851,7 @@ func (c *HisApiController) GetRegisterInfo() {
 				his.PsnNo = psn_info.PsnNo
 				psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
 				var cert_no string
+
 				if id_card_type == 1 {
 					bas := strings.Split(psn_info.CardInfo, "|")
 					cert_no = bas[2]
@@ -25869,7 +25870,7 @@ func (c *HisApiController) GetRegisterInfo() {
 				his.Insutype = insutype
 				var api string
 				ipt_otp_no = timeFormat
-				api = miConfig.SecretKey + "ahyb/2201?psn_no=" + PsnNo + "&insutype=" + insutype + "&cert_no=" + cert_no + "&ipt_otp_no=" + ipt_otp_no +
+				api = miConfig.SecretKey + "ahyb/2201?verify_number="+cert_no+"&cert_no="+IdCardNo+"&psn_no=" + PsnNo + "&insutype=" + insutype + "&cert_no=" + cert_no + "&ipt_otp_no=" + ipt_otp_no +
 					"&org_name=" + miConfig.OrgName + "&opera=" + roles.UserName + "&doctor_name=" + doctor_info.UserName + "&fixmedins_code=" + miConfig.Code +
 					"&insuplc_admdvs=" + insuplc_admdvs_temp + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&dept_code=" + department.Number + "&dept=" + department.Name + "&doctor_id=" + doctor_info.DoctorNumber + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
 
@@ -25931,7 +25932,7 @@ func (c *HisApiController) GetRegisterInfo() {
 				his.Insutype = insutype
 				var api string
 				ipt_otp_no = timeFormat
-				api = miConfig.SecretKey + "ahyb/2201?psn_no=" + PsnNo + "&insutype=" + insutype + "&cert_no=" + cert_no + "&ipt_otp_no=" + ipt_otp_no +
+				api = miConfig.SecretKey + "ahyb/2201?psn_no=" + PsnNo +"&verify_number="+cert_no+"&cert_no="+IdCardNo+ "&insutype=" + insutype + "&cert_no=" + cert_no + "&ipt_otp_no=" + ipt_otp_no +
 					"&org_name=" + miConfig.OrgName + "&opera=" + roles.UserName + "&doctor_name=" + doctor_info.UserName + "&fixmedins_code=" + miConfig.Code +
 					"&insuplc_admdvs=" + insuplc_admdvs_temp + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&dept_code=" + department.Number + "&dept=" + department.Name + "&doctor_id=" + doctor_info.DoctorNumber + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
 
@@ -29306,6 +29307,10 @@ func (c *HisApiController) GetUploadInfo() {
 					if reg_type == 140104 {
 						med_type = "140104"
 					}
+
+					if reg_type == 140201 {
+						med_type = "140201"
+					}
 					if reg_type == 14 {
 						med_type = "14"
 					}
@@ -29313,6 +29318,13 @@ func (c *HisApiController) GetUploadInfo() {
 					if reg_type == 992102 {
 						med_type = "992102"
 					}
+					if reg_type == 140104 {
+						med_type = "140104"
+					}
+
+					if reg_type == 140201 {
+						med_type = "140201"
+					}
 					if reg_type == 14 {
 						med_type = "14"
 					}
@@ -30681,8 +30693,13 @@ func (c *HisApiController) GetPreUploadInfo() {
 				data["sick_code"] = sickConfig.CountryCode
 				data["sick_name"] = sickConfig.ClassName
 			}
+			if reg_type == 140201 {
+				med_type = "140201"
+				data["sick_code"] = sickConfig.CountryCode
+				data["sick_name"] = sickConfig.ClassName
+			}
 			if reg_type == 14 {
-				med_type = "140104"
+				med_type = "14"
 				data["sick_code"] = sickConfig.CountryCode
 				data["sick_name"] = sickConfig.ClassName
 			}
@@ -30690,18 +30707,23 @@ func (c *HisApiController) GetPreUploadInfo() {
 			if reg_type == 992102 {
 				med_type = "992102"
 				data["sick_code"] = sickConfig.CountryCode
-				data["sick_name"] = sickConfig.CountryCode
+				data["sick_name"] = sickConfig.ClassName
+
 			}
 			if reg_type == 140104 {
 				med_type = "140104"
 				data["sick_code"] = sickConfig.CountryCode
-				data["sick_name"] = sickConfig.CountryCode
+				data["sick_name"] = sickConfig.ClassName
+			}
+			if reg_type == 140201 {
+				med_type = "140201"
+				data["sick_code"] = sickConfig.CountryCode
+				data["sick_name"] = sickConfig.ClassName
 			}
 			if reg_type == 14 {
 				med_type = "14"
 				data["sick_code"] = sickConfig.CountryCode
 				data["sick_name"] = sickConfig.ClassName
-
 			}
 		}
 
@@ -31002,20 +31024,38 @@ func (c *HisApiController) GetPreUploadInfo() {
 
 				data["diag_code"] = sickConfig.CountryCode
 
+			}
+			if reg_type == 140201 {
+
+				data["diag_code"] = sickConfig.CountryCode
+
 			}
 			if reg_type == 14 {
 				data["diag_code"] = sickConfig.CountryCode
 
 			}
 		} else if his.Insutype == "310" {
-			if reg_type == 992102 {
-				data["diag_code"] = "ZDZ940"
+			if miConfig.MdtrtareaAdmvs == "341203"{
+				if reg_type == 992102 {
+					data["diag_code"] = "ZDZ940"
+
+				}
+				if reg_type != 992102 {
+					data["diag_code"] = sickConfig.CountryCode
+
+				}
+
+
+			}else{
+
+
+
+					data["diag_code"] = sickConfig.CountryCode
+
 
-			}
-			if reg_type == 14 {
-				data["diag_code"] = sickConfig.CountryCode
 
 			}
+
 		}
 
 		data["cainfo"] = miConfig.Cainfo
@@ -32475,6 +32515,9 @@ func (c *HisApiController) GetPreUploadInfo() {
 							if reg_type == 140104 {
 								med_type = "140104"
 							}
+							if reg_type == 140201 {
+								med_type = "140201"
+							}
 							if reg_type == 14 {
 								med_type = "140104"
 							}
@@ -32483,9 +32526,14 @@ func (c *HisApiController) GetPreUploadInfo() {
 								med_type = "992102"
 
 							}
+							if reg_type == 140104 {
+								med_type = "140104"
+							}
+							if reg_type == 140201 {
+								med_type = "140201"
+							}
 							if reg_type == 14 {
-								med_type = "14"
-
+								med_type = "140104"
 							}
 						}
 
@@ -32631,17 +32679,24 @@ func (c *HisApiController) GetPreUploadInfo() {
 							if reg_type == 140104 {
 								med_type = "140104"
 							}
+							if reg_type == 140201 {
+								med_type = "140201"
+							}
 							if reg_type == 14 {
-								med_type = "140104"
+								med_type = "14"
 							}
 						} else if his.Insutype == "310" {
 							if reg_type == 992102 {
 								med_type = "992102"
-
+							}
+							if reg_type == 140104 {
+								med_type = "140104"
+							}
+							if reg_type == 140201 {
+								med_type = "140201"
 							}
 							if reg_type == 14 {
 								med_type = "14"
-
 							}
 						}
 
@@ -33175,6 +33230,10 @@ func (c *HisApiController) GetPreUploadInfo() {
 						if res.Output.Setlinfo.MedType == "140104" {
 							order.MedType = "140104"
 
+						}
+						if res.Output.Setlinfo.MedType == "140201" {
+							order.MedType = "140201"
+
 						}
 						if res.Output.Setlinfo.MedType == "14" {
 							order.MedType = "14"

service/ahyb_service.go

@@ -1239,7 +1239,7 @@ func AHyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 
 	if id_card_type == 1 {
 		inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
-		inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
+		inputData["mdtrt_cert_no"] = certNo  // 就诊凭证编号
 	} else if id_card_type == 3 {
 		inputData["mdtrt_cert_type"] = "04"        // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号