111

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10106
+org_id = 10387
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/nm/nm_controller.go

@@ -44,6 +44,7 @@ func NmybRegistRouters() {
 	beego.Router("/nmyb/2202", &NmController{}, "get:Post2202")
 
 	beego.Router("/nmyb/4101", &NmController{}, "post:Post4101")
+	beego.Router("/nmyb/2601", &NmController{}, "get:Get2601")
 
 }
 
@@ -980,3 +981,23 @@ func (c *NmController) Get3201() {
 		"pre": dat,
 	})
 }
+func (c *NmController) Get2601() {
+	result := service.Gdyb26011("150000CFSJM100000100135084", "H15049901371202210111721190000", "2305", "赤峰费森血液透析中心", "李彩星", "H15049901371", "150402", "150499", "MSDBYGxXm1Mtyi3PtOUB7n1ktcxwyW57\n")
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
+	result2 := service.Gdyb26011("150000CFSJM100000100135084", "H15049901371202209281143070000", "2304", "赤峰费森血液透析中心", "李彩星", "H15049901371", "150402", "150499", "MSDBYGxXm1Mtyi3PtOUB7n1ktcxwyW57\n")
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(result2), &dat2); err == nil {
+		fmt.Println(dat2)
+	} else {
+		fmt.Println(err)
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+	})
+}

controllers/sg/his_api_controller.go

