更新

controllers/gz/new_his_api_controller.go

@@ -71,10 +71,6 @@ func NewHisManagerApiRegistRouters() {
 	beego.Router("/api/batchsettlelist/get", &HisApiController{}, "get:GetBatchSettleList")
 	beego.Router("/api/psn/info", &HisApiController{}, "get:GetPsnNcdsInfo")
 
-	beego.Router("/api/allopatry/get", &HisApiController{}, "get:GetAllopatry")
-	beego.Router("/api/comfirmallopatry/post", &HisApiController{}, "post:ComfirmAllopatry")
-	beego.Router("/api/allopatry/refund", &HisApiController{}, "post:RefundAllopatry")
-
 	beego.Router("/api/check", &HisApiController{}, "get:Check")
 	beego.Router("/api/check3101", &HisApiController{}, "get:Check3101")
 	beego.Router("/api/check3102", &HisApiController{}, "get:Check3102")
@@ -11829,155 +11825,155 @@ func (c *HisApiController) ReversalData() {
 	}
 }
 
-func (c *HisApiController) GetAllopatry() {
-	year := c.GetString("year")
-	month := c.GetString("month")
-	admin_user_id, _ := c.GetInt64("admin_user_id")
-	adminUser := c.GetAdminUserInfo()
-	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
-	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
-	result, _ := service.Gdyb9001(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 1669)
-
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-		fmt.Println(dat)
-	} else {
-		fmt.Println(err)
-	}
-	userJSONBytes, _ := json.Marshal(dat)
-	var res models.Result9001
-	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
-
-	result2, _ := service.Gdyb3260(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month, "")
-	var dat2 map[string]interface{}
-	if err := json.Unmarshal([]byte(result2), &dat2); err == nil {
-		fmt.Println(dat)
-	} else {
-		fmt.Println(err)
-	}
-	userJSONBytes2, _ := json.Marshal(dat2)
-	var res2 models.Result3260
-	if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
-	if res2.Infcode == 0 {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"list": res2.Output.Data,
-		})
-		return
-	} else {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
-
-}
-
-func (c *HisApiController) ComfirmAllopatry() {
-	year := c.GetString("year")
-	month := c.GetString("month")
-	admin_user_id, _ := c.GetInt64("admin_user_id")
-	adminUser := c.GetAdminUserInfo()
-	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
-	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
-	result, _ := service.Gdyb9001(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 1669)
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-		fmt.Println(dat)
-	} else {
-		fmt.Println(err)
-	}
-	userJSONBytes, _ := json.Marshal(dat)
-	var res models.Result9001
-	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
-
-	result2, _ := service.Gdyb3260(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month, "")
-	var dat2 map[string]interface{}
-	if err := json.Unmarshal([]byte(result2), &dat2); err == nil {
-		fmt.Println(dat)
-	} else {
-		fmt.Println(err)
-	}
-	userJSONBytes2, _ := json.Marshal(dat2)
-	var res2 models.Result3260
-	if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
-
-	if res2.Infcode == 0 {
-		result, _, msgId := service.Gdyb3261(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month, res2)
-		var dat map[string]interface{}
-		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-			fmt.Println(dat)
-		} else {
-			fmt.Println(err)
-		}
-		userJSONBytes, _ := json.Marshal(dat)
-		var res3 models.Result3261
-		if err := json.Unmarshal(userJSONBytes, &res3); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-
-		if res3.Infcode == 0 {
-			record := &models.HisYidiClearRecord{
-				UserOrgId: c.GetAdminUserInfo().CurrentOrgId,
-				Ctime:     time.Now().Unix(),
-				Mtime:     time.Now().Unix(),
-				Status:    1,
-				MsgId:     msgId,
-			}
-			service.SaveClearRecord(record)
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "提取成功",
-			})
-		}
-	}
-}
-
-func (c *HisApiController) RefundAllopatry() {
-	year := c.GetString("year")
-	month := c.GetString("month")
-	id, _ := c.GetInt64("id")
-	admin_user_id, _ := c.GetInt64("admin_user_id")
-	adminUser := c.GetAdminUserInfo()
-	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
-	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
-	record, _ := service.GetClearRecordById(id)
-	result, _ := service.Gdyb3262(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month, record.MsgId)
+//func (c *HisApiController) GetAllopatry() {
+//	year := c.GetString("year")
+//	month := c.GetString("month")
+//	admin_user_id, _ := c.GetInt64("admin_user_id")
+//	adminUser := c.GetAdminUserInfo()
+//	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+//	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+//	result, _ := service.Gdyb9001(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 1669)
+//
+//	var dat map[string]interface{}
+//	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//		fmt.Println(dat)
+//	} else {
+//		fmt.Println(err)
+//	}
+//	userJSONBytes, _ := json.Marshal(dat)
+//	var res models.Result9001
+//	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+//		utils.ErrorLog("解析失败：%v", err)
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//		return
+//	}
+//
+//	result2, _ := service.Gdyb3260(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month, "")
+//	var dat2 map[string]interface{}
+//	if err := json.Unmarshal([]byte(result2), &dat2); err == nil {
+//		fmt.Println(dat)
+//	} else {
+//		fmt.Println(err)
+//	}
+//	userJSONBytes2, _ := json.Marshal(dat2)
+//	var res2 models.Result3260
+//	if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
+//		utils.ErrorLog("解析失败：%v", err)
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//		return
+//	}
+//	if res2.Infcode == 0 {
+//		c.ServeSuccessJSON(map[string]interface{}{
+//			"list": res2.Output.Data,
+//		})
+//		return
+//	} else {
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//		return
+//	}
+//
+//}
 
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-		fmt.Println(dat)
-	} else {
-		fmt.Println(err)
-	}
-	userJSONBytes, _ := json.Marshal(dat)
-	var empty ResultFourteen
-	if err := json.Unmarshal(userJSONBytes, &empty); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
-	if empty.Infcode == 0 {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"msg": "撤销成功",
-		})
-		return
-	}
-}
+//func (c *HisApiController) ComfirmAllopatry() {
+//	year := c.GetString("year")
+//	month := c.GetString("month")
+//	admin_user_id, _ := c.GetInt64("admin_user_id")
+//	adminUser := c.GetAdminUserInfo()
+//	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+//	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+//	result, _ := service.Gdyb9001(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 1669)
+//	var dat map[string]interface{}
+//	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//		fmt.Println(dat)
+//	} else {
+//		fmt.Println(err)
+//	}
+//	userJSONBytes, _ := json.Marshal(dat)
+//	var res models.Result9001
+//	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+//		utils.ErrorLog("解析失败：%v", err)
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//		return
+//	}
+//
+//	result2, _ := service.Gdyb3260(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month, "")
+//	var dat2 map[string]interface{}
+//	if err := json.Unmarshal([]byte(result2), &dat2); err == nil {
+//		fmt.Println(dat)
+//	} else {
+//		fmt.Println(err)
+//	}
+//	userJSONBytes2, _ := json.Marshal(dat2)
+//	var res2 models.Result3260
+//	if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
+//		utils.ErrorLog("解析失败：%v", err)
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//		return
+//	}
+//
+//	if res2.Infcode == 0 {
+//		result, _, msgId := service.Gdyb3261(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month, res2)
+//		var dat map[string]interface{}
+//		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//			fmt.Println(dat)
+//		} else {
+//			fmt.Println(err)
+//		}
+//		userJSONBytes, _ := json.Marshal(dat)
+//		var res3 models.Result3261
+//		if err := json.Unmarshal(userJSONBytes, &res3); err != nil {
+//			utils.ErrorLog("解析失败：%v", err)
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//			return
+//		}
+//
+//		if res3.Infcode == 0 {
+//			record := &models.HisYidiClearRecord{
+//				UserOrgId: c.GetAdminUserInfo().CurrentOrgId,
+//				Ctime:     time.Now().Unix(),
+//				Mtime:     time.Now().Unix(),
+//				Status:    1,
+//				MsgId:     msgId,
+//			}
+//			service.SaveClearRecord(record)
+//			c.ServeSuccessJSON(map[string]interface{}{
+//				"msg": "提取成功",
+//			})
+//		}
+//	}
+//}
+//
+//func (c *HisApiController) RefundAllopatry() {
+//	year := c.GetString("year")
+//	month := c.GetString("month")
+//	id, _ := c.GetInt64("id")
+//	admin_user_id, _ := c.GetInt64("admin_user_id")
+//	adminUser := c.GetAdminUserInfo()
+//	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+//	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+//	record, _ := service.GetClearRecordById(id)
+//	result, _ := service.Gdyb3262(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month, record.MsgId)
+//
+//	var dat map[string]interface{}
+//	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//		fmt.Println(dat)
+//	} else {
+//		fmt.Println(err)
+//	}
+//	userJSONBytes, _ := json.Marshal(dat)
+//	var empty ResultFourteen
+//	if err := json.Unmarshal(userJSONBytes, &empty); err != nil {
+//		utils.ErrorLog("解析失败：%v", err)
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//		return
+//	}
+//	if empty.Infcode == 0 {
+//		c.ServeSuccessJSON(map[string]interface{}{
+//			"msg": "撤销成功",
+//		})
+//		return
+//	}
+//}
 
 func (c *HisApiController) ReversalOtherData() {
 	var customData []*CustomData

controllers/sg/his_api_controller.go

@@ -100,6 +100,12 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/4209", &HisApiController{}, "get:Get4209")
 	//
 
+	beego.Router("/api/allopatry/get", &HisApiController{}, "get:GetAllopatry")
+	beego.Router("/api/comfirmallopatry/post", &HisApiController{}, "post:ComfirmAllopatry")
+	beego.Router("/api/allopatry/refund", &HisApiController{}, "post:RefundAllopatry")
+
+	//beego.Router("/api/2205", &HisApiController{}, "get:Get2205")
+
 }
 
 func (c *HisApiController) Get2505() {
@@ -3066,6 +3072,12 @@ func (c *HisApiController) ReadCard() {
 			patient, _ := service.GetPatientByIDCard(id_card_no, miConfig.UserOrgId)
 
 			basStr := cardnum + "|" + cardCode + "|" + id_card_no + "|" + name
+
+			result2, requestLog2, errMsgLog2 := service.FJybidcomfirm(cardnum, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, id_card_type, cardCode, certificates, miConfig.Url, miConfig.Cainfo, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, patient.Name)
+			fmt.Println(result2)
+			fmt.Println(requestLog2)
+			fmt.Println(errMsgLog2)
+
 			result, requestLog, errMsgLog := service.FJyb1101(cardnum, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, id_card_type, cardCode, certificates, miConfig.Url, miConfig.Cainfo, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, patient.Name)
 			saveLog(result, requestLog, "1101", "获取人员信息")
 			fmt.Println(errMsgLog)
@@ -3432,7 +3444,7 @@ func (c *HisApiController) ReadCard() {
 			fmt.Println(cardNumber)
 			patient, _ := service.GetPatientByIDCard(basNumber, miConfig.UserOrgId)
 
-			result := service.Gdyb1101B(basNumber, miConfig.OrgName, roles.UserName, miConfig.Code, bas[0], miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, certificates, patient.Name, cardNumber)
+			result := service.Gdyb1101f(basNumber, miConfig.OrgName, roles.UserName, miConfig.Code, bas[0], miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, certificates, patient.Name, cardNumber)
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
 				fmt.Println(dat)
@@ -3500,7 +3512,7 @@ func (c *HisApiController) ReadCard() {
 						insutype = "310"
 					}
 					if len(insutypes) == 0 {
-						insutype = "390"
+						insutype = "310"
 					}
 					for _, item := range rf {
 						if item.Insutype == insutype {
@@ -8358,7 +8370,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			var result string
 			var requestLog string
 			if miConfig.UserOrgId == 10138 {
-				if id_card_type != 4 || id_card_type != 2 {
+				if id_card_type != 4 || id_card_type != 1 {
 					var insa string
 					if len(patient.InsuplcAdmdvs) > 0 {
 						insa = patient.InsuplcAdmdvs
@@ -8857,6 +8869,45 @@ func (c *HisApiController) GetRegisterInfo() {
 				psn_info, _ := service.GetPsnByPatientId(id)
 				if id_card_type == 4 || id_card_type == 1 {
 					insuplc_admdvs_temp = psn_info.InsuplcAdmdvs
+
+				}
+				var rf []*ResultFive
+				json.Unmarshal([]byte(psn_info.Insuinfo), &rf)
+				var insutypes []*ResultFive
+				var insutype string
+				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"
 				}
 
 				result, requestLog := service.Gdyb2201A(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, psn_info.VerifyNumber)
@@ -9234,6 +9285,11 @@ func (c *HisApiController) GetUploadInfo() {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
+
+			result2, src_request, _ := service.FJyb2205(his.PsnNo, his.Number, "0000", miConfig.OrgName, roles.UserName, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+			fmt.Println(result2)
+			fmt.Println(src_request)
+
 		} else {
 			if miConfig.MdtrtareaAdmvs == "440781" { //
 				result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time)
@@ -10059,6 +10115,7 @@ func (c *HisApiController) GetUploadInfo() {
 							order.CvlservFlag = res.Output.Setlinfo.CvlservFlag
 							order.SetlTime = res.Output.Setlinfo.SetlTime
 							order.MdtrtCertType = res.Output.Setlinfo.MdtrtCertType
+
 							if res.Output.Setlinfo.MedType == "140101" {
 								order.MedType = "14"
 
@@ -10562,6 +10619,14 @@ func (c *HisApiController) GetUploadInfo() {
 				order.CvlservFlag = res.Output.Setlinfo.CvlservFlag
 				order.SetlTime = res.Output.Setlinfo.SetlTime
 				order.MdtrtCertType = res.Output.Setlinfo.MdtrtCertType
+				order.PayWays = pay_ways
+				order.AcctUsedFlag = acct_used_flag
+				order.WechatPay = wechat_pay
+				order.AliPay = ali_pay
+				order.JifenPay = jifen_pay
+				order.BandCardPay = band_card_pay
+				order.CashPay = cash_pay
+				order.OthDesc = oth_desc
 				//order.MedType = res.Output.Setlinfo.MedType
 				if reg_type == 1112 {
 					order.MedType = "1112"
@@ -13428,7 +13493,7 @@ func (c *HisApiController) GetCheckAccount() {
 			}
 			api := "http://172.16.13.254:9532/" + "nmyb/3201?" +
 				"insutype=" + insutype +
-				"&clr_type=" + "51" +
+				"&clr_type=" + clr_type +
 				"&setl_optins=" + clr_org +
 				"&stmt_begndate=" + start_time +
 				"&stm_enddate=" + end_time +
@@ -15969,123 +16034,132 @@ func (c *HisApiController) ReversalData() {
 	}
 }
 
-//func (c *HisApiController) GetAllopatry() {
-//	year := c.GetString("year")
-//	month := c.GetString("month")
-//	admin_user_id, _ := c.GetInt64("admin_user_id")
-//	adminUser := c.GetAdminUserInfo()
-//	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
-//	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
-//	result, _ := service.Gdyb9001(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 1669)
-//
-//	var dat map[string]interface{}
-//	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-//		fmt.Println(dat)
-//	} else {
-//		fmt.Println(err)
-//	}
-//	userJSONBytes, _ := json.Marshal(dat)
-//	var res models.Result9001
-//	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-//		utils.ErrorLog("解析失败：%v", err)
-//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-//		return
-//	}
-//
-//	result2, _ := service.Gdyb3260(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month, res.Output.Signinoutb.SignNo)
-//	var dat2 map[string]interface{}
-//	if err := json.Unmarshal([]byte(result2), &dat2); err == nil {
-//		fmt.Println(dat)
-//	} else {
-//		fmt.Println(err)
-//	}
-//	userJSONBytes2, _ := json.Marshal(dat2)
-//	var res2 models.Result3260
-//	if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
-//		utils.ErrorLog("解析失败：%v", err)
-//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-//		return
-//	}
-//	if res2.Infcode == 0 {
-//		c.ServeSuccessJSON(map[string]interface{}{
-//			"list": res2.Output.Data,
-//		})
-//		return
-//	} else {
-//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-//		return
-//	}
-//
-//}
+func (c *HisApiController) GetAllopatry() {
+	year := c.GetString("year")
+	month := c.GetString("month")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	adminUser := c.GetAdminUserInfo()
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+	result, _ := service.Gdyb9001Two(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, admin_user_id)
 
-//func (c *HisApiController) ComfirmAllopatry() {
-//	year := c.GetString("year")
-//	month := c.GetString("month")
-//	admin_user_id, _ := c.GetInt64("admin_user_id")
-//	adminUser := c.GetAdminUserInfo()
-//	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
-//	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
-//	result, _ := service.Gdyb9001(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 1669)
-//	var dat map[string]interface{}
-//	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-//		fmt.Println(dat)
-//	} else {
-//		fmt.Println(err)
-//	}
-//	userJSONBytes, _ := json.Marshal(dat)
-//	var res models.Result9001
-//	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-//		utils.ErrorLog("解析失败：%v", err)
-//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-//		return
-//	}
-//
-//	result2, _ := service.Gdyb3260(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month, res.Output.Signinoutb.SignNo)
-//	var dat2 map[string]interface{}
-//	if err := json.Unmarshal([]byte(result2), &dat2); err == nil {
-//		fmt.Println(dat)
-//	} else {
-//		fmt.Println(err)
-//	}
-//	userJSONBytes2, _ := json.Marshal(dat2)
-//	var res2 models.Result3260
-//	if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
-//		utils.ErrorLog("解析失败：%v", err)
-//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-//		return
-//	}
-//
-//	if res2.Infcode == 0 {
-//		result, _, msgId := service.Gdyb3261(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month, res2)
-//		var dat map[string]interface{}
-//		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-//			fmt.Println(dat)
-//		} else {
-//			fmt.Println(err)
-//		}
-//		userJSONBytes, _ := json.Marshal(dat)
-//		var res3 models.Result3261
-//		if err := json.Unmarshal(userJSONBytes, &res3); err != nil {
-//			utils.ErrorLog("解析失败：%v", err)
-//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-//			return
-//		}
-//
-//		if res3.Infcode == 0 {
-//			record := &models.HisYidiClearRecord{
-//				UserOrgId: c.GetAdminUserInfo().CurrentOrgId,
-//				Ctime:     time.Now().Unix(),
-//				Mtime:     time.Now().Unix(),
-//				Status:    1,
-//				MsgId:     msgId,
-//			}
-//			service.SaveClearRecord(record)
-//			c.ServeSuccessJSON(map[string]interface{}{
-//				"msg": "提取成功",
-//			})
-//		}
-//	}
-//}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
+	userJSONBytes, _ := json.Marshal(dat)
+	var res models.Result9001
+	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	fmt.Println(res.Output.Signinoutb)
+	fmt.Println(res.Output.Signinoutb.SignNo)
+	fmt.Println(string(userJSONBytes))
+
+	result2, _ := service.Gdyb3260(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month, res.Output.Signinoutb.SignNo)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(result2), &dat2); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
+	userJSONBytes2, _ := json.Marshal(dat2)
+	var res2 models.Result3260
+	if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	if res2.Infcode == 0 {
+		result3, _, _ := service.Gdyb3261(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month, res2)
+		var dat2 map[string]interface{}
+		if err := json.Unmarshal([]byte(result3), &dat2); err == nil {
+			fmt.Println(dat)
+		} else {
+			fmt.Println(err)
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": res2.Output.Data,
+		})
+		return
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+}
+
+func (c *HisApiController) ComfirmAllopatry() {
+	year := c.GetString("year")
+	month := c.GetString("month")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	adminUser := c.GetAdminUserInfo()
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+	result, _ := service.Gdyb9001Two(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, admin_user_id)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
+	userJSONBytes, _ := json.Marshal(dat)
+	var res models.Result9001
+	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	result2, _ := service.Gdyb3260(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month, res.Output.Signinoutb.SignNo)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(result2), &dat2); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
+	userJSONBytes2, _ := json.Marshal(dat2)
+	var res2 models.Result3260
+	if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	if res2.Infcode == 0 {
+		result, _, msgId := service.Gdyb3261(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month, res2)
+		var dat map[string]interface{}
+		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+			fmt.Println(dat)
+		} else {
+			fmt.Println(err)
+		}
+		userJSONBytes, _ := json.Marshal(dat)
+		var res3 models.Result3261
+		if err := json.Unmarshal(userJSONBytes, &res3); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		if res3.Infcode == 0 {
+			record := &models.HisYidiClearRecord{
+				UserOrgId: c.GetAdminUserInfo().CurrentOrgId,
+				Ctime:     time.Now().Unix(),
+				Mtime:     time.Now().Unix(),
+				Status:    1,
+				MsgId:     msgId,
+			}
+			service.SaveClearRecord(record)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "提取成功",
+			})
+		}
+	}
+}
 
 func (c *HisApiController) RefundAllopatry() {
 	year := c.GetString("year")

models/yb_models.go

@@ -47,10 +47,10 @@ type Result9001 struct {
 	InfRefmsgid string `json:"inf_refmsgid"`
 	Infcode     int64  `json:"infcode"`
 	Output      struct {
-		Result struct {
+		Signinoutb struct {
 			SignNo   string `json:"sign_no"`
 			SignTime string `json:"sign_time"`
-		} `json:"result"`
+		} `json:"signinoutb"`
 	} `json:"output"`
 	RefmsgTime  string      `json:"refmsg_time"`
 	RespondTime string      `json:"respond_time"`

service/fj_service.go

@@ -36,7 +36,7 @@ func FJyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	timestamp := time.Now().Unix()
 	//生成输入报文
 
-	inputMessage := SetFjInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, app_id, app_secret, sign_key, enc_key)
+	inputMessage := SetFjInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, "", mdtrtarea_admvs, url, app_id, app_secret, sign_key, enc_key)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "1101" // 交易编码
@@ -86,6 +86,40 @@ func FJyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
 	return output, inputLog, err_msg
 }
+func FJybidcomfirm(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, id_card_type int64, card_sn string, certificates int64, url string, app_id string, app_secret string, sign_key string, enc_key string, name string) (string, string, string) {
+	//生成签名
+	//nonce := GetRandomString(32)
+	//timestamp := time.Now().Unix()
+	//生成输入报文
+
+	//i nputMessage := SetFjInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, app_id, app_secret, sign_key, enc_key)
+	//input := make(map[string]interface{})
+	inputMessage := make(map[string]interface{})
+
+	inputData := make(map[string]interface{})
+	inputMessage["funid"] = "yb04.10.01.16" // 交易编码
+	inputMessage["info"] = ""               // 交易编码
+
+	inputData["bkz543"] = ""         // 就诊凭证类型
+	inputData["aaz501"] = card_sn    // 卡识别码
+	inputData["bke284"] = "01"       // 人员证件类型
+	inputData["aaz500"] = certNo     // 就诊凭证编号
+	inputData["aac002"] = certNo     // 证件号码
+	inputData["aac003"] = name       // 人员姓名
+	inputMessage["data"] = inputData //交易输入
+
+	var inputLog string
+	bytesData, err := json.Marshal(inputMessage)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), "", ""
+	}
+	enc := mahonia.NewEncoder("gbk")
+	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
+	return output, inputLog, err_msg
+}
 
 func FJyb1101ForEleToken(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, id_card_type int64, card_sn string, certificates int64, url string, app_id string, app_secret string, sign_key string, enc_key string, token string, name string) (string, string, string) {
 	//生成签名

service/gdyb_service.go

@@ -3435,7 +3435,7 @@ func SetInputMessageTwo(nonce string, timestamp int64, org_name string, doctor s
 	if mdtrtarea_admvs == "440100" {
 		inputMessage["sign_no"] = GetSignInInfo(fixmedins_code) //交易签到流水号
 	} else {
-		inputMessage["sign_no"] = "" //交易签到流水号
+		inputMessage["sign_no"] = sign_no //交易签到流水号
 	}
 	return inputMessage
 }
@@ -3808,6 +3808,108 @@ func Gdyb1101B(certNo string, org_name string, doctor string, fixmedins_code str
 	return str
 }
 
+func Gdyb1101f(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates int64, name string, cardNumber string) string {
+	//生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+	//生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "1101" // 交易编码
+
+	if certificates == 3 {
+		inputData["mdtrt_cert_type"] = "99"     // 就诊凭证类型
+		inputData["certno"] = "01836483"        // 证件号码
+		inputData["psn_cert_type"] = "01"       // 人员证件类型
+		inputData["mdtrt_cert_no"] = "01836483" // 就诊凭证编号
+
+	} else {
+		if certificates == 1 {
+			if id_card_type == 1 {
+				inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+				inputData["card_sn"] = ""           // 卡识别码
+				inputData["certno"] = certNo        // 证件号码
+				inputData["psn_cert_type"] = "01"   // 人员证件类型
+				inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+
+			} else {
+				inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+				inputData["card_sn"] = ""           // 卡识别码
+				inputData["certno"] = certNo        // 证件号码
+				inputData["psn_cert_type"] = ""     // 人员证件类型
+				inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+
+			}
+
+		} else if certificates == 6 {
+			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["card_sn"] = ""           // 卡识别码
+			inputData["certno"] = certNo        // 证件号码
+			inputData["psn_cert_type"] = "17"   // 人员证件类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+
+		}
+
+	}
+
+	inputData["begntime"] = "" // 开始时间
+	inputData["psn_name"] = "" // 人员姓名
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	//url := gdyb_url + "1101"
+	var url string
+	if fixmedins_code == "H15049901371" {
+		url = gdyb_url
+	} else {
+		url = gdyb_url + "1101"
+	}
+
+	fmt.Println(url)
+	fmt.Println(gdyb_paasid)
+	fmt.Println(secret_key)
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	return str
+}
+
 func Gdyb1101G(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates int64, name string, cardNumber string) string {
 	//生成签名
 	nonce := GetRandomString(32)
@@ -4206,7 +4308,7 @@ func Gdyb3260(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3260" // 交易编码
-
+	inputData["sign"] = sign       // 就诊凭证编号
 	inputData["trt_year"] = year   // 就诊凭证编号
 	inputData["trt_month"] = month // 开始时间
 	inputData["startrow"] = "100"  // 人员姓名
@@ -4555,6 +4657,89 @@ func Gdyb9001(org_name string, doctor string, fixmedins_code string, insuplc_adm
 
 }
 
+func Gdyb9001Two(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, admin_user_id int64) (string, string) {
+	//生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+	//生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "9001"        // 交易编码
+	inputData["opter_no"] = admin_user_id // 就诊凭证编号
+	inputData["mac"] = GetMac()           // 开始时间
+	inputData["ip"] = GetLocalIp()
+	input["signIn"] = inputData
+	inputMessage["input"] = input //交易输入
+	var inputLog string
+	bytesData, err := json.Marshal(inputMessage)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	var url string
+	if fixmedins_code == "H15049901371" {
+		url = gdyb_url
+	} else {
+		url = gdyb_url + "9001"
+	}
+
+	if insuplc_admdvs == "421300" {
+		var json2 string
+		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101", string(bytesData), json2)
+		out, err := cmd.Output()
+		if err != nil {
+			fmt.Println("error:", err.Error())
+		}
+		fmt.Println(string(out))
+		return hex.EncodeToString(out), inputLog
+	} else {
+
+		//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+
+		request, err := http.NewRequest("POST", url, reader)
+		if err != nil {
+			fmt.Println(err.Error())
+			return err.Error(), ""
+		}
+
+		request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+		request.Header.Set("x-tif-paasid", gdyb_paasid)
+		request.Header.Set("x-tif-signature", signature)
+		request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+		request.Header.Set("x-tif-nonce", nonce)
+
+		fmt.Println(string(bytesData))
+		fmt.Println(gdyb_url)
+		fmt.Println(gdyb_paasid)
+		fmt.Println(request.Header)
+
+		client := http.Client{}
+		resp, err := client.Do(request)
+		if err != nil {
+			fmt.Println(err.Error())
+			return err.Error(), ""
+		}
+		respBytes, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			fmt.Println(err.Error())
+			return err.Error(), ""
+		}
+		fmt.Println(string(respBytes))
+		str := string(respBytes)
+		return str, inputLog
+
+	}
+
+}
+
 //获取本机ip
 func GetLocalIp() string {
 	addrs, err := net.InterfaceAddrs()