111

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9532
-runmode = dev
+runmode = prod
 
 
 
@@ -45,42 +45,15 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10409
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
 call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
-#url  = "http://192.168.1.228:17001/szsi-portal/transData"
-#url = "http://192.168.1.88:6666/szsi-portal/transData"
-#gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 
-gdyb_url = "http://test.inner.getway.ylbzj.hebei.gov.cn/ebus/mbs_fsi_auth"
-#test
-# gdyb_url = http://10.97.240.206/ebus/gdyb_inf/poc/hsa/hgs/
-#gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
-#gdyb_url = "http://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"
-#内蒙古
-# http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service
-# gdyb_url = "http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service"
-# gdyb_url = "http://19.15.78.136:20001/ebus/gdyb_inf/poc/hsa/hgs/gzzq/"
-#韶关
-#gdyb_paasid = "sg03_prd"
-# gdyb_paasid = "test_hosp"
-#江门
-#gdyb_paasid = "jm_sc_yjyy"
-#珠海
-# gdyb_paasid="zh_prd_yrojyy"
-#深圳
-#gdyb_paasid = "sz_prd_yjyy"
-#肇庆
-#gdyb_paasid = "zq_prd_yjyy"
-# gdyb_paasid = "sztest_hosp"
-#广州
-#gdyb_paasid = "gdyb_inf"
-#江西
-#gdyb_url = "http://10.77.211.236/CSB/hsa-fsi-"
-gdyb_paasid = "mbs_fsi_auth"
+org_id = 10106
+gdyb_url = "http://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"
+gdyb_paasid = "sztest_hosp"
 
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
 readmysqlport = 3306
@@ -231,8 +204,6 @@ writemiddleuser = root
 writemiddlepass = 1Q2W3e4r!@#$
 writemiddlename = ky_xt_middle
 
-
-
 readpatienthost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readpatientport = 3306
 readpatientuser = root

controllers/nm/nm_controller.go