@@ -298,6 +298,84 @@ func (c *HisApiController) ReadEleToken() {
 		fmt.Println(ele.Data.UserName)
 		result2, requestLog2 := service.Jxyb1101ForEleCert(miConfig.OrgName, roles.UserName, miConfig.Code, ele.Data.InsuOrg, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Url, miConfig.AccessKey, token, "", ele.Data.IdNo, ele.Data.UserName)
 
+		saveLog(result2, requestLog2, "1101", "获取人员信息")
+		var res ResultTwo
+		if err := json.Unmarshal([]byte(result2), &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		if res.Infcode == 0 {
+			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)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"patient": patient,
+					"number":  token,
+				})
+			}
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+			return
+		}
+	} else if miConfig.MdtrtareaAdmvs == "430800" {
+		if initFlag == 0 {
+			c.TestGetJiangXiBasBaseInit()
+		}
+		json_result := GetJxEleBaseInfo(c.GetAdminUserInfo().CurrentOrgId)
+		type ELeData struct {
+			Data struct {
+				IdNo        string `json:"idNo"`
+				IdType      string `json:"idType"`
+				UserName    string `json:"userName"`
+				EcToken     string `json:"ecToken"`
+				InsuOrg     string `json:"insuOrg"`
+				Gender      string `json:"gender"`
+				Birthday    string `json:"birthday"`
+				Nationality string `json:"nationality"`
+				Email       string `json:"email"`
+				Extra       string `json:"extra"`
+			} `json:"data"`
+			Code    int    `json:"code"`
+			Message string `json:"message"`
+		}
+
+		var ele ELeData
+		err := json.Unmarshal([]byte(json_result), &ele)
+		if err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+		}
+		token := ele.Data.EcToken
+		token = Remove0000(token)
+		fmt.Println(ele.Data.UserName)
+		result2, requestLog2 := service.Hnyb1101ForEleCert(miConfig.OrgName, roles.UserName, miConfig.Code, ele.Data.InsuOrg, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Url, miConfig.AccessKey, token, "", ele.Data.IdNo, ele.Data.UserName)
+
 		saveLog(result2, requestLog2, "1101", "获取人员信息")
 		var res ResultTwo
 		if err := json.Unmarshal([]byte(result2), &res); err != nil {
@@ -1416,6 +1494,25 @@ func (c *HisApiController) GetPsnNcdsInfo() {
 			return
 		}
 
+	} else if miConfig.MdtrtareaAdmvs == "430800" {
+		p, _ := service.GetHisPatientById(patient_id)
+
+		result, _ := service.Hnyb5301(p.PsnNo, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Url, miConfig.AccessKey, "")
+
+		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)
+		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
 	} else {
 
 		result := service.Gdyb5301(psn_record.PsnNo, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
@@ -2169,10 +2266,168 @@ func (c *HisApiController) ReadCard() {
 						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,
+						"patient":  patient,
+						"number":   basNumber,
+						"insutype": insutype,
+					})
+				}
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+				return
+			}
+
+		} else if miConfig.MdtrtareaAdmvs == "430800" {
+			fmt.Println(initFlag)
+			fmt.Println("initFlag")
+
+			if initFlag == 0 {
+				c.TestGetJiangXiBasBaseInit()
+			}
+			basStr := c.GetBasBaseInfo()
+			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.Hnyb1101(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,
+						"insutype": insutype,
 					})
 				}
 			} else {
@@ -2598,10 +2853,51 @@ func (c *HisApiController) ReadCard() {
 							CardInfo:     card_info,
 							VerifyNumber: token,
 						}
+						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"
+						}
+
 						service.CreateHisPsn(psn)
 						c.ServeSuccessJSON(map[string]interface{}{
-							"patient": patient,
-							"number":  token,
+							"patient":  patient,
+							"number":   token,
+							"insutype": insutype,
 						})
 					}
 				} else {
@@ -2743,9 +3039,171 @@ func (c *HisApiController) ReadCard() {
 						VerifyNumber: token,
 					}
 					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":  token,
+						"patient":  patient,
+						"number":   token,
+						"insutype": insutype,
+					})
+				}
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+				return
+			}
+
+		} else if miConfig.MdtrtareaAdmvs == "430800" {
+			//if initFlag == 0 {
+			c.TestGetJiangXiBasBaseInit()
+			//}
+			//if initEleFlag == 0 {
+			//	GetJxEleBaseInitInfo(c.GetAdminUserInfo().CurrentOrgId)
+			//}
+			json_result := GetJxEleBaseInfo(c.GetAdminUserInfo().CurrentOrgId)
+			type ELeData struct {
+				Data struct {
+					IdNo        string `json:"idNo"`
+					IdType      string `json:"idType"`
+					UserName    string `json:"userName"`
+					EcToken     string `json:"ecToken"`
+					InsuOrg     string `json:"insuOrg"`
+					Gender      string `json:"gender"`
+					Birthday    string `json:"birthday"`
+					Nationality string `json:"nationality"`
+					Email       string `json:"email"`
+					Extra       string `json:"extra"`
+				} `json:"data"`
+				Code    int    `json:"code"`
+				Message string `json:"message"`
+			}
+
+			var ele ELeData
+			err := json.Unmarshal([]byte(json_result), &ele)
+			if err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+			}
+			token := ele.Data.EcToken
+			token = Remove0000(token)
+			result2, requestLog2 := service.Hnyb1101ForEleCert(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Url, miConfig.AccessKey, token, "", ele.Data.IdNo, ele.Data.UserName)
+			saveLog(result2, requestLog2, "1101", "获取人员信息")
+			var res ResultTwo
+			if err := json.Unmarshal([]byte(result2), &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			if res.Infcode == 0 {
+				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 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":   token,
+						"insutype": insutype,
 					})
 				}
 			} else {
@@ -3263,8 +3721,8 @@ func (c *HisApiController) GetSettleList() {
 		HiType:         order.Insutype,
 		Insuplc:        miConfig.InsuplcAdmdvs,
 		MaindiagFlag:   "1",
-		BillCode:       last_order.FaPiaoCode,
-		BillNo:         zero,
+		BillCode:       order.SetlId,
+		BillNo:         order.SetlId,
 		BizSn:          order.Number,
 		PsnSelfPay:     order.PsnPartAmt,
 		PsnOwnPay:      order.PsnPartAmt,
@@ -3299,7 +3757,7 @@ func (c *HisApiController) GetSettleList() {
 	var tempOpspdiseinfo2 service.OpspdiseinfoStruct
 	var tempOpspdiseinfos []service.OpspdiseinfoStruct
 
-	diagnosis_ids := strings.Split(order.Diagnosis, ",")
+	diagnosis_ids := strings.Split(his.Diagnosis, ",")
 	var config []*models.HisXtDiagnoseConfig
 	for _, item := range diagnosis_ids {
 		id, _ := strconv.ParseInt(item, 10, 64)
@@ -3743,21 +4201,73 @@ func (c *HisApiController) GetSettleList() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
-
-		respJSON = respJSON["data"].(map[string]interface{})["request_log"].(map[string]interface{})
-		userJSONBytes, _ := json.Marshal(respJSON)
-		fmt.Println("log")
-		fmt.Println(string(userJSONBytes))
-		if err := json.Unmarshal(userJSONBytes, &resOther); err != nil {
+
+		respJSON = respJSON["data"].(map[string]interface{})["request_log"].(map[string]interface{})
+		userJSONBytes, _ := json.Marshal(respJSON)
+		fmt.Println("log")
+		fmt.Println(string(userJSONBytes))
+		if err := json.Unmarshal(userJSONBytes, &resOther); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		res.InfRefmsgid = resOther.InfRefmsgid
+		res.Output = resOther.Output
+		res.ErrMsg = resOther.ErrMsg
+		infocode, _ := strconv.ParseInt(resOther.Infcode, 10, 64)
+		res.Infcode = infocode
+	} else if miConfig.MdtrtareaAdmvs == "360399" {
+
+		var pp models.PublicParams
+		pp.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+		pp.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+		pp.FixmedinsName = miConfig.OrgName
+		pp.FixmedinsCode = miConfig.Code
+		pp.RequestUrl = miConfig.Url
+		pp.Cainfo = miConfig.Cainfo
+		pp.SecretKey = miConfig.SecretKey
+		pp.AccessKey = miConfig.AccessKey
+		pp.OpterName = curRoles.UserName
+		result, _ := service.Jxyb4101(struct4101, pp)
+		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)
+		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+	} else if miConfig.MdtrtareaAdmvs == "430800" {
+
+		var pp models.PublicParams
+		pp.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+		pp.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+		pp.FixmedinsName = miConfig.OrgName
+		pp.FixmedinsCode = miConfig.Code
+		pp.RequestUrl = miConfig.Url
+		pp.Cainfo = miConfig.Cainfo
+		pp.SecretKey = miConfig.SecretKey
+		pp.AccessKey = miConfig.AccessKey
+		pp.OpterName = curRoles.UserName
+		result, _ := service.Hnyb4101(struct4101, pp)
+		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)
+		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
 			utils.ErrorLog("解析失败：%v", err)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
-		res.InfRefmsgid = resOther.InfRefmsgid
-		res.Output = resOther.Output
-		res.ErrMsg = resOther.ErrMsg
-		infocode, _ := strconv.ParseInt(resOther.Infcode, 10, 64)
-		res.Infcode = infocode
+
 	} else {
 
 		result := service.Gdyb4101(struct4101, miConfig.SecretKey, miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.UserOrgId)
@@ -3860,8 +4370,8 @@ func (c *HisApiController) GetSettleListHospital() {
 		HiType:         order.Insutype,
 		Insuplc:        miConfig.InsuplcAdmdvs,
 		MaindiagFlag:   "1",
-		BillCode:       order.FaPiaoNumber,
-		BillNo:         order.FaPiaoNumber,
+		BillCode:       order.SetlId,
+		BillNo:         order.SetlId,
 		BizSn:          order.Number,
 		PsnSelfPay:     order.PsnPartAmt,
 		PsnOwnPay:      order.PsnPartAmt,
@@ -6492,6 +7002,47 @@ func (c *HisApiController) GetRegisterInfo() {
 
 			}
 
+		} else if miConfig.MdtrtareaAdmvs == "430800" {
+			if id_card_type == 1 {
+				psn_info, _ := service.GetPsnByPatientId(id)
+				PsnNo = psn_info.PsnNo
+				PsnCertType = psn_info.PsnCertType
+				Certno = psn_info.Certno
+				PsnName = psn_info.PsnName
+				Gend = psn_info.Gend
+				Naty = psn_info.Naty
+				Brdy = psn_info.Brdy
+				Age = psn_info.Age
+				infoStr = psn_info.Insuinfo
+				idetinfoStr = psn_info.Idetinfo
+				infocode = 0
+				verify_number = psn_info.VerifyNumber
+
+			} else if id_card_type == 2 {
+				result, requestLog := service.Hnyb1101(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", "1", miConfig.Url, miConfig.AccessKey, "")
+				saveLog(result, requestLog, "1101", "人员基本信息获取")
+				if err := json.Unmarshal([]byte(result), &res); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+
+				PsnNo = res.Output.Baseinfo.PsnNo
+				PsnCertType = res.Output.Baseinfo.PsnCertType
+				Certno = res.Output.Baseinfo.Certno
+				PsnName = res.Output.Baseinfo.PsnName
+				Gend = res.Output.Baseinfo.Gend
+				Naty = res.Output.Baseinfo.Naty
+				Brdy = res.Output.Baseinfo.Brdy
+				Age = res.Output.Baseinfo.Age
+				Iinfos, _ := json.Marshal(res.Output.Iinfo)
+				Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
+				infoStr = string(Iinfos)
+				idetinfoStr = string(Idetinfos)
+				infocode = res.Infcode
+
+			}
+
 		} else {
 
 			var result string
@@ -6865,16 +7416,48 @@ func (c *HisApiController) GetRegisterInfo() {
 				var result string
 				var requestLog string
 				if id_card_type == 1 {
-					result, requestLog = service.Jxyb2201(PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_info.DoctorNumber, miConfig.MdtrtareaAdmvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, miConfig.Url, miConfig.AccessKey, psn_info.VerifyNumber, "")
+					bas := strings.Split(psn_info.CardInfo, "|")
+					basNumber := bas[2]
+					card_sn := bas[3]
+					result, requestLog = service.Jxyb2201(PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_info.DoctorNumber, miConfig.MdtrtareaAdmvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, miConfig.Url, miConfig.AccessKey, basNumber, "", card_sn)
+					saveLog(result, requestLog, "2201A", "挂号")
+
+				} else if id_card_type == 2 {
+					result, requestLog = service.Jxyb2201(PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_info.DoctorNumber, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, miConfig.Url, miConfig.AccessKey, IdCardNo, "", "")
+					saveLog(result, requestLog, "2201A", "挂号")
+
+				} else {
+
+					result, requestLog = service.Jxyb2201(PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_info.DoctorNumber, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, miConfig.Url, miConfig.AccessKey, psn_info.VerifyNumber, "", "")
+					saveLog(result, requestLog, "2201A", "挂号")
+
+				}
+
+				if err := json.Unmarshal([]byte(result), &resThree); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				infocode = resThree.Infcode
+			} else if miConfig.MdtrtareaAdmvs == "430800" { //江西萍乡
+
+				psn_info, _ := service.GetPsnByPatientId(id)
+				var result string
+				var requestLog string
+				if id_card_type == 1 {
+					bas := strings.Split(psn_info.CardInfo, "|")
+					basNumber := bas[2]
+					card_sn := bas[3]
+					result, requestLog = service.Hnyb2201(PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_info.DoctorNumber, miConfig.MdtrtareaAdmvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, miConfig.Url, miConfig.AccessKey, basNumber, "", card_sn)
 					saveLog(result, requestLog, "2201A", "挂号")
 
 				} else if id_card_type == 2 {
-					result, requestLog = service.Jxyb2201(PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_info.DoctorNumber, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, miConfig.Url, miConfig.AccessKey, IdCardNo, "")
+					result, requestLog = service.Hnyb2201(PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_info.DoctorNumber, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, miConfig.Url, miConfig.AccessKey, IdCardNo, "", "")
 					saveLog(result, requestLog, "2201A", "挂号")
 
 				} else {
 
-					result, requestLog = service.Jxyb2201(PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_info.DoctorNumber, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, miConfig.Url, miConfig.AccessKey, psn_info.VerifyNumber, "")
+					result, requestLog = service.Hnyb2201(PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_info.DoctorNumber, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, miConfig.Url, miConfig.AccessKey, psn_info.VerifyNumber, "", "")
 					saveLog(result, requestLog, "2201A", "挂号")
 
 				}
@@ -8446,6 +9029,32 @@ func (c *HisApiController) GetUploadInfo() {
 					return
 				}
 
+			} else if miConfig.MdtrtareaAdmvs == "430800" {
+				psn_info, _ := service.GetPsnByPatientId(his.PatientId)
+				var cert_no string
+				if his.IdCardType == 1 {
+					cert_no = strings.Split(psn_info.CardInfo, "|")[0]
+				} else if his.IdCardType == 2 {
+					cert_no = his.IdCardNo
+				} else {
+					cert_no = psn_info.VerifyNumber
+
+				}
+				result2, src_resquest := service.Hnyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdCardType, acct_used_flag, miConfig.Url, miConfig.AccessKey, cert_no, "")
+				var dat map[string]interface{}
+				if err := json.Unmarshal([]byte(result2), &dat); err == nil {
+					fmt.Println(dat)
+				} else {
+					fmt.Println(err)
+				}
+				saveLog(result2, src_resquest, "2207", "结算")
+				userJSONBytes, _ := json.Marshal(dat)
+				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+
 			} else {
 
 				var src_resquest string
@@ -9367,6 +9976,25 @@ func (c *HisApiController) GetPreUploadInfo() {
 			return
 		}
 
+	} else if miConfig.MdtrtareaAdmvs == "430800" {
+		var result string
+		var requestLog string
+		result, requestLog = service.Hnyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, miConfig.Url, miConfig.AccessKey, "")
+
+		saveLog(result, requestLog, "2203", "上传就诊信息")
+		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
+		}
+
 	} else {
 		var result string
 		var requestLog string
@@ -9640,6 +10268,24 @@ func (c *HisApiController) GetPreUploadInfo() {
 					return
 				}
 
+			} else if miConfig.MdtrtareaAdmvs == "430800" {
+				result, request_log := service.Hnyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, data["dept"].(string), data["fixmedins_code"].(string), data["dept_code"].(string), data["doctor_id"].(string), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, data["balance_accounts_type"].(string), sickConfig.CountryCode, miConfig.Url, miConfig.AccessKey, doctor_info.UserName, "", "")
+				var dat map[string]interface{}
+				if err := json.Unmarshal([]byte(result), &dat); err == nil {
+					fmt.Println(dat)
+				} else {
+					fmt.Println(err)
+				}
+				saveLog(result, request_log, "2204", "上传费用明细")
+
+				userJSONBytes, _ := json.Marshal(dat)
+
+				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+
 			} else {
 
 				if miConfig.Code == "H15049901371" {
@@ -10045,8 +10691,50 @@ func (c *HisApiController) GetPreUploadInfo() {
 						if his.IdCardType == 2 {
 							result, request_log = service.Jxyb2206(his.PsnNo, his.Number, chrg_bchno, his.IdCardNo, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, miConfig.Url, miConfig.AccessKey, his.IdCardNo, "")
 
+						} else if his.IdCardType == 1 {
+							psn_info, _ := service.GetPsnByPatientId(his.PatientId)
+							bas := strings.Split(psn_info.CardInfo, "|")
+							basNumber := bas[2]
+							card_sn := bas[3]
+							result, request_log = service.Jxyb2206Two(his.PsnNo, his.Number, chrg_bchno, psn_info.VerifyNumber, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, miConfig.Url, miConfig.AccessKey, basNumber, "", card_sn)
+
+						} else {
+							psn_info, _ := service.GetPsnByPatientId(his.PatientId)
+
+							result, request_log = service.Jxyb2206(his.PsnNo, his.Number, chrg_bchno, psn_info.VerifyNumber, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, miConfig.Url, miConfig.AccessKey, psn_info.VerifyNumber, "")
+
+						}
+						var dat map[string]interface{}
+						if err := json.Unmarshal([]byte(result), &dat); err == nil {
+							fmt.Println(dat)
+						} else {
+							fmt.Println(err)
+						}
+						saveLog(result, request_log, "2206", "预结算")
+
+						userJSONBytes, _ := json.Marshal(dat)
+						if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+							utils.ErrorLog("解析失败：%v", err)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
+
+					} else if miConfig.MdtrtareaAdmvs == "430800" {
+						var result string
+						var request_log string
+						if his.IdCardType == 2 {
+							result, request_log = service.Hnyb2206(his.PsnNo, his.Number, chrg_bchno, his.IdCardNo, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, miConfig.Url, miConfig.AccessKey, his.IdCardNo, "")
+
+						} else if his.IdCardType == 1 {
+							psn_info, _ := service.GetPsnByPatientId(his.PatientId)
+							bas := strings.Split(psn_info.CardInfo, "|")
+							basNumber := bas[2]
+							card_sn := bas[3]
+							result, request_log = service.Jxyb2206Two(his.PsnNo, his.Number, chrg_bchno, psn_info.VerifyNumber, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, miConfig.Url, miConfig.AccessKey, basNumber, "", card_sn)
+
 						} else {
 							psn_info, _ := service.GetPsnByPatientId(his.PatientId)
+
 							result, request_log = service.Jxyb2206(his.PsnNo, his.Number, chrg_bchno, psn_info.VerifyNumber, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, miConfig.Url, miConfig.AccessKey, psn_info.VerifyNumber, "")
 
 						}
@@ -10407,6 +11095,24 @@ func (c *HisApiController) Refund() {
 				return
 			}
 
+		} else if miConfig.MdtrtareaAdmvs == "430800" {
+			result, src_resquest = service.Hnyb2208(order.PsnNo, order.MdtrtId, order.SetlId, miConfig.OrgName, roles.UserName, miConfig.SecretKey, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.Url, miConfig.AccessKey, "")
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+			saveLog(result, src_resquest, "2208", "退费")
+
+			userJSONBytes, _ := json.Marshal(dat)
+
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
 		} else {
 
 			if miConfig.Code == "H15049901371" {
@@ -10569,6 +11275,22 @@ func (c *HisApiController) Refund() {
 					fmt.Println(err)
 				}
 
+				saveLog(result2, src_request, "2205", "撤销明细")
+				userJSONBytes, _ := json.Marshal(dat)
+				if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+			} else if miConfig.MdtrtareaAdmvs == "430800" {
+				result2, src_request := service.Hnyb2205(order.PsnNo, order.MdtrtId, order.Number, miConfig.OrgName, roles.UserName, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, miConfig.Url, miConfig.AccessKey, "")
+				var dat map[string]interface{}
+				if err := json.Unmarshal([]byte(result2), &dat); err == nil {
+					fmt.Println(dat)
+				} else {
+					fmt.Println(err)
+				}
+
 				saveLog(result2, src_request, "2205", "撤销明细")
 				userJSONBytes, _ := json.Marshal(dat)
 				if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
@@ -10810,6 +11532,22 @@ func (c *HisApiController) RefundNumber() {
 				return
 			}
 
+		} else if miConfig.MdtrtareaAdmvs == "430800" {
+			result, request := service.Hnyb2202(his.PsnNo, his.Number, his.IptOtpNo, miConfig.OrgName, roles.UserName, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, miConfig.Url, miConfig.AccessKey, "")
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+			saveLog(result, request, "2202", "退号")
+			userJSONBytes, _ := json.Marshal(dat)
+			if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
 		} else {
 			var api3 string
 
@@ -11112,6 +11850,40 @@ func (c *HisApiController) RefundDetail() {
 				})
 			}
 
+		} else if miConfig.MdtrtareaAdmvs == "430800" {
+			result2, src_request := service.Hnyb2205(his.PsnNo, his.Number, order.Number, miConfig.OrgName, roles.UserName, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, miConfig.Url, miConfig.AccessKey, "")
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result2), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+
+			saveLog(result2, src_request, "2205", "撤销明细")
+			userJSONBytes, _ := json.Marshal(dat)
+			if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			if res2.Infcode == 0 {
+				err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId, "", "")
+				if err == nil {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "撤销明细成功",
+					})
+					return
+				} else {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+			} else {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"code": -10,
+					"msg":  res2.ErrMsg,
+				})
+			}
+
 		} else {
 			api2 := "http://127.0.0.1:9532/" + "gdyb/six?psn_no=" + his.PsnNo +
 				"&mdtrt_id=" + his.Number + "&chrg_bchno=" + order.Number + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
@@ -12109,6 +12881,21 @@ func (c *HisApiController) GetSettleAccounts() {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
+		} else if miConfig.MdtrtareaAdmvs == "430800" {
+			result, requestLog := service.Hnyb5203(baseParams, businessParams)
+			saveLog(result, requestLog, "5203", "结算单")
+			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)
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 		} else if miConfig.MdtrtareaAdmvs == "150499" {
 
 			api := "http://172.16.13.254:9532/" + "nmyb/5203?psn_no=" + businessParams.PsnNo + "&mdtrt_id=" + businessParams.MdtrtId + "&setl_id=" + businessParams.SetlId +

controllers/zh/zh_his_api_controller.go

@@ -1492,6 +1492,7 @@ 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)
 
