更新

controllers/sg/his_api_controller.go

 	struct3505.Bchno = "---"
 	struct3505.FixmedinsCode = miConfig.Code
 	struct3505.Code = miConfig.Code
-	struct3505.FinlTrnsPric = drug.HisDoctorAdviceInfo.Price
+	struct3505.FinlTrnsPric =  strconv.FormatFloat(drug.HisDoctorAdviceInfo.Price, 'f', -1, 64)
 
 	roles, _ := service.GetAdminUserInfoByID(org_id, pre.Creator)
 	struct3505.PrscDrName = roles.UserName
 	} else {
 		struct3505.TrdnFlag = "1"
 	}
-
 	if drug.HisDoctorAdviceInfo.ZeroFlag == 1 {
 		struct3505.TrdnFlag = "1"
 	}
 
 	}
 
+
+	if org_id == 10610 || org_id == 10278 || org_id == 10138 || org_id == 10537{
+
+		if drug.HisDoctorAdviceInfo.BaseDrugLib.IsZeroFlag == 1 {
+			struct3505.TrdnFlag = "1"
+		}
+
+		if drug.HisDoctorAdviceInfo.BaseDrugLib.IsZeroFlag == 2 {
+			struct3505.TrdnFlag = "0"
+
+		}
+
+	}
+
+
+
 	struct3505.RtalDocno = order.Number
 	struct3505.PsnCertType = "01"
 
 				order.RxID = strconv.FormatInt(item.ID, 10)
 				order.Rxno = strconv.FormatInt(item.ID, 10)
 				order.LongDrordFlag = "0"
-				order.HilistType = "1"
+				order.HilistType = "101"
 				order.ChrgType = "1"
 				order.DrordBhvr = "-"
 				order.HilistCode = subItem.BaseDrugLib.MedicalInsuranceNumber
 				order.RxID = strconv.FormatInt(item.ID, 10)
 				order.Rxno = strconv.FormatInt(item.ID, 10)
 				order.LongDrordFlag = "0"
-				order.HilistType = "1"
+				order.HilistType = "201"
 				order.ChrgType = "1"
 				order.DrordBhvr = "-"
 				order.HilistCode = subItem.HisProject.MedicalCode
 				order.RxID = strconv.FormatInt(item.ID, 10)
 				order.Rxno = strconv.FormatInt(item.ID, 10)
 				order.LongDrordFlag = "0"
-				order.HilistType = "1"
+				order.HilistType = "301"
 				order.ChrgType = "1"
 				order.DrordBhvr = "0"
 				order.HilistCode = subItem.GoodInfo.MedicalInsuranceNumber
 					order.RxID = strconv.FormatInt(item.ID, 10)
 					order.Rxno = strconv.FormatInt(item.ID, 10)
 					order.LongDrordFlag = "0"
-					order.HilistType = "1"
+					order.HilistType = "101"
 					order.ChrgType = "1"
 					order.DrordBhvr = "0"
 					order.HilistCode = subItem.BaseDrugLib.MedicalInsuranceNumber
 					order.RxID = strconv.FormatInt(item.ID, 10)
 					order.Rxno = strconv.FormatInt(item.ID, 10)
 					order.LongDrordFlag = "0"
-					order.HilistType = "1"
+					order.HilistType = "201"
 					order.ChrgType = "1"
 					order.DrordBhvr = "0"
 					order.HilistCode = subItem.HisProject.MedicalCode
 					order.RxID = strconv.FormatInt(item.ID, 10)
 					order.Rxno = strconv.FormatInt(item.ID, 10)
 					order.LongDrordFlag = "0"
-					order.HilistType = "1"
+					order.HilistType = "301"
 					order.ChrgType = "1"
 					order.DrordBhvr = "0"
 					order.HilistCode = subItem.GoodInfo.MedicalInsuranceNumber
 					order.RxID = strconv.FormatInt(item.ID, 10)
 					order.Rxno = strconv.FormatInt(item.ID, 10)
 					order.LongDrordFlag = "0"
-					order.HilistType = "1"
+					order.HilistType = "101"
 					order.ChrgType = "1"
 					order.DrordBhvr = "0"
 					order.HilistCode = subItem.BaseDrugLib.MedicalInsuranceNumber
 					order.RxID = strconv.FormatInt(item.ID, 10)
 					order.Rxno = strconv.FormatInt(item.ID, 10)
 					order.LongDrordFlag = "0"
-					order.HilistType = "1"
+					order.HilistType = "201"
 					order.ChrgType = "1"
 					order.DrordBhvr = "0"
 					order.HilistCode = subItem.HisProject.MedicalCode
 					order.RxID = strconv.FormatInt(item.ID, 10)
 					order.Rxno = strconv.FormatInt(item.ID, 10)
 					order.LongDrordFlag = "0"