@@ -11,6 +11,7 @@ import (
 	"gdyb/utils"
 	"github.com/astaxie/beego"
 	"github.com/axgle/mahonia"
+	"golang.org/x/text/encoding/simplifiedchinese"
 	"io/ioutil"
 	"net/http"
 	"os"
@@ -50,8 +51,59 @@ func NmybRegistRouters() {
 	beego.Router("/nmyb/2601", &NmController{}, "get:Get2601")
 
 	beego.Router("/api/token", &NmController{}, "get:GetToken")
+	beego.Router("/api/eleinfo", &NmController{}, "get:GetNewELeInfo")
 
 }
+func (c *NmController) GetNewELeInfo() {
+	token := c.GetString("token")
+	user_name := c.GetString("user_name")
+	id_card_no := c.GetString("id_card_no")
+
+	result, _ := service.Gdyb1101ForEleCert("赤峰费森血液透析中心", "关学丽", "H15049901371", "150499", "150499", "MSDBYGxXm1Mtyi3PtOUB7n1ktcxwyW57", token, user_name, id_card_no)
+	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 ResultTwo
+
+	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	infocode, _ := strconv.ParseInt(res.Infcode, 10, 64)
+	if infocode == 0 {
+		data := make(map[string]interface{})
+		data["token"] = token
+		data["result"] = dat
+		var req *http.Request
+		bytesData, _ := json.Marshal(data)
+		req, _ = http.NewRequest("POST", "http://172.16.23.189:9532/"+"api/ele/info", bytes.NewReader(bytesData))
+		client := &http.Client{}
+		resp, _ := client.Do(req)
+		defer resp.Body.Close()
+		body, ioErr := ioutil.ReadAll(resp.Body)
+		if ioErr != nil {
+			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		var respJSON map[string]interface{}
+		if err := json.Unmarshal([]byte(body), &respJSON); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "成功",
+		})
+
+	}
+}
 func (c *NmController) GetToken() {
 	token := c.GetString("token")
 	results := strings.Split(token, "-")
@@ -59,6 +111,7 @@ func (c *NmController) GetToken() {
 	result_code := results[0]
 	result_info := results[1]
 	if result_code == "0000" {
+
 		var ele2 ELeData2
 		err := json.Unmarshal([]byte(result_info), &ele2)
 		if err != nil {
@@ -72,47 +125,30 @@ func (c *NmController) GetToken() {
 				utils.ErrorLog("解析失败：%v", err)
 			}
 			token := ele.Data.EcToken
-			fmt.Println(token)
+
 			if len(token) > 0 {
-				result, _ := service.Gdyb1101ForEleCert("赤峰费森血液透析中心", "关学丽", "H15049901371", "150499", "150499", "MSDBYGxXm1Mtyi3PtOUB7n1ktcxwyW57", token, ele.Data.UserName, ele.Data.IdNo)
-				var dat map[string]interface{}
-				if err := json.Unmarshal([]byte(result), &dat); err == nil {
-					fmt.Println(dat)
-				} else {
-					fmt.Println(err)
+				data := make(map[string]interface{})
+				data["token"] = token
+				data["result"] = ele.Data
+				var req *http.Request
+				bytesData, _ := json.Marshal(data)
+				req, _ = http.NewRequest("POST", "http://172.16.23.189:9532/"+"api/token/get", bytes.NewReader(bytesData))
+				client := &http.Client{}
+				resp, _ := client.Do(req)
+				defer resp.Body.Close()
+				body, ioErr := ioutil.ReadAll(resp.Body)
+				if ioErr != nil {
+					utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
 				}
-				userJSONBytes, _ := json.Marshal(dat)
-				var res ResultTwo
-				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-					utils.ErrorLog("解析失败：%v", err)
+				var respJSON map[string]interface{}
+				if err := json.Unmarshal([]byte(body), &respJSON); err != nil {
+					utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 					return
 				}
 
-				infocode, _ := strconv.ParseInt(res.Infcode, 10, 64)
-				if infocode == 0 {
-					data := make(map[string]interface{})
-					data["token"] = token
-					data["result"] = dat
-					var req *http.Request
-					bytesData, _ := json.Marshal(data)
-					req, _ = http.NewRequest("POST", "http://172.16.23.189:9532/"+"api/token/get", bytes.NewReader(bytesData))
-					client := &http.Client{}
-					resp, _ := client.Do(req)
-					defer resp.Body.Close()
-					body, ioErr := ioutil.ReadAll(resp.Body)
-					if ioErr != nil {
-						utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-					var respJSON map[string]interface{}
-					if err := json.Unmarshal([]byte(body), &respJSON); err != nil {
-						utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-				}
 			} else {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
 				return
@@ -734,108 +770,109 @@ func (c *NmController) ReadCard() {
 
 		break
 	case "4": //电子凭证
-		result_code, result_info := c.GetELeInfo()
-		if result_code == "0000" {
-			var ele ELeData
-			err := json.Unmarshal([]byte(result_info), &ele)
-			if err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-			}
-			token := ele.Data.EcToken
-			fmt.Println(token)
-			if len(token) > 0 {
-				result, _ := service.Gdyb1101ForEleCert(org_name, operator, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, token, ele.Data.UserName, ele.Data.IdNo)
-				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 ResultTwo
-				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-					utils.ErrorLog("解析失败：%v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
-
-				infocode, _ := strconv.ParseInt(res.Infcode, 10, 64)
-
-				if infocode == 0 {
-
-					c.ServeSuccessJSON(map[string]interface{}{
-						"status":         "0",
-						"card_info":      result_info,
-						"busi_card_info": result_info,
-						"token":          token,
-						"result":         dat,
-					})
-
-				} else {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"status": "-1",
-					})
-
-				}
-			} else {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-				return
-			}
-		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-			return
-		}
+		c.GetELeInfo()
+		//if result_code == "0000" {
+		//	var ele ELeData
+		//	err := json.Unmarshal([]byte(result_info), &ele)
+		//	if err != nil {
+		//		utils.ErrorLog("解析失败：%v", err)
+		//	}
+		//	token := ele.Data.EcToken
+		//	fmt.Println(token)
+		//	if len(token) > 0 {
+		//		result, _ := service.Gdyb1101ForEleCert(org_name, operator, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, token, ele.Data.UserName, ele.Data.IdNo)
+		//		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 ResultTwo
+		//		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+		//			utils.ErrorLog("解析失败：%v", err)
+		//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//			return
+		//		}
+		//
+		//		infocode, _ := strconv.ParseInt(res.Infcode, 10, 64)
+		//
+		//		if infocode == 0 {
+		//
+		//			c.ServeSuccessJSON(map[string]interface{}{
+		//				"status":         "0",
+		//				"card_info":      result_info,
+		//				"busi_card_info": result_info,
+		//				"token":          token,
+		//				"result":         dat,
+		//			})
+		//
+		//		} else {
+		//			c.ServeSuccessJSON(map[string]interface{}{
+		//				"status": "-1",
+		//			})
+		//
+		//		}
+		//	} else {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+		//		return
+		//	}
+		//} else {
+		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+		//	return
+		//}
 
 		break
 	case "5": //电子凭证
-		_, pBusiCardInfo := c.GetELeInfoTwo(fixmedins_code, operator_id, operator)
-
-		var ele ELeData
-		err := json.Unmarshal([]byte(pBusiCardInfo), &ele)
-		if err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-		}
-		token := ele.Data.EcToken
-		fmt.Println(token)
-		if len(token) > 0 {
-			result, _ := service.Gdyb1101ForEleCert(org_name, operator, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, token, ele.Data.IdNo, ele.Data.UserName)
-			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 ResultTwo
-			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-
-			infocode, _ := strconv.ParseInt(res.Infcode, 10, 64)
-
-			if infocode == 0 {
-
-				c.ServeSuccessJSON(map[string]interface{}{
-					"status":         "0",
-					"card_info":      pBusiCardInfo,
-					"busi_card_info": pBusiCardInfo,
-					"token":          token,
-					"result":         dat,
-				})
-
-			} else {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"status": "-1",
-				})
-
-			}
-		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-			return
-		}
-		break
+		c.GetELeInfoTwo(fixmedins_code, operator_id, operator)
+		//_, pBusiCardInfo := c.GetELeInfoTwo(fixmedins_code, operator_id, operator)
+
+		//var ele ELeData
+		//err := json.Unmarshal([]byte(pBusiCardInfo), &ele)
+		//if err != nil {
+		//	utils.ErrorLog("解析失败：%v", err)
+		//}
+		//token := ele.Data.EcToken
+		//fmt.Println(token)
+		//if len(token) > 0 {
+		//	result, _ := service.Gdyb1101ForEleCert(org_name, operator, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, token, ele.Data.IdNo, ele.Data.UserName)
+		//	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 ResultTwo
+		//	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+		//		utils.ErrorLog("解析失败：%v", err)
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//		return
+		//	}
+		//
+		//	infocode, _ := strconv.ParseInt(res.Infcode, 10, 64)
+		//
+		//	if infocode == 0 {
+		//
+		//		c.ServeSuccessJSON(map[string]interface{}{
+		//			"status":         "0",
+		//			"card_info":      pBusiCardInfo,
+		//			"busi_card_info": pBusiCardInfo,
+		//			"token":          token,
+		//			"result":         dat,
+		//		})
+		//
+		//	} else {
+		//		c.ServeSuccessJSON(map[string]interface{}{
+		//			"status": "-1",
+		//		})
+		//
+		//	}
+		//} else {
+		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+		//	return
+		//}
+		//break
 
 	}
 
@@ -1162,3 +1199,18 @@ func (c *NmController) Get2601() {
 		"pre": dat,
 	})
 }
+func ConvertByte2String(byte []byte, charset Charset) string {
+
+	var str string
+	switch charset {
+	case GB18030:
+		decodeBytes, _ := simplifiedchinese.GB18030.NewDecoder().Bytes(byte)
+		str = string(decodeBytes)
+	case UTF8:
+		fallthrough
+	default:
+		str = string(byte)
+	}
+
+	return str
+}

controllers/sg/his_api_controller.go

@@ -91,9 +91,9 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/2505", &HisApiController{}, "get:Get2505")
 
-	//beego.Router("/api/4201A", &HisApiController{}, "get:Get4201A")
-	//beego.Router("/api/4202", &HisApiController{}, "get:Get4202")
-	//beego.Router("/api/4203", &HisApiController{}, "get:Get4203")
+	beego.Router("/api/4201A", &HisApiController{}, "get:Get4201A")
+	beego.Router("/api/4202", &HisApiController{}, "get:Get4202")
+	beego.Router("/api/4203", &HisApiController{}, "get:Get4203")
 	//beego.Router("/api/4205", &HisApiController{}, "get:Get4205")
 	//beego.Router("/api/4207", &HisApiController{}, "get:Get4207")
 	//beego.Router("/api/4208", &HisApiController{}, "get:Get4208")
@@ -109,123 +109,189 @@ func (c *HisApiController) Get2505() {
 
 }
 
-//func (c *HisApiController) Get4201A(){
-//	order_id, _ := c.GetInt64("order_id")
-//	admin_user_id, _ := c.GetInt64("admin_user_id")
-//	order, _ := service.GetHisOrderByIDTwo(order_id)
-//	his, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
-//	order_info, _ := service.GetHisOrderInfoByNumber(order.MdtrtId)
-//	order_info_two, _ := service.GetHisOrderInfoByNumberTwo(order.MdtrtId)
-//	order_info = append(order_info, order_info_two...)
-//	curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
-//	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
-//
-//	department,_ := service.GetDepartMentDetail(his.Departments)
-//
-//
-//
-//
-//	if order.ID == 0 {
-//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisOrderNoExistParamWrong)
-//		return
-//	}
-//	var fsiOPFLDs []models.FsiOwnpayPatnFeeListDDTO
-//	for _,items := range order_info{
-//		var fsiOPFLD models.FsiOwnpayPatnFeeListDDTO
-//		fsiOPFLD.FixmedinsMdtrtID = items.OrderNumber
-//		fsiOPFLD.MedType = "14"
-//		fsiOPFLD.BkkpSn = items.OrderNumber
-//		fsiOPFLD.FeeOcurTime = time.Unix(items.HisDoctorAdviceInfo.CreatedTime,0).Format("2006-01-02 15:04:05")
-//		fsiOPFLD.FixmedinsCode = miConfig.Code
-//		fsiOPFLD.FixmedinsName =  miConfig.OrgName
-//		fsiOPFLD.Cnt = fmt.Sprintf("%.2f", items.Cnt)
-//		fsiOPFLD.Pric = fmt.Sprintf("%.2f", items.Pric)
-//		fsiOPFLD.MedChrgitmType = "09"
-//		fsiOPFLD.Prodname = items.HisDoctorAdviceInfo.AdviceName
-//		fsiOPFLD.BilgDeptCodg = department.Number
-//		fsiOPFLD.BilgDeptName = department.Name
-//
-//
-//
-//
-//
-//
-//	}
-//
-//
-//
-//
-//
-//
-//}
-//func (c *HisApiController) Get4202(){
-//	order_id, _ := c.GetInt64("order_id")
-//	admin_user_id, _ := c.GetInt64("admin_user_id")
-//	order, _ := service.GetHisOrderByIDTwo(order_id)
-//	his, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
-//	curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
-//	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
-//
-//	if order.ID == 0 {
-//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisOrderNoExistParamWrong)
-//		return
-//	}
-//
-//	var struct4202 models.Struct4202
-//	struct4202.OwnPayPatnMdtrtD.FixmedinsMdtrtID = his.Number
-//	struct4202.OwnPayPatnMdtrtD.FixmedinsCode = miConfig.Code
-//	struct4202.OwnPayPatnMdtrtD.FixmedinsName = miConfig.OrgName
-//	struct4202.OwnPayPatnMdtrtD.PsnCertType ="01"
-//	struct4202.OwnPayPatnMdtrtD.Certno =his.IdCardNo
-//	struct4202.OwnPayPatnMdtrtD.PsnName = his.Name
-//	struct4202.OwnPayPatnMdtrtD.Begntime = his.InHosptialTime
-//	struct4202.OwnPayPatnMdtrtD.MedType = "14"
-//	struct4202.OwnPayPatnMdtrtD.ValiFlag = "1"
-//	struct4202.OwnPayPatnMdtrtD.MedfeeSumamt = fmt.Sprintf("%.2f",order.MedfeeSumamt)
-//
-//
-//	diagnosis_ids := strings.Split(his.Diagnosis, ",")
-//	var config []*models.HisXtDiagnoseConfig
-//	for _, item := range diagnosis_ids {
-//		id, _ := strconv.ParseInt(item, 10, 64)
-//		diagnosisConfig, _ := service.FindDiagnoseById(id)
-//		config = append(config, &diagnosisConfig)
-//	}
-//	var tempDiaginfos []models.OwnPayPatnDiagListD
-//	for index, item := range config {
-//		if index == 0 {
-//			var tempDiaginfo  models.OwnPayPatnDiagListD
-//			tempDiaginfo.InoutDiagType = "1"
-//			tempDiaginfo.DiagCode = item.CountryCode
-//			tempDiaginfo.DiagName = item.CountryContentName
-//			tempDiaginfo.DiagType = "1"
-//			tempDiaginfo.DiagSrtNo = "1"
-//			tempDiaginfo.MaindiagFlag = "1"
-//			tempDiaginfo.ValiFlag = "1"
-//			tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
-//		} else {
-//
-//			var tempDiaginfo models.OwnPayPatnDiagListD
-//			tempDiaginfo.DiagCode = item.CountryCode
-//			tempDiaginfo.DiagName = item.CountryContentName
-//			tempDiaginfo.DiagType = "2"
-//			tempDiaginfo.DiagSrtNo = strconv.FormatInt(int64(index+1),10)
-//			tempDiaginfo.MaindiagFlag = "0"
-//			tempDiaginfo.ValiFlag = "1"
-//			tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
-//		}
-//	}
-//	struct4202.ODiagListD = tempDiaginfos
-//	service.Gdyb4202(miConfig.OrgName,curRoles.UserName,miConfig.Code,miConfig.InsuplcAdmdvs,miConfig.MdtrtareaAdmvs,miConfig.SecretKey,struct4202)
-//
-//
-//
-//
-//}
-//func (c *HisApiController) Get4203(){
-//
-//
-//}
+func (c *HisApiController) Get4201A() {
+	order_id, _ := c.GetInt64("order_id")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	order, _ := service.GetHisOrderByIDTwo(order_id)
+	his, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
+	order_info, _ := service.GetHisOrderInfoByNumber(order.MdtrtId)
+	order_info_two, _ := service.GetHisOrderInfoByNumberTwo(order.MdtrtId)
+	order_info = append(order_info, order_info_two...)
+	curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
+	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+	department, _ := service.GetDepartMentDetail(his.Departments)
+	pre, _ := service.GetNewHisPrescriptionByNumber(order.Number)
+	doctor, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, pre.Creator)
+
+	if order.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisOrderNoExistParamWrong)
+		return
+	}
+	var struct4201A models.Struct4201A
+	var fsiOPFLDs []models.FsiOwnpayPatnFeeListDDTO
+	for _, items := range order_info {
+		var fsiOPFLD models.FsiOwnpayPatnFeeListDDTO
+		fsiOPFLD.FixmedinsMdtrtID = items.OrderNumber
+		fsiOPFLD.MedType = "14"
+		fsiOPFLD.BkkpSn = items.OrderNumber
+		fsiOPFLD.FeeOcurTime = time.Unix(items.HisDoctorAdviceInfo.CreatedTime, 0).Format("2006-01-02 15:04:05")
+		fsiOPFLD.FixmedinsCode = miConfig.Code
+		fsiOPFLD.FixmedinsName = miConfig.OrgName
+		fsiOPFLD.Cnt = fmt.Sprintf("%.2f", items.Cnt)
+		fsiOPFLD.Pric = fmt.Sprintf("%.2f", items.Pric)
+		fsiOPFLD.DetItemFeeSumamt = fmt.Sprintf("%.2f", items.DetItemFeeSumamt)
+
+		if items.AdviceId > 0 && items.ProjectId == 0 {
+			fsiOPFLD.MedinsListCodg = items.HisDoctorAdviceInfo.BaseDrugLib.MedicalInsuranceNumber
+			fsiOPFLD.MedinsListName = items.HisDoctorAdviceInfo.BaseDrugLib.DrugName
+			fsiOPFLD.Prodname = items.HisDoctorAdviceInfo.BaseDrugLib.DrugName
+			fsiOPFLD.BilgDeptName = department.Name
+			fsiOPFLD.BilgDeptCodg = department.Number
+			fsiOPFLD.BilgDrCode = doctor.DoctorCode
+			fsiOPFLD.BilgDrName = doctor.UserName
+
+		} else if items.AdviceId == 0 && items.ProjectId > 0 {
+			fsiOPFLD.MedinsListCodg = items.HisPrescriptionProject.HisProject.MedicalCode
+			fsiOPFLD.MedinsListName = items.HisPrescriptionProject.HisProject.ProjectName
+			fsiOPFLD.Prodname = items.HisPrescriptionProject.HisProject.ProjectName
+			fsiOPFLD.BilgDeptName = department.Name
+			fsiOPFLD.BilgDeptCodg = department.Number
+			fsiOPFLD.BilgDrCode = doctor.DoctorCode
+			fsiOPFLD.BilgDrName = doctor.UserName
+		}
+
+		//fsiOPFLD.DetItemFeeSumamt = items.DetItemFeeSumamt
+		fsiOPFLD.MedChrgitmType = "09"
+		fsiOPFLD.Prodname = items.HisDoctorAdviceInfo.AdviceName
+		fsiOPFLD.BilgDeptCodg = department.Number
+		fsiOPFLD.BilgDeptName = department.Name
+		fsiOPFLDs = append(fsiOPFLDs, fsiOPFLD)
+	}
+	struct4201A.Fopfd = fsiOPFLDs
+	result, requestLog := service.Gdyb4201A(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, struct4201A)
+
+}
+func (c *HisApiController) Get4202() {
+	order_id, _ := c.GetInt64("order_id")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	order, _ := service.GetHisOrderByIDTwo(order_id)
+	his, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
+	curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
+	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+
+	if order.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisOrderNoExistParamWrong)
+		return
+	}
+
+	var struct4202 models.Struct4202
+	struct4202.OwnPayPatnMdtrtD.FixmedinsMdtrtID = his.Number
+	struct4202.OwnPayPatnMdtrtD.FixmedinsCode = miConfig.Code
+	struct4202.OwnPayPatnMdtrtD.FixmedinsName = miConfig.OrgName
+	struct4202.OwnPayPatnMdtrtD.PsnCertType = "01"
+	struct4202.OwnPayPatnMdtrtD.Certno = his.IdCardNo
+	struct4202.OwnPayPatnMdtrtD.PsnName = his.Name
+	struct4202.OwnPayPatnMdtrtD.Begntime = his.InHosptialTime
+	struct4202.OwnPayPatnMdtrtD.MedType = "14"
+	struct4202.OwnPayPatnMdtrtD.ValiFlag = "1"
+	struct4202.OwnPayPatnMdtrtD.MedfeeSumamt = fmt.Sprintf("%.2f", order.MedfeeSumamt)
+
+	diagnosis_ids := strings.Split(his.Diagnosis, ",")
+	var config []*models.HisXtDiagnoseConfig
+	for _, item := range diagnosis_ids {
+		id, _ := strconv.ParseInt(item, 10, 64)
+		diagnosisConfig, _ := service.FindDiagnoseById(id)
+		config = append(config, &diagnosisConfig)
+	}
+	var tempDiaginfos []models.OwnPayPatnDiagListD
+	for index, item := range config {
+		if index == 0 {
+			var tempDiaginfo models.OwnPayPatnDiagListD
+			tempDiaginfo.InoutDiagType = "1"
+			tempDiaginfo.DiagCode = item.CountryCode
+			tempDiaginfo.DiagName = item.CountryContentName
+			tempDiaginfo.DiagType = "1"
+			tempDiaginfo.DiagSrtNo = "1"
+			tempDiaginfo.MaindiagFlag = "1"
+			tempDiaginfo.ValiFlag = "1"
+			tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
+		} else {
+
+			var tempDiaginfo models.OwnPayPatnDiagListD
+			tempDiaginfo.DiagCode = item.CountryCode
+			tempDiaginfo.DiagName = item.CountryContentName
+			tempDiaginfo.DiagType = "2"
+			tempDiaginfo.DiagSrtNo = strconv.FormatInt(int64(index+1), 10)
+			tempDiaginfo.MaindiagFlag = "0"
+			tempDiaginfo.ValiFlag = "1"
+			tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
+		}
+	}
+	struct4202.ODiagListD = tempDiaginfos
+	result, requestLog := service.Gdyb4202(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, struct4202)
+	saveLog(result, requestLog, "4202", "自费就诊和诊断信息上传")
+	var res2 ResultSix
+	var respJSON2 map[string]interface{}
+	if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	userJSONBytes2, _ := json.Marshal(respJSON2)
+	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{}{
+			"failed_code": -10,
+			"msg":         res2.ErrMsg,
+		})
+		return
+
+	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "上传成功",
+		})
+	}
+}
+func (c *HisApiController) Get4203() {
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
+	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+	order_id, _ := c.GetInt64("order_id")
+	order, _ := service.GetHisOrderByIDTwo(order_id)
+	his, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
+	result, requestLog := service.Gdyb4203(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, his.Number)
+	saveLog(result, requestLog, "4203", "自费就诊与结算明细上传完成")
+	var res2 ResultSix
+	var respJSON2 map[string]interface{}
+	if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	userJSONBytes2, _ := json.Marshal(respJSON2)
+	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{}{
+			"failed_code": -10,
+			"msg":         res2.ErrMsg,
+		})
+		return
+
+	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "上传成功",
+		})
+	}
+}
+
 //func (c *HisApiController) Get4205(){
 //
 //