@@ -1504,7 +1505,6 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 			struct2401.MdtrtCertType = "02"
 			struct2401.MdtrtCertNo = res2.Output.Baseinfo.Certno
 		}
-		insutype = "310"
 
 		if miConfig.Code == "H15049901371" {
 			if med_type == 14 {
@@ -1778,7 +1778,7 @@ func (this *ZHHisApiController) GetZHOutHospitalCheck() {
 		dise.DiagCode = item.CountryCode
 		dise.DiagName = item.ClassName
 		dise.DiagDept = departmentInfo.Name
-		dise.DiseDorNo = strconv.FormatInt(int64(doctorInfo.AdminUserId), 10)
+		dise.DiseDorNo = doctorInfo.DoctorNumber
 		dise.DiagTime = timeFormatOne
 
 		dises = append(dises, dise)
@@ -2982,11 +2982,11 @@ func (c *ZHHisApiController) ZHRefund() {
 
 		if res.Infcode == 0 {
 			err := service.UpdataOrderStatusThree(order_id, order.Number, adminUser.CurrentOrgId, "", result)
-			////不同地区退费流程不一样，肇庆那边退费就包括撤销出院，内蒙古退费不包括撤销明细，所以下面需要根据不同情况进行判断
-			//if miConfig.UserOrgId == 10215 {
-			//	record.OutHospitalStatus = 0
-			//	service.CreateHospitalRecord(&record)
-			//}
+			//不同地区退费流程不一样，肇庆那边退费就包括撤销出院，内蒙古退费不包括撤销明细，所以下面需要根据不同情况进行判断
+			if miConfig.UserOrgId == 10215 {
+				record.OutHospitalStatus = 0
+				service.CreateHospitalRecord(&record)
+			}
 			service.UpdataOrderStatusByNumber(record.Number)
 			if err == nil {
 				////当押金不为零时产生退费记录
@@ -3689,6 +3689,12 @@ func (c *ZHHisApiController) ReadCard() {
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 
+	if miConfig.MdtrtareaAdmvs == "" {
+
+	} else {
+
+	}
+
 	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

service/jx_service.go

@@ -172,7 +172,7 @@ func Jxyb1101ForEleCert(org_name string, doctor string, fixmedins_code string, i
 }
 
 // 门诊挂号
-func Jxyb2201(psnNo string, insutype string, certNo string, org_name string, opera 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, doctor_name string, request_url string, access_key string, verify_number string, cainfo string) (string, string) {
+func Jxyb2201(psnNo string, insutype string, certNo string, org_name string, opera 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, doctor_name string, request_url string, access_key string, verify_number string, cainfo string, card_sn string) (string, string) {
 	fmt.Println(opera)
 
 	// 生成签名
@@ -190,8 +190,11 @@ func Jxyb2201(psnNo string, insutype string, certNo string, org_name string, ope
 	inputData["begntime"] = timeFormatOne // 开始时间
 
 	if id_card_type == 1 {
-		inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
-		inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
+		inputData["mdtrt_cert_type"] = "03"        // 就诊凭证类型
+		inputData["card_sn"] = card_sn             // 卡识别码
+		inputData["certno"] = certNo               // 证件号码
+		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
+
 	} else if id_card_type == 3 {
 		inputData["mdtrt_cert_type"] = "04"        // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
@@ -626,8 +629,78 @@ func Jxyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 	} else {
 		if id_card_type == 1 {
+			inputData["mdtrt_cert_type"] = "03"        // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
+		} else if id_card_type == 3 {
+			inputData["mdtrt_cert_type"] = "04"        // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
+		} else if id_card_type == 4 {
+			inputData["mdtrt_cert_type"] = "01"        // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
+		} else {
 			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		}
+	}
+	if insuplc_admdvs == "421300" {
+		if med_type == "11" || med_type == "1112" || med_type == "1111" {
+			inputData["med_type"] = "110104" // 医疗类别 11 普通门诊  12 门诊挂号
+		} else if med_type == "14" {
+			inputData["med_type"] = "140110" // 医疗类别 11 普通门诊  12 门诊挂号
+		}
+	} else {
+		inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号
+	}
+
+	inputData["medfee_sumamt"] = total  // 医疗费总额
+	inputData["psn_setlway"] = "01"     // 个人结算方式 01 按项目结 02 按定额结算
+	inputData["mdtrt_id"] = mdtrtId     // 就诊 ID（来自2201接口返回）
+	inputData["chrg_bchno"] = chrgBchno // 收费批次号(来自2204生成的)
+	inputData["acct_used_flag"] = "0"   // 个人账户使用标志 0否 1是
+	inputData["insutype"] = insutype    // 险种类型
+	inputData["invono"] = ""            // 发票号
+	inputData["exp_content"] = ""       // 人员编号 （来自1101接口返回）
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	var requestLog string
+
+	bytesData, err := json.Marshal(inputMessage)
+
+	requestLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	request_url = request_url + "2206"
+	//fmt.Println(JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
+
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2206"), requestLog
+
+}
+
+//  门诊预结算
+func Jxyb2206Two(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, request_url string, access_key string, verify_number string, cainfo string, card_sn string) (string, string) {
+
+	// 生成签名
+	timestamp := time.Now().Unix() //		inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+	//		inputData["mdtrt_cert_no"] = certNo
+	// 生成输入报文
+	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"] = "2206" // 交易编码
+	inputData["psn_no"] = psnNo    // 人员编号 （来自1101接口返回）
+	if certificates == 3 {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	} else {
+		if id_card_type == 1 {
+			inputData["mdtrt_cert_type"] = "03"        // 就诊凭证类型
+			inputData["card_sn"] = card_sn             // 卡识别码
+			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
 		} else if id_card_type == 3 {
 			inputData["mdtrt_cert_type"] = "04"        // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
@@ -635,8 +708,8 @@ func Jxyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 			inputData["mdtrt_cert_type"] = "01"        // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
 		} else {
-			inputData["mdtrt_cert_type"] = "02"        // 就诊凭证类型
-			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 		}
 	}
 	if insuplc_admdvs == "421300" {
@@ -743,6 +816,73 @@ func Jxyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 
 }
 
+//  门诊结算
+func Jxyb2207Two(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, acct_used_flag string, request_url string, access_key string, verify_number string, cainfo string, card_sn 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"] = "2207" // 交易编码
+	inputData["psn_no"] = psnNo    // 人员编号 （来自1101接口返回）
+
+	if id_card_type == 1 {
+		inputData["mdtrt_cert_type"] = "03"        // 就诊凭证类型
+		inputData["card_sn"] = card_sn             // 卡识别码
+		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
+
+	} else if id_card_type == 3 {
+		inputData["mdtrt_cert_type"] = "04"        // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
+	} else if id_card_type == 4 {
+		inputData["mdtrt_cert_type"] = "01"        // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
+	} else {
+		inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo
+	}
+
+	if med_type == "1111" || med_type == "1112" {
+		med_type = "11"
+	}
+	if insuplc_admdvs == "421300" {
+		if med_type == "11" {
+			inputData["med_type"] = "110104" // 医疗类别 11 普通门诊  12 门诊挂号
+		} else if med_type == "14" {
+			inputData["med_type"] = "140101" // 医疗类别 11 普通门诊  12 门诊挂号
+		}
+	} else {
+		inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号
+	}
+	inputData["medfee_sumamt"] = total           // 医疗费总额
+	inputData["psn_setlway"] = "01"              // 个人结算方式 01 按项目结 02 按定额结算
+	inputData["mdtrt_id"] = mdtrtId              // 就诊 ID（来自2201接口返回）
+	inputData["chrg_bchno"] = chrgBchno          // 收费批次号(来自2204生成的)
+	inputData["acct_used_flag"] = acct_used_flag // 个人账户使用标志 0否 1是
+	inputData["insutype"] = insutype             // 险种类型
+	inputData["invono"] = ""                     // 发票号
+
+	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //
+	inputData["overlmt_selfpay"] = overlmt_selfpay     //
+	inputData["preselfpay_amt"] = preselfpay_amt       //
+	inputData["inscp_scp_amt"] = inscp_scp_amt         //
+	inputData["exp_content"] = ""                      // 人员编号 （来自1101接口返回）
+
+	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 + "2207"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2207"), string(bytesData)
+
+}
+
 func Jxyb2207A(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, acct_used_flag string, request_url string, access_key string, cainfo string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()

service/zh_his_service.go

@@ -1046,6 +1046,62 @@ func ZHGdyb2304(psnNo string, mdtrtId string, chrgBchno string, certNo string, i
 
 	return str, str2
 }
+func Gdyb26011(psnNo string, omsgid string, oinfno string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key 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"] = "2601" // 交易编码
+	inputData["psn_no"] = psnNo
+	inputData["omsgid"] = omsgid
+	inputData["oinfno"] = oinfno
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	url := gdyb_url + "2601"
+	if mdtrtarea_admvs == "150499" {
+		url = gdyb_url
+	}
+	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
+}
 
 //  住院结算撤销
 func Gdyb2305(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) (string, string) {