更新

controllers/nm/nm_controller.go

@@ -11,11 +11,13 @@ import (
 	"gdyb/utils"
 	"github.com/astaxie/beego"
 	"github.com/axgle/mahonia"
+	"github.com/gorilla/websocket"
 	"golang.org/x/text/encoding/simplifiedchinese"
 	"io/ioutil"
+	"log"
 	"net/http"
+	"net/url"
 	"os"
-	"os/exec"
 	"regexp"
 	"strconv"
 	"strings"
@@ -785,6 +787,7 @@ func (c *NmController) ReadCard() {
 	id_card_type := c.GetString("id_card_type")
 	operator_id := c.GetString("operator_id")
 	operator := c.GetString("operator")
+	is_settle := c.GetString("is_settle")
 
 	switch id_card_type {
 	case "1":
@@ -857,61 +860,61 @@ func (c *NmController) ReadCard() {
 
 		break
 	case "4": //电子凭证
-		c.GetELeInfo()
+		//c.GetELeInfo()
+		var result_info string
+		if len(is_settle) > 0 {
+			_, result_info = c.GetELeInfo(fixmedins_code, operator_id, operator)
+		} else {
+			_, result_info = c.GetELeInfoThree(fixmedins_code, operator_id, operator)
+		}
 		//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
-		//}
+		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
+		}
 
 		break
 	case "5": //电子凭证
-		c.GetELeInfoTwo(fixmedins_code, operator_id, operator)
+		//c.GetELeInfoTwo(fixmedins_code, operator_id, operator)
 		//_, pBusiCardInfo := c.GetELeInfoTwo(fixmedins_code, operator_id, operator)
 
 		//var ele ELeData
@@ -1106,29 +1109,101 @@ func (c *NmController) GetBasBaseInfo(fixmedins_code string, mdtrtarea_admvs str
 	}
 	return DeleteExtraSpace(string(pBusiCardInfo))
 }
-func (c *NmController) GetELeInfo() (string, string) {
-	fmt.Println("执行java")
-	var json string
-	cmd := exec.Command("java", "-jar", "NM_DZPZ.jar", json)
-	//fmt.Println(cmd)
-	//fmt.Println(cmd.Output())
-
-	out, err := cmd.Output()
+func (c *NmController) GetELeInfo(code string, operator_id string, operator_name string) (string, string) {
+	// WebSocket服务器地址
+	serverURL := "ws://127.0.0.1:8899"
+
+	// 解析WebSocket服务器地址
+	u, err := url.Parse(serverURL)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	// 建立WebSocket连接
+	conn, _, err := websocket.DefaultDialer.Dial(u.String(), nil)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer conn.Close()
+	input2 := make(map[string]interface{})
+
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputData["orgId"] = code
+	inputData["businessType"] = "01103"
+	inputData["operatorId"] = operator_id
+	inputData["operatorName"] = operator_name
+	inputData["officeId"] = "001"
+	inputData["officeName"] = "血透室"
+	inputData["deviceType"] = ""
+	input["data"] = inputData
+	input["orgId"] = code
+	input["transType"] = "ec.query"
+	input2["url"] = "http://10.38.22.15:8081/localcfc/api/hsecfc/localQrCodeQuery"
+	input2["indata"] = input
+
+	bytesData, _ := json.Marshal(input2)
+	err = conn.WriteMessage(websocket.TextMessage, bytesData)
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	// 接收消息
+	_, receivedMessage, err := conn.ReadMessage()
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	return "", string(receivedMessage)
+}
+func (c *NmController) GetELeInfoThree(code string, operator_id string, operator_name string) (string, string) {
+	// WebSocket服务器地址
+	serverURL := "ws://127.0.0.1:8899"
+
+	// 解析WebSocket服务器地址
+	u, err := url.Parse(serverURL)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	// 建立WebSocket连接
+	conn, _, err := websocket.DefaultDialer.Dial(u.String(), nil)
 	if err != nil {
-		fmt.Println("error:", err.Error())
+		log.Fatal(err)
 	}
-	fmt.Println(err)
-	fmt.Println(string(out))
-	fmt.Println("json:")
-	fmt.Println(cmd.Args[0])
-	fmt.Println(json)
-	fmt.Println(string(json))
-	fmt.Println("json:")
+	defer conn.Close()
+	input2 := make(map[string]interface{})
 
-	results := strings.Split(string(out), "-")
-	return results[0], results[1]
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputData["orgId"] = code
+	inputData["businessType"] = "01301"
+	inputData["operatorId"] = operator_id
+	inputData["operatorName"] = operator_name
+	inputData["officeId"] = "001"
+	inputData["officeName"] = "血透室"
+	inputData["deviceType"] = ""
+	input["data"] = inputData
+	input["orgId"] = code
+	input["transType"] = "ec.query"
+	input2["url"] = "http://10.38.22.15:8081/localcfc/api/hsecfc/localQrCodeQuery"
+	input2["indata"] = input
+
+	bytesData, _ := json.Marshal(input2)
+	err = conn.WriteMessage(websocket.TextMessage, bytesData)
+	if err != nil {
+		fmt.Println(err)
+	}
 
+	// 接收消息
+	_, receivedMessage, err := conn.ReadMessage()
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	return "", string(receivedMessage)
 }
+
 func IntPtr(n int) uintptr {
 	return uintptr(n)
 }

controllers/zh/zh_his_api_controller.go

@@ -1494,20 +1494,13 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 	if miConfig.MdtrtareaAdmvs == "150499" {
 		if id_card_type == 2 {
 			mdtrt_cert_no := ""
-			card_sn := ""
 
-			if record.IdCardType == 1 {
-				bas := strings.Split(psn_info.CardInfo, "|")
-				cardNumber := bas[2]
-				mdtrt_cert_no = cardNumber
-				card_sn = bas[3]
-			} else {
-				mdtrt_cert_no = id_card_no
-			}
+			mdtrt_cert_no = id_card_no
+
 			//请求内网数据
 			api := "http://172.16.13.254:9532/" + "nmyb/1101?cert_no=" + mdtrt_cert_no +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + role.UserName + "&fixmedins_code=" + miConfig.Code +
-				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&card_sn=" + card_sn + "&certificates=" + strconv.FormatInt(certificates, 10) + "&name=" + patient.Name
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(certificates, 10) + "&name=" + patient.Name
 			resp, requestErr := http.Get(api)
 			if requestErr != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1559,8 +1552,15 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 			res2.Output.Baseinfo.Certno = patient.IdCardNo
 		}
 	} else if miConfig.MdtrtareaAdmvs == "360399" {
-		result, request_log = service.JxybZY1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, "", miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", certificates, miConfig.Url, miConfig.AccessKey, "", patient.IdCardNo, "")
-		saveLog(result_log, request_log, "1101", "人员基本信息获取")
+		//res2.Infcode = 0
+		//res2.Output.Baseinfo.PsnNo = psn_info.PsnNo
+		//res2.Output.Baseinfo.Certno = patient.IdCardNo
+		//result, request_log = service.JxybZY1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, insuplc_admdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, ca, certificates, miConfig.Url, miConfig.AccessKey, "", patient.IdCardNo, "")
+		bas := strings.Split(psn_info.CardInfo, "|")
+		cardNumber := bas[3]
+		result, request_log = service.Jxyb1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, cardNumber, "1", miConfig.Url, miConfig.AccessKey, "")
+		saveLog(result, request_log, "1101", "人员基本信息获取")
+
 	} else {
 		result, request_log, result_log = service.ZHGdyb1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", certificates, name)
 		saveLog(result_log, request_log, "1101", "人员基本信息获取")
@@ -1694,7 +1694,6 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 
 		timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 		var struct2401 service.Struct2401
-		struct2401.PsnNo = res2.Output.Baseinfo.PsnNo
 		//insutype = "310"
 		struct2401.Insutype = insutype
 		psn_info, _ := service.GetPsnByPatientId(patient.ID)
@@ -1704,11 +1703,16 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 			bas := strings.Split(psn_info.CardInfo, "|")
 			cardNumber := bas[2]
 			struct2401.MdtrtCertNo = cardNumber
+			struct2401.PsnNo = res2.Output.Baseinfo.PsnNo
+		} else if id_card_type == 4 {
+			struct2401.MdtrtCertType = "01"
+			struct2401.MdtrtCertNo = psn_info.VerifyNumber
+			struct2401.PsnNo = psn_info.PsnNo
 		} else {
 			struct2401.MdtrtCertType = "02"
-			struct2401.MdtrtCertNo = res2.Output.Baseinfo.Certno
+			struct2401.MdtrtCertNo = id_card_no
+			struct2401.PsnNo = res2.Output.Baseinfo.PsnNo
 		}
-
 		if miConfig.Code == "H15049901371" {
 			if med_type == 14 {
 				if insutype == "390" {
@@ -1724,8 +1728,8 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 			}
 		} else {
 			if med_type == 11 {
-				struct2401.MedType = "24"
-				med_type = 24
+				struct2401.MedType = "21"
+				med_type = 21
 			} else {
 				struct2401.MedType = strconv.FormatInt(int64(med_type), 10)
 			}
@@ -1750,7 +1754,12 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 		for index, item := range diagnosisConfig {
 			var dise service.DiseinfoStruct
 
-			dise.PsnNo = res2.Output.Baseinfo.PsnNo
+			if id_card_type == 4 || id_card_type == 1 {
+				dise.PsnNo = psn_info.PsnNo
+			} else {
+				dise.PsnNo = res2.Output.Baseinfo.PsnNo
+
+			}
 			dise.DiagType = "1"
 			if index == 0 {
 				dise.MaindiagFlag = "1"
@@ -2668,6 +2677,9 @@ func (c *ZHHisApiController) GetPreSettleInfo() {
 		cardNumber := bas[2]
 		cert_no = cardNumber
 
+	} else if record.IdCardType == 4 {
+		cert_no = psn_info.VerifyNumber
+
 	} else {
 		cert_no = record.Certno
 	}
@@ -2722,48 +2734,104 @@ func (c *ZHHisApiController) GetPreSettleInfo() {
 	var res2 ResultSevenTwo
 	var res ResultSeven
 	var resSeven10265 ResultSeven10265
-	if miConfig.Code == "H15049901371" {
-		if err := json.Unmarshal(userJSONBytes, &resSeven10265); err != nil {
+
+	if miConfig.MdtrtareaAdmvs == "360399" {
+		if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
 			utils.ErrorLog("解析失败：%v", err)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
-		Infcode, _ := strconv.ParseInt(resSeven10265.Infcode, 10, 64)
-		res.Infcode = Infcode
-		res.InfRefmsgid = resSeven10265.InfRefmsgid
-		res.RespondTime = resSeven10265.RespondTime
-		res.ErrMsg = resSeven10265.ErrMsg
-		res.Output = resSeven10265.Output
-		res.WarnMsg = resSeven10265.WarnMsg
-		res.Cainfo = resSeven10265.Cainfo
 
-	} else {
-		if miConfig.MdtrtareaAdmvs == "360399" {
-			if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
+		if res2.Infcode != 0 {
+			errlog := &models.HisOrderError{
+				UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
+				Ctime:      time.Now().Unix(),
+				Mtime:      time.Now().Unix(),
+				Number:     chrg_bchno,
+				ErrMsg:     res.ErrMsg,
+				Status:     1,
+				PatientId:  patient_id,
+				RecordTime: time.Now().Unix(),
+				Stage:      6,
 			}
+			service.CreateErrMsgLog(errlog)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         res.ErrMsg,
+			})
+			return
+		} else {
+			//order, _ := service.GetHisOrderTwo(adminUser.CurrentOrgId, chrg_bchno, id)
+			order.OrderStatus = 1
+			order.MdtrtId = res2.Output.Setlinfo.MdtrtID
+			order.SetlId = res2.Output.Setlinfo.SetlID
+			order.PsnNo = res2.Output.Setlinfo.PsnNo
+			order.PsnName = res2.Output.Setlinfo.PsnName
+			order.PsnCertType = res2.Output.Setlinfo.PsnCertType
+			order.Certno = res2.Output.Setlinfo.Certno
+			order.Gend = res2.Output.Setlinfo.Gend
+			order.Naty = res2.Output.Setlinfo.Naty
+			val, _ := strconv.ParseFloat(res2.Output.Setlinfo.Age, 64)
+			order.Age = val
+			order.Insutype = res2.Output.Setlinfo.Insutype
+			order.PsnType = res2.Output.Setlinfo.PsnType
+			order.CvlservFlag = res2.Output.Setlinfo.CvlservFlag
+			order.SetlTime = res2.Output.Setlinfo.SetlTime
+			order.MdtrtCertType = res2.Output.Setlinfo.MdtrtCertType
+			if res.Output.Setlinfo.MedType == "140104" {
+
+				order.MedType = "14"
 
-			if res2.Infcode != 0 {
-				errlog := &models.HisOrderError{
-					UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
-					Ctime:      time.Now().Unix(),
-					Mtime:      time.Now().Unix(),
-					Number:     chrg_bchno,
-					ErrMsg:     res.ErrMsg,
-					Status:     1,
-					PatientId:  patient_id,
-					RecordTime: time.Now().Unix(),
-					Stage:      6,
-				}
-				service.CreateErrMsgLog(errlog)
-				c.ServeSuccessJSON(map[string]interface{}{
-					"failed_code": -10,
-					"msg":         res.ErrMsg,
-				})
-				return
 			} else {
+
+				order.MedType = res2.Output.Setlinfo.MedType
+
+			}
+			order.MedfeeSumamt = res2.Output.Setlinfo.MedfeeSumamt
+			order.FulamtOwnpayAmt = res2.Output.Setlinfo.FulamtOwnpayAmt
+			order.OverlmtSelfPay = res2.Output.Setlinfo.OverlmtSelfpay
+			order.PreselfpayAmt = res2.Output.Setlinfo.PreselfpayAmt
+			order.InscpScpAmt = res2.Output.Setlinfo.InscpScpAmt
+			order.ActPayDedc = res2.Output.Setlinfo.ActPayDedc
+			order.HifmiPay = res2.Output.Setlinfo.HifmiPay
+			order.HifpPay = res2.Output.Setlinfo.HifpPay
+			order.HifesPay = res2.Output.Setlinfo.HifesPay
+			order.HifobPay = res2.Output.Setlinfo.HifobPay
+			order.MafPay = res2.Output.Setlinfo.MafPay
+			order.OthPay = res2.Output.Setlinfo.OthPay
+			order.CvlservPay = res2.Output.Setlinfo.CvlservPay
+			order.PoolPropSelfpay = res2.Output.Setlinfo.PoolPropSelfpay
+			order.FundPaySumamt = res2.Output.Setlinfo.FundPaySumamt
+			order.PsnPartAmt = res2.Output.Setlinfo.PsnPartAmt
+			order.AcctPay = res2.Output.Setlinfo.AcctPay
+			order.PsnCashPay = res2.Output.Setlinfo.PsnCashPay
+			order.HospPartAmt = res2.Output.Setlinfo.HospPartAmt
+			order.Balc = res2.Output.Setlinfo.Balc
+			order.AcctMulaidPay = res2.Output.Setlinfo.AcctMulaidPay
+			order.MedinsSetlId = res2.Output.Setlinfo.MedinsSetlID
+			order.ClrOptins = res2.Output.Setlinfo.ClrOptins
+			order.ClrWay = res2.Output.Setlinfo.ClrWay
+			order.Creator = order.Creator
+			order.Modify = roles.AdminUserId
+			order.RequestLog = src_resquest
+			setlDetail, _ := json.Marshal(res2.Output.Setldetail)
+			detailStr := string(setlDetail)
+			order.SetlDetail = detailStr
+			//err := service.UpdataOrderStatusTwo(chrg_bchno, c.GetAdminUserInfo().CurrentOrgId)
+			if record.OutHospitalStatus == 1 && order.ID > 0 {
+				err := service.UpDateOrder(order)
+				if err == nil {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":       "预结算成功",
+						"order_way": 1,
+					})
+				} else {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAmountAccountException)
+					return
+				}
+			} else if record.OutHospitalStatus == 0 && order.ID == 0 {
+
+				var order models.HisOrder
 				//order, _ := service.GetHisOrderTwo(adminUser.CurrentOrgId, chrg_bchno, id)
 				order.OrderStatus = 1
 				order.MdtrtId = res2.Output.Setlinfo.MdtrtID
@@ -2781,7 +2849,7 @@ func (c *ZHHisApiController) GetPreSettleInfo() {
 				order.CvlservFlag = res2.Output.Setlinfo.CvlservFlag
 				order.SetlTime = res2.Output.Setlinfo.SetlTime
 				order.MdtrtCertType = res2.Output.Setlinfo.MdtrtCertType
-				if res.Output.Setlinfo.MedType == "140104" {
+				if res2.Output.Setlinfo.MedType == "140104" {
 
 					order.MedType = "14"
 
@@ -2820,184 +2888,129 @@ func (c *ZHHisApiController) GetPreSettleInfo() {
 				setlDetail, _ := json.Marshal(res2.Output.Setldetail)
 				detailStr := string(setlDetail)
 				order.SetlDetail = detailStr
-				//err := service.UpdataOrderStatusTwo(chrg_bchno, c.GetAdminUserInfo().CurrentOrgId)
-				if record.OutHospitalStatus == 1 && order.ID > 0 {
-					err := service.UpDateOrder(order)
-					if err == nil {
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg":       "预结算成功",
-							"order_way": 1,
-						})
-					} else {
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAmountAccountException)
-						return
-					}
-				} else if record.OutHospitalStatus == 0 && order.ID == 0 {
-
-					var order models.HisOrder
-					//order, _ := service.GetHisOrderTwo(adminUser.CurrentOrgId, chrg_bchno, id)
-					order.OrderStatus = 1
-					order.MdtrtId = res2.Output.Setlinfo.MdtrtID
-					order.SetlId = res2.Output.Setlinfo.SetlID
-					order.PsnNo = res2.Output.Setlinfo.PsnNo
-					order.PsnName = res2.Output.Setlinfo.PsnName
-					order.PsnCertType = res2.Output.Setlinfo.PsnCertType
-					order.Certno = res2.Output.Setlinfo.Certno
-					order.Gend = res2.Output.Setlinfo.Gend
-					order.Naty = res2.Output.Setlinfo.Naty
-					val, _ := strconv.ParseFloat(res2.Output.Setlinfo.Age, 64)
-					order.Age = val
-					order.Insutype = res2.Output.Setlinfo.Insutype
-					order.PsnType = res2.Output.Setlinfo.PsnType
-					order.CvlservFlag = res2.Output.Setlinfo.CvlservFlag
-					order.SetlTime = res2.Output.Setlinfo.SetlTime
-					order.MdtrtCertType = res2.Output.Setlinfo.MdtrtCertType
-					if res2.Output.Setlinfo.MedType == "140104" {
-
-						order.MedType = "14"
 
-					} else {
-
-						order.MedType = res2.Output.Setlinfo.MedType
-
-					}
-					order.MedfeeSumamt = res2.Output.Setlinfo.MedfeeSumamt
-					order.FulamtOwnpayAmt = res2.Output.Setlinfo.FulamtOwnpayAmt
-					order.OverlmtSelfPay = res2.Output.Setlinfo.OverlmtSelfpay
-					order.PreselfpayAmt = res2.Output.Setlinfo.PreselfpayAmt
-					order.InscpScpAmt = res2.Output.Setlinfo.InscpScpAmt
-					order.ActPayDedc = res2.Output.Setlinfo.ActPayDedc
-					order.HifmiPay = res2.Output.Setlinfo.HifmiPay
-					order.HifpPay = res2.Output.Setlinfo.HifpPay
-					order.HifesPay = res2.Output.Setlinfo.HifesPay
-					order.HifobPay = res2.Output.Setlinfo.HifobPay
-					order.MafPay = res2.Output.Setlinfo.MafPay
-					order.OthPay = res2.Output.Setlinfo.OthPay
-					order.CvlservPay = res2.Output.Setlinfo.CvlservPay
-					order.PoolPropSelfpay = res2.Output.Setlinfo.PoolPropSelfpay
-					order.FundPaySumamt = res2.Output.Setlinfo.FundPaySumamt
-					order.PsnPartAmt = res2.Output.Setlinfo.PsnPartAmt
-					order.AcctPay = res2.Output.Setlinfo.AcctPay
-					order.PsnCashPay = res2.Output.Setlinfo.PsnCashPay
-					order.HospPartAmt = res2.Output.Setlinfo.HospPartAmt
-					order.Balc = res2.Output.Setlinfo.Balc
-					order.AcctMulaidPay = res2.Output.Setlinfo.AcctMulaidPay
-					order.MedinsSetlId = res2.Output.Setlinfo.MedinsSetlID
-					order.ClrOptins = res2.Output.Setlinfo.ClrOptins
-					order.ClrWay = res2.Output.Setlinfo.ClrWay
-					order.Creator = order.Creator
-					order.Modify = roles.AdminUserId
-					order.RequestLog = src_resquest
-					setlDetail, _ := json.Marshal(res2.Output.Setldetail)
-					detailStr := string(setlDetail)
-					order.SetlDetail = detailStr
-
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":       "预结算成功",
-						"order":     order,
-						"order_way": 2,
-					})
-				}
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":       "预结算成功",
+					"order":     order,
+					"order_way": 2,
+				})
+			}
+		}
+	} else {
+		if miConfig.Code == "H15049901371" {
+			if err := json.Unmarshal(userJSONBytes, &resSeven10265); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
 			}
+			Infcode, _ := strconv.ParseInt(resSeven10265.Infcode, 10, 64)
+			res.Infcode = Infcode
+			res.InfRefmsgid = resSeven10265.InfRefmsgid
+			res.RespondTime = resSeven10265.RespondTime
+			res.ErrMsg = resSeven10265.ErrMsg
+			res.Output = resSeven10265.Output
+			res.WarnMsg = resSeven10265.WarnMsg
+			res.Cainfo = resSeven10265.Cainfo
+
 		} else {
 			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
-			if res.Infcode != 0 {
-				errlog := &models.HisOrderError{
-					UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
-					Ctime:      time.Now().Unix(),
-					Mtime:      time.Now().Unix(),
-					Number:     chrg_bchno,
-					ErrMsg:     res.ErrMsg,
-					Status:     1,
-					PatientId:  patient_id,
-					RecordTime: time.Now().Unix(),
-					Stage:      6,
-				}
-				service.CreateErrMsgLog(errlog)
-				c.ServeSuccessJSON(map[string]interface{}{
-					"failed_code": -10,
-					"msg":         res.ErrMsg,
-				})
-				return
-			} else {
-				//order, _ := service.GetHisOrderTwo(adminUser.CurrentOrgId, chrg_bchno, id)
-				order.OrderStatus = 1
-				order.MdtrtId = res.Output.Setlinfo.MdtrtID
-				order.SetlId = res.Output.Setlinfo.SetlID
-				order.PsnNo = res.Output.Setlinfo.PsnNo
-				order.PsnName = res.Output.Setlinfo.PsnName
-				order.PsnCertType = res.Output.Setlinfo.PsnCertType
-				order.Certno = res.Output.Setlinfo.Certno
-				order.Gend = res.Output.Setlinfo.Gend
-				order.Naty = res.Output.Setlinfo.Naty
-				order.Age = res.Output.Setlinfo.Age
-				order.Insutype = res.Output.Setlinfo.Insutype
-				order.PsnType = res.Output.Setlinfo.PsnType
-				order.CvlservFlag = res.Output.Setlinfo.CvlservFlag
-				order.SetlTime = res.Output.Setlinfo.SetlTime
-				order.MdtrtCertType = res.Output.Setlinfo.MdtrtCertType
-				if res.Output.Setlinfo.MedType == "140104" {
-
-					order.MedType = "14"
+		}
+		if res.Infcode != 0 {
+			errlog := &models.HisOrderError{
+				UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
+				Ctime:      time.Now().Unix(),
+				Mtime:      time.Now().Unix(),
+				Number:     chrg_bchno,
+				ErrMsg:     res.ErrMsg,
+				Status:     1,
+				PatientId:  patient_id,
+				RecordTime: time.Now().Unix(),
+				Stage:      6,
+			}
+			service.CreateErrMsgLog(errlog)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         res.ErrMsg,
+			})
+			return
+		} else {
+			//order, _ := service.GetHisOrderTwo(adminUser.CurrentOrgId, chrg_bchno, id)
+			order.OrderStatus = 1
+			order.MdtrtId = res.Output.Setlinfo.MdtrtID
+			order.SetlId = res.Output.Setlinfo.SetlID
+			order.PsnNo = res.Output.Setlinfo.PsnNo
+			order.PsnName = res.Output.Setlinfo.PsnName
+			order.PsnCertType = res.Output.Setlinfo.PsnCertType
+			order.Certno = res.Output.Setlinfo.Certno
+			order.Gend = res.Output.Setlinfo.Gend
+			order.Naty = res.Output.Setlinfo.Naty
+			order.Age = res.Output.Setlinfo.Age
+			order.Insutype = res.Output.Setlinfo.Insutype
+			order.PsnType = res.Output.Setlinfo.PsnType
+			order.CvlservFlag = res.Output.Setlinfo.CvlservFlag
+			order.SetlTime = res.Output.Setlinfo.SetlTime
+			order.MdtrtCertType = res.Output.Setlinfo.MdtrtCertType
+			if res.Output.Setlinfo.MedType == "140104" {
+
+				order.MedType = "14"
 
-				} else {
+			} else {
 
-					order.MedType = res.Output.Setlinfo.MedType
+				order.MedType = res.Output.Setlinfo.MedType
 
-				}
-				order.MedfeeSumamt = res.Output.Setlinfo.MedfeeSumamt
-				order.FulamtOwnpayAmt = res.Output.Setlinfo.FulamtOwnpayAmt
-				order.OverlmtSelfPay = res.Output.Setlinfo.OverlmtSelfpay
-				order.PreselfpayAmt = res.Output.Setlinfo.PreselfpayAmt
-				order.InscpScpAmt = res.Output.Setlinfo.InscpScpAmt
-				order.ActPayDedc = res.Output.Setlinfo.ActPayDedc
-				order.HifmiPay = res.Output.Setlinfo.HifmiPay
-				order.HifpPay = res.Output.Setlinfo.HifpPay
-				order.HifesPay = res.Output.Setlinfo.HifesPay
-				order.HifobPay = res.Output.Setlinfo.HifobPay
-				order.MafPay = res.Output.Setlinfo.MafPay
-				order.OthPay = res.Output.Setlinfo.OthPay
-				order.CvlservPay = res.Output.Setlinfo.CvlservPay
-				order.PoolPropSelfpay = res.Output.Setlinfo.PoolPropSelfpay
-				order.FundPaySumamt = res.Output.Setlinfo.FundPaySumamt
-				order.PsnPartAmt = res.Output.Setlinfo.PsnPartAmt
-				order.AcctPay = res.Output.Setlinfo.AcctPay
-				order.PsnCashPay = res.Output.Setlinfo.PsnCashPay
-				order.HospPartAmt = res.Output.Setlinfo.HospPartAmt
-				order.Balc = res.Output.Setlinfo.Balc
-				order.AcctMulaidPay = res.Output.Setlinfo.AcctMulaidPay
-				order.MedinsSetlId = res.Output.Setlinfo.MedinsSetlID
-				order.ClrOptins = res.Output.Setlinfo.ClrOptins
-				order.ClrWay = res.Output.Setlinfo.ClrWay
-				order.Creator = order.Creator
-				order.Modify = roles.AdminUserId
-				order.RequestLog = src_resquest
-				setlDetail, _ := json.Marshal(res.Output.Setldetail)
-				detailStr := string(setlDetail)
-				order.SetlDetail = detailStr
-				//err := service.UpdataOrderStatusTwo(chrg_bchno, c.GetAdminUserInfo().CurrentOrgId)
-				if record.OutHospitalStatus == 1 && order.ID > 0 {
-					err := service.UpDateOrder(order)
-					if err == nil {
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg":       "预结算成功",
-							"order_way": 1,
-						})
-					} else {
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAmountAccountException)
-						return
-					}
-				} else if record.OutHospitalStatus == 0 && order.ID == 0 {
+			}
+			order.MedfeeSumamt = res.Output.Setlinfo.MedfeeSumamt
+			order.FulamtOwnpayAmt = res.Output.Setlinfo.FulamtOwnpayAmt
+			order.OverlmtSelfPay = res.Output.Setlinfo.OverlmtSelfpay
+			order.PreselfpayAmt = res.Output.Setlinfo.PreselfpayAmt
+			order.InscpScpAmt = res.Output.Setlinfo.InscpScpAmt
+			order.ActPayDedc = res.Output.Setlinfo.ActPayDedc
+			order.HifmiPay = res.Output.Setlinfo.HifmiPay
+			order.HifpPay = res.Output.Setlinfo.HifpPay
+			order.HifesPay = res.Output.Setlinfo.HifesPay
+			order.HifobPay = res.Output.Setlinfo.HifobPay
+			order.MafPay = res.Output.Setlinfo.MafPay
+			order.OthPay = res.Output.Setlinfo.OthPay
+			order.CvlservPay = res.Output.Setlinfo.CvlservPay
+			order.PoolPropSelfpay = res.Output.Setlinfo.PoolPropSelfpay
+			order.FundPaySumamt = res.Output.Setlinfo.FundPaySumamt
+			order.PsnPartAmt = res.Output.Setlinfo.PsnPartAmt
+			order.AcctPay = res.Output.Setlinfo.AcctPay
+			order.PsnCashPay = res.Output.Setlinfo.PsnCashPay
+			order.HospPartAmt = res.Output.Setlinfo.HospPartAmt
+			order.Balc = res.Output.Setlinfo.Balc
+			order.AcctMulaidPay = res.Output.Setlinfo.AcctMulaidPay
+			order.MedinsSetlId = res.Output.Setlinfo.MedinsSetlID
+			order.ClrOptins = res.Output.Setlinfo.ClrOptins
+			order.ClrWay = res.Output.Setlinfo.ClrWay
+			order.Creator = order.Creator
+			order.Modify = roles.AdminUserId
+			order.RequestLog = src_resquest
+			setlDetail, _ := json.Marshal(res.Output.Setldetail)
+			detailStr := string(setlDetail)
+			order.SetlDetail = detailStr
+			//err := service.UpdataOrderStatusTwo(chrg_bchno, c.GetAdminUserInfo().CurrentOrgId)
+			if record.OutHospitalStatus == 1 && order.ID > 0 {
+				err := service.UpDateOrder(order)
+				if err == nil {
 					c.ServeSuccessJSON(map[string]interface{}{
 						"msg":       "预结算成功",
-						"order":     order,
-						"order_way": 2,
+						"order_way": 1,
 					})
+				} else {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAmountAccountException)
+					return
 				}
+			} else if record.OutHospitalStatus == 0 && order.ID == 0 {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":       "预结算成功",
+					"order":     order,
+					"order_way": 2,
+				})
 			}
 		}
 	}