-					order.HilistType = "1"
+					order.HilistType = "301"
 					order.ChrgType = "1"
 					order.DrordBhvr = "0"
 					order.HilistCode = subItem.GoodInfo.MedicalInsuranceNumber
 				order.RxID = strconv.FormatInt(item.ID, 10)
 				order.Rxno = strconv.FormatInt(item.ID, 10)
 				order.LongDrordFlag = "0"
-				order.HilistType = "1"
-				order.ChrgType = "1"
+				order.HilistType = "101"
+				order.ChrgType = "01"
 				order.DrordBhvr = "0"
 				order.HilistCode = subItem.BaseDrugLib.MedicalInsuranceNumber
 				order.HosplistName = subItem.BaseDrugLib.DrugName
 				order.RxID = strconv.FormatInt(item.ID, 10)
 				order.Rxno = strconv.FormatInt(item.ID, 10)
 				order.LongDrordFlag = "0"
-				order.HilistType = "1"
-				order.ChrgType = "1"
+				order.HilistType = "201"
+				order.ChrgType = "05"
 				order.DrordBhvr = "0"
 				order.HilistCode = subItem.HisProject.MedicalCode
 				order.HosplistName = subItem.HisProject.ProjectName
 				order.RxID = strconv.FormatInt(item.ID, 10)
 				order.Rxno = strconv.FormatInt(item.ID, 10)
 				order.LongDrordFlag = "0"
-				order.HilistType = "1"
-				order.ChrgType = "1"
+				order.HilistType = "301"
+				order.ChrgType = "08"
 				order.DrordBhvr = "0"
 				order.HilistCode = subItem.GoodInfo.MedicalInsuranceNumber
 				order.HosplistName = subItem.GoodInfo.GoodName
 			bas := strings.Split(basStr, "|")
 			basNumber := bas[1]
 			fmt.Println(basNumber)
+			card := bas[2]
+
 			card_sn := bas[3]
 			fmt.Println(card_sn)
 			patient, _ := service.GetPatientByNumber(basNumber, c.GetAdminUserInfo().CurrentOrgId)
 
-			result, _ := service.Jxyb1101(basNumber, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, "1", miConfig.Url, miConfig.AccessKey, patient.Name)
+			result, _ := service.Jxyb11012(basNumber, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, "1", miConfig.Url, miConfig.AccessKey, patient.Name,card)
 
 			//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{}
 			}
 
 		} else if miConfig.MdtrtareaAdmvs == "360100" {
+			fmt.Println(initFlag)
+			fmt.Println("initFlag")
 
-			basStr := c.GetBasBaseInfo22222()
-			fmt.Println(basStr)
-
+			if initFlag == 0 {
+				c.TestGetJiangXiBasBaseInittwo()
+			}
+			basStr := c.GetBasBaseInfo()
 			if len(basStr) == 0 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
 				return
 			}
 			fmt.Println(basStr)
 			bas := strings.Split(basStr, "|")
-			basNumber := bas[2] //卡号
-			card_sn := bas[3]   //
-
-			id_card_No := bas[1] //卡号
-
+			basNumber := bas[1]
 			fmt.Println(basNumber)
+			card_sn := bas[3]
 			fmt.Println(card_sn)
-			fmt.Println(id_card_No)
-
-			var patient service.Patients
-			if len(id_card_No) == 0 {
-
-				patient, _ = service.GetPatientByNumber(basNumber, c.GetAdminUserInfo().CurrentOrgId)
-
-			} else {
-				patient, _ = service.GetPatientByNumber(id_card_No, c.GetAdminUserInfo().CurrentOrgId)
-
-			}
+			patient, _ := service.GetPatientByNumber(basNumber, c.GetAdminUserInfo().CurrentOrgId)
 
-			result, _ := service.Jxyb1101bycard(basNumber, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, "1", miConfig.Url, miConfig.AccessKey, patient.Name, patient.IdCardNo)
+			result, _ := service.Jxyb1101(basNumber, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, "1", miConfig.Url, miConfig.AccessKey, patient.Name)
 
 			//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 res.Infcode == 0 {