@@ -2354,7 +2420,7 @@ func (c *HisApiController) ReadCard() {
 						}
 
 						if len(insutypes) == 0 {
-							insutype = "310"
+							insutype = "390"
 						}
 
 						c.ServeSuccessJSON(map[string]interface{}{
@@ -3605,7 +3671,7 @@ func (c *HisApiController) ReadCard() {
 				token := ele.Data.EcToken
 				fmt.Println(inputInfo)
 				fmt.Println(outPutInfo)
-				result, requestLog, errMsgLog := service.FJyb1101ForEleToken(ele.Data.IDNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, id_card_type, "", 1, miConfig.Url, miConfig.Cainfo, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, token, ele.Data.UserName)
+				result, requestLog, errMsgLog := service.FJyb1101ForEleToken(ele.Data.IDNo, miConfig.OrgName, roles.UserName, miConfig.Code, ele.Data.InsuOrg, miConfig.MdtrtareaAdmvs, id_card_type, "", 1, miConfig.Url, miConfig.Cainfo, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, token, ele.Data.UserName)
 				saveLog(result, requestLog, "1101", "获取人员信息")
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -3638,20 +3704,21 @@ func (c *HisApiController) ReadCard() {
 						infoStr := string(Iinfos)
 						idetinfoStr := string(Idetinfos)
 						psn := &models.HisPsn{
-							PsnNo:        res.Output.Baseinfo.PsnNo,
-							Age:          res.Output.Baseinfo.Age,
-							PatientId:    patient.ID,
-							Certno:       res.Output.Baseinfo.Certno,
-							Brdy:         res.Output.Baseinfo.Brdy,
-							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:     outPutInfo,
-							VerifyNumber: token,
+							PsnNo:         res.Output.Baseinfo.PsnNo,
+							Age:           res.Output.Baseinfo.Age,
+							PatientId:     patient.ID,
+							Certno:        res.Output.Baseinfo.Certno,
+							Brdy:          res.Output.Baseinfo.Brdy,
+							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:      outPutInfo,
+							VerifyNumber:  token,
+							InsuplcAdmdvs: ele.Data.InsuOrg,
 						}
 						service.CreateHisPsn(psn)
 
@@ -4047,30 +4114,32 @@ func (c *HisApiController) GetSettleList() {
 	curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	depart, _ := service.GetDepartMentDetail(curRoles.DepartmentId)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+	pre, _ := service.GetNewHisPrescriptionByNumber(order.Number)
+	doctor, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, pre.Creator)
 
 	if order.ID == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisOrderNoExistParamWrong)
 		return
 	}
 
-	last_order, _ := service.GetLastHisOrder(c.GetAdminUserInfo().CurrentOrgId)
-	max_order, _ := service.GetLastHisOrderTwo(c.GetAdminUserInfo().CurrentOrgId)
-	count, _ := strconv.ParseInt(max_order.FaPiaoNumber, 10, 64)
-	fmt.Println(count)
-	var zero string
-	number := count + 1
-	if number >= 1000 {
-		zero = "0000" + strconv.FormatInt(number, 10)
-	} else if number >= 10000 {
-		zero = "000" + strconv.FormatInt(number, 10)
-	} else if number >= 100000 {
-		zero = "00" + strconv.FormatInt(number, 10)
-	} else if number >= 1000000 {
-		zero = "0" + strconv.FormatInt(number, 10)
-	} else {
-		zero = strconv.FormatInt(number, 10)
-	}
-	fmt.Println(zero)
+	//last_order, _ := service.GetLastHisOrder(c.GetAdminUserInfo().CurrentOrgId)
+	//max_order, _ := service.GetLastHisOrderTwo(c.GetAdminUserInfo().CurrentOrgId)
+	//count, _ := strconv.ParseInt(max_order.FaPiaoNumber, 10, 64)
+	//fmt.Println(count)
+	//var zero string
+	//number := count + 1
+	//if number >= 1000 {
+	//	zero = "0000" + strconv.FormatInt(number, 10)
+	//} else if number >= 10000 {
+	//	zero = "000" + strconv.FormatInt(number, 10)
+	//} else if number >= 100000 {
+	//	zero = "00" + strconv.FormatInt(number, 10)
+	//} else if number >= 1000000 {
+	//	zero = "0" + strconv.FormatInt(number, 10)
+	//} else {
+	//	zero = strconv.FormatInt(number, 10)
+	//}
+	//fmt.Println(zero)
 
 	struct4101 := service.Struct4101{
 		PsnNo:          order.PsnNo,
@@ -4144,7 +4213,6 @@ func (c *HisApiController) GetSettleList() {
 			tempDiaginfo.MaindiagFlag = "1"
 			tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
 		} else {
-
 			var tempDiaginfo service.DiaginfoStructTwo
 			tempDiaginfo.DiagCode = item.CountryCode
 			tempDiaginfo.DiagName = item.CountryContentName
@@ -4529,6 +4597,9 @@ func (c *HisApiController) GetSettleList() {
 	struct4101.Ntly = "中国"
 	struct4101.AdmCaty = "A03.06"
 
+	struct4101.DoctorName = doctor.UserName
+	struct4101.DoctorCode = doctor.DoctorNumber
+
 	var res ResultSeventeen
 
 	if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
@@ -4613,7 +4684,6 @@ func (c *HisApiController) GetSettleList() {
 		}
 
 	} else if miConfig.MdtrtareaAdmvs == "430800" {
-
 		var pp models.PublicParams
 		pp.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
 		pp.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
@@ -4663,9 +4733,9 @@ func (c *HisApiController) GetSettleList() {
 		})
 		return
 	} else {
-		order.FaPiaoNumber = zero
-		order.FaPiaoCode = last_order.FaPiaoCode
-		service.UpdateOrder(order)
+		//order.FaPiaoNumber = zero
+		//order.FaPiaoCode = last_order.FaPiaoCode
+		//service.UpdateOrder(order)
 		hisFundSettleListResult := &models.HisFundSettleListResult{
 			Number:    res.Output.SetlListId,
 			Status:    1,
@@ -7673,13 +7743,32 @@ func (c *HisApiController) GetRegisterInfo() {
 				json.Unmarshal([]byte(idetinfoStr), &rf)
 				if len(rf) > 0 {
 					if len(rf[0].Memo) > 0 {
+						fmt.Println("122222222222222")
+
 						content := rf[0].Memo[1:len(rf[0].Memo)]
-						content2 := content[:len(rf[0].Memo)-1]
+						content2 := content[:len(content)-1]
 						fmt.Println(content2)
-						var rf2 ResultMemo
-						json.Unmarshal([]byte(content2), &rf2)
-						fmt.Println(rf2)
-						fmt.Println(rf2.InsuAdmdvs)
+						//var rf2 ResultMemo
+						//json.Unmarshal([]byte(content2), &rf2)
+						//fmt.Println(rf2)
+						//fmt.Println(rf2.InsuAdmdvs)
+						arr := strings.Split(content2, ",")
+
+						var tarstring string
+						for _, item := range arr {
+							if find := strings.Contains(item, "insuAdmdvs"); find {
+								tarstring = item
+							}
+						}
+						fmt.Println(tarstring)
+
+						if len(tarstring) > 0 {
+							arr := strings.Split(tarstring, ":")
+
+							insuplc_admdvs_temp = strings.Replace(arr[1], "\"", "", -1)
+
+							//insuplc_admdvs_temp = arr[1]
+						}
 
 					}
 				}
@@ -7841,11 +7930,12 @@ func (c *HisApiController) GetRegisterInfo() {
 					cert_no = strings.Split(psn_info.CardInfo, "|")[0]
 				} else if id_card_type == 4 {
 					cert_no = psn_info.VerifyNumber
+					insuplc_admdvs_temp = psn_info.InsuplcAdmdvs
 				} else {
 					cert_no = psn_info.VerifyNumber
 				}
 
-				result, requestLog, _ := service.FJyb2201(psn_info.PsnNo, insutype, IdCardNo, miConfig.OrgName, doctor_info.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_info.DoctorNumber, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, roles.UserName, doctor_info.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, cert_no)
+				result, requestLog, _ := service.FJyb2201(psn_info.PsnNo, insutype, IdCardNo, miConfig.OrgName, doctor_info.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_info.DoctorNumber, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, roles.UserName, doctor_info.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, cert_no, record_time)
 				saveLog(result, requestLog, "2201", "挂号")
 				if miConfig.Code == "H15049901371" {
 
@@ -12451,8 +12541,8 @@ func (c *HisApiController) GetCheckAccount() {
 	loc, _ := time.LoadLocation("Local")
 	startime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
-	orders, _ := service.GetOrderByTime(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, "", clr_type)
-	orders_two, _ := service.GetOrderByTimeFive(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, "", clr_type)
+	orders, _ := service.GetOrderByTime(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, "", clr_type, miConfig.MdtrtareaAdmvs)
+	orders_two, _ := service.GetOrderByTimeFive(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, "", clr_type, miConfig.MdtrtareaAdmvs)
 
 	fixmedins_setl_cnt := int64(len(orders))
 	var medfee_sumamt float64
@@ -12528,10 +12618,12 @@ func (c *HisApiController) GetCheckAccount() {
 			res.Infcode = infocode
 
 		} else if miConfig.MdtrtareaAdmvs == "150499" {
-
+			if clr_type == "11" {
+				fixmedins_setl_cnt = 2
+			}
 			api := "http://172.16.13.254:9532/" + "nmyb/3201?" +
 				"insutype=" + insutype +
-				"&clr_type=" + "21" +
+				"&clr_type=" + clr_type +
 				"&setl_optins=" + clr_org +
 				"&stmt_begndate=" + start_time +
 				"&stm_enddate=" + end_time +
@@ -14490,12 +14582,22 @@ func (c *HisApiController) PsnPutNCDSOnRecord() {
 	end_time := c.GetString("end_time")
 	check_time := c.GetString("check_time")
 
+	hospital_code := c.GetString("hospital_code")
+	hospital_name := c.GetString("hospital_name")
+
 	adminUser := c.GetAdminUserInfo()
 	patient, _ := service.GetPatientByID(adminUser.CurrentOrgId, patient_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 	sick, _ := service.FindSickById(sick_id)
 	doctor, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, doctor_id)
+	if len(hospital_code) == 0 {
+
+		hospital_code = miConfig.Code
+	}
+	if len(hospital_name) == 0 {
+		hospital_name = miConfig.OrgName
+	}
 
 	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, doctor_id)
 	var res ResultTwo
@@ -14629,7 +14731,7 @@ func (c *HisApiController) PsnPutNCDSOnRecord() {
 		if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 
 		} else {
-			result := service.Gdyb2503(psn_no, insutype, miConfig.OrgName, doctor.UserName, miConfig.Code, strconv.FormatInt(doctor.ID, 10), insuplc_admdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sick.ClassName, sick.ContentCode, start_time, end_time, check_time)
+			result := service.Gdyb2503(psn_no, insutype, miConfig.OrgName, doctor.UserName, miConfig.Code, strconv.FormatInt(doctor.ID, 10), insuplc_admdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sick.ClassName, sick.ContentCode, start_time, end_time, check_time, hospital_code, hospital_name)
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
 				fmt.Println(dat)

controllers/zh/zh_his_api_controller.go

@@ -501,6 +501,27 @@ func ZHHisManagerApiRegistRouters() {
 	beego.Router("/zh/api/lingbao/get", &ZHHisApiController{}, "get:GetLingBao")
 
 	beego.Router("/api/token/get", &ZHHisApiController{}, "post:GetToken")
+	beego.Router("/api/ele/info", &ZHHisApiController{}, "post:GetEleInfo")
+
+}
+
+func (c *ZHHisApiController) GetEleInfo() {
+	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		return
+	}
+	token := respJSON["token"].(string)
+	result_respJson := respJSON["result"].(string)
+	fmt.Println("token")
+	fmt.Println(token)
+	fmt.Println("result")
+	fmt.Println(result_respJson)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "读卡成功",
+	})
 
 }
 func (c *ZHHisApiController) GetToken() {
@@ -516,76 +537,45 @@ func (c *ZHHisApiController) GetToken() {
 	fmt.Println(token)
 	fmt.Println("result")
 	fmt.Println(result_respJson)
-	var res ResultTwo           //1101结果
-	var res10265 ResultTwo10265 //1101结果
+	var res ELeData
 	result, _ := json.Marshal(result_respJson)
-	if err := json.Unmarshal([]byte(result), &res10265); err != nil {
+	if err := json.Unmarshal([]byte(result), &res); err != nil {
 		utils.ErrorLog("解析失败：%v", err)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
-	res.ErrMsg = res10265.ErrMsg
-	infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
-	res.Infcode = infocode
-	res.Output = res10265.Output
-	res.InfRefmsgid = res10265.InfRefmsgid
-	if res.Infcode == 0 {
-		var insutypes []string
-		var insutype string
-		var is390 int = 0
-		var is310 int = 0
-		for _, item := range res.Output.Iinfo {
-			if (item.Insutype == "390" && item.PsnInsuStas == "1") || (item.Insutype == "310" && item.PsnInsuStas == "1") {
-				insutypes = append(insutypes, item.Insutype)
-			}
-		}
-		if len(insutypes) == 1 {
-			insutype = insutypes[0]
-		} else {
-			for _, i := range insutypes {
-				if i == "390" {
-					is390 = 1
-				}
 
-				if i == "310" {
-					is310 = 1
-				}
-			}
-		}
-		if is390 == 1 {
-			insutype = "390"
-		}
-		if is310 == 1 {
-			insutype = "310"
-		}
-		if len(insutypes) == 0 {
-			insutype = "310"
-		}
-		fmt.Println(insutype)
-		patient, _ := service.GetPatientByIDCard(res.Output.Baseinfo.Certno, c.GetAdminUserInfo().CurrentOrgId)
-		Iinfos, _ := json.Marshal(res.Output.Iinfo)
-		Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
-		infoStr := string(Iinfos)
-		idetinfoStr := string(Idetinfos)
-		psn := &models.HisPsn{
-			PsnNo:        res.Output.Baseinfo.PsnNo,
-			Age:          res.Output.Baseinfo.Age,
-			PatientId:    patient.ID,
-			Certno:       res.Output.Baseinfo.Certno,
-			Brdy:         res.Output.Baseinfo.Brdy,
-			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:     "",
-			VerifyNumber: token,
-		}
-		service.CreateHisPsn(psn)
+	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+
+	patient, _ := service.GetPatientByIDCard(res.Data.IdNo, c.GetAdminUserInfo().CurrentOrgId)
+
+	var api string
+	api = "http://172.16.13.254:9532/" + "api/eleinfo?" + "fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&org_name=" + miConfig.OrgName +
+		"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&cainfo=" + miConfig.Cainfo + "&token=" + token + "&user_name=" + patient.Name + "&id_card_no=" + patient.IdCardNo
+
+	resp, requestErr := http.Get(api)
+	if requestErr != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
 	}
 
+	body, ioErr := ioutil.ReadAll(resp.Body)
+	if ioErr != nil {
+		utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	//var respJSON map[string]interface{}
+	//if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+	//	utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "读卡成功",
+	})
+
 }
 
 func (c *ZHHisApiController) UploadLingBao() {

main.go

@@ -25,13 +25,13 @@ import (
 
 func init() {
 	service.ConnectDB()
-	//org_id, _ := beego.AppConfig.Int64("org_id")
-	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	////CreateLog(miConfig)
-	////UploadLog(miConfig)
-	//if org_id == 10191 {
-	//	service.GetFjAuthorizationInfo(miConfig.Code)
-	//}
+	org_id, _ := beego.AppConfig.Int64("org_id")
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	//CreateLog(miConfig)
+	//UploadLog(miConfig)
+	if org_id == 10191 {
+		service.GetFjAuthorizationInfo(miConfig.Code)
+	}
 
 }
 func main() {
@@ -63,8 +63,18 @@ type ResultSeventeen struct {
 func GetBatchSettleList() {
 
 	org_id, _ := beego.AppConfig.Int64("org_id")
+	list, _ := service.GetLastFundList(org_id)
+	order, _ := service.GetHisOrderByID(list.OrderId)
+	var orders []*models.HisOrder
+	if order.ID > 0 {
+
+		orders, _ = service.GetAllHisOrderTwo(org_id, order.ID)
+
+	} else {
+		orders, _ = service.GetAllHisOrder(org_id)
+
+	}
 
-	orders, _ := service.GetAllHisOrder(org_id)
 	for _, item := range orders {
 		order_id := item.ID
 		order, _ := service.GetHisOrderByIDTwo(order_id)

models/his_models.go

@@ -1315,23 +1315,24 @@ type NewCustom struct {
 }
 
 type HisPsn struct {
-	ID           int64   `gorm:"column:id" json:"id" form:"id"`
-	PsnNo        string  `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
-	Age          float64 `gorm:"column:age" json:"age" form:"age"`
-	PatientId    int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Certno       string  `gorm:"column:certno" json:"certno" form:"certno"`
-	Brdy         string  `gorm:"column:brdy" json:"brdy" form:"brdy"`
-	Gend         string  `gorm:"column:gend" json:"gend" form:"gend"`
-	Naty         string  `gorm:"column:naty" json:"naty" form:"naty"`
-	PsnCertType  string  `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
-	PsnName      string  `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
-	Idetinfo     string  `gorm:"column:idetinfo" json:"idetinfo" form:"idetinfo"`
-	Insuinfo     string  `gorm:"column:insuinfo" json:"insuinfo" form:"insuinfo"`
-	UserOrgId    int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	CardInfo     string  `gorm:"column:card_info" json:"card_info" form:"card_info"`
-	VerifyNumber string  `gorm:"column:verify_number" json:"verify_number" form:"verify_number"`
-	Stage        string  `gorm:"column:stage" json:"stage" form:"stage"`
-	RecordDate   int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	ID            int64   `gorm:"column:id" json:"id" form:"id"`
+	PsnNo         string  `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	Age           float64 `gorm:"column:age" json:"age" form:"age"`
+	PatientId     int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Certno        string  `gorm:"column:certno" json:"certno" form:"certno"`
+	Brdy          string  `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Gend          string  `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty          string  `gorm:"column:naty" json:"naty" form:"naty"`
+	PsnCertType   string  `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	PsnName       string  `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	Idetinfo      string  `gorm:"column:idetinfo" json:"idetinfo" form:"idetinfo"`
+	Insuinfo      string  `gorm:"column:insuinfo" json:"insuinfo" form:"insuinfo"`
+	UserOrgId     int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	CardInfo      string  `gorm:"column:card_info" json:"card_info" form:"card_info"`
+	VerifyNumber  string  `gorm:"column:verify_number" json:"verify_number" form:"verify_number"`
+	Stage         string  `gorm:"column:stage" json:"stage" form:"stage"`
+	RecordDate    int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	InsuplcAdmdvs string  `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 }
 
 func (HisPsn) TableName() string {

service/fj_service.go

@@ -148,7 +148,7 @@ func FJyb1101ForEleToken(certNo string, org_name string, doctor string, fixmedin
 }
 
 // 门诊挂号
-func FJyb2201(psnNo string, insutype string, certNo string, org_name string, doctor string, ipt_otp_no string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, opter string, doctor_name string, url string, app_id string, app_secret string, sign_key string, enc_key string, card_number string) (string, string, string) {
+func FJyb2201(psnNo string, insutype string, certNo string, org_name string, doctor string, ipt_otp_no string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, opter string, doctor_name string, url string, app_id string, app_secret string, sign_key string, enc_key string, card_number string, record_time string) (string, string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -160,10 +160,10 @@ func FJyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 	inputMessage := SetFjInputMessage(nonce, timestamp, org_name, opter, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, app_id, app_secret, sign_key, enc_key)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "2201"        // 交易编码
-	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
-	inputData["insutype"] = insutype      // 险种类型（来自1101接口返回）
-	inputData["begntime"] = timeFormatOne // 开始时间
+	inputMessage["infno"] = "2201"                                                   // 交易编码
+	inputData["psn_no"] = psnNo                                                      // 人员编号 （来自1101接口返回）
+	inputData["insutype"] = insutype                                                 // 险种类型（来自1101接口返回）
+	inputData["begntime"] = record_time + " " + strings.Split(timeFormatOne, " ")[1] // 开始时间
 
 	if id_card_type == 1 {
 		inputData["mdtrt_cert_type"] = "03"      // 就诊凭证类型
@@ -277,15 +277,15 @@ func FJyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 
 	for index, item := range config {
 		diseinfo_sun := make(map[string]interface{})
-		diseinfo_sun["diag_type"] = "1"              // 诊断类别
-		diseinfo_sun["diag_srt_no"] = index          // 诊断排序号
-		diseinfo_sun["diag_code"] = item.CountryCode // 诊断代码
-		diseinfo_sun["diag_name"] = item.ClassName   // 诊断名称
-		diseinfo_sun["diag_dept"] = department       // 诊断科室
-		diseinfo_sun["dise_dor_no"] = doctor_id      // 诊断医生编码
-		diseinfo_sun["dise_dor_name"] = doctor_name  // 诊断医生姓名
-		diseinfo_sun["diag_time"] = timeFormatOne    // 诊断时间
-		diseinfo_sun["vali_flag"] = "1"              // 有效标志
+		diseinfo_sun["diag_type"] = "1"                                                     // 诊断类别
+		diseinfo_sun["diag_srt_no"] = index                                                 // 诊断排序号
+		diseinfo_sun["diag_code"] = item.CountryCode                                        // 诊断代码
+		diseinfo_sun["diag_name"] = item.ClassName                                          // 诊断名称
+		diseinfo_sun["diag_dept"] = department                                              // 诊断科室
+		diseinfo_sun["dise_dor_no"] = doctor_id                                             // 诊断医生编码
+		diseinfo_sun["dise_dor_name"] = doctor_name                                         // 诊断医生姓名
+		diseinfo_sun["diag_time"] = begin_time + " " + strings.Split(timeFormatOne, " ")[1] // 诊断时间
+		diseinfo_sun["vali_flag"] = "1"                                                     // 有效标志
 		diseinfo = append(diseinfo, diseinfo_sun)
 	}
 
@@ -2765,3 +2765,9 @@ func ReadEleCardForSettle(code string, user_name string, id int64) (string, stri
 	return ConvertByte2String([]byte(DeleteExtraSpace(string(bytesData))), GB18030), ConvertByte2String([]byte(DeleteExtraSpace(string(pBusiCardInfo))), GB18030), ConvertByte2String([]byte(DeleteExtraSpace(string(pErrMsg))), GB18030)
 
 }
+
+//
+//func GetLastPsnByInsOrg(patient_id int64) (psn models.HisPsn, err error){
+//	err := readDb.Model(&models.HisPsn{}).Where("patient_id = ? AND insuplc_admdvs <> ''",patient_id).Last(&psn).Error
+//	return
+//}

service/gdyb_service.go

@@ -2467,7 +2467,7 @@ func Gdyb2506(psnNo string, doctor string, org_name string, fixmedins_code strin
 	fmt.Println(str)
 	return str
 }
-func Gdyb2503(psnNo string, insutype string, org_name string, doctor string, fixmedins_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_name string, sick_code string, start_time string, end_time string, check_time string) string {
+func Gdyb2503(psnNo string, insutype string, org_name string, doctor string, fixmedins_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_name string, sick_code string, start_time string, end_time string, check_time string, hospital_code string, hospital_name string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -2485,21 +2485,21 @@ func Gdyb2503(psnNo string, insutype string, org_name string, doctor string, fix
 	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"] = "2503"                 // 交易编码
-	inputData["psn_no"] = psnNo                    // 人员编号 （来自1101接口返回）
-	inputData["insutype"] = insutype               // 险种类型（来自1101接口返回）
-	inputData["opsp_dise_code"] = sick_code        // 险种类型（来自1101接口返回）
-	inputData["opsp_dise_name"] = sick_name        // 险种类型（来自1101接口返回）
-	inputData["insu_optins"] = insuplc_admdvs      // 险种类型（来自1101接口返回）
-	inputData["ide_fixmedins_no"] = "H44122400103" // 险种类型（来自1101接口返回）
-	inputData["ide_fixmedins_name"] = "广东省怀集县人民医院" // 险种类型（来自1101接口返回）
-	inputData["hosp_ide_date"] = check_time        // 险种类型（来自1101接口返回）
-	inputData["diag_dr_codg"] = doctor_id          // 开始时间
-	inputData["diag_dr_name"] = doctor             // 开始时间
-	inputData["begndate"] = start_time             // 医师编码
-	inputData["tel"] = ""                          // 医师编码
-	inputData["addr"] = ""                         // 医师编码
-	inputData["enddate"] = end_time                // 医师编码
+	inputMessage["infno"] = "2503"                  // 交易编码
+	inputData["psn_no"] = psnNo                     // 人员编号 （来自1101接口返回）
+	inputData["insutype"] = insutype                // 险种类型（来自1101接口返回）
+	inputData["opsp_dise_code"] = sick_code         // 险种类型（来自1101接口返回）
+	inputData["opsp_dise_name"] = sick_name         // 险种类型（来自1101接口返回）
+	inputData["insu_optins"] = insuplc_admdvs       // 险种类型（来自1101接口返回）
+	inputData["ide_fixmedins_no"] = hospital_code   // 险种类型（来自1101接口返回）
+	inputData["ide_fixmedins_name"] = hospital_name // 险种类型（来自1101接口返回）
+	inputData["hosp_ide_date"] = check_time         // 险种类型（来自1101接口返回）
+	inputData["diag_dr_codg"] = doctor_id           // 开始时间
+	inputData["diag_dr_name"] = doctor              // 开始时间
+	inputData["begndate"] = start_time              // 医师编码
+	inputData["tel"] = ""                           // 医师编码
+	inputData["addr"] = ""                          // 医师编码
+	inputData["enddate"] = end_time                 // 医师编码
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入

service/gdyb_zifei_service.go

@@ -14,7 +14,7 @@ import (
 )
 
 // 人员基本信息
-func Gdyb4201A(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 string, psn_name string) (string, string) {
+func Gdyb4201A(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, struct4201A models.Struct4201A) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -25,6 +25,10 @@ func Gdyb4201A(certNo string, org_name string, doctor string, fixmedins_code str
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "4201A" // 交易编码
 
+	for _, item := range struct4201A.Fopfd {
+
+	}
+
 	inputData["fixmedins_mdtrt_id"] = ""
 	inputData["med_type"] = ""
 	inputData["bkkp_sn"] = ""
@@ -195,22 +199,20 @@ func Gdyb4202(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	inputData["elec_billno_code"] = ""
 	inputData["exp_content"] = ""
 
-	for _, item := range struct4202.ODiagListD {
-
+	for index, item := range struct4202.ODiagListD {
 		feedetailInfo := make(map[string]interface{})
 		feedetailInfo["inout_diag_type"] = item.InoutDiagType
 		feedetailInfo["diag_type"] = item.DiagType         // 就诊 ID（来自2201接口返回）
 		feedetailInfo["maindiag_flag"] = item.MaindiagFlag // 人员编号 （来自1101接口返回）
-		feedetailInfo["diag_srt_no"] = ""                  // 收费批次号
-		feedetailInfo["diag_code"] = ""                    // 病种编码
+		feedetailInfo["diag_srt_no"] = index               // 收费批次号
+		feedetailInfo["diag_code"] = item.DiagCode         // 病种编码
 		feedetailInfo["diag_name"] = ""                    // 处方号
 		feedetailInfo["diag_dept"] = ""
 		feedetailInfo["diag_dr_code"] = ""
 		feedetailInfo["diag_dr_name"] = ""
 		feedetailInfo["diag_time"] = ""
-		feedetailInfo["vali_flag"] = ""
+		feedetailInfo["vali_flag"] = "1"
 		feedetail = append(feedetail, feedetailInfo)
-
 	}
 
 	inputData["ownPayPatnDiagListD"] = feedetail
@@ -234,7 +236,7 @@ func Gdyb4202(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	if fixmedins_code == "H15049901371" {
 		url = gdyb_url
 	} else {
-		url = gdyb_url + "1101"
+		url = gdyb_url + "4202"
 	}
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
@@ -266,7 +268,7 @@ func Gdyb4202(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	return str, inputLog
 
 }
-func Gdyb4203(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 string, psn_name string) (string, string) {
+func Gdyb4203(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_mdtrt_id string) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -275,11 +277,11 @@ func Gdyb4203(certNo string, org_name string, doctor string, fixmedins_code stri
 	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"] = "4203"       // 交易编码
-	inputData["fixmedins_mdtrt_id"] = "" // 开始时间
-	inputData["fixmedins_code"] = ""     // 开始时间
-	inputData["cplt_flag"] = ""          // 人员姓名
-	inputMessage["input"] = inputData    //交易输入
+	inputMessage["infno"] = "4203"                       // 交易编码
+	inputData["fixmedins_mdtrt_id"] = fixmedins_mdtrt_id // 开始时间
+	inputData["fixmedins_code"] = fixmedins_code         // 开始时间
+	inputData["cplt_flag"] = "1"                         // 人员姓名
+	inputMessage["input"] = inputData                    //交易输入
 
 	var inputLog string
 	bytesData, err := json.Marshal(inputMessage)
@@ -297,7 +299,7 @@ func Gdyb4203(certNo string, org_name string, doctor string, fixmedins_code stri
 	if fixmedins_code == "H15049901371" {
 		url = gdyb_url
 	} else {
-		url = gdyb_url + "1101"
+		url = gdyb_url + "4203"
 	}
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"

service/his_service.go

@@ -749,7 +749,7 @@ func UpdataRegStatus2(id int64) error {
 	return err
 }
 func GetAdminUserInfoByID(org_id int64, admin_user_id int64) (role models.UserAdminRole, err error) {
-	err = readUserDb.Model(&models.UserAdminRole{}).Where("org_id = ? AND status = 1 AND admin_user_id = ?", org_id, admin_user_id).First(&role).Error
+	err = readUserDb.Model(&models.UserAdminRole{}).Where("org_id = ?  AND admin_user_id = ?", org_id, admin_user_id).First(&role).Error
 	return
 }
 
@@ -978,27 +978,43 @@ func GetHisOrderInfoByNumberThree(order_number string) (order []*models.HisOrder
 	return
 }
 
-func GetOrderByTime(start_time int64, end_time int64, org_id int64, insutype string, clr_org string, clr_type string) (orders []*models.HisOrder, err error) {
+func GetOrderByTime(start_time int64, end_time int64, org_id int64, insutype string, clr_org string, clr_type string, mdtrtareaAdmvs string) (orders []*models.HisOrder, err error) {
 	db := readDb.Model(&models.HisOrder{})
 	db = db.Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ?", org_id, end_time, start_time, insutype)
 	if len(clr_org) > 0 {
 		db = db.Where("clr_optins = ?", clr_org)
 	}
 	if len(clr_type) > 0 {
-		db = db.Where("clr_type = ?", clr_type)
+		if mdtrtareaAdmvs == "150499" {
+			if clr_type == "11" {
+				db = db.Where("clr_type = ?", clr_type)
+			}
+
+		} else {
+			db = db.Where("clr_type = ?", clr_type)
+
+		}
 	}
 	err = db.Find(&orders).Error
 	return
 }
 
-func GetOrderByTimeFive(start_time int64, end_time int64, org_id int64, insutype string, clr_org string, clr_type string) (orders []*models.HisOrder, err error) {
+func GetOrderByTimeFive(start_time int64, end_time int64, org_id int64, insutype string, clr_org string, clr_type string, mdtrtareaAdmvs string) (orders []*models.HisOrder, err error) {
 	db := readDb.Model(&models.HisOrder{})
 	db = db.Where("user_org_id = ?  AND order_status = 3 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ?", org_id, end_time, start_time, insutype)
 	if len(clr_org) > 0 {
 		db = db.Where("clr_optins = ?", clr_org)
 	}
 	if len(clr_type) > 0 {
-		db = db.Where("clr_type = ?", clr_type)
+		if mdtrtareaAdmvs == "150499" {
+			if clr_type == "11" {
+				db = db.Where("clr_type = ?", clr_type)
+			}
+
+		} else {
+			db = db.Where("clr_type = ?", clr_type)
+
+		}
 	}
 	err = db.Find(&orders).Error
 	return
@@ -1401,6 +1417,11 @@ func GetTodayHisOrder(org_id int64, patient_id int64, record_time int64, number
 	return
 }
 
+func GetLastFundList(org_id int64) (order models.HisFundSettleListResult, err error) {
+	err = readDb.Model(&models.HisFundSettleListResult{}).Where("user_org_id = ? AND status = 1 ", org_id).Last(&order).Error
+	return
+}
+
 func GetOrderCountByNumber(org_id int64, patient_id int64, record_time int64, number string) (count int64, err error) {
 	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND settle_accounts_date = ? AND order_status = 2 AND mdtrt_id = ?", org_id, patient_id, record_time, number).Count(&count).Error
 
@@ -1422,7 +1443,13 @@ func GetPsnByPatientIdTwo(patient_id int64, record_date int64) (psn models.HisPs
 }
 
 func GetAllHisOrder(org_id int64) (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ?  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND setl_time >= '2022-11-01 00:00:00'", org_id).Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ?  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND setl_time >= '2022-12-15 00:00:00'", org_id).Order("setl_time asc").Find(&his).Error
+	fmt.Println(err)
+	return
+}
+
+func GetAllHisOrderTwo(org_id int64, id int64) (his []*models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ?  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND id > ?", org_id, id).Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }

service/hn_service.go

@@ -1566,17 +1566,20 @@ func Hnyb4101(struct4101 Struct4101, params models.PublicParams) (string, string
 	inputData["setl_id"] = struct4101.SetlId   // 结算 ID  必填
 	inputData["psn_no"] = struct4101.PsnNo     // 结算 ID  必填
 
-	inputData["fixmedins_name"] = params.FixmedinsName        // 定点医药机构名称  必填
-	inputData["fixmedins_code"] = params.FixmedinsCode        // 定点医药机构编码  必填
-	inputData["hi_setl_lv"] = ""                              // 医保结算等级
-	inputData["hi_no"] = struct4101.PsnNo                     // 医保编号
-	inputData["medcasno"] = struct4101.PsnNo                  // 病案号  必填
-	inputData["dcla_time"] = year + "-" + month + "-" + day   // 申报时间  必填
-	inputData["psn_name"] = struct4101.PsnName                // 人员姓名  必填
-	inputData["gend"] = struct4101.Gend                       // 性别  必填
-	inputData["brdy"] = struct4101.Brdy                       // 出生日期  必填
-	inputData["age"] = struct4101.Age                         // 年龄  必填
-	inputData["ntly"] = struct4101.Ntly                       // 国籍  必填
+	inputData["fixmedins_name"] = params.FixmedinsName      // 定点医药机构名称  必填
+	inputData["fixmedins_code"] = params.FixmedinsCode      // 定点医药机构编码  必填
+	inputData["hi_setl_lv"] = ""                            // 医保结算等级
+	inputData["hi_no"] = struct4101.PsnNo                   // 医保编号
+	inputData["medcasno"] = struct4101.PsnNo                // 病案号  必填
+	inputData["dcla_time"] = year + "-" + month + "-" + day // 申报时间  必填
+	inputData["psn_name"] = struct4101.PsnName              // 人员姓名  必填
+	inputData["gend"] = struct4101.Gend                     // 性别  必填
+	inputData["brdy"] = struct4101.Brdy                     // 出生日期  必填
+	inputData["age"] = struct4101.Age                       // 年龄  必填
+	inputData["ntly"] = struct4101.Ntly                     // 国籍  必填
+
+	inputData["resp_nurs_code"] = "N430822004867" // 民族  必填
+
 	inputData["nwb_age"] = ""                                 // 年龄  必填
 	inputData["naty"] = struct4101.Naty                       // 民族  必填
 	inputData["patn_cert_type"] = struct4101.PatnCertType     // 患者证件类别  必填
@@ -1630,8 +1633,8 @@ func Hnyb4101(struct4101 Struct4101, params models.PublicParams) (string, string
 	inputData["biz_sn"] = struct4101.BizSn                    // 业务流水号  必填
 	inputData["days_rinp_flag_31"] = ""                       // 出院 31 天内再住院计划标志  必填
 	inputData["days_rinp_pup_31"] = ""                        // 出院 31 天内再住院目的  必填
-	inputData["chfpdr_name"] = ""                             // 主诊医师姓名  必填
-	inputData["chfpdr_code"] = ""                             // 主诊医师代码  必填
+	inputData["chfpdr_name"] = struct4101.DoctorName          // 主诊医师姓名  必填
+	inputData["chfpdr_code"] = struct4101.DoctorCode          // 主诊医师代码  必填
 	inputData["setl_begn_date"] = struct4101.SetlBegnDate     // 结算开始日期  必填
 	inputData["setl_end_date"] = struct4101.SetlEndDate       // 结算结束日期  必填
 	inputData["psn_selfpay"] = struct4101.PsnSelfPay          // 个人自付  必填