@@ -4282,9 +4295,49 @@ type ELeData struct {
 
 var initFlagTwo int64 = 0
 
+func (c *ZHHisApiController) TestGetJiangXiBasBaseInit() {
+	DllDef := syscall.MustLoadDLL("SSCard.dll")
+	Iinit := DllDef.MustFindProc("Init")
+	//miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+	//http://10.77.211.236/CSB/hsa-fsi-1303
+	ret, _, err := Iinit.Call(StrPtr("http://10.77.224.18:9001/1.0.0/agent-card-init"), StrPtr("360399"))
+	if ret != 0 {
+		fmt.Println("SSCard的报错原因:", err)
+		fmt.Println("SSCard的运算结果为:", ret)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
+		return
+	}
+
+	result := int(ret)
+	fmt.Println("SSCard的运算结果为1:", result)
+	initFlag = 1
+	return
+}
+func (c *ZHHisApiController) GetBasBaseInfoxxx() string {
+	DllDef := syscall.MustLoadDLL("SSCard.dll")
+	readCard := DllDef.MustFindProc("ReadCardBas")
+	if readCard == nil {
+		fmt.Println("readcard is nil")
+		readCard = DllDef.MustFindProc("ReadCardBas")
+	}
+	str := make([]byte, 1024)
+	str1 := make([]byte, 1024)
+	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), uintptr(1024), (uintptr)(unsafe.Pointer(&str1[0])), uintptr(1024))
+	fmt.Println(string(str1))
+	fmt.Println(string(str))
+	fmt.Println(":", ConvertToString(string(str1), "gbk", "utf-8"))
+	fmt.Println(":", ConvertToString(string(str), "gbk", "utf-8"))
+	if ret2 != 0 {
+		return ""
+	}
+	return string(str)
+}
+
 func (c *ZHHisApiController) ReadCard() {
 	id_card_type, _ := c.GetInt64("id_card_type")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
+	is_settle := c.GetString("is_settle")
+
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 
@@ -4488,6 +4541,125 @@ func (c *ZHHisApiController) ReadCard() {
 
 			}
 
+		} else if miConfig.MdtrtareaAdmvs == "360399" {
+			fmt.Println(initFlag)
+			fmt.Println("initFlag")
+
+			if initFlag == 0 {
+				c.TestGetJiangXiBasBaseInit()
+			}
+			basStr := c.GetBasBaseInfoxxx()
+			if len(basStr) == 0 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
+				return
+			}
+			fmt.Println(basStr)
+			bas := strings.Split(basStr, "|")
+			basNumber := bas[1]
+			fmt.Println(basNumber)
+			card_sn := bas[3]
+			fmt.Println(card_sn)
+			result, _ := service.Jxyb1101(basNumber, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, "1", miConfig.Url, miConfig.AccessKey, "")
+
+			//result := service.Jxyb1101(basNumber, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, certificates)
+			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
+			}
+
+			if res.Infcode == 0 {
+				patient, err := service.GetPatientByNumber(basNumber, c.GetAdminUserInfo().CurrentOrgId)
+				if err == gorm.ErrRecordNotFound {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
+					return
+				} else if err != nil {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+					return
+
+				} else {
+					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:     basStr,
+						VerifyNumber: "",
+					}
+					service.CreateHisPsn(psn)
+					var rf []*ResultFive
+					json.Unmarshal([]byte(infoStr), &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"
+					}
+
+					c.ServeSuccessJSON(map[string]interface{}{
+						"patient":  patient,
+						"number":   basNumber,
+						"info":     res,
+						"insutype": insutype,
+					})
+				}
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+				return
+			}
+
 		} else {
 
 			if initFlagTwo == 0 {
@@ -4601,7 +4773,7 @@ func (c *ZHHisApiController) ReadCard() {
 		if miConfig.MdtrtareaAdmvs == "150499" {
 			var api string
 			api = "http://172.16.13.254:9532/" + "nmyb/readcard?" + "fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName +
-				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&cainfo=" + miConfig.Cainfo + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&operator_id=" + strconv.FormatInt(admin_user_id, 10) + "&operator=" + roles.UserName
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&cainfo=" + miConfig.Cainfo + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&operator_id=" + strconv.FormatInt(admin_user_id, 10) + "&operator=" + roles.UserName + "&is_settle=" + is_settle
 
 			resp, requestErr := http.Get(api)
 			if requestErr != nil {
@@ -4641,13 +4813,81 @@ func (c *ZHHisApiController) ReadCard() {
 				res.Infcode = infocode
 				res.Output = res10265.Output
 				res.InfRefmsgid = res10265.InfRefmsgid
+
 				if res.Infcode == 0 {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"number": token,
-					})
+					patient, err := service.GetPatientByNumber(res.Output.Baseinfo.Certno, c.GetAdminUserInfo().CurrentOrgId)
+					if err == gorm.ErrRecordNotFound {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
+						return
+					} else if err != nil {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+						return
+					} else {
+						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)
+
+						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 = "390"
+						}
+						c.ServeSuccessJSON(map[string]interface{}{
+							"failed_code": 0,
+							"info":        res,
+							"insutype":    insutype,
+							"patient":     patient,
+						})
+					}
+				} else {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+					return
 				}
 			}
-
 		} else {
 			if initFlagTwo == 0 {
 				c.TestGetBasBaseInitTwo()

models/yb_models.go

@@ -13,6 +13,7 @@ type Result3260 struct {
 			MedfeeSumamt    float64 `json:"medfee_sumamt"`
 			OptinsPaySumamt float64 `json:"optins_pay_sumamt"`
 		} `json:"data"`
+		Totalrow int64 `json:"totalrow"`
 	} `json:"output"`
 	RefmsgTime  string      `json:"refmsg_time"`
 	RespondTime string      `json:"respond_time"`

service/gdyb_service.go

@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"gdyb/models"
+	"math"
 	"strings"
 
 	//"gdyb/utils"
@@ -686,7 +687,7 @@ func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, o
 		med_type = "11"
 	}
 