-				var pateint2 service.Patients
-				var err error
-				if len(id_card_No) == 0 {
-					pateint2, err = service.GetPatientByNumber(basNumber, c.GetAdminUserInfo().CurrentOrgId)
-
-				} else {
-					pateint2, err = service.GetPatientByNumber(id_card_No, c.GetAdminUserInfo().CurrentOrgId)
-
-					//patient, _ = service.GetPatientByNumber(id_card_No, c.GetAdminUserInfo().CurrentOrgId)
-
-				}
+				patient, err := service.GetPatientByNumber(basNumber, c.GetAdminUserInfo().CurrentOrgId)
 				if err == gorm.ErrRecordNotFound {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
 					return
 					psn := &models.HisPsn{
 						PsnNo: res.Output.Baseinfo.PsnNo,
 
-						PatientId: pateint2.ID,
+						PatientId: patient.ID,
 						Certno:    res.Output.Baseinfo.Certno,
 
 						Gend:          res.Output.Baseinfo.Gend,
 				return
 			}
 
+
+
 		} else if miConfig.MdtrtareaAdmvs == "430800" {
 			fmt.Println(initFlag)
 			fmt.Println("initFlag")
 	social_type, _ := c.GetInt64("social_type")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	insuplc_admdvs_tt := c.GetString("insuplc_admdvs")
+
 	mdtrt_type := c.GetString("mdtrt_type")
 	if id_card_type == 5 {
 		id_card_type = 4
 					}
 					var result string
 					var requestLog string
-					if miConfig.Code == "H44030501364" || miConfig.Code == "H44030903432" || miConfig.Code == "H44030500255" {
+					if miConfig.Code == "H44030501364" || miConfig.Code == "H44030903432" || miConfig.Code == "H44030500255" ||  miConfig.Code == "H44082500483" {
 						var hisPrescription []*models.HisPrescription
 						res3101 := Checkgd3101ForOne(c, patient.ID, his, admin_user_id, "1", record_time, hisPrescription, department)
 						if res3101.Infcode == 0 {
 
 						for _, item := range rf {
 
-							utils.ErrorLog("解析失败：%v", item.Insutype)
-							utils.ErrorLog("解析失败：%v", insutype)
+
 
 							if item.Insutype == insutype {
 								insuplc_admdvs_temp = item.InsuplcAdmdvs
-								utils.ErrorLog("解析失败：%v", insuplc_admdvs_temp)
 
 							}
 
 						}
 
+						if len(insuplc_admdvs_tt) > 0{
+							insuplc_admdvs_temp = insuplc_admdvs_tt
+
+
+						}
+
 						result, requestLog = service.Gdyb2201A(psn_info.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_info.DoctorNumber, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, record_time_two, psn_info.VerifyNumber, admin_user_id)
 						saveLog(result, requestLog, "2201A", "挂号")
 					}
 					}
 					result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, med_type, his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, "", admin_user_id)
 				} else {
-					if miConfig.Code == "H44030501364" || miConfig.Code == "H44030903432" || miConfig.Code == "H44030500255" {
+					if miConfig.Code == "H44030501364" || miConfig.Code == "H44030903432" || miConfig.Code == "H44030500255" ||  miConfig.Code == "H44082500483" {
 						result3101 := Checkgd3102(c, id, his_patient_id, admin_user_id, "7", tempOrder.ID)
 						if result3101.Infcode == 0 {
 							if len(result3101.Output.Result) > 0 {
 						res.Infcode = infocode
 
 					} else {
-						if miConfig.Code == "H44030903432" || miConfig.Code == "H44030501364" || miConfig.Code == "H44030500255" {
+						if miConfig.Code == "H44030903432" || miConfig.Code == "H44030501364" || miConfig.Code == "H44030500255"  ||  miConfig.Code == "H44082500483"{
 							result3101 := Checkgd3101(c, id, his_patient_id, admin_user_id, "2", record_time, prescriptions)
 							if result3101.Infcode == 0 {
 								if len(result3101.Output.Result) > 0 {
 
 							psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 							allTotal = fmt.Sprintf("%.2f", total_two)
-							if miConfig.Code == "H44030501364" || miConfig.Code == "H44030903432" || miConfig.Code == "H44030500255" {
+							if miConfig.Code == "H44030501364" || miConfig.Code == "H44030903432" || miConfig.Code == "H44030500255" ||  miConfig.Code == "H44082500483" {
 
 								result3101 := Checkgd3102(c, id, his_patient_id, admin_user_id, "6", order.ID)
 								if result3101.Infcode == 0 {
 					"msg": "退号成功",
 				})
 				service.UpdataRegStatusTwo(his_patient_id, recordDateTime, adminUser.CurrentOrgId)
+				//service.UpdataOrderStatusTen(his., recordDateTime, adminUser.CurrentOrgId)
 
 			} else {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			baseParams.RequestUrl = miConfig.Url
 
 			if clr_type == "9903" {
-				clr_type = "9994"
+				clr_type = "9901"
 			}
 
 			businessParams := models.BusinessParams{
 		res.Output.Setlinfo.PsnCashPay = order.PsnCashPay
 
 		if res.Infcode == 0 {
-			if adminUser.CurrentOrgId == 10215 || adminUser.CurrentOrgId == 10387 || adminUser.CurrentOrgId == 9919 || adminUser.CurrentOrgId == 10088 || adminUser.CurrentOrgId == 10150 || adminUser.CurrentOrgId == 10454 || adminUser.CurrentOrgId == 10644 || adminUser.CurrentOrgId == 10653 || adminUser.CurrentOrgId == 10210 {
+			if adminUser.CurrentOrgId == 10215 || adminUser.CurrentOrgId == 10387 || adminUser.CurrentOrgId == 9919 || adminUser.CurrentOrgId == 10088 || adminUser.CurrentOrgId == 10150 || adminUser.CurrentOrgId == 10454 || adminUser.CurrentOrgId == 10644 || adminUser.CurrentOrgId == 10653{
 				c.ServeSuccessJSON(map[string]interface{}{
 					"diagnosis":            name,
 					"order_infos":          orderInfos,

controllers/zh/zh_his_api_controller.go

 			result = string(result_byte)
 			saveLog(result_log, request_log, "1101", "人员基本信息获取")
 
-		} else if miConfig.MdtrtareaAdmvs == "360399" ||  miConfig.MdtrtareaAdmvs == "361025" {
+		} else if miConfig.MdtrtareaAdmvs == "360399" ||  miConfig.MdtrtareaAdmvs == "361025" || miConfig.MdtrtareaAdmvs == "360100" {
 			result, request_log = service.JxybZY1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code,  miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 2, "", 0, miConfig.Url, miConfig.AccessKey, patient.Name, patient.IdCardNo, patient.Name)
 			saveLog(result_log, request_log, "1101", "人员基本信息获取")
 		}else if miConfig.MdtrtareaAdmvs == "341203"{

main.go

 //}GetAllHisOrder10138
 //
 //
-//func GetblBatchSettleList() {
-//	org_id, _ := beego.AppConfig.Int64("org_id")
-//	var orders []*models.HisOrder
-//	//var orders []*models.HisOrderError
-//	orders, _ = service.GetAllHisOrder10138()
-//	for _, item := range orders {
-//		order_id := item.ID
-//		order, _ := service.GetHisOrderByIDTwo(order_id)
-//		if order.MedType == "14" {
-//			his, _ := service.GetHisPatientByNumber(order.MdtrtId)
-//			var patientPrescription models.HisPrescriptionInfo
-//			patientPrescription, _ = service.FindLastPatientPrescriptionInfo(order.UserOrgId, order.PatientId, order.SettleAccountsDate)
-//			doctor_info, _ := service.GetAdminUserInfoByID(order.UserOrgId, patientPrescription.DoctorId)
-//			department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
-//			miConfig, _ := service.FindMedicalInsuranceInfo(order.UserOrgId)
-//			var configTwo []*models.HisXtDiagnoseConfig
-//			diagnosis_idstwo := strings.Split(his.Diagnosis, ",")
-//			curRoles, _ := service.GetAdminUserInfoByID(org_id, 5320)
-//			for _, item := range diagnosis_idstwo {
-//				id, _ := strconv.ParseInt(item, 10, 64)
-//				diagnosisConfig, _ := service.FindDiagnoseById(id)
-//				configTwo = append(configTwo, &diagnosisConfig)
-//			}
-//			patient, _ := service.GetPatientByIDTwo(10028, order.PatientId)
-//
-//			sickConfig, _ := service.FindSickById(his.SickType)
-//			//if order.MedType == "1111" || order.MedType == "1112" {
-//			//	order.MedType = "11"
-//			//}
-//			service.Gdyb2203d(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, "14", doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, curRoles.UserName, configTwo, time.Unix(his.RecordDate, 0).Format("2006-01-02 15:04:05"))
-//
-//			depart, _ := service.GetDepartMentDetail(curRoles.DepartmentId)
-//			pre, _ := service.GetNewHisPrescriptionByNumber(order.Number)
-//			doctor, _ := service.GetAdminUserInfoByID(org_id, pre.Creator)
-//			if order.ID == 0 {
-//				return
-//			}
-//			if his.BalanceAccountsType == 2 {
-//				continue
-//			}
-//			struct4101 := service.Struct4101{
-//				PsnNo:          order.PsnNo,
-//				MdtrtId:        order.MdtrtId,
-//				SetlId:         order.SetlId,
-//				PsnName:        order.PsnName,
-//				Gend:           order.Gend,
-//				Brdy:           his.Brdy,
-//				Age:            his.Age,
-//				Naty:           order.Naty,
-//				PatnCertType:   order.PsnCertType,
-//				Certno:         order.Certno,
-//				Prfs:           "90",
-//				ConerName:      "",
-//				PatnRlts:       "",
-//				ConerAddr:      "",
-//				ConerTel:       "",
-//				HiType:         order.Insutype,
-//				Insuplc:        his.InsuplcAdmdvs,
-//				MaindiagFlag:   "1",
-//				BillCode:       order.SetlId,
-//				BillNo:         order.SetlId,
-//				BizSn:          order.Number,
-//				PsnSelfPay:     order.PsnPartAmt,
-//				PsnOwnPay:      order.PsnPartAmt,
-//				AcctPay:        order.AcctPay,
-//				PsnCashpay:     order.PsnCashPay,
-//				HiPaymtd:       "1",
-//				Hsorg:          his.InsuplcAdmdvs,
-//				HsorgOpter:     his.InsuplcAdmdvs,
-//				MedinsFillPsn:  curRoles.UserName,
-//				MedinsFillDept: depart.Name,
-//				IptMedType:     "2",
-//				CurAddr:        patient.HomeAddress,
-//			}
-//
-//			struct4101.SetlBegnDate = order.SetlTime
-//			struct4101.SetlEndDate = order.SetlTime
-//
-//			var rf []CustomFundPay
-//			json.Unmarshal([]byte(order.SetlDetail), &rf)
-//
-//			//var tempFunPays []service.CustomStruct
-//			//var tempFunPay610100 service.CustomStruct
-//
-//			//for _, item := range rf {
-//			//	if item.FundPayType == "610100" {
-//			//		tempFunPay610100.FundPayamt, _ = decimal.NewFromFloat(tempFunPay610100.FundPayamt).Add(decimal.NewFromFloat(item.FundPayamt)).Float64()
-//			//		tempFunPay610100.FundPayType = item.FundPayType
-//			//	} else {
-//			//		var tempFunPay service.CustomStruct
-//			//		tempFunPay.FundPayamt = item.FundPayamt
-//			//		tempFunPay.FundPayType = item.FundPayType
-//			//		tempFunPays = append(tempFunPays, tempFunPay)
-//			//	}
-//			//}
-//			//tempFunPays = append(tempFunPays, tempFunPay610100)
-//			//struct4101.CustomStruct = tempFunPays
-//
-//			var tempDiaginfos []service.DiaginfoStructTwo
-//			var tempOpspdiseinfo2 service.OpspdiseinfoStruct
-//			var tempOpspdiseinfos []service.OpspdiseinfoStruct
-//
-//			diagnosis_ids := strings.Split(his.Diagnosis, ",")
-//			var config []*models.HisXtDiagnoseConfig
-//			for _, item := range diagnosis_ids {
-//				id, _ := strconv.ParseInt(item, 10, 64)
-//				if id == 24 {
-//
-//					diagnosisConfig, _ := service.FindDiagnoseById(id)
-//					config = append(config, &diagnosisConfig)
-//				}
-//
-//			}
-//
-//			for _, item := range diagnosis_ids {
-//
-//				id, _ := strconv.ParseInt(item, 10, 64)
-//				if id != 24 {
-//					diagnosisConfig, _ := service.FindDiagnoseById(id)
-//					config = append(config, &diagnosisConfig)
-//				}
-//
-//			}
-//
-//			for index, item := range config {
-//				if index == 0 {
-//					var tempDiaginfo service.DiaginfoStructTwo
-//					tempDiaginfo.DiagCode = item.CountryCode
-//					tempDiaginfo.DiagName = item.CountryContentName
-//					tempDiaginfo.DiagType = "1"
-//					tempDiaginfo.MaindiagFlag = "1"
-//					tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
-//				} else {
-//
-//					var tempDiaginfo service.DiaginfoStructTwo
-//					tempDiaginfo.DiagCode = item.CountryCode
-//					tempDiaginfo.DiagName = item.CountryContentName
-//					tempDiaginfo.DiagType = "1"
-//					tempDiaginfo.MaindiagFlag = "0"
-//					tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
-//				}
-//			}
-//			struct4101.Diseinfo = tempDiaginfos
-//			sickConfigTwo, _ := service.FindSickById(his.SickType)
-//			tempOpspdiseinfo2.DiagCode = sickConfigTwo.ContentCode
-//			tempOpspdiseinfo2.DiagName = sickConfigTwo.CountryContentName
-//			tempOpspdiseinfo2.OprnOprtCode = ""
-//			tempOpspdiseinfo2.OprnOprtName = ""
-//			tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo2)
-//			struct4101.OpspdiseinfoStruct = tempOpspdiseinfos
-//			time_arr := strings.Split(order.SetlTime, " ")
-//			struct4101.AdmTime = time_arr[0]
-//			struct4101.AdmEndTime = time_arr[0]
-//			struct4101.DoctorName = doctor.UserName
-//			struct4101.DoctorCode = doctor.DoctorNumber
-//
-//			struct4101.Ntly = "CHN"
-//			struct4101.AdmCaty = "A03.06"
-//			var res ResultSeventeen
-//
-//			result, request := service.Gdyb4101For10138(struct4101, miConfig.SecretKey, miConfig.OrgName, curRoles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, org_id)
-//			fmt.Println(result)
-//			saveLog(result, request, "4101A", "清单上传")
-//			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)
-//				//adminUser := c.GetAdminUserInfo()
-//				errlog := &models.HisOrderError{
-//					UserOrgId: org_id,
-//					Ctime:     time.Now().Unix(),
-//					Mtime:     time.Now().Unix(),
-//					ErrMsg:    res.ErrMsg + "解析失败",
-//					Status:    1,
-//					PatientId: order_id,
-//					Stage:     10138600,
-//				}
-//				service.CreateErrMsgLog(errlog)
-//				continue
-//			}
-//
-//			if res.Infcode != 0 {
-//				//adminUser := c.GetAdminUserInfo()
-//				errlog := &models.HisOrderError{
-//					UserOrgId: org_id,
-//					Ctime:     time.Now().Unix(),
-//					Mtime:     time.Now().Unix(),
-//					ErrMsg:    res.ErrMsg,
-//					Status:    1,
-//					PatientId: order_id,
-//					Stage:     10138600,
-//				}
-//				service.CreateErrMsgLog(errlog)
-//				continue
-//			} else {
-//				hisFundSettleListResult := &models.HisFundSettleListResult{
-//					Number:    res.Output.SetlListId,
-//					Status:    1,
-//					Ctime:     time.Now().Unix(),
-//					Mtime:     time.Now().Unix(),
-//					UserOrgId: org_id,
-//					IsUpload:  1,
-//					OrderId:   order_id,
-//				}
-//				service.CreateUploadRecord(hisFundSettleListResult)
-//				continue
-//			}
-//		}
-//	}
-//}
+func GetblBatchSettleList() {
+	org_id, _ := beego.AppConfig.Int64("org_id")
+	var orders []*models.HisOrder
+	//var orders []*models.HisOrderError
+	orders, _ = service.GetAllHisOrder10138()
+	for _, item := range orders {
+		order_id := item.ID
+		order, _ := service.GetHisOrderByIDTwo(order_id)
+		if order.MedType == "14" {
+			his, _ := service.GetHisPatientByNumber(order.MdtrtId)
+			var patientPrescription models.HisPrescriptionInfo
+			patientPrescription, _ = service.FindLastPatientPrescriptionInfo(order.UserOrgId, order.PatientId, order.SettleAccountsDate)
+			doctor_info, _ := service.GetAdminUserInfoByID(order.UserOrgId, patientPrescription.DoctorId)
+			department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
+			miConfig, _ := service.FindMedicalInsuranceInfo(order.UserOrgId)
+			var configTwo []*models.HisXtDiagnoseConfig
+			diagnosis_idstwo := strings.Split(his.Diagnosis, ",")
+			curRoles, _ := service.GetAdminUserInfoByID(org_id, 5318)
+			for _, item := range diagnosis_idstwo {
+				id, _ := strconv.ParseInt(item, 10, 64)
+				diagnosisConfig, _ := service.FindDiagnoseById(id)
+				configTwo = append(configTwo, &diagnosisConfig)
+			}
+			patient, _ := service.GetPatientByIDTwo(10138, order.PatientId)
+
+			sickConfig, _ := service.FindSickById(his.SickType)
+			//if order.MedType == "1111" || order.MedType == "1112" {
+			//	order.MedType = "11"
+			//}
+			service.Gdyb2203d(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, "14", doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, curRoles.UserName, configTwo, time.Unix(his.RecordDate, 0).Format("2006-01-02 15:04:05"))
+
+			depart, _ := service.GetDepartMentDetail(curRoles.DepartmentId)
+			pre, _ := service.GetNewHisPrescriptionByNumber(order.Number)
+			doctor, _ := service.GetAdminUserInfoByID(org_id, pre.Creator)
+			if order.ID == 0 {
+				return
+			}
+			if his.BalanceAccountsType == 2 {
+				continue
+			}
+			struct4101 := service.Struct4101{
+				PsnNo:          order.PsnNo,
+				MdtrtId:        order.MdtrtId,
+				SetlId:         order.SetlId,
+				PsnName:        order.PsnName,
+				Gend:           order.Gend,
+				Brdy:           his.Brdy,
+				Age:            his.Age,
+				Naty:           order.Naty,
+				PatnCertType:   order.PsnCertType,
+				Certno:         order.Certno,
+				Prfs:           "90",
+				ConerName:      "",
+				PatnRlts:       "",
+				ConerAddr:      "",
+				ConerTel:       "",
+				HiType:         order.Insutype,
+				Insuplc:        his.InsuplcAdmdvs,
+				MaindiagFlag:   "1",
+				BillCode:       order.SetlId,
+				BillNo:         order.SetlId,
+				BizSn:          order.Number,
+				PsnSelfPay:     order.PsnPartAmt,
+				PsnOwnPay:      order.PsnPartAmt,
+				AcctPay:        order.AcctPay,
+				PsnCashpay:     order.PsnCashPay,
+				HiPaymtd:       "1",
+				Hsorg:          his.InsuplcAdmdvs,
+				HsorgOpter:     his.InsuplcAdmdvs,
+				MedinsFillPsn:  curRoles.UserName,
+				MedinsFillDept: depart.Name,
+				IptMedType:     "2",
+				CurAddr:        patient.HomeAddress,
+			}
+
+			struct4101.SetlBegnDate = order.SetlTime
+			struct4101.SetlEndDate = order.SetlTime
+
+			var rf []CustomFundPay
+			json.Unmarshal([]byte(order.SetlDetail), &rf)
+
+			//var tempFunPays []service.CustomStruct
+			//var tempFunPay610100 service.CustomStruct
+
+			//for _, item := range rf {
+			//	if item.FundPayType == "610100" {
+			//		tempFunPay610100.FundPayamt, _ = decimal.NewFromFloat(tempFunPay610100.FundPayamt).Add(decimal.NewFromFloat(item.FundPayamt)).Float64()
+			//		tempFunPay610100.FundPayType = item.FundPayType
+			//	} else {
+			//		var tempFunPay service.CustomStruct
+			//		tempFunPay.FundPayamt = item.FundPayamt
+			//		tempFunPay.FundPayType = item.FundPayType
+			//		tempFunPays = append(tempFunPays, tempFunPay)
+			//	}
+			//}
+			//tempFunPays = append(tempFunPays, tempFunPay610100)
+			//struct4101.CustomStruct = tempFunPays
+
+			var tempDiaginfos []service.DiaginfoStructTwo
+			var tempOpspdiseinfo2 service.OpspdiseinfoStruct
+			var tempOpspdiseinfos []service.OpspdiseinfoStruct
+
+			diagnosis_ids := strings.Split(his.Diagnosis, ",")
+			var config []*models.HisXtDiagnoseConfig
+			for _, item := range diagnosis_ids {
+				id, _ := strconv.ParseInt(item, 10, 64)
+				if id == 24 {
+
+					diagnosisConfig, _ := service.FindDiagnoseById(id)
+					config = append(config, &diagnosisConfig)
+				}
+
+			}
+
+			for _, item := range diagnosis_ids {
+
+				id, _ := strconv.ParseInt(item, 10, 64)
+				if id != 24 {
+					diagnosisConfig, _ := service.FindDiagnoseById(id)
+					config = append(config, &diagnosisConfig)
+				}
+
+			}
+
+			for index, item := range config {
+				if index == 0 {
+					var tempDiaginfo service.DiaginfoStructTwo
+					tempDiaginfo.DiagCode = item.CountryCode
+					tempDiaginfo.DiagName = item.CountryContentName
+					tempDiaginfo.DiagType = "1"
+					tempDiaginfo.MaindiagFlag = "1"
+					tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
+				} else {
+
+					var tempDiaginfo service.DiaginfoStructTwo
+					tempDiaginfo.DiagCode = item.CountryCode
+					tempDiaginfo.DiagName = item.CountryContentName
+					tempDiaginfo.DiagType = "1"
+					tempDiaginfo.MaindiagFlag = "0"
+					tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
+				}
+			}
+			struct4101.Diseinfo = tempDiaginfos
+			sickConfigTwo, _ := service.FindSickById(his.SickType)
+			tempOpspdiseinfo2.DiagCode = sickConfigTwo.ContentCode
+			tempOpspdiseinfo2.DiagName = sickConfigTwo.CountryContentName
+			tempOpspdiseinfo2.OprnOprtCode = ""
+			tempOpspdiseinfo2.OprnOprtName = ""
+			tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo2)
+			struct4101.OpspdiseinfoStruct = tempOpspdiseinfos
+			time_arr := strings.Split(order.SetlTime, " ")
+			struct4101.AdmTime = time_arr[0]
+			struct4101.AdmEndTime = time_arr[0]
+			struct4101.DoctorName = doctor.UserName
+			struct4101.DoctorCode = doctor.DoctorNumber
+
+			struct4101.Ntly = "CHN"
+			struct4101.AdmCaty = "A03.06"
+			var res ResultSeventeen
+
+			result, request := service.Gdyb4101For10138(struct4101, miConfig.SecretKey, miConfig.OrgName, curRoles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, org_id)
+			fmt.Println(result)
+			saveLog(result, request, "4101A", "清单上传")
+			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)
+				//adminUser := c.GetAdminUserInfo()
+				errlog := &models.HisOrderError{
+					UserOrgId: org_id,
+					Ctime:     time.Now().Unix(),
+					Mtime:     time.Now().Unix(),
+					ErrMsg:    res.ErrMsg + "解析失败",
+					Status:    1,
+					PatientId: order_id,
+					Stage:     10138600,
+				}
+				service.CreateErrMsgLog(errlog)
+				continue
+			}
+
+			if res.Infcode != 0 {
+				//adminUser := c.GetAdminUserInfo()
+				errlog := &models.HisOrderError{
+					UserOrgId: org_id,
+					Ctime:     time.Now().Unix(),
+					Mtime:     time.Now().Unix(),
+					ErrMsg:    res.ErrMsg,
+					Status:    1,
+					PatientId: order_id,
+					Stage:     10138600,
+				}
+				service.CreateErrMsgLog(errlog)
+				continue
+			} else {
+				hisFundSettleListResult := &models.HisFundSettleListResult{
+					Number:    res.Output.SetlListId,
+					Status:    1,
+					Ctime:     time.Now().Unix(),
+					Mtime:     time.Now().Unix(),
+					UserOrgId: org_id,
+					IsUpload:  1,
+					OrderId:   order_id,
+				}
+				service.CreateUploadRecord(hisFundSettleListResult)
+				continue
+			}
+		}
+	}
+}
 
 func GetblbrBatchSettleList() {
 	org_id, _ := beego.AppConfig.Int64("org_id")
-	org_id = 10537
+	org_id = 10278
 	var orders []*models.HisOrder
 	//var orders []*models.HisOrderError
 	orders, _ = service.GetAllHisOrder10278()
 			miConfig, _ := service.FindMedicalInsuranceInfo(order.UserOrgId)
 			var configTwo []*models.HisXtDiagnoseConfig
 			diagnosis_idstwo := strings.Split(his.Diagnosis, ",")
-			curRoles, _ := service.GetAdminUserInfoByID(org_id, 2234)
+			curRoles, _ := service.GetAdminUserInfoByID(org_id, 2791)
 			for _, item := range diagnosis_idstwo {
 				id, _ := strconv.ParseInt(item, 10, 64)
 				diagnosisConfig, _ := service.FindDiagnoseById(id)
 				configTwo = append(configTwo, &diagnosisConfig)
 			}
-			patient, _ := service.GetPatientByIDTwo(10537, order.PatientId)
+			patient, _ := service.GetPatientByIDTwo(10278, order.PatientId)
 
 			//sickConfig, _ := service.FindSickById(his.SickType)
 			//if order.MedType == "1111" || order.MedType == "1112" {

models/drug.go

 	Bck01b             string    `gorm:"column:bck01b" json:"bck01b" form:"bck01b"`
 	Bby01             string    `gorm:"column:bby01" json:"bby01" form:"bby01"`
 
+	IsZeroFlag           int64   `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 
 
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`

models/models_3501.go

 	ExpyEnd             string
 	RxFlag              string
 	TrdnFlag            string
-	FinlTrnsPric        float64
+	FinlTrnsPric        string
 	Rxno                string
 	RxCircFlag          string
 	RtalDocno           string

service/his_service.go

 	HospApprFlag         int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	LmtUsedFlag          int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	IsUser               int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	IsZeroFlag           int64   `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 	OtherDrugWarehouseInfo []*OtherDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"stock_in"`
 	return
 }
 func GetAllHisOrder10138() (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10028  AND status = 1  AND  order_status = 2 AND  setl_id <> '' AND setl_time >= '2024-01-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10138  AND status = 1  AND  order_status = 2 AND  setl_id <> '' AND setl_time >= '2024-11-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
 }
 
 func GetAllHisOrder10278() (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where(" user_org_id = 10537  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND setl_time >= '2024-09-01 00:00:00' AND setl_time <= '2024-10-31 23:00:00' and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
+
+	err = readDb.Model(&models.HisOrder{}).Where(" user_org_id = 10278  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND setl_time >= '2024-11-01 00:00:00' AND setl_time <= '2024-11-30 23:00:00' and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }

service/hn_service.go

 	//timestamp := time.Now().Unix()
 	//timestamp := time.Now().Unix()
 
-	//timestamp2 := time.Now().Unix()
+	timestamp2 := time.Now().Unix()
 
 
 	var customs []*Custom

service/jx_service.go

 }
 
 
+func Jxyb11012(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, request_url string, access_key string, name string,id_card_no string) (string, string) {
+	timestamp := time.Now().Unix()
+	//生成输入报文
+	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, "")
+
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "1101" // 交易编码
+
+	if certificates == "3" {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
+		inputData["certno"] = certNo        // 证件号码
+		inputData["psn_cert_type"] = "99"   // 人员证件类型
+
+	} else {
+		if id_card_type == 1 {
+			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["card_sn"] = card_sn      // 卡识别码
+			inputData["certno"] = certNo        // 证件号码
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
+			inputData["mdtrt_cert_no"] = id_card_no // 就诊凭证编号
+
+
+		} else if id_card_type == 4 {
+			inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
+			inputData["card_sn"] = ""      // 卡识别码
+			inputData["certno"] = certNo        // 证件号码
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
+			inputData["mdtrt_cert_no"] = card_sn // 就诊凭证编号
+
+		}else {
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["card_sn"] = ""           // 卡识别码
+			inputData["certno"] = certNo        // 证件号码
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
+		}
+	}
+
+	inputData["begntime"] = ""          // 开始时间
+	inputData["psn_name"] = name          // 人员姓名
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	var inputLog string
+	bytesData, _ := json.Marshal(inputMessage)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	request_url = request_url + "1101"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "1101"), inputLog
+}
+
+
 func Jxyb1101bycard(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, request_url string, access_key string, name string,id_card_no string) (string, string) {
 	timestamp := time.Now().Unix()
 	//生成输入报文