更新

conf/app.conf

@@ -51,7 +51,7 @@ sso_domain = https://sso.kuyicloud.com
 call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
 
-org_id = 10215
+org_id = 10188
 gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 gdyb_paasid = "sg02_prd"
 

controllers/gz/new_his_api_controller.go

@@ -1136,7 +1136,8 @@ func (c *HisApiController) CheckCardPWD() {
 		})
 		return
 	} else {
-		if res.Output.Result.SscnoCheckStat == "0" {
+		fmt.Println(res.Output.Result.CardStat)
+		if res.Output.Result.SscnoCheckStat == "0" && res.Output.Result.CardStat != "10" {
 			var msg string
 			switch res.Output.Result.CardStat {
 			case "00":

controllers/hb/hbyb_controller.go

@@ -266,9 +266,7 @@ func (c *HBybController) PostFour() {
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-
 	} else {
-
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": dat,

controllers/nm/nm_controller.go

@@ -85,7 +85,7 @@ func (c *NmController) GetNewELeInfo() {
 		data["result"] = dat
 		var req *http.Request
 		bytesData, _ := json.Marshal(data)
-		req, _ = http.NewRequest("POST", "http://172.16.23.189:9532/"+"api/ele/info", bytes.NewReader(bytesData))
+		req, _ = http.NewRequest("POST", "http://172.16.13.253:9532/"+"api/ele/info", bytes.NewReader(bytesData))
 		client := &http.Client{}
 		resp, _ := client.Do(req)
 		defer resp.Body.Close()
@@ -132,14 +132,25 @@ func (c *NmController) GetToken() {
 			if len(token) > 0 {
 				data := make(map[string]interface{})
 				data["token"] = token
-				data["result"] = ele.Data
+				data["id_card_no"] = ele.Data.IdNo
+				fmt.Println(data)
 				var req *http.Request
+				fmt.Println(req)
+
 				bytesData, _ := json.Marshal(data)
-				req, _ = http.NewRequest("POST", "http://172.16.23.189:9532/"+"api/token/get", bytes.NewReader(bytesData))
+				fmt.Println(bytesData)
+
+				req, _ = http.NewRequest("POST", "http://172.16.13.253:9532/"+"api/token/get", bytes.NewReader(bytesData))
+				fmt.Println(req)
 				client := &http.Client{}
 				resp, _ := client.Do(req)
+				fmt.Println(resp)
+
 				defer resp.Body.Close()
 				body, ioErr := ioutil.ReadAll(resp.Body)
+				fmt.Println(resp.Body)
+				fmt.Println(body)
+				fmt.Println(ioErr)
 				if ioErr != nil {
 					utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

controllers/zh/zh_his_api_controller.go

@@ -506,6 +506,22 @@ func ZHHisManagerApiRegistRouters() {
 	beego.Router("/api/4102", &ZHHisApiController{}, "get:Get4102")
 	beego.Router("/api/4103", &ZHHisApiController{}, "get:Get4103")
 
+	beego.Router("/api/cardstatus", &ZHHisApiController{}, "get:GetCardStatus")
+
+}
+func (c *ZHHisApiController) GetCardStatus() {
+	//patient_id, _ := c.GetInt64("patient_id")
+	//record_date, _ := c.GetInt64("record_date")
+	//psn, _  := service.GetPsnByPatientIdtWO(patient_id,record_date)
+	//if len(psn.VerifyNumber) > 0{
+	//	c.ServeSuccessJSON(map[string]interface{}{
+	//		"msg": "读卡成功",
+	//	})
+	//} else{
+	//	c.ServeSuccessJSON(map[string]interface{}{
+	//		"msg": "",
+	//	})
+	//}
 }
 
 func (c *ZHHisApiController) GetEleInfo() {
@@ -516,16 +532,67 @@ func (c *ZHHisApiController) GetEleInfo() {
 		return
 	}
 	token := respJSON["token"].(string)
-	result_respJson := respJSON["result"].(string)
+	respJSON = respJSON["result"].(map[string]interface{})
+	result_byte, _ := json.Marshal(respJSON)
+	result := string(result_byte)
+
 	fmt.Println("token")
 	fmt.Println(token)
 	fmt.Println("result")
-	fmt.Println(result_respJson)
+	fmt.Println(result)
 
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "读卡成功",
-	})
+	var res ResultTwo
+	var res10265 ResultTwo10265 //1101结果
+	if err := json.Unmarshal([]byte(result), &res10265); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	res.ErrMsg = res10265.ErrMsg
+	infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
+	res.Infcode = infocode
+	res.Output = res10265.Output
+	res.InfRefmsgid = res10265.InfRefmsgid
 
+	if res.Infcode == 0 {
+		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
+	}
 }
 func (c *ZHHisApiController) GetToken() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
@@ -535,27 +602,17 @@ func (c *ZHHisApiController) GetToken() {
 		return
 	}
 	token := respJSON["token"].(string)
-	result_respJson := respJSON["result"].(string)
+	id_card_no := respJSON["id_card_no"].(string)
 	fmt.Println("token")
 	fmt.Println(token)
 	fmt.Println("result")
-	fmt.Println(result_respJson)
-	var res ELeData
-	result, _ := json.Marshal(result_respJson)
-	if err := json.Unmarshal([]byte(result), &res); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
+	fmt.Println(id_card_no)
 
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
-
-	patient, _ := service.GetPatientByIDCard(res.Data.IdNo, c.GetAdminUserInfo().CurrentOrgId)
-
+	patient, _ := service.GetPatientByIDCard(id_card_no, c.GetAdminUserInfo().CurrentOrgId)
 	var api string
 	api = "http://172.16.13.254:9532/" + "api/eleinfo?" + "fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&org_name=" + miConfig.OrgName +
 		"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&cainfo=" + miConfig.Cainfo + "&token=" + token + "&user_name=" + patient.Name + "&id_card_no=" + patient.IdCardNo
-
 	resp, requestErr := http.Get(api)
 	if requestErr != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -568,12 +625,6 @@ func (c *ZHHisApiController) GetToken() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
-	//var respJSON map[string]interface{}
-	//if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-	//	utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//}
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg": "读卡成功",
@@ -1602,7 +1653,6 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 				} else if insutype == "310" {
 
 					struct2401.MedType = "990502"
-
 				}
 			} else if med_type == 11 {
 				struct2401.MedType = "21"
@@ -2285,6 +2335,7 @@ func (c *ZHHisApiController) GetSettleInfo() {
 	}
 
 	if miConfig.MdtrtareaAdmvs == "150499" {
+
 		psn_info, _ := service.GetPsnByPatientId(patient_id)
 		mdtrt_cert_no := ""
 		if record.IdCardType == 1 {
@@ -2302,6 +2353,18 @@ func (c *ZHHisApiController) GetSettleInfo() {
 			acct_used_flag = "0"
 		}
 
+		if pay_way == 6 {
+			mdtrt_cert_no = psn_info.VerifyNumber
+			acct_used_flag = "1"
+			record.IdCardType = 4
+		} else {
+			acct_used_flag = "0"
+		}
+
+		fmt.Println(mdtrt_cert_no)
+		fmt.Println(acct_used_flag)
+		fmt.Println(record.IdCardType)
+
 		//请求内网数据
 		api := "http://172.16.13.254:9532/" + "nmyb/2304?psn_no=" + record.PsnNo + "&mdtrt_id=" + record.Number + "&chrg_bchno=" + chrg_bchno +
 			"&insutype_type=" + record.InsutypeType + "&total=" + allTotal +

main.go

@@ -65,25 +65,26 @@ type ResultSeventeen struct {
 func GetBatchSettleList() {
 
 	org_id, _ := beego.AppConfig.Int64("org_id")
-	list, _ := service.GetLastFundList(org_id)
-	order, _ := service.GetHisOrderByID(list.OrderId)
-	var orders []*models.HisOrder
-	if order.ID > 0 {
-
-		orders, _ = service.GetAllHisOrderTwo(org_id, order.ID)
-
-	} else {
-		orders, _ = service.GetAllHisOrder(org_id)
-
-	}
+	//list, _ := service.GetLastFundList(org_id)
+	orders, _ := service.GetOrderError(org_id)
+	//order, _ := service.GetHisOrderByID(list.OrderId)
+	//var orders []*models.HisOrder
+	//if order.ID > 0 {
+	//
+	//	orders, _ = service.GetAllHisOrderTwo(org_id, order.ID)
+	//
+	//} else {
+	//	orders, _ = service.GetAllHisOrder(org_id)
+	//
+	//}
 
 	for _, item := range orders {
-		order_id := item.ID
+		order_id := item.PatientId
 		order, _ := service.GetHisOrderByIDTwo(order_id)
 		roles, _ := service.GetDoctorListTwo(org_id)
 		his, _ := service.GetHisPatientByNumber(order.MdtrtId)
 		admin, _ := service.GetAdminUserByUserID(roles[0].AdminUserId)
-		curRoles, _ := service.GetAdminUserInfoByID(org_id, 2495)
+		curRoles, _ := service.GetAdminUserInfoByID(org_id, 2185)
 		depart, _ := service.GetDepartMentDetail(curRoles.DepartmentId)
 		miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
 
@@ -132,6 +133,12 @@ func GetBatchSettleList() {
 		}
 		struct4101.SetlBegnDate = order.SetlTime
 		struct4101.SetlEndDate = order.SetlTime
+
+		if len(order.SetlTime) == 0 {
+			struct4101.SetlBegnDate = time.Unix(order.Ctime, 0).Format("2006-01-02 15:04:05")
+			struct4101.SetlEndDate = time.Unix(order.Ctime, 0).Format("2006-01-02 15:04:05")
+
+		}
 		//if order.SettleType == 1 {
 		//	t := time.Unix(int64(order.SettleAccountsDate), 0)
 		//	dateStr := t.Format("2006-01-02")
@@ -605,166 +612,170 @@ func GetBatchSettleList() {
 
 		var iteminfoStructs []service.IteminfoStruct
 
-		if bedCostTotal != 0 {
-			iteminfo.MedChrgitm = "01"
-			iteminfo.FulamtOwnpayAmt = bed_fulamt_ownpay_amt
-			iteminfo.Amt = bedCostTotal
-			iteminfo.ClaaSumfee = bed_claa_sunmfee
-			iteminfo.ClabAmt = bed_clab_amt
-			iteminfo.OthAmt = bed_other_amt
-			iteminfoStructs = append(iteminfoStructs, iteminfo)
-		}
+		if order.Insutype != "310" {
+			if bedCostTotal != 0 {
+				iteminfo.MedChrgitm = "01"
+				iteminfo.FulamtOwnpayAmt = bed_fulamt_ownpay_amt
+				iteminfo.Amt = bedCostTotal
+				iteminfo.ClaaSumfee = bed_claa_sunmfee
+				iteminfo.ClabAmt = bed_clab_amt
+				iteminfo.OthAmt = bed_other_amt
+				iteminfoStructs = append(iteminfoStructs, iteminfo)
+			}
 
-		if examineCostTotal != 0 {
-			iteminfo.MedChrgitm = "02"
-			iteminfo.FulamtOwnpayAmt = examine_fulamt_ownpay_amt
-			iteminfo.Amt = examineCostTotal
-			iteminfo.ClaaSumfee = examine_claa_sunmfee
-			iteminfo.ClabAmt = examine_clab_amt
-			iteminfo.OthAmt = examine_other_amt
-			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
-			iteminfoStructs = append(iteminfoStructs, iteminfo)
-		}
+			if examineCostTotal != 0 {
+				iteminfo.MedChrgitm = "02"
+				iteminfo.FulamtOwnpayAmt = examine_fulamt_ownpay_amt
+				iteminfo.Amt = examineCostTotal
+				iteminfo.ClaaSumfee = examine_claa_sunmfee
+				iteminfo.ClabAmt = examine_clab_amt
+				iteminfo.OthAmt = examine_other_amt
+				//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+				iteminfoStructs = append(iteminfoStructs, iteminfo)
+			}
 
-		if checkCostTotal != 0 {
-			iteminfo.MedChrgitm = "03"
-			iteminfo.FulamtOwnpayAmt = check_fulamt_ownpay_amt
-			iteminfo.Amt = checkCostTotal
-			iteminfo.ClaaSumfee = check_claa_sunmfee
-			iteminfo.ClabAmt = check_clab_amt
-			iteminfo.OthAmt = check_other_amt
-			iteminfoStructs = append(iteminfoStructs, iteminfo)
+			if checkCostTotal != 0 {
+				iteminfo.MedChrgitm = "03"
+				iteminfo.FulamtOwnpayAmt = check_fulamt_ownpay_amt
+				iteminfo.Amt = checkCostTotal
+				iteminfo.ClaaSumfee = check_claa_sunmfee
+				iteminfo.ClabAmt = check_clab_amt
+				iteminfo.OthAmt = check_other_amt
+				iteminfoStructs = append(iteminfoStructs, iteminfo)
 
-		}
+			}
 
-		if laboratoryCostTotal != 0 {
-			iteminfo.MedChrgitm = "04"
-			iteminfo.FulamtOwnpayAmt = laboratory_fulamt_ownpay_amt
-			iteminfo.Amt = laboratoryCostTotal
-			iteminfo.ClaaSumfee = laboratory_claa_sunmfee
-			iteminfo.ClabAmt = laboratory_clab_amt
-			iteminfo.OthAmt = laboratory_other_amt
-			iteminfoStructs = append(iteminfoStructs, iteminfo)
+			if laboratoryCostTotal != 0 {
+				iteminfo.MedChrgitm = "04"
+				iteminfo.FulamtOwnpayAmt = laboratory_fulamt_ownpay_amt
+				iteminfo.Amt = laboratoryCostTotal
+				iteminfo.ClaaSumfee = laboratory_claa_sunmfee
+				iteminfo.ClabAmt = laboratory_clab_amt
+				iteminfo.OthAmt = laboratory_other_amt
+				iteminfoStructs = append(iteminfoStructs, iteminfo)
 
-			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+				//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
 
-		}
+			}
 
-		if treatCostTotal != 0 {
-			iteminfo.MedChrgitm = "05"
-			iteminfo.FulamtOwnpayAmt = treat_fulamt_ownpay_amt
-			iteminfo.Amt = treatCostTotal
-			iteminfo.ClaaSumfee = treat_claa_sunmfee
-			iteminfo.ClabAmt = treat_clab_amt
-			iteminfo.OthAmt = treat_other_amt
-			iteminfoStructs = append(iteminfoStructs, iteminfo)
-			//(struct4101.IteminfoStruct, iteminfo)
-			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
-		}
+			if treatCostTotal != 0 {
+				iteminfo.MedChrgitm = "05"
+				iteminfo.FulamtOwnpayAmt = treat_fulamt_ownpay_amt
+				iteminfo.Amt = treatCostTotal
+				iteminfo.ClaaSumfee = treat_claa_sunmfee
+				iteminfo.ClabAmt = treat_clab_amt
+				iteminfo.OthAmt = treat_other_amt
+				iteminfoStructs = append(iteminfoStructs, iteminfo)
+				//(struct4101.IteminfoStruct, iteminfo)
+				//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+			}
 
-		if operationCostTotal != 0 {
-			iteminfo.MedChrgitm = "06"
-			iteminfo.FulamtOwnpayAmt = bed_fulamt_ownpay_amt
-			iteminfo.Amt = operationCostTotal
-			iteminfo.ClaaSumfee = operation_claa_sunmfee
-			iteminfo.ClabAmt = operation_clab_amt
-			iteminfo.OthAmt = operation_other_amt
-			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
-			iteminfoStructs = append(iteminfoStructs, iteminfo)
-		}
+			if operationCostTotal != 0 {
+				iteminfo.MedChrgitm = "06"
+				iteminfo.FulamtOwnpayAmt = bed_fulamt_ownpay_amt
+				iteminfo.Amt = operationCostTotal
+				iteminfo.ClaaSumfee = operation_claa_sunmfee
+				iteminfo.ClabAmt = operation_clab_amt
+				iteminfo.OthAmt = operation_other_amt
+				//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+				iteminfoStructs = append(iteminfoStructs, iteminfo)
+			}
 
-		if nursingCostTotal != 0 {
-			iteminfo.MedChrgitm = "07"
-			iteminfo.FulamtOwnpayAmt = nursing_fulamt_ownpay_amt
-			iteminfo.Amt = nursingCostTotal
-			iteminfo.ClaaSumfee = nursing_claa_sunmfee
-			iteminfo.ClabAmt = nursing_clab_amt
-			iteminfo.OthAmt = nursing_other_amt
-			iteminfoStructs = append(iteminfoStructs, iteminfo)
-		}
+			if nursingCostTotal != 0 {
+				iteminfo.MedChrgitm = "07"
+				iteminfo.FulamtOwnpayAmt = nursing_fulamt_ownpay_amt
+				iteminfo.Amt = nursingCostTotal
+				iteminfo.ClaaSumfee = nursing_claa_sunmfee
+				iteminfo.ClabAmt = nursing_clab_amt
+				iteminfo.OthAmt = nursing_other_amt
+				iteminfoStructs = append(iteminfoStructs, iteminfo)
+			}
 
-		if materialCostTotal != 0 {
-			iteminfo.MedChrgitm = "08"
-			iteminfo.FulamtOwnpayAmt = material_fulamt_ownpay_amt
-			iteminfo.Amt = materialCostTotal
-			iteminfo.ClaaSumfee = material_claa_sunmfee
-			iteminfo.ClabAmt = material_clab_amt
-			iteminfo.OthAmt = material_other_amt
-			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
-			iteminfoStructs = append(iteminfoStructs, iteminfo)
-		}
+			if materialCostTotal != 0 {
+				iteminfo.MedChrgitm = "08"
+				iteminfo.FulamtOwnpayAmt = material_fulamt_ownpay_amt
+				iteminfo.Amt = materialCostTotal
+				iteminfo.ClaaSumfee = material_claa_sunmfee
+				iteminfo.ClabAmt = material_clab_amt
+				iteminfo.OthAmt = material_other_amt
+				//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+				iteminfoStructs = append(iteminfoStructs, iteminfo)
+			}
 
-		if westernMedicineCostTotal != 0 {
-			iteminfo.MedChrgitm = "09"
-			iteminfo.FulamtOwnpayAmt = westernMedicine_fulamt_ownpay_amt
-			iteminfo.Amt = westernMedicineCostTotal
-			iteminfo.ClaaSumfee = westernMedicine_claa_sunmfee
-			iteminfo.ClabAmt = westernMedicine_clab_amt
-			iteminfo.OthAmt = westernMedicine_other_amt
-			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
-			iteminfoStructs = append(iteminfoStructs, iteminfo)
+			if westernMedicineCostTotal != 0 {
+				iteminfo.MedChrgitm = "09"
+				iteminfo.FulamtOwnpayAmt = westernMedicine_fulamt_ownpay_amt
+				iteminfo.Amt = westernMedicineCostTotal
+				iteminfo.ClaaSumfee = westernMedicine_claa_sunmfee
+				iteminfo.ClabAmt = westernMedicine_clab_amt
+				iteminfo.OthAmt = westernMedicine_other_amt
+				//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+				iteminfoStructs = append(iteminfoStructs, iteminfo)
 
-		}
+			}
 
-		if chineseMedicineCostTotal != 0 {
-			iteminfo.MedChrgitm = "10"
-			iteminfo.FulamtOwnpayAmt = chinese_medicine_fulamt_ownpay_amt
-			iteminfo.Amt = chineseMedicineCostTotal
-			iteminfo.ClaaSumfee = chinese_medicine_claa_sunmfee
-			iteminfo.ClabAmt = chinese_medicine_clab_amt
-			iteminfo.OthAmt = chinese_medicine_other_amt
-			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
-			iteminfoStructs = append(iteminfoStructs, iteminfo)
+			if chineseMedicineCostTotal != 0 {
+				iteminfo.MedChrgitm = "10"
+				iteminfo.FulamtOwnpayAmt = chinese_medicine_fulamt_ownpay_amt
+				iteminfo.Amt = chineseMedicineCostTotal
+				iteminfo.ClaaSumfee = chinese_medicine_claa_sunmfee
+				iteminfo.ClabAmt = chinese_medicine_clab_amt
+				iteminfo.OthAmt = chinese_medicine_other_amt
+				//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+				iteminfoStructs = append(iteminfoStructs, iteminfo)
 
-		}
+			}
 
-		if chineseTraditionalMedicineCostTotal != 0 {
-			iteminfo.MedChrgitm = "11"
-			iteminfo.FulamtOwnpayAmt = westernMedicine_fulamt_ownpay_amt
-			iteminfo.Amt = westernMedicineCostTotal
-			iteminfo.ClaaSumfee = westernMedicine_claa_sunmfee
-			iteminfo.ClabAmt = westernMedicine_clab_amt
-			iteminfo.OthAmt = westernMedicine_other_amt
-			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
-			iteminfoStructs = append(iteminfoStructs, iteminfo)
+			if chineseTraditionalMedicineCostTotal != 0 {
+				iteminfo.MedChrgitm = "11"
+				iteminfo.FulamtOwnpayAmt = westernMedicine_fulamt_ownpay_amt
+				iteminfo.Amt = westernMedicineCostTotal
+				iteminfo.ClaaSumfee = westernMedicine_claa_sunmfee
+				iteminfo.ClabAmt = westernMedicine_clab_amt
+				iteminfo.OthAmt = westernMedicine_other_amt
+				//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+				iteminfoStructs = append(iteminfoStructs, iteminfo)
 
-		}
+			}
 
-		if commonlyTreatmentCostTotal != 0 {
-			iteminfo.MedChrgitm = "12"
-			iteminfo.FulamtOwnpayAmt = commonly_treatment_fulamt_ownpay_amt
-			iteminfo.Amt = commonlyTreatmentCostTotal
-			iteminfo.ClaaSumfee = commonly_treatment_claa_sunmfee
-			iteminfo.ClabAmt = commonly_treatment_clab_amt
-			iteminfo.OthAmt = commonly_treatment_other_amt
-			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
-			iteminfoStructs = append(iteminfoStructs, iteminfo)
+			if commonlyTreatmentCostTotal != 0 {
+				iteminfo.MedChrgitm = "12"
+				iteminfo.FulamtOwnpayAmt = commonly_treatment_fulamt_ownpay_amt
+				iteminfo.Amt = commonlyTreatmentCostTotal
+				iteminfo.ClaaSumfee = commonly_treatment_claa_sunmfee
+				iteminfo.ClabAmt = commonly_treatment_clab_amt
+				iteminfo.OthAmt = commonly_treatment_other_amt
+				//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+				iteminfoStructs = append(iteminfoStructs, iteminfo)
 
-		}
+			}
 
-		if registerCostTotal != 0 {
-			iteminfo.MedChrgitm = "13"
-			iteminfo.FulamtOwnpayAmt = register_fulamt_ownpay_amt
-			iteminfo.Amt = registerCostTotal
-			iteminfo.ClaaSumfee = register_claa_sunmfee
-			iteminfo.ClabAmt = register_clab_amt
-			iteminfo.OthAmt = register_other_amt
-			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
-			iteminfoStructs = append(iteminfoStructs, iteminfo)
+			if registerCostTotal != 0 {
+				iteminfo.MedChrgitm = "13"
+				iteminfo.FulamtOwnpayAmt = register_fulamt_ownpay_amt
+				iteminfo.Amt = registerCostTotal
+				iteminfo.ClaaSumfee = register_claa_sunmfee
+				iteminfo.ClabAmt = register_clab_amt
+				iteminfo.OthAmt = register_other_amt
+				//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+				iteminfoStructs = append(iteminfoStructs, iteminfo)
 
-		}
+			}
+
+			if otherCostTotal != 0 {
+				iteminfo.MedChrgitm = "14"
+				iteminfo.FulamtOwnpayAmt = other_fulamt_ownpay_amt
+				iteminfo.Amt = otherCostTotal
+				iteminfo.ClaaSumfee = other_claa_sunmfee
+				iteminfo.ClabAmt = other_clab_amt
+				iteminfo.OthAmt = other_other_amt
+				//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+				iteminfoStructs = append(iteminfoStructs, iteminfo)
 
-		if otherCostTotal != 0 {
-			iteminfo.MedChrgitm = "14"
-			iteminfo.FulamtOwnpayAmt = other_fulamt_ownpay_amt
-			iteminfo.Amt = otherCostTotal
-			iteminfo.ClaaSumfee = other_claa_sunmfee
-			iteminfo.ClabAmt = other_clab_amt
-			iteminfo.OthAmt = other_other_amt
-			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
-			iteminfoStructs = append(iteminfoStructs, iteminfo)
+			}
 
 		}
+
 		struct4101.IteminfoStruct = iteminfoStructs
 		time_arr := strings.Split(order.SetlTime, " ")
 		struct4101.AdmTime = time_arr[0]
@@ -845,7 +856,7 @@ func GetBatchSettleList() {
 					ErrMsg:    res.ErrMsg + "解析失败",
 					Status:    1,
 					PatientId: order_id,
-					Stage:     10106,
+					Stage:     90000,
 				}
 				service.CreateErrMsgLog(errlog)
 				continue
@@ -861,7 +872,7 @@ func GetBatchSettleList() {
 				ErrMsg:    res.ErrMsg,
 				Status:    1,
 				PatientId: order_id,
-				Stage:     10106,
+				Stage:     90000,
 			}
 			service.CreateErrMsgLog(errlog)
 			continue

models/his_models.go

@@ -609,82 +609,83 @@ func (XtHisPatient) TableName() string {
 }
 
 type HisOrder struct {
-	ID                    int64     `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId             int64     `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	HisPatientId          int64     `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	SettleAccountsDate    int64     `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
-	Ctime                 int64     `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                 int64     `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status                int64     `gorm:"column:status" json:"status" form:"status"`
-	Number                string    `gorm:"column:number" json:"number" form:"number"`
-	PatientId             int64     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Infcode               int64     `gorm:"column:infcode" json:"infcode" form:"infcode"`
-	WarnMsg               string    `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
-	Cainfo                string    `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
-	ErrMsg                string    `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
-	RespondTime           string    `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
-	InfRefmsgid           string    `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
-	OrderStatus           int64     `gorm:"column:order_status" json:"order_status" form:"order_status"`
-	MdtrtId               string    `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
-	SetlId                string    `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
-	PsnNo                 string    `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
-	PsnName               string    `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
-	PsnCertType           string    `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
-	Certno                string    `gorm:"column:certno" json:"certno" form:"certno"`
-	Gend                  string    `gorm:"column:gend" json:"gend" form:"gend"`
-	Naty                  string    `gorm:"column:naty" json:"naty" form:"naty"`
-	Brdy                  time.Time `gorm:"column:brdy" json:"brdy" form:"brdy"`
-	Age                   float64   `gorm:"column:age" json:"age" form:"age"`
-	Insutype              string    `gorm:"column:insutype" json:"insutype" form:"insutype"`
-	PsnType               string    `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
-	CvlservFlag           string    `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
-	SetlTime              string    `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
-	MdtrtCertType         string    `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
-	MedType               string    `gorm:"column:med_type" json:"med_type" form:"med_type"`
-	MedfeeSumamt          float64   `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
-	FulamtOwnpayAmt       float64   `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
-	OverlmtSelfPay        float64   `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
-	PreselfpayAmt         float64   `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
-	InscpScpAmt           float64   `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
-	ActPayDedc            float64   `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
-	HifpPay               float64   `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
-	CvlservPay            float64   `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
-	PoolPropSelfpay       float64   `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
-	HifesPay              float64   `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
-	HifmiPay              float64   `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
-	HifobPay              float64   `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
-	MafPay                float64   `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
-	OthPay                float64   `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
-	FundPaySumamt         float64   `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
-	PsnPartAmt            float64   `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
-	AcctPay               float64   `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
-	PsnCashPay            float64   `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
-	HospPartAmt           float64   `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
-	Balc                  float64   `gorm:"column:balc" json:"balc" form:"balc"`
-	AcctMulaidPay         float64   `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
-	MedinsSetlId          string    `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
-	ClrOptins             string    `gorm:"column:clr_optins" json:"clr_optins" form:"clr_optins"`
-	ClrWay                string    `gorm:"column:clr_way" json:"clr_way" form:"clr_way"`
-	ClrType               string    `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
-	SetlDetail            string    `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
-	IsMedicineInsurance   int64     `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
-	PayWay                int64     `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
-	PayPrice              float64   `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
-	PayCardNo             string    `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
-	DiscountPrice         float64   `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
-	PreferentialPrice     float64   `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
-	RealityPrice          float64   `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
-	FoundPrice            float64   `gorm:"column:found_price" json:"found_price" form:"found_price"`
-	MedicalInsurancePrice float64   `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
-	PrivatePrice          float64   `gorm:"column:private_price" json:"private_price" form:"private_price"`
-	Creator               int64     `gorm:"column:creator" json:"creator" form:"creator"`
-	Modify                int64     `gorm:"column:modify" json:"modify" form:"modify"`
-	AccountPrice          float64   `gorm:"column:account_price" json:"account_price" form:"account_price"`
-
-	SzChargeInfo            string `gorm:"column:sz_charge_info" json:"sz_charge_info" form:"sz_charge_info"`
-	SzProjectInfo           string `gorm:"column:sz_project_info" json:"sz_project_info" form:"sz_project_info"`
-	SzMedicineInsuranceInfo string `gorm:"column:sz_medicine_insurance_info" json:"sz_medicine_insurance_info" form:"sz_medicine_insurance_info"`
-	YiliaoNumber            string `gorm:"column:yiliao_number" json:"yiliao_number" form:"yiliao_number"`
+	ID                      int64     `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId               int64     `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId            int64     `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate      int64     `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	Ctime                   int64     `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                   int64     `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                  int64     `gorm:"column:status" json:"status" form:"status"`
+	Number                  string    `gorm:"column:number" json:"number" form:"number"`
+	PatientId               int64     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Infcode                 int64     `gorm:"column:infcode" json:"infcode" form:"infcode"`
+	WarnMsg                 string    `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
+	Cainfo                  string    `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
+	ErrMsg                  string    `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
+	RespondTime             string    `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
+	InfRefmsgid             string    `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
+	OrderStatus             int64     `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId                 string    `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	SetlId                  string    `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
+	PsnNo                   string    `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnName                 string    `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	PsnCertType             string    `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno                  string    `gorm:"column:certno" json:"certno" form:"certno"`
+	Gend                    string    `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty                    string    `gorm:"column:naty" json:"naty" form:"naty"`
+	Brdy                    time.Time `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Age                     float64   `gorm:"column:age" json:"age" form:"age"`
+	Insutype                string    `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	PsnType                 string    `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
+	CvlservFlag             string    `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
+	SetlTime                string    `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	MdtrtCertType           string    `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+	MedType                 string    `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	MedfeeSumamt            float64   `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	FulamtOwnpayAmt         float64   `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtSelfPay          float64   `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
+	PreselfpayAmt           float64   `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	InscpScpAmt             float64   `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	ActPayDedc              float64   `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
+	HifpPay                 float64   `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
+	CvlservPay              float64   `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
+	PoolPropSelfpay         float64   `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
+	HifesPay                float64   `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
+	HifmiPay                float64   `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
+	HifobPay                float64   `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
+	MafPay                  float64   `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
+	OthPay                  float64   `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
+	FundPaySumamt           float64   `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	PsnPartAmt              float64   `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
+	AcctPay                 float64   `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
+	PsnCashPay              float64   `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
+	HospPartAmt             float64   `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
+	Balc                    float64   `gorm:"column:balc" json:"balc" form:"balc"`
+	AcctMulaidPay           float64   `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
+	MedinsSetlId            string    `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
+	ClrOptins               string    `gorm:"column:clr_optins" json:"clr_optins" form:"clr_optins"`
+	ClrWay                  string    `gorm:"column:clr_way" json:"clr_way" form:"clr_way"`
+	ClrType                 string    `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
+	SetlDetail              string    `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
+	IsMedicineInsurance     int64     `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
+	PayWay                  int64     `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
+	PayPrice                float64   `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
+	PayCardNo               string    `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
+	DiscountPrice           float64   `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
+	PreferentialPrice       float64   `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
+	RealityPrice            float64   `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
+	FoundPrice              float64   `gorm:"column:found_price" json:"found_price" form:"found_price"`
+	MedicalInsurancePrice   float64   `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
+	PrivatePrice            float64   `gorm:"column:private_price" json:"private_price" form:"private_price"`
+	Creator                 int64     `gorm:"column:creator" json:"creator" form:"creator"`
+	Modify                  int64     `gorm:"column:modify" json:"modify" form:"modify"`
+	AccountPrice            float64   `gorm:"column:account_price" json:"account_price" form:"account_price"`
+	PayWays                 string    `gorm:"column:pay_ways" json:"pay_way" form:"pay_ways"`
+	SzChargeInfo            string    `gorm:"column:sz_charge_info" json:"sz_charge_info" form:"sz_charge_info"`
+	SzProjectInfo           string    `gorm:"column:sz_project_info" json:"sz_project_info" form:"sz_project_info"`
+	SzMedicineInsuranceInfo string    `gorm:"column:sz_medicine_insurance_info" json:"sz_medicine_insurance_info" form:"sz_medicine_insurance_info"`
+	YiliaoNumber            string    `gorm:"column:yiliao_number" json:"yiliao_number" form:"yiliao_number"`
+	OthDesc                 string    `gorm:"column:oth_desc" json:"oth_desc" form:"oth_desc"`
 
 	FaPiaoCode   string `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
 	FaPiaoNumber string `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
@@ -712,6 +713,13 @@ type HisOrder struct {
 	Decimal float64 `gorm:"column:decimal" json:"decimal" form:"decimal"`
 
 	Diagnosis string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+
+	AcctUsedFlag string `gorm:"column:acct_used_flag" json:"acct_used_flag" form:"acct_used_flag"`
+	CashPay      string `gorm:"cash_pay" json:"cash_pay" form:"cash_pay"`
+	BandCardPay  string `gorm:"band_card_pay" json:"band_card_pay" form:"band_card_pay"`
+	WechatPay    string `gorm:"wechat_pay" json:"wechat_pay" form:"wechat_pay"`
+	AliPay       string `gorm:"ali_pay" json:"ali_pay" form:"ali_pay"`
+	JifenPay     string `gorm:"jifen_pay" json:"jifen_pay" form:"jifen_pay"`
 }
 
 func (HisOrder) TableName() string {
@@ -1536,6 +1544,8 @@ type HisChargeSettleOrder struct {
 	SettleStartTime     int64   `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
 	SettleEndTime       int64   `gorm:"column:settle_end_time" json:"settle_end_time" form:"settle_end_time"`
 	IsPre               int64   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+	PayWays             string  `gorm:"column:pay_ways" json:"pay_way" form:"pay_ways"`
+	OthDesc             string  `gorm:"column:oth_desc" json:"oth_desc" form:"oth_desc"`
 }
 
 func (HisChargeSettleOrder) TableName() string {

service/auto_create_week_schedules_service.go

@@ -198,40 +198,19 @@ func AutoGdybCreateStock() {
 	var NewWarehousing []*models.NewWarehousingInfo
 	var NewWarehouseOut []*models.NewWarehouseOutInfo
 	var NewCancelStock []*models.NewCancelStockInfo
-
 	var NewDrugWarehouse []*models.NewDrugWarehouseInfo
 	var NewDrugWarehouseOut []*models.NewDrugWarehouseOutInfo
 	var NewDrugCancelStock []*models.NewDrugCancelStockInfo
-
 	var XtDrugInventorys []*models.XtDrugInventory
 	var XtStockInventorys []*models.XtStockInventoryTwo
-
 	var NewDrugWarehouseOutTwo []*models.NewDrugWarehouseOutInfo
 
-	//var XtDrugInventorys2 []*models.XtDrugInventory
-
-	readDb.Model(&models.XtDrugInventory{}).Where("user_org_id = ? and status = 1 and is_upload <> 1 AND stock_max_number > 0", org_id).Preload("BaseDrugLib", "status = 1").Find(&XtDrugInventorys)
-	readDb.Model(&models.XtStockInventoryTwo{}).Where("user_org_id = ? and status = 1 and is_upload <> 1 AND stock_max_number > 0", org_id).Preload("GoodInfo", "status = 1").Find(&XtStockInventorys)
-
 	readDb.Model(&models.NewWarehousingInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("GoodInfo", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).First(&NewWarehousing)
-	readDb.Model(&models.NewWarehouseOutInfo{}).Where("user_org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("GoodInfo", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewWarehouseOut)
-	readDb.Model(&models.NewCancelStockInfo{}).Where("user_org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("GoodInfo", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewCancelStock)
-
-	////大丰
-	//readDb.Model(&models.NewDrugWarehouseInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1 AND id >= 4778", org_id).Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugWarehouse)
-	//readDb.Model(&models.NewDrugWarehouseOutInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1 AND id >= 360136", org_id).Preload("NewDrugWarehouseInfo","status = 1").Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugWarehouseOut)
-	//readDb.Model(&models.NewDrugCancelStockInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugCancelStock)
-
-	//响水
-	//readDb.Model(&models.NewDrugWarehouseInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1 AND id >= 5720", org_id).Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugWarehouse)
-	//readDb.Model(&models.NewDrugWarehouseOutInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1 AND id >= 366003", org_id).Preload("NewDrugWarehouseInfo","status = 1").Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugWarehouseOut)
-	//readDb.Model(&models.NewDrugCancelStockInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1 ", org_id).Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugCancelStock)
-	//3502
-	//readDb.Model(&models.NewDrugWarehouseOutInfo{}).Where("org_id = ? and status = 1 and is_upload = 1 ", org_id).Preload("NewDrugWarehouseInfo","status = 1").Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugWarehouseOut)
-
-	//3502
-	readDb.Model(&models.NewDrugWarehouseOutInfo{}).Where("org_id = ? and status = 1 and is_upload = 1 ", org_id).Preload("NewDrugWarehouseInfo", "status = 1").Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugWarehouseOutTwo)
+	readDb.Model(&models.NewCancelStockInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("GoodInfo", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewCancelStock)
 
+	//3501,药品和耗材
+	readDb.Model(&models.XtDrugInventory{}).Where("user_org_id = ? and status = 1 and is_upload <> 1 AND stock_max_number > 0", org_id).Preload("BaseDrugLib", "status = 1").Find(&XtDrugInventorys)
+	readDb.Model(&models.XtStockInventoryTwo{}).Where("user_org_id = ? and status = 1 and is_upload <> 1 ", org_id).Preload("GoodInfo", "status = 1").Find(&XtStockInventorys)
 	for _, item := range XtDrugInventorys {
 		res := Post3501ForDrug(org_id, item)
 		if res.Infcode == 0 {
@@ -244,9 +223,8 @@ func AutoGdybCreateStock() {
 		}
 
 	}
-
-	for _, item := range NewDrugWarehouseOutTwo {
-		res := Post3502ForDrug(org_id, item)
+	for _, item := range XtStockInventorys {
+		res := Post3501ForGoodInfo(org_id, item)
 		if res.Infcode == 0 {
 			writeDb.Model(&models.XtDrugInventory{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
 				"is_upload": 1,
@@ -258,34 +236,41 @@ func AutoGdybCreateStock() {
 
 	}
 
-	for _, item := range NewWarehousing {
-		res := Post3503ForGoodInfo(org_id, item)
+	//3502
+	readDb.Model(&models.NewDrugWarehouseOutInfo{}).Where("org_id = ? and status = 1 and is_upload = 1 ", org_id).Preload("NewDrugWarehouseInfo", "status = 1").Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugWarehouseOutTwo)
+	//readDb.Model(&models.NewDrugWarehouseOutInfo{}).Where("org_id = ? and status = 1 and is_upload = 1 ", org_id).Preload("NewDrugWarehouseInfo", "status = 1").Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugWarehouseOutTwo)
+	readDb.Model(&models.NewWarehouseOutInfo{}).Where("user_org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("GoodInfo", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewWarehouseOut)
+
+	for _, item := range NewDrugWarehouseOutTwo {
+		res := Post3502ForDrug(org_id, item)
 		if res.Infcode == 0 {
-			writeDb.Model(&models.NewWarehousingInfo{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
+			writeDb.Model(&models.XtDrugInventory{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
 				"is_upload": 1,
 			})
 		} else {
 
 			continue
 		}
-	}
 
+	}
 	for _, item := range NewWarehouseOut {
-		res := Post3505ForGoodInfo(org_id, item)
+		res := Post3502ForGoodInfo(org_id, item)
 		if res.Infcode == 0 {
-			writeDb.Model(&models.NewWarehouseOutInfo{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
+			writeDb.Model(&models.XtDrugInventory{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
 				"is_upload": 1,
 			})
 		} else {
 
 			continue
 		}
+
 	}
 
-	for _, item := range NewCancelStock {
-		res := Post3506ForGoodInfo(org_id, item)
+	//3503
+	for _, item := range NewWarehousing {
+		res := Post3503ForGoodInfo(org_id, item)
 		if res.Infcode == 0 {
-			writeDb.Model(&models.NewCancelStockInfo{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
+			writeDb.Model(&models.NewWarehousingInfo{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
 				"is_upload": 1,
 			})
 		} else {
@@ -293,7 +278,6 @@ func AutoGdybCreateStock() {
 			continue
 		}
 	}
-
 	for _, item := range NewDrugWarehouse {
 		res := Post3503ForDrug(org_id, item)
 		if res.Infcode == 0 {
@@ -306,6 +290,18 @@ func AutoGdybCreateStock() {
 		}
 	}
 
+	//3505
+	for _, item := range NewWarehouseOut {
+		res := Post3505ForGoodInfo(org_id, item)
+		if res.Infcode == 0 {
+			writeDb.Model(&models.NewWarehouseOutInfo{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
+				"is_upload": 1,
+			})
+		} else {
+
+			continue
+		}
+	}
 	for _, item := range NewDrugWarehouseOut {
 		res := Post3505ForDrug(org_id, item)
 		if res.Infcode == 0 {
@@ -314,7 +310,18 @@ func AutoGdybCreateStock() {
 			})
 		}
 	}
+	//3506
+	for _, item := range NewCancelStock {
+		res := Post3506ForGoodInfo(org_id, item)
+		if res.Infcode == 0 {
+			writeDb.Model(&models.NewCancelStockInfo{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
+				"is_upload": 1,
+			})
+		} else {
 
+			continue
+		}
+	}
 	for _, item := range NewDrugCancelStock {
 		res := Post3506ForDrug(org_id, item)
 		if res.Infcode == 0 {
@@ -330,16 +337,16 @@ func AutoGdybCreateStock() {
 }
 
 //耗材库盘上传
-func Post3501ForGoodInfo(org_id int64, infos *models.XtDrugInventory) ResultSix {
+func Post3501ForGoodInfo(org_id int64, infos *models.XtStockInventoryTwo) ResultSix {
 	var res ResultSix
 	miConfig, _ := FindMedicalInsuranceInfo(org_id)
 	data := make(map[string]interface{})
 	var struct3501s []models.Struct3501
 	var struct3501 models.Struct3501
-	struct3501.MedListCodg = infos.BaseDrugLib.MedicalInsuranceNumber
+	struct3501.MedListCodg = infos.GoodInfo.MedicalInsuranceNumber
 	struct3501.FixmedinsHilistId = miConfig.Code
 	struct3501.FixmedinsHilistName = miConfig.OrgName
-	struct3501.FixmedinsBchno = infos.BatchNumber
+	struct3501.FixmedinsBchno = infos.Number
 	struct3501.RxFlag = "0"
 	struct3501.Invdate = time.Unix(infos.Ctime, 0).Format("2006-01-02 15:04:05")
 	struct3501.OrgName = miConfig.OrgName
@@ -349,8 +356,8 @@ func Post3501ForGoodInfo(org_id int64, infos *models.XtDrugInventory) ResultSix
 	struct3501.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
 	struct3501.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
 	struct3501.InvCnt = strconv.FormatInt(infos.Count, 10)
-	struct3501.ManuDate = time.Unix(infos.DrugWarehouseInfo.ProductDate, 0).Format("2006-01-02 15:04:05")
-	struct3501.ExpyEnd = time.Unix(infos.DrugWarehouseInfo.ExpiryDate, 0).Format("2006-01-02 15:04:05")
+	struct3501.ManuDate = time.Unix(infos.WarehousingInfo.ProductDate, 0).Format("2006-01-02 15:04:05")
+	struct3501.ExpyEnd = time.Unix(infos.WarehousingInfo.ExpiryDate, 0).Format("2006-01-02 15:04:05")
 
 	struct3501s = append(struct3501s, struct3501)
 	data["struct_3501s"] = struct3501s[0]
@@ -358,7 +365,7 @@ func Post3501ForGoodInfo(org_id int64, infos *models.XtDrugInventory) ResultSix
 	bytesData, _ := json.Marshal(data)
 	var req *http.Request
 
-	if miConfig.MdtrtareaAdmvs == "441202" {
+	if miConfig.UserOrgId == 10215 {
 		result := Gdyb3501(struct3501, miConfig.SecretKey)
 
 		var dat map[string]interface{}
@@ -449,7 +456,7 @@ func Post3501ForDrug(org_id int64, infos *models.XtDrugInventory) ResultSix {
 	bytesData, _ := json.Marshal(data)
 	var req *http.Request
 
-	if miConfig.MdtrtareaAdmvs == "441202" {
+	if miConfig.UserOrgId == 10215 {
 		result := Gdyb3501(struct3501, miConfig.SecretKey)
 
 		var dat map[string]interface{}
@@ -540,7 +547,94 @@ func Post3502ForDrug(org_id int64, infos *models.NewDrugWarehouseOutInfo) Result
 	bytesData, _ := json.Marshal(data)
 	var req *http.Request
 
-	if miConfig.MdtrtareaAdmvs == "441202" {
+	if miConfig.UserOrgId == 10215 {
+		result := Gdyb3502(struct3502, miConfig.SecretKey)
+
+		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)
+			res.Infcode = -1
+			return res
+		}
+		return res
+
+	} else {
+		if miConfig.MdtrtareaAdmvs == "320921" {
+			req, _ = http.NewRequest("POST", "http://192.168.2.110:9532/"+"jsyb/3502", bytes.NewReader(bytesData))
+		} else {
+			req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/3502", bytes.NewReader(bytesData))
+		}
+
+		resp, _ := client.Do(req)
+		defer resp.Body.Close()
+		body, ioErr := ioutil.ReadAll(resp.Body)
+		if ioErr != nil {
+			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+			res.Infcode = -1
+			return res
+		}
+		var respJSON map[string]interface{}
+		if err := json.Unmarshal([]byte(body), &respJSON); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+			res.Infcode = -1
+			return res
+		}
+
+		var resSix10265 ResultSix10265 //1101结果
+
+		respJSON = respJSON["data"].(map[string]interface{})["request_log"].(map[string]interface{})
+		result, _ := json.Marshal(respJSON)
+		if err := json.Unmarshal([]byte(result), &resSix10265); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			res.Infcode = -1
+			return res
+		}
+		res.InfRefmsgid = resSix10265.InfRefmsgid
+		res.Output = resSix10265.Output
+		res.ErrMsg = resSix10265.ErrMsg
+		res.Cainfo = resSix10265.Cainfo
+		res.WarnMsg = resSix10265.WarnMsg
+		infocode, _ := strconv.ParseInt(resSix10265.Infcode, 10, 64)
+		res.Infcode = infocode
+
+		return res
+	}
+}
+func Post3502ForGoodInfo(org_id int64, infos *models.NewWarehouseOutInfo) ResultSix {
+	var res ResultSix
+	miConfig, _ := FindMedicalInsuranceInfo(org_id)
+	data := make(map[string]interface{})
+	//var struct3502s []models.Struct3502
+	var struct3502 models.Struct3502
+	struct3502.MedListCodg = infos.GoodInfo.MedicalInsuranceNumber
+	struct3502.FixmedinsHilistId = miConfig.Code
+	struct3502.FixmedinsHilistName = miConfig.OrgName
+	struct3502.FixmedinsBchno = infos.WarehousingInfo.Number
+	struct3502.FixmedinsCode = miConfig.Code
+	struct3502.RxFlag = "0"
+	struct3502.InvChgTime = time.Unix(infos.Ctime, 0).Format("2006-01-02 15:04:05")
+	struct3502.OrgName = miConfig.OrgName
+	struct3502.AccessKey = miConfig.AccessKey
+	struct3502.RequestUrl = miConfig.Url
+	struct3502.SecretKey = miConfig.SecretKey
+	struct3502.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+	struct3502.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+	struct3502.InvChgType = "102"
+	struct3502.Cnt = strconv.FormatInt(infos.Count, 10)
+	struct3502.Pric = fmt.Sprintf("%.2f", infos.GoodInfo.RetailPrice)
+
+	data["struct_3502s"] = struct3502
+	client := &http.Client{}
+	bytesData, _ := json.Marshal(data)
+	var req *http.Request
+
+	if miConfig.UserOrgId == 10215 {
 		result := Gdyb3502(struct3502, miConfig.SecretKey)
 
 		var dat map[string]interface{}
@@ -647,7 +741,7 @@ func Post3503ForGoodInfo(org_id int64, infos *models.NewWarehousingInfo) ResultS
 	bytesData, _ := json.Marshal(data)
 	fmt.Println(string(bytesData))
 	var req *http.Request
-	if miConfig.MdtrtareaAdmvs == "441202" {
+	if miConfig.UserOrgId == 10215 {
 		result := Gdyb3503(struct3503, miConfig.SecretKey)
 
 		var dat map[string]interface{}
@@ -745,7 +839,7 @@ func Post3503ForDrug(org_id int64, infos *models.NewDrugWarehouseInfo) ResultSix
 	client := &http.Client{}
 	bytesData, _ := json.Marshal(data)
 	var req *http.Request
-	if miConfig.MdtrtareaAdmvs == "441202" {
+	if miConfig.UserOrgId == 10215 {
 		result := Gdyb3503(struct3503, miConfig.SecretKey)
 
 		var dat map[string]interface{}
@@ -854,7 +948,7 @@ func Post3505ForGoodInfo(org_id int64, infos *models.NewWarehouseOutInfo) Result
 	bytesData, _ := json.Marshal(data)
 	var req *http.Request
 
-	if miConfig.MdtrtareaAdmvs == "441202" {
+	if miConfig.UserOrgId == 10215 {
 		result := Gdyb3505(struct3501, miConfig.SecretKey)
 
 		var dat map[string]interface{}
@@ -972,7 +1066,7 @@ func Post3505ForDrug(org_id int64, infos *models.NewDrugWarehouseOutInfo) Result
 	bytesData, _ := json.Marshal(data)
 	var req *http.Request
 
-	if miConfig.MdtrtareaAdmvs == "441202" {
+	if miConfig.UserOrgId == 10215 {
 		result := Gdyb3505(struct3505, miConfig.SecretKey)
 
 		var dat map[string]interface{}
@@ -1070,7 +1164,7 @@ func Post3506ForGoodInfo(org_id int64, infos *models.NewCancelStockInfo) ResultS
 	client := &http.Client{}
 	bytesData, _ := json.Marshal(data)
 	var req *http.Request
-	if miConfig.MdtrtareaAdmvs == "441202" {
+	if miConfig.UserOrgId == 10215 {
 		result := Gdyb3506(struct3506, miConfig.SecretKey)
 
 		var dat map[string]interface{}
@@ -1165,7 +1259,7 @@ func Post3506ForDrug(org_id int64, infos *models.NewDrugCancelStockInfo) ResultS
 	client := &http.Client{}
 	bytesData, _ := json.Marshal(data)
 	var req *http.Request
-	if miConfig.MdtrtareaAdmvs == "441202" {
+	if miConfig.UserOrgId == 10215 {
 		result := Gdyb3506(struct3506, miConfig.SecretKey)
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result), &dat); err == nil {

service/fj_service.go

@@ -50,7 +50,7 @@ func FJyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 		if id_card_type == 1 {
 			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
 			inputData["card_sn"] = card_sn      // 卡识别码
-			inputData["psn_cert_type"] = ""     // 人员证件类型
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
 			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 
 		} else if id_card_type == 4 {
@@ -278,7 +278,7 @@ func FJyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 	for index, item := range config {
 		diseinfo_sun := make(map[string]interface{})
 		diseinfo_sun["diag_type"] = "1"                                                     // 诊断类别
-		diseinfo_sun["diag_srt_no"] = index                                                 // 诊断排序号
+		diseinfo_sun["diag_srt_no"] = index + 1                                             // 诊断排序号
 		diseinfo_sun["diag_code"] = item.CountryCode                                        // 诊断代码
 		diseinfo_sun["diag_name"] = item.ClassName                                          // 诊断名称
 		diseinfo_sun["diag_dept"] = department                                              // 诊断科室
@@ -992,8 +992,16 @@ func FJyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputMessage["sign_key"] = baseParams.SignKey     // 险种
 	inputMessage["enc_key"] = baseParams.EncKey       // 险种
 
-	inputData["insutype"] = businessParams.Insutype                   // 险种
-	inputData["clr_type"] = "11"                                      // 就诊 ID（来自2201接口返回）
+	inputData["insutype"] = businessParams.Insutype // 险种
+	fmt.Println(businessParams.ClrType)
+	if len(businessParams.ClrType) > 0 {
+		inputData["clr_type"] = "9903"
+	} else {
+
+		inputData["clr_type"] = "11"
+
+	}
+	// 就诊 ID（来自2201接口返回）
 	inputData["setl_optins"] = "350581"                               // 结算经办机构
 	inputData["stmt_begndate"] = businessParams.StmtBegndate          // 对帐开始时间
 	inputData["stmt_enddate"] = businessParams.StmtEnddate            //对帐结束时间

service/gdyb_service.go

@@ -2948,14 +2948,14 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	inputData["nwb_adm_wt"] = ""                              // 新生儿入院体重  必填
 	inputData["opsp_diag_caty"] = ""                          // 门诊慢特病诊断  必填
 	inputData["opsp_mdtrt_date"] = ""                         // 门诊慢特病就诊日期  必填
-	inputData["ipt_med_type"] = struct4101.IptMedType         // 住院医疗类型  必填
-	inputData["adm_way"] = "2"                                // 入院途径  必填
-	inputData["trt_type"] = "1"                               // 治疗类别  必填
-	inputData["adm_time"] = struct4101.AdmTime                // 入院时间  必填
-	inputData["adm_caty"] = struct4101.AdmCaty                // 入院科别  必填
+	inputData["ipt_med_type"] = ""                            // 住院医疗类型  必填
+	inputData["adm_way"] = ""                                 // 入院途径  必填
+	inputData["trt_type"] = ""                                // 治疗类别  必填
+	inputData["adm_time"] = ""                                // 入院时间  必填
+	inputData["adm_caty"] = ""                                // 入院科别  必填
 	inputData["refldept_dept"] = ""                           // 转科科别  必填
-	inputData["dscg_time"] = struct4101.AdmEndTime            // 出院时间  必填
-	inputData["dscg_caty"] = struct4101.AdmCaty               // 出院科别  必填
+	inputData["dscg_time"] = ""                               // 出院时间  必填
+	inputData["dscg_caty"] = ""                               // 出院科别  必填
 	inputData["act_ipt_days"] = ""                            // 实际住院天数  必填
 	inputData["otp_wm_dise"] = ""                             // 门（急） 诊西医诊断  必填
 	inputData["wm_dise_code"] = ""                            // 门（急） 诊中医诊断  必填
@@ -3012,15 +3012,15 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	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)
-	}
+	//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 {
@@ -3057,7 +3057,7 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 
 	input["setlinfo"] = inputData
 	input["payinfo"] = payinfo
-	input["opspdiseinfo"] = opspdiseinfo
+	//input["opspdiseinfo"] = opspdiseinfo
 	input["diseinfo"] = diseinfo
 	input["iteminfo"] = iteminfo
 	inputMessage["input"] = input //交易输入
@@ -3706,7 +3706,7 @@ func Gdyb2601(psnNo string, omsgid string, oinfno string, org_name string, docto
 }
 
 //人员信息版本3
-func Gdyb1101B(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates int64) string {
+func Gdyb1101B(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates int64, name string, cardNumber string) string {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -3726,11 +3726,11 @@ func Gdyb1101B(certNo string, org_name string, doctor string, fixmedins_code str
 	} else {
 		if certificates == 1 {
 			if id_card_type == 1 {
-				inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
-				inputData["card_sn"] = ""           // 卡识别码
-				inputData["certno"] = certNo        // 证件号码
-				inputData["psn_cert_type"] = "01"   // 人员证件类型
-				inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+				inputData["mdtrt_cert_type"] = "03"     // 就诊凭证类型
+				inputData["card_sn"] = card_sn          // 卡识别码
+				inputData["certno"] = certNo            // 证件号码
+				inputData["psn_cert_type"] = "01"       // 人员证件类型
+				inputData["mdtrt_cert_no"] = cardNumber // 就诊凭证编号
 
 			} else {
 				inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
@@ -3752,8 +3752,8 @@ func Gdyb1101B(certNo string, org_name string, doctor string, fixmedins_code str
 
 	}
 
-	inputData["begntime"] = "" // 开始时间
-	inputData["psn_name"] = "" // 人员姓名
+	inputData["begntime"] = ""   // 开始时间
+	inputData["psn_name"] = name // 人员姓名
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 
@@ -4815,7 +4815,7 @@ func Gdyb3501(struct3501 models.Struct3501, secret_key string) string {
 	signature := setSignature(timestamp, nonce, secret_key)
 
 	// 生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, struct3501.OrgName, struct3501.Opter, struct3501.FixmedinsHilistId, struct3501.InsuplcAdmdvs, struct3501.MdtrtareaAdmvs, struct3501.Cainfo)
+	inputMessage := SetGdInputMessage(timestamp, struct3501.OrgName, struct3501.Opter, struct3501.FixmedinsHilistId, struct3501.InsuplcAdmdvs, struct3501.MdtrtareaAdmvs, struct3501.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3501"                                  // 交易编码
@@ -4879,7 +4879,7 @@ func Gdyb3502(struct3502 models.Struct3502, secret_key string) string {
 	signature := setSignature(timestamp, nonce, secret_key)
 
 	// 生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, struct3502.OrgName, struct3502.Opter, struct3502.FixmedinsCode, struct3502.InsuplcAdmdvs, struct3502.MdtrtareaAdmvs, struct3502.Cainfo)
+	inputMessage := SetGdInputMessage(timestamp, struct3502.OrgName, struct3502.Opter, struct3502.FixmedinsCode, struct3502.InsuplcAdmdvs, struct3502.MdtrtareaAdmvs, struct3502.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3502"                      // 交易编码
@@ -4947,7 +4947,7 @@ func Gdyb3503(struct3503 models.Struct3503, secret_key string) string {
 	signature := setSignature(timestamp, nonce, secret_key)
 
 	// 生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, struct3503.OrgName, struct3503.Opter, struct3503.FixmedinsHilistId, struct3503.InsuplcAdmdvs, struct3503.MdtrtareaAdmvs, struct3503.Cainfo)
+	inputMessage := SetGdInputMessage(timestamp, struct3503.OrgName, struct3503.Opter, struct3503.FixmedinsHilistId, struct3503.InsuplcAdmdvs, struct3503.MdtrtareaAdmvs, struct3503.Cainfo)
 
 	input := make(map[string]interface{})
 
@@ -5025,7 +5025,7 @@ func Gdyb3504(struct3504 models.Struct3504, secret_key string) string {
 	signature := setSignature(timestamp, nonce, secret_key)
 
 	// 生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, struct3504.OrgName, struct3504.Opter, struct3504.FixmedinsCode, struct3504.InsuplcAdmdvs, struct3504.MdtrtareaAdmvs, struct3504.Cainfo)
+	inputMessage := SetGdInputMessage(timestamp, struct3504.OrgName, struct3504.Opter, struct3504.FixmedinsCode, struct3504.InsuplcAdmdvs, struct3504.MdtrtareaAdmvs, struct3504.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3504"                                      // 交易编码
@@ -5096,7 +5096,7 @@ func Gdyb3505(struct3505 models.Struct3505, secret_key string) string {
 	signature := setSignature(timestamp, nonce, secret_key)
 
 	// 生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, struct3505.OrgName, struct3505.Opter, struct3505.FixmedinsHilistId, struct3505.InsuplcAdmdvs, struct3505.MdtrtareaAdmvs, struct3505.Cainfo)
+	inputMessage := SetGdInputMessage(timestamp, struct3505.OrgName, struct3505.Opter, struct3505.FixmedinsHilistId, struct3505.InsuplcAdmdvs, struct3505.MdtrtareaAdmvs, struct3505.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3505"                                  // 交易编码
@@ -5191,7 +5191,7 @@ func Gdyb3506(struct3506 models.Struct3506, secret_key string) string {
 	signature := setSignature(timestamp, nonce, secret_key)
 
 	// 生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, struct3506.OrgName, struct3506.Opter, struct3506.FixmedinsCode, struct3506.InsuplcAdmdvs, struct3506.MdtrtareaAdmvs, struct3506.Cainfo)
+	inputMessage := SetGdInputMessage(timestamp, struct3506.OrgName, struct3506.Opter, struct3506.FixmedinsCode, struct3506.InsuplcAdmdvs, struct3506.MdtrtareaAdmvs, struct3506.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3506"                                  // 交易编码
@@ -5266,7 +5266,7 @@ func Gdyb3507(struct3507 models.Struct3507, secret_key string) string {
 	signature := setSignature(timestamp, nonce, secret_key)
 
 	// 生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, struct3507.OrgName, struct3507.Opter, struct3507.FixmedinsCode, struct3507.InsuplcAdmdvs, struct3507.MdtrtareaAdmvs, struct3507.Cainfo)
+	inputMessage := SetGdInputMessage(timestamp, struct3507.OrgName, struct3507.Opter, struct3507.FixmedinsCode, struct3507.InsuplcAdmdvs, struct3507.MdtrtareaAdmvs, struct3507.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3507"                          // 交易编码
@@ -5315,3 +5315,47 @@ func Gdyb3507(struct3507 models.Struct3507, secret_key string) string {
 	fmt.Println(str)
 	return str
 }
+
+// 生成基础报文
+func SetGdInputMessage(timestamp int64, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, cainfo string) map[string]interface{} {
+	// 生成签名
+	tempTime := time.Unix(timestamp, 0)
+	//timeFormat := tempTime.Format("20060102150405")
+	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+	//randNum := rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000)
+
+	month := time.Unix(1557042972, 0).Format("1")
+	year := time.Now().Format("2006")
+	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")
+
+	// 生成输入报文
+	inputMessage := make(map[string]interface{})
+	inputMessage["msgid"] = fixmedins_code + year + month + day + hour + min + sec + msec + "0" // 发送方报文 ID
+	inputMessage["mdtrtarea_admvs"] = mdtrtarea_admvs                                           // 就医地医保区划
+	inputMessage["insuplc_admdvs"] = insuplc_admdvs                                             // 参保地医保区划
+	inputMessage["recer_sys_code"] = "MBS_LOCAL"                                                // 接收方系统代码
+	inputMessage["dev_no"] = "1"                                                                // 设备编号
+	inputMessage["dev_safe_info"] = "1"                                                         // 设备安全信息
+	inputMessage["cainfo"] = cainfo                                                             // 数字签名信息
+	inputMessage["signtype"] = "SM3"                                                            // 签名类型
+	inputMessage["infver"] = "1.0.0"                                                            // 接收方系统代码
+	inputMessage["opter_type"] = "1"                                                            // 经办人类别
+
+	inputMessage["opter"] = doctor      // 经办人
+	inputMessage["opter_name"] = doctor // 经办人姓名
+
+	inputMessage["inf_time"] = timeFormatOne        // 交易时间
+	inputMessage["fixmedins_code"] = fixmedins_code // 定点医药机构编号
+	inputMessage["fixmedins_name"] = org_name
+	inputMessage["fixmedins_soft_fcty"] = "深圳市领透科技有限公司" //定点医药机构名称
+	//定点医药机构名称
+	inputMessage["sign_no"] = "" //交易签到流水号
+	return inputMessage
+}

service/gdyb_zifei_service.go

@@ -400,7 +400,7 @@ func Gdyb4204(certNo string, org_name string, doctor string, fixmedins_code stri
 
 }
 
-func Gdyb4205(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates string, psn_name string) (string, string) {
+func Gdyb4205(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, struct4202 models.Struct4202, struct4201A models.Struct4201A) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -411,14 +411,14 @@ func Gdyb4205(certNo string, org_name string, doctor string, fixmedins_code stri
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "4205" // 交易编码
 
-	inputData["fixmedins_mdtrt_id"] = ""
-	inputData["fixmedins_code"] = ""
-	inputData["fixmedins_name"] = ""
+	inputData["fixmedins_mdtrt_id"] = struct4202.OwnPayPatnMdtrtD.FixmedinsMdtrtID
+	inputData["fixmedins_code"] = struct4202.OwnPayPatnMdtrtD.FixmedinsCode
+	inputData["fixmedins_name"] = struct4202.OwnPayPatnMdtrtD.FixmedinsName
 
-	inputData["psn_cert_type"] = ""
+	inputData["psn_cert_type"] = struct4202.OwnPayPatnMdtrtD.PsnCertType
 
-	inputData["certno"] = ""
-	inputData["psn_name"] = ""
+	inputData["certno"] = struct4202.OwnPayPatnMdtrtD.Certno
+	inputData["psn_name"] = struct4202.OwnPayPatnMdtrtD.PsnName
 
 	inputData["gend"] = ""
 	inputData["naty"] = ""
@@ -428,9 +428,9 @@ func Gdyb4205(certNo string, org_name string, doctor string, fixmedins_code stri
 	inputData["tel"] = ""
 
 	inputData["addr"] = ""
-	inputData["begntime"] = ""
+	inputData["begntime"] = struct4202.OwnPayPatnMdtrtD.Begntime
 	inputData["endtime"] = ""
-	inputData["med_type"] = ""
+	inputData["med_type"] = struct4202.OwnPayPatnMdtrtD.MedType
 	inputData["main_cond_dscr"] = ""
 	inputData["dise_codg"] = ""
 	inputData["dise_name"] = ""
@@ -446,65 +446,64 @@ func Gdyb4205(certNo string, org_name string, doctor string, fixmedins_code stri
 	inputData["exp_content"] = ""
 
 	diagInfos := make([]map[string]interface{}, 0)
-
-	diagInfo := make(map[string]interface{})
-	diagInfo["diag_type"] = ""   // 就诊 ID（来自2201接口返回）
-	diagInfo["diag_srt_no"] = "" // 收费批次号
-	diagInfo["diag_code"] = ""   // 病种编码
-	diagInfo["diag_name"] = ""   // 处方号
-	diagInfo["diag_dept"] = ""
-	diagInfo["diag_dr_code"] = ""
-	diagInfo["diag_dr_name"] = ""
-	diagInfo["diag_time"] = ""
-	diagInfo["vali_flag"] = ""
-	diagInfos = append(diagInfos, diagInfo)
+	for index, item := range struct4202.ODiagListD {
+		diagInfo := make(map[string]interface{})
+		diagInfo["diag_type"] = item.DiagType // 就诊 ID（来自2201接口返回）
+		diagInfo["diag_srt_no"] = index       // 收费批次号
+		diagInfo["diag_code"] = item.DiagCode // 病种编码
+		diagInfo["diag_name"] = item.DiagName // 处方号
+		diagInfo["diag_dept"] = "血透"
+		diagInfo["diag_dr_code"] = item.DiagDrCode
+		diagInfo["diag_dr_name"] = item.DiagDrName
+		diagInfo["diag_time"] = item.DiagTime
+		diagInfo["vali_flag"] = "1"
+		diagInfos = append(diagInfos, diagInfo)
+	}
 	inputData["diseinfo"] = diagInfos
 
 	feedetail := make([]map[string]interface{}, 0)
-	feedetailInfo := make(map[string]interface{})
-	feedetailInfo["fixmedins_mdtrt_id"] = "" // 就诊 ID（来自2201接口返回）
-	feedetailInfo["med_type"] = ""           // 收费批次号
-	feedetailInfo["bkkp_sn"] = ""            // 病种编码
-	feedetailInfo["fee_ocur_time"] = ""      // 处方号
-	feedetailInfo["fixmedins_code"] = ""
-	feedetailInfo["fixmedins_name"] = ""
-	feedetailInfo["cnt"] = ""
-	feedetailInfo["pric"] = ""
-	feedetailInfo["det_item_fee_sumamt"] = ""
-	feedetailInfo["medins_list_codg"] = ""
-	feedetailInfo["medins_list_name"] = ""
-	feedetailInfo["med_chrgitm_type"] = ""
-	feedetailInfo["prodname"] = ""
-	feedetailInfo["bilg_dept_codg"] = ""
-	feedetailInfo["bilg_dept_name"] = ""
-
-	feedetailInfo["bilg_dr_code"] = ""
-	feedetailInfo["bilg_dr_name"] = ""
-	feedetailInfo["acord_dept_codg"] = ""
-	feedetailInfo["acord_dept_name"] = ""
-	feedetailInfo["acord_dr_code"] = ""
-	feedetailInfo["acord_dr_name"] = ""
-
-	feedetailInfo["tcmdrug_used_way"] = ""
-	feedetailInfo["etip_flag"] = ""
-	feedetailInfo["etip_hosp_code"] = ""
-
-	feedetailInfo["dscg_tkdrug_flag"] = ""
-	feedetailInfo["sin_dos_dscr"] = ""
-	feedetailInfo["used_frqu_dscr"] = ""
-	feedetailInfo["prd_days"] = ""
-	feedetailInfo["medc_way_dscr"] = ""
-	feedetailInfo["memo"] = ""
-
-	feedetailInfo["fulamt_ownpay_amt"] = ""
-	feedetailInfo["overlmt_selfpay"] = ""
-	feedetailInfo["preselfpay_amt"] = ""
-	feedetailInfo["inscp_amt"] = ""
-	feedetailInfo["rxno"] = ""
+	for _, item := range struct4201A.Fopfd {
+		inputData := make(map[string]interface{})
+		inputData["fixmedins_mdtrt_id"] = item.FixmedinsMdtrtID
+		inputData["med_type"] = item.MedType
+		inputData["bkkp_sn"] = item.BkkpSn
+		inputData["fee_ocur_time"] = item.FeeOcurTime
+		inputData["fixmedins_code"] = item.FixmedinsCode
+		inputData["fixmedins_name"] = item.FixmedinsName
+		inputData["cnt"] = item.Cnt
+		inputData["pric"] = item.Pric
+		inputData["det_item_fee_sumamt"] = item.DetItemFeeSumamt
 
-	feedetail = append(feedetail, feedetailInfo)
-	inputData["feedetail"] = feedetail
+		inputData["medins_list_name"] = item.MedinsListName
+		inputData["medins_list_code"] = item.MedinsListCodg
+		inputData["med_chrgitm_type"] = item.MedChrgitmType
+		inputData["prodname"] = item.Prodname
+		inputData["bilg_dept_codg"] = item.BilgDeptCodg
+		inputData["bilg_dept_name"] = item.BilgDeptName
+		inputData["bilg_dr_code"] = item.BilgDrCode
+		inputData["bilg_dr_name"] = item.BilgDrName
+		inputData["acord_dept_codg"] = ""
+		inputData["acord_dept_name"] = ""
+		inputData["acord_dr_code"] = ""
+		inputData["acord_dr_name"] = ""
+		inputData["tcmdrug_used_way"] = ""
+		inputData["etip_flag"] = ""
+		inputData["etip_hosp_code"] = ""
+		inputData["dscg_tkdrug_flag"] = ""
+		inputData["sin_dos_dscr"] = ""
+		inputData["used_frqu_dscr"] = ""
+		inputData["prd_days"] = ""
+		inputData["medc_way_dscr"] = ""
+		inputData["memo"] = item.Memo
+		inputData["fulamt_ownpay_amt"] = ""
+		inputData["overlmt_selfpay"] = ""
+		inputData["preselfpay_amt"] = ""
+		inputData["inscp_amt"] = ""
+		inputData["rxno"] = ""
+		feedetail = append(feedetail, inputData)
 
+	}
+	inputData["feedetail"] = feedetail
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 
@@ -524,7 +523,7 @@ func Gdyb4205(certNo string, org_name string, doctor string, fixmedins_code stri
 	if fixmedins_code == "H15049901371" {
 		url = gdyb_url
 	} else {
-		url = gdyb_url + "1101"
+		url = gdyb_url + "4205"
 	}
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
@@ -556,7 +555,7 @@ func Gdyb4205(certNo string, org_name string, doctor string, fixmedins_code stri
 	return str, inputLog
 
 }
-func Gdyb4206(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates string, psn_name string) (string, string) {
+func Gdyb4206(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -619,7 +618,7 @@ func Gdyb4206(certNo string, org_name string, doctor string, fixmedins_code stri
 	return str, inputLog
 
 }
-func Gdyb4207(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates string, psn_name string) (string, string) {
+func Gdyb4207(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, struct4207 models.Struct4207) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -630,10 +629,10 @@ func Gdyb4207(certNo string, org_name string, doctor string, fixmedins_code stri
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "4207" // 交易编码
 
-	inputData["fixmedins_mdtrt_id"] = "" // 开始时间
-	inputData["fixmedins_code"] = ""     // 人员姓名
-	inputData["page_num"] = ""           // 人员姓名
-	inputData["page_size"] = ""          // 人员姓名
+	inputData["fixmedins_mdtrt_id"] = struct4207.FixmedinsMdtrtID // 开始时间
+	inputData["fixmedins_code"] = struct4207.FixmedinsCode        // 人员姓名
+	inputData["page_num"] = struct4207.PageNum                    // 人员姓名
+	inputData["page_size"] = struct4207.PageSize                  // 人员姓名
 
 	input["input"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -654,7 +653,7 @@ func Gdyb4207(certNo string, org_name string, doctor string, fixmedins_code stri
 	if fixmedins_code == "H15049901371" {
 		url = gdyb_url
 	} else {
-		url = gdyb_url + "1101"
+		url = gdyb_url + "4207"
 	}
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
@@ -686,7 +685,7 @@ func Gdyb4207(certNo string, org_name string, doctor string, fixmedins_code stri
 	return str, inputLog
 
 }
-func Gdyb4208(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates string, psn_name string) (string, string) {
+func Gdyb4208(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, struct4208 models.Struct4208) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -697,16 +696,16 @@ func Gdyb4208(certNo string, org_name string, doctor string, fixmedins_code stri
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "4208" // 交易编码
 
-	inputData["psn_cert_type"] = ""    // 开始时间
-	inputData["certno"] = ""           // 人员姓名
-	inputData["psn_name"] = ""         // 人员姓名
-	inputData["begintime"] = ""        // 人员姓名
-	inputData["endtime"] = ""          // 人员姓名
-	inputData["med_type"] = ""         // 人员姓名
-	inputData["medfee_sumamt"] = ""    // 人员姓名
-	inputData["elec_billno_code"] = "" // 人员姓名
-	inputData["page_num"] = ""         // 人员姓名
-	inputData["page_size"] = ""        // 人员姓名
+	inputData["psn_cert_type"] = struct4208.PsnCertType       // 开始时间
+	inputData["certno"] = struct4208.Certno                   // 人员姓名
+	inputData["psn_name"] = struct4208.PsnName                // 人员姓名
+	inputData["begintime"] = struct4208.Begntime              // 人员姓名
+	inputData["endtime"] = struct4208.Endtime                 // 人员姓名
+	inputData["med_type"] = struct4208.MedType                // 人员姓名
+	inputData["medfee_sumamt"] = struct4208.MedfeeSumamt      // 人员姓名
+	inputData["elec_billno_code"] = struct4208.ElecBillnoCode // 人员姓名
+	inputData["page_num"] = struct4208.PageNum                // 人员姓名
+	inputData["page_size"] = struct4208.PageSize              // 人员姓名
 
 	input["input"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -759,7 +758,7 @@ func Gdyb4208(certNo string, org_name string, doctor string, fixmedins_code stri
 	return str, inputLog
 
 }
-func Gdyb4209(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates string, psn_name string) (string, string) {
+func Gdyb4209(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, struct4209 models.Struct4209) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -770,10 +769,10 @@ func Gdyb4209(certNo string, org_name string, doctor string, fixmedins_code stri
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "4209" // 交易编码
 
-	inputData["fixmedins_mdtrt_id"] = "" // 开始时间
-	inputData["fixmedins_code"] = ""     // 人员姓名
-	inputData["page_num"] = ""           // 人员姓名
-	inputData["page_size"] = ""          // 人员姓名
+	inputData["fixmedins_mdtrt_id"] = struct4209.FixmedinsMdtrtID // 开始时间
+	inputData["fixmedins_code"] = struct4209.FixmedinsCode        // 人员姓名
+	inputData["page_num"] = struct4209.PageNum                    // 人员姓名
+	inputData["page_size"] = struct4209.PageSize                  // 人员姓名
 
 	input["input"] = inputData
 	inputMessage["input"] = input //交易输入

service/his_service.go

@@ -614,6 +614,8 @@ type HisOrder struct {
 	SzMedicineInsuranceInfo string  `gorm:"column:sz_medicine_insurance_info" json:"sz_medicine_insurance_info" form:"sz_medicine_insurance_info"`
 	MzNumber                string  `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
 	OrgSetlNumber           string  `gorm:"column:org_setl_number" json:"org_setl_number" form:"org_setl_number"`
+	PayWays                 string  `gorm:"column:pay_ways" json:"pay_way" form:"pay_ways"`
+	OthDesc                 string  `gorm:"column:oth_desc" json:"oth_desc" form:"oth_desc"`
 
 	HisOrderInfo        models.HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 	Patients            models.Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
@@ -833,6 +835,8 @@ type XtHisOrder struct {
 	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
 	Modify             int64  `gorm:"column:modify" json:"modify" form:"modify"`
+	PayWays            string `gorm:"column:pay_ways" json:"pay_way" form:"pay_ways"`
+	OthDesc            string `gorm:"column:oth_desc" json:"oth_desc" form:"oth_desc"`
 
 	FaPiaoCode   string `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
 	FaPiaoNumber string `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
@@ -995,6 +999,9 @@ func GetOrderByTime(start_time int64, end_time int64, org_id int64, insutype str
 			db = db.Where("clr_type = ?", clr_type)
 
 		}
+	} else {
+		db = db.Where("clr_type <> ?", "9903")
+
 	}
 	err = db.Find(&orders).Error
 	return
@@ -1423,6 +1430,11 @@ func GetLastFundList(org_id int64) (order models.HisFundSettleListResult, err er
 	return
 }
 
+func GetOrderError(org_id int64) (order []*models.HisOrderError, err error) {
+	err = readDb.Model(&models.HisOrderError{}).Where("user_org_id = ? AND status = 1 AND stage = 10106 ", org_id).Find(&order).Error
+	return
+}
+
 func GetOrderCountByNumber(org_id int64, patient_id int64, record_time int64, number string) (count int64, err error) {
 	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND settle_accounts_date = ? AND order_status = 2 AND mdtrt_id = ?", org_id, patient_id, record_time, number).Count(&count).Error
 
@@ -1437,9 +1449,18 @@ func GetPsnByPatientId(patient_id int64) (psn models.HisPsn, err error) {
 	err = readDb.Model(&models.HisPsn{}).Where("patient_id = ?", patient_id).Last(&psn).Error
 	return
 }
+func GetPsnByPatientIdtWO(patient_id int64, record_date int64) (psn models.HisPsn, err error) {
+	err = readDb.Model(&models.HisPsn{}).Where("patient_id = ? AND record_date = ?", patient_id, record_date).Last(&psn).Error
+	return
+}
 
-func GetPsnByPatientIdTwo(patient_id int64, record_date int64) (psn models.HisPsn, err error) {
-	err = readDb.Model(&models.HisPsn{}).Where("patient_id = ? AND record_date = ? AND stage = 1", patient_id, record_date).Last(&psn).Error
+//func GetPsnByPatientIdTwo(patient_id int64, record_date int64) (psn models.HisPsn, err error) {
+//	err = readDb.Model(&models.HisPsn{}).Where("patient_id = ? AND record_date = ? AND stage = 1", patient_id, record_date).Last(&psn).Error
+//	return
+//}
+
+func GetPsnByPatientIdTwo(patient_id int64) (psn models.HisPsn, err error) {
+	err = readDb.Model(&models.HisPsn{}).Where("patient_id = ?", patient_id).Last(&psn).Error
 	return
 }
 

service/hn_service.go

@@ -616,7 +616,7 @@ func Hnyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 }
 
 //  门诊预结算
-func Hnyb2206(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) (string, string) {
+func Hnyb2206(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, acct_used_flag string) (string, string) {
 
 	// 生成签名
 	timestamp := time.Now().Unix() //		inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
@@ -655,14 +655,14 @@ func Hnyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		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接口返回）
+	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["exp_content"] = ""                // 人员编号 （来自1101接口返回）
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -685,7 +685,7 @@ func Hnyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 }
 
 //  门诊预结算
-func Hnyb2206Two(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) {
+func Hnyb2206Two(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, acct_used_flag string) (string, string) {
 
 	// 生成签名
 	timestamp := time.Now().Unix() //		inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
@@ -725,14 +725,14 @@ func Hnyb2206Two(psnNo string, mdtrtId string, chrgBchno string, certNo string,
 		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接口返回）
+	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["exp_content"] = ""                // 人员编号 （来自1101接口返回）
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入

service/zh_his_service.go

@@ -1063,6 +1063,11 @@ func ZHGdyb2304(psnNo string, mdtrtId string, chrgBchno string, certNo string, i
 		if id_card_type == 1 {
 			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		} else if id_card_type == 4 {
+
+			inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+
 		} else {
 			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号