-	inputMessage["infno"] = "2203A"    // 交易编码
+	inputMessage["infno"] = "2203"     // 交易编码
 	inputData["mdtrt_id"] = mdtrtId    // 就诊 ID（来自2201接口返回）
 	inputData["psn_no"] = psnNo        // 人员编号 （来自1101接口返回）
 	inputData["med_type"] = med_type   // 医疗类别 16门诊特殊病
@@ -735,7 +736,7 @@ func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, o
 	if fixmedins_code == "H15049901371" {
 		url = gdyb_url
 	} else {
-		url = gdyb_url + "2203A"
+		url = gdyb_url + "2203"
 	}
 
 	if insuplc_admdvs == "421300" {
@@ -3331,6 +3332,207 @@ func Gdyb4101For10106(struct4101 Struct4101, secret_key string, org_name string,
 	return str, string(bytesData)
 }
 
+func Gdyb4101For10138(struct4101 Struct4101, secret_key string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, org_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"] = "4101A" // 交易编码
+
+	year := time.Now().Format("2006")
+	month := time.Now().Format("01")
+	day := time.Now().Format("02")
+	inputData["psn_no"] = struct4101.PsnNo                  // 结算 ID  必填
+	inputData["mdtrt_id"] = struct4101.MdtrtId              // 就诊 ID  必填（来自2201接口返回）
+	inputData["setl_id"] = struct4101.SetlId                // 结算 ID  必填
+	inputData["hi_no"] = struct4101.PsnNo                   // 医保编号
+	inputData["medcasno"] = struct4101.PsnNo                // 病案号  必填
+	inputData["dcla_time"] = year + "-" + month + "-" + day // 申报时间  必填
+	inputData["ntly"] = struct4101.Ntly                     // 国籍  必填
+	inputData["prfs"] = struct4101.Prfs                     // 职业  必填
+	inputData["curr_addr"] = ""                             // 现住址  必填
+	inputData["emp_name"] = ""                              // 单位名称  必填
+	inputData["emp_addr"] = ""                              // 单位地址  必填
+	inputData["emp_tel"] = ""
+	inputData["poscode"] = ""    // 邮编  必填
+	inputData["coner_name"] = "" // 联系人姓名  必填
+	inputData["patn_rlts"] = ""  // 与患者关系  必填
+	inputData["coner_addr"] = "" // 联系人地址  必填
+	inputData["coner_tel"] = ""
+
+	inputData["nwb_adm_type"] = "" // 新生儿入院类型  必填
+	inputData["nwb_bir_wt"] = ""   // 新生儿出生体重  必填
+	inputData["nwb_adm_wt"] = ""   // 新生儿入院体重  必填
+
+	inputData["mul_nwb_bir_wt"] = "" // 新生儿入院体重  必填
+	inputData["mul_nwb_adm_wt"] = "" // 新生儿入院体重  必填
+
+	inputData["opsp_diag_caty"] = ""  // 门诊慢特病诊断  必填
+	inputData["opsp_mdtrt_date"] = "" // 门诊慢特病就诊日期  必填
+
+	inputData["adm_way"] = ""  // 入院途径  必填
+	inputData["trt_type"] = "" // 治疗类别  必填
+	inputData["adm_time"] = "" // 入院时间  必填
+
+	inputData["refldept_dept"] = "" // 转科科别  必填
+	inputData["dscg_time"] = ""     // 出院时间  必填
+	inputData["dscg_caty"] = ""     // 出院科别  必填
+
+	inputData["otp_wm_dise"] = ""   // 门（急） 诊西医诊断  必填
+	inputData["wm_dise_code"] = ""  // 门（急） 诊中医诊断  必填
+	inputData["otp_tcm_dise"] = ""  // 西医诊断疾病代码  必填
+	inputData["tcm_dise_code"] = "" // 中医诊断代码  必填
+
+	inputData["vent_used_dura"] = ""        // 呼吸机使用时长  必填
+	inputData["pwcry_bfadm_coma_dura"] = "" // 颅脑损伤患者入院前昏迷时长  必填
+	inputData["pwcry_afadm_coma_dura"] = "" // 颅脑损伤患者入院后昏迷时长  必填
+
+	inputData["spga_nurscare_days"] = "" // 特级护理天数  必填
+
+	inputData["lv1_nurscare_days"] = ""          // 一级护理天数  必填
+	inputData["scd_nurscare_days"] = ""          // 二级护理天数  必填
+	inputData["lv3_nurscare_days"] = ""          // 三级护理天数  必填
+	inputData["acp_medins_name"] = ""            // 拟接收机构名称  必填
+	inputData["acp_optins_code"] = ""            // 拟接收机构代码  必填
+	inputData["bill_code"] = struct4101.BillCode // 票据代码  必填
+	inputData["bill_no"] = struct4101.BillNo     // 票据号码  必填
+	inputData["biz_sn"] = struct4101.BizSn       // 业务流水号  必填
+	inputData["hi_paymtd"] = "1"                 // 业务流水号  必填
+
+	inputData["days_rinp_flag_31"] = "" // 出院 31 天内再住院计划标志  必填
+	inputData["days_rinp_pup_31"] = ""  // 出院 31 天内再住院目的  必填
+	//inputData["chfpdr_name"] = struct4101.DoctorName          // 主诊医师姓名  必填
+	//inputData["chfpdr_code"] = struct4101.DoctorCode          // 主诊医师代码  必填
+	inputData["setl_begn_date"] = struct4101.SetlBegnDate     // 结算开始日期  必填
+	inputData["setl_end_date"] = struct4101.SetlEndDate       // 结算结束日期  必填
+	inputData["medins_fill_dept"] = struct4101.MedinsFillDept // 医疗机构填报部门  必填
+	inputData["medins_fill_psn"] = struct4101.MedinsFillPsn   // 医疗机构填报人  必填
+
+	//payinfo := make([]map[string]interface{}, 0) // 基金支付信息
+	//for _, item := range struct4101.CustomStruct {
+	//	payinfotemp := make(map[string]interface{})
+	//	if item.FundPayType == "310100" || item.FundPayType == "310200" || item.FundPayType == "320100" || item.FundPayType == "330100" || item.FundPayType == "340100" || item.FundPayType == "350100" || item.FundPayType == "370100" || item.FundPayType == "390100" || item.FundPayType == "610100" || item.FundPayType == "640100" || item.FundPayType == "620100" {
+	//		payinfotemp["fund_pay_type"] = item.FundPayType // 基金支付类型  必填
+	//		payinfotemp["fund_payamt"] = item.FundPayamt    // 基金支付金额
+	//		payinfo = append(payinfo, payinfotemp)
+	//	}
+	//}
+	opspdiseinfo := make([]map[string]interface{}, 0) // 门诊慢特病诊断信息
+
+	opspdiseinfotemp := make(map[string]interface{})
+	opspdiseinfotemp["diag_name"] = struct4101.Diseinfo[len(struct4101.Diseinfo)-1].DiagName // 诊断名称  必填
+	opspdiseinfotemp["diag_code"] = struct4101.Diseinfo[len(struct4101.Diseinfo)-1].DiagCode // 诊断代码 必填
+	opspdiseinfotemp["oprn_oprt_name"] = "血液透析"                                              // 手术操作名称 必填
+	opspdiseinfotemp["oprn_oprt_code"] = "39.9500"                                           // 手术操作代码 必填
+	opspdiseinfo = append(opspdiseinfo, opspdiseinfotemp)
+
+	//diseinfo := make([]map[string]interface{}, 0) // 住院诊断信息
+	//for _, item := range struct4101.Diseinfo {
+	//	diseinfotemp := make(map[string]interface{})
+	//	diseinfotemp["maindiag_flag"] = item.MaindiagFlag // 手术操作代码 必填
+	//	diseinfotemp["diag_type"] = item.DiagType         // 诊断类别  必填
+	//	diseinfotemp["diag_code"] = item.DiagCode         // 诊断代码 必填
+	//	diseinfotemp["diag_name"] = item.DiagName         // 诊断名称 必填
+	//	diseinfotemp["adm_cond_type"] = "3"               // 入院病情类型 必填
+	//	diseinfo = append(diseinfo, diseinfotemp)
+	//}
+
+	//iteminfo := make([]map[string]interface{}, 0)
+	//for _, item := range struct4101.IteminfoStruct {
+	//	iteminfotemp := make(map[string]interface{})
+	//	iteminfotemp["med_chrgitm"] = item.MedChrgitm            // 医疗收费项目  必填
+	//	iteminfotemp["amt"] = item.Amt                           // 金额 必填
+	//	iteminfotemp["claa_sumfee"] = item.ClaaSumfee            // 甲类费用合计 必填
+	//	iteminfotemp["clab_amt"] = item.ClabAmt                  // 乙类金额 必填
+	//	iteminfotemp["fulamt_ownpay_amt"] = item.FulamtOwnpayAmt // 全自费金额 必填
+	//	iteminfotemp["oth_amt"] = item.OthAmt                    // 其他金额 必填
+	//	iteminfo = append(iteminfo, iteminfotemp)
+	//}
+
+	oprninfo := make([]map[string]interface{}, 0) // 手术操作信息
+	oprninfotemp := make(map[string]interface{})
+	oprninfotemp["oprn_oprt_type"] = "" // 手术操作类别  必填
+	oprninfotemp["oprn_oprt_name"] = "" // 手术操作名称 必填
+	oprninfotemp["oprn_oprt_code"] = "" // 手术操作代码 必填
+	oprninfotemp["oprn_oprt_date"] = "" // 手术操作日期 必填
+	oprninfotemp["anst_way"] = ""       // 麻醉方式 必填
+	oprninfotemp["oper_dr_name"] = ""   // 术者医师姓名 必填
+	oprninfotemp["oper_dr_code"] = ""   // 术者医师代码 必填
+	oprninfotemp["anst_dr_name"] = ""   // 麻醉医师姓名 必填
+	oprninfotemp["anst_dr_code"] = ""   // 麻醉医师代码 必填
+	oprninfo = append(oprninfo, oprninfotemp)
+
+	icuinfo := make([]map[string]interface{}, 0) // 重症监护信息
+	icuinfotemp := make(map[string]interface{})
+	icuinfotemp["scs_cutd_ward_type"] = ""   // 重症监护病房类型  必填
+	icuinfotemp["scs_cutd_inpool_time"] = "" // 重症监护进入时间 必填
+	icuinfotemp["scs_cutd_exit_time"] = ""   // 重症监护退出时间 必填
+	icuinfotemp["scs_cutd_sum_dura"] = ""    // 重症监护合计时长 必填
+	icuinfo = append(icuinfo, icuinfotemp)
+
+	input["setlinfo"] = inputData
+	input["opspdiseinfo"] = opspdiseinfo
+	//input["diseinfo"] = payinfo
+	//input["oprninfo"] = payinfo
+	//input["icuinfo"] = payinfo
+	//input["bldinfo"] = payinfo
+	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 := gdyb_url + "4101"
+
+	var url string
+	if fixmedins_code == "H15049901371" {
+		url = gdyb_url
+	} else {
+
+		url = gdyb_url + "4101A"
+
+	}
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/4101"
+	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(), ""
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str, string(bytesData)
+}
+
 //func Gdyb7101(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) string {
 //	// 生成签名
 //	nonce := GetRandomString(32)
@@ -4591,7 +4793,7 @@ func Gdyb90100(psn_no string, org_name string, doctor string, fixmedins_code str
 	return str
 }
 
-func Gdyb3260(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, year string, month string, sign string) (string, string) {
+func Gdyb3260(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, year string, month string, sign string, count int) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -4604,7 +4806,7 @@ func Gdyb3260(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	inputData["sign"] = sign       // 就诊凭证编号
 	inputData["trt_year"] = year   // 就诊凭证编号
 	inputData["trt_month"] = month // 开始时间
-	inputData["startrow"] = "0"    // 人员姓名
+	inputData["startrow"] = count  // 人员姓名
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 	var inputLog string
@@ -4668,40 +4870,42 @@ func Gdyb3260(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	}
 
 }
-func Gdyb3261(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, year string, month string, result3260 models.Result3260, sign_no string) (string, string, string) {
-	//生成签名
-	nonce := GetRandomString(32)
-	timestamp := time.Now().Unix()
-	signature := setSignature(timestamp, nonce, secret_key)
-
-	msg_month := time.Unix(1557042972, 0).Format("1")
-	msg_year := time.Now().Format("2006")
-	msg_month = time.Now().Format("01")
-	day := time.Now().Format("02")
+func Gdyb3261(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, year string, month string, result3260 models.Result3260, sign_no string) {
 
-	hour := time.Now().Format("15")
-	min := time.Now().Format("04")
-	sec := time.Now().Format("05")
-
-	msec := time.Now().Format("000")
+	//msg_month := time.Unix(1557042972, 0).Format("1")
+	//msg_year := time.Now().Format("2006")
+	//msg_month = time.Now().Format("01")
+	//day := time.Now().Format("02")
+	//
+	//hour := time.Now().Format("15")
+	//min := time.Now().Format("04")
+	//sec := time.Now().Format("05")
+	//
+	//msec := time.Now().Format("000")
 
-	msg_id := fixmedins_code + msg_year + msg_month + day + hour + min + sec + msec + "0"
+	//msg_id := fixmedins_code + msg_year + msg_month + day + hour + min + sec + msec + "0"
 
 	//生成输入报文
-	inputMessage := SetInputMessageTwo(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, sign_no)
-	input := make(map[string]interface{})
-	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "3261" // 交易编码
-	inputData["trt_year"] = year   // 就诊凭证编号
-	inputData["trt_month"] = month // 开始时间
-	feedetail := make([]map[string]interface{}, 0)
 
 	var curpage int
 	var pagesize int = 10
 	var start int = 1
 	var stop int
-	pagecount := 10
+	//pagecount := 10
+	pagecount := int(math.Ceil(float64(len(result3260.Output.Data)) / float64(pagesize)))
+
 	for curpage = 1; curpage <= pagecount; curpage++ {
+		//生成签名
+		nonce := GetRandomString(32)
+		timestamp := time.Now().Unix()
+		signature := setSignature(timestamp, nonce, secret_key)
+		inputMessage := SetInputMessageTwo(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, sign_no)
+		input := make(map[string]interface{})
+		inputData := make(map[string]interface{})
+		inputMessage["infno"] = "3261" // 交易编码
+		inputData["trt_year"] = year   // 就诊凭证编号
+		inputData["trt_month"] = month // 开始时间
+		feedetail := make([]map[string]interface{}, 0)
 		if curpage == 1 {
 			start = 1
 		} else {
@@ -4740,7 +4944,6 @@ func Gdyb3261(org_name string, doctor string, fixmedins_code string, insuplc_adm
 			}
 
 		}
-
 		for _, item := range result3260.Output.Data[start-1 : stop] {
 			if item.MdtrtId == "out20230406681868" {
 				feedetailInfo := make(map[string]interface{})
@@ -4770,18 +4973,18 @@ func Gdyb3261(org_name string, doctor string, fixmedins_code string, insuplc_adm
 
 		}
 
-		inputData["totalrow"] = 119 // 人员姓名
+		inputData["totalrow"] = 314 // 人员姓名
 
 		input["data"] = inputData
 		input["detail"] = feedetail
 		inputMessage["input"] = input //交易输入
-		var inputLog string
+		//var inputLog string
 		bytesData, err := json.Marshal(inputMessage)
-		inputLog = string(bytesData)
+		//inputLog = string(bytesData)
 		fmt.Println(string(bytesData))
 		if err != nil {
 			fmt.Println(err.Error())
-			return err.Error(), "", ""
+			return
 		}
 		reader := bytes.NewReader(bytesData)
 		gdyb_url := beego.AppConfig.String("gdyb_url")
@@ -4798,7 +5001,7 @@ func Gdyb3261(org_name string, doctor string, fixmedins_code string, insuplc_adm
 		request, err := http.NewRequest("POST", url, reader)
 		if err != nil {
 			fmt.Println(err.Error())
-			return err.Error(), "", ""
+			return
 		}
 
 		request.Header.Set("Content-Type", "application/json;charset=UTF-8")
@@ -4811,19 +5014,19 @@ func Gdyb3261(org_name string, doctor string, fixmedins_code string, insuplc_adm
 		resp, err := client.Do(request)
 		if err != nil {
 			fmt.Println(err.Error())
-			return err.Error(), "", ""
+			return
 		}
 		respBytes, err := ioutil.ReadAll(resp.Body)
 		if err != nil {
 			fmt.Println(err.Error())
-			return err.Error(), "", ""
+			return
 		}
 		fmt.Println(string(respBytes))
 		str := string(respBytes)
-		return str, inputLog, msg_id
-
+		fmt.Println(str)
+		//return str, inputLog, msg_id
 	}
-	return "", "", msg_id
+	return
 }
 func Gdyb3262(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, year string, month string, otransid string, sign_no string) (string, string) {
 	//生成签名
@@ -4837,7 +5040,7 @@ func Gdyb3262(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	inputMessage["infno"] = "3262" // 交易编码
 
 	inputData["trt_year"] = year  // 就诊凭证编号
-	inputData["trt_month"] = "04" // 开始时间
+	inputData["trt_month"] = "05" // 开始时间
 	inputData["otransid"] = "0"   // 开始时间
 
 	input["data"] = inputData

service/his_service.go

@@ -517,7 +517,7 @@ func FindHisPatientPrescriptionInfo(org_id int64, his_patient_id int64, record_d
 }
 
 func FindLastPatientPrescriptionInfo(org_id int64, patient_id int64, record_date int64) (info models.HisPrescriptionInfo, err error) {
-	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date < ? AND patient_id = ?", org_id, record_date, patient_id).Order("record_date desc").First(&info).Error
+	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date <= ? AND patient_id = ?", org_id, record_date, patient_id).Order("record_date desc").First(&info).Error
 	return
 }
 
@@ -1485,7 +1485,18 @@ func GetAllHisOrderTwo(org_id int64) (his []*models.HisOrder, err error) {
 }
 
 func GetAllHisOrder10106(org_id int64) (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10106  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND id >= 264212").Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10106  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND setl_time >= '2023-05-01 00:00:00' AND setl_time <= '2023-05-31 00:00:00'").Order("setl_time asc").Find(&his).Error
+	fmt.Println(err)
+	return
+}
+
+func GetAllHisOrder10138() (his []*models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10138  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND setl_time >= '2023-04-01 00:00:00'").Order("setl_time asc").Find(&his).Error
+	fmt.Println(err)
+	return
+}
+func GetAllHisOrder10278() (his []*models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("id = 263631 and user_org_id = 10278  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND setl_time >= '2023-04-01 00:00:00'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
@@ -1494,10 +1505,10 @@ func GetAllHisOrder10106(org_id int64) (his []*models.HisOrder, err error) {
 //	err = readDb.Model(&models.HisOrder{}).Where("id = 180753").Order("setl_time asc").First(&his).Error
 //	return
 //}
-//func GetAllHisOrderErr(org_id int64, stage int64) (his []*models.HisOrderError, err error) {
-//	err = readDb.Model(&models.HisOrderError{}).Where("user_org_id = ? AND status = 1 AND stage = 101060", org_id).Find(&his).Error
-//	return
-//}
+func GetAllHisOrderErr10278() (his []*models.HisOrderError, err error) {
+	err = readDb.Model(&models.HisOrderError{}).Where("user_org_id = 10278 AND status = 1 AND stage = 10276").Find(&his).Error
+	return
+}
 
 func GetHisOrderInfoByNumberFour(order_number string) (order []*models.HisOrderInfo, err error) {
 	db := readDb.Model(&models.HisOrderInfo{})

service/jx_service.go

@@ -2510,3 +2510,248 @@ func Jxyb3507(struct3507 models.Struct3507) (string, string) {
 	return JXHttpRequest(struct3507.RequestUrl, struct3507.AccessKey, struct3507.SecretKey, timestamp, string(bytesData), "3507"), string(bytesData)
 
 }
+
+func Jxyb3203(fixmedins_setl_cnt int64, acct_pay float64, fund_pay_sumamt float64, medfee_sumamt float64, stmt_begndate string, stmt_enddate string, setl_optins string, clr_type string, insutype string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3203"                       // 交易编码
+	inputData["stmt_begndate"] = stmt_begndate           // 对帐开始时间
+	inputData["stmt_enddate"] = stmt_enddate             //对帐结束时间
+	inputData["medfee_sumamt"] = medfee_sumamt           //医疗费总额
+	inputData["fund_pay_sumamt"] = fund_pay_sumamt       //基金支付总额
+	inputData["acct_pay"] = acct_pay                     //个人账户支付金额
+	inputData["fixmedins_setl_cnt"] = fixmedins_setl_cnt //定点医药机构结算笔数
+	inputData["fixmedins_code"] = fixmedins_code         //个人账户支付金额
+
+	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(), ""
+	}
+	request_url = request_url + "3203"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3203"), string(bytesData)
+}
+
+//对账权限查询
+func Jxyb3260(setl_optins string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3260"               // 交易编码
+	inputData["fixmedins_code"] = fixmedins_code // 对帐开始时间
+	inputData["fixmedins_name"] = org_name       //对帐结束时间
+	inputData["fix_blng_admdvs"] = setl_optins   //医疗费总额
+
+	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(), ""
+	}
+	request_url = request_url + "3260"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3260"), string(bytesData)
+}
+
+//月度对账状态查询
+func Jxyb3261(stmt_mon string, setl_optins string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3261"               // 交易编码
+	inputData["fixmedins_code"] = fixmedins_code // 对帐开始时间
+	inputData["fixmedins_name"] = org_name       //对帐结束时间
+	inputData["fix_blng_admdvs"] = setl_optins   //医疗费总额
+	inputData["stmt_mon"] = stmt_mon             //医疗费总额
+
+	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(), ""
+	}
+	request_url = request_url + "3261"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3261"), string(bytesData)
+}
+
+func Jxyb3262(stmt_mon string, setl_optins string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3262" // 交易编码
+	inputData["fixmedins_code"] = fixmedins_code
+	inputData["fixmedins_name"] = org_name
+	inputData["fix_fill_dept"] = fix_fill_dept
+	inputData["fix_fill_psn_id"] = fix_fill_psn_id
+	inputData["fix_fill_psn"] = fix_fill_psn
+	inputData["fix_fill_date"] = fix_fill_date
+	inputData["stmt_loc"] = stmt_loc
+	inputData["upld_btch"] = upld_btch
+
+	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(), ""
+	}
+	request_url = request_url + "3261"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3261"), string(bytesData)
+}
+
+func Jxyb3263(fixmedins_setl_cnt int64, acct_pay float64, fund_pay_sumamt float64, medfee_sumamt float64, stmt_begndate string, stmt_enddate string, setl_optins string, clr_type string, insutype string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3263"               // 交易编码
+	inputData["fixmedins_code"] = fixmedins_code // 对帐开始时间
+	inputData["fixmedins_name"] = org_name       //对帐结束时间
+	inputData["stmt_mon"] = ""                   //医疗费总额
+	inputData["stmt_loc"] = ""                   //医疗费总额
+	inputData["upld_btch"] = ""                  //医疗费总额
+
+	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(), ""
+	}
+	request_url = request_url + "3263"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3263"), string(bytesData)
+}
+func Jxyb3264(fixmedins_setl_cnt int64, acct_pay float64, fund_pay_sumamt float64, medfee_sumamt float64, stmt_begndate string, stmt_enddate string, setl_optins string, clr_type string, insutype string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3264"               // 交易编码
+	inputData["fixmedins_code"] = fixmedins_code // 对帐开始时间
+	inputData["fixmedins_name"] = org_name       //对帐结束时间
+	inputData["stmt_mon"] = ""                   //医疗费总额
+	inputData["stmt_loc"] = ""                   //医疗费总额
+	inputData["upld_btch"] = ""                  //医疗费总额
+
+	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(), ""
+	}
+	request_url = request_url + "3264"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3264"), string(bytesData)
+}
+
+func Jxyb3265(fixmedins_setl_cnt int64, acct_pay float64, fund_pay_sumamt float64, medfee_sumamt float64, stmt_begndate string, stmt_enddate string, setl_optins string, clr_type string, insutype string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3266"               // 交易编码
+	inputData["fixmedins_code"] = fixmedins_code // 对帐开始时间
+	inputData["fixmedins_name"] = org_name       //对帐结束时间
+	inputData["stmt_mon"] = ""                   //医疗费总额
+	inputData["fix_fill_dept"] = setl_optins     //对帐结束时间
+	inputData["fix_fill_psn_id"] = setl_optins   //对帐结束时间
+	inputData["fix_fill_psn"] = setl_optins      //对帐结束时间
+	inputData["fix_fill_date"] = setl_optins     //对帐结束时间
+	inputData["stmt_loc"] = ""                   //医疗费总额
+	inputData["upld_btch"] = ""                  //医疗费总额
+
+	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(), ""
+	}
+	request_url = request_url + "3266"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3266"), string(bytesData)
+}
+func Jxyb3266(fixmedins_setl_cnt int64, acct_pay float64, fund_pay_sumamt float64, medfee_sumamt float64, stmt_begndate string, stmt_enddate string, setl_optins string, clr_type string, insutype string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3266"               // 交易编码
+	inputData["fixmedins_code"] = fixmedins_code // 对帐开始时间
+	inputData["fixmedins_name"] = org_name       //对帐结束时间
+
+	inputData["fix_blng_admdvs"] = setl_optins //对帐结束时间
+	inputData["stmt_mon"] = ""                 //医疗费总额
+	inputData["fix_fill_dept"] = setl_optins   //对帐结束时间
+	inputData["fix_fill_psn_id"] = setl_optins //对帐结束时间
+	inputData["fix_fill_psn"] = setl_optins    //对帐结束时间
+	inputData["fix_fill_date"] = setl_optins   //对帐结束时间
+	inputData["stmt_loc"] = ""                 //医疗费总额
+	inputData["upld_btch"] = ""                //医疗费总额
+
+	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(), ""
+	}
+	request_url = request_url + "3266"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3266"), string(bytesData)
+}
+func Jxyb3267(fixmedins_setl_cnt int64, acct_pay float64, fund_pay_sumamt float64, medfee_sumamt float64, stmt_begndate string, stmt_enddate string, setl_optins string, clr_type string, insutype string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3267"               // 交易编码
+	inputData["fixmedins_code"] = fixmedins_code // 对帐开始时间
+	inputData["fixmedins_name"] = org_name       //对帐结束时间
+	inputData["stmt_mon"] = ""                   //医疗费总额
+	inputData["stmt_loc"] = ""                   //医疗费总额
+	inputData["upld_btch"] = ""                  //医疗费总额
+
+	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(), ""
+	}
+	request_url = request_url + "3267"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3267"), string(bytesData)
+}

service/zh_his_service.go

@@ -40,6 +40,12 @@ func ZHGdyb1101(certNo string, org_name string, doctor string, fixmedins_code st
 			inputData["certno"] = certNo        // 证件号码
 			inputData["psn_cert_type"] = "01"   // 人员证件类型
 
+		} else if id_card_type == 4 {
+			inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
+			inputData["card_sn"] = ""           // 卡识别码
+			inputData["certno"] = certNo        // 证件号码
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
+
 		} else {
 			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 			inputData["card_sn"] = ""           // 卡识别码