更新

controllers/js/jsyb_controller.go

@@ -2476,7 +2476,7 @@ func (c *JSybController) ReadCard() {
 	case "4": //电子凭证
 		fmt.Println(operator_id)
 		fmt.Println(operator)
-		_, pBusiCardInfo := c.GetELeCertInfoTwo(fixmedins_code, operator_id, operator)
+		_, pBusiCardInfo :=GetELeCertInfoSettle(fixmedins_code, operator_id, operator)
 		fmt.Println(pBusiCardInfo)
 		pBusiCardInfo = Remove0000(pBusiCardInfo)
 		var ele ELeCertData
@@ -2518,13 +2518,17 @@ func (c *JSybController) ReadCard() {
 	case "5": //电子凭证
 		fmt.Println(operator_id)
 		fmt.Println(operator)
-		_, pBusiCardInfo := c.GetELeCertInfoByFace(fixmedins_code, operator_id, operator, "01101")
+		_, pBusiCardInfo := c.GetELeCertInfoByFaceTwoOne(fixmedins_code, operator_id, operator,"01101")
+
+
+		//_, pBusiCardInfo := c.GetELeCertInfoByFace(fixmedins_code, operator_id, operator, "01101")
 		fmt.Println(pBusiCardInfo)
 		pBusiCardInfo = Remove0000(pBusiCardInfo)
 		var eletwo ELeCertDatatwo
 		json.Unmarshal([]byte(pBusiCardInfo), &eletwo)
+		_, pBusiCardInfotwo := c.GetELeCertInfoByFaceTwoTwo(fixmedins_code, operator_id, operator, eletwo.Data.AuthNo, eletwo.Data.OutBizNo, "01301")
 
-		_, pBusiCardInfotwo := GetELeCertInfoByFacetwo(fixmedins_code, operator_id, operator, eletwo.Data.AuthNo, eletwo.Data.OutBizNo, "01301")
+		//_, pBusiCardInfotwo := GetELeCertInfoByFacetwo(fixmedins_code, operator_id, operator, eletwo.Data.AuthNo, eletwo.Data.OutBizNo, "01301")
 
 		var ele ELeCertDatathree
 		err2 := json.Unmarshal([]byte(pBusiCardInfotwo), &ele)
@@ -2832,6 +2836,40 @@ func (c *JSybController) GetELeCertInfoFour2223(code string, operator_id string,
 	return ConvertByte2String([]byte(DeleteExtraSpace(string(bytesData))), GB18030), ConvertByte2String([]byte(DeleteExtraSpace(string(pBusiCardInfo))), GB18030)
 }
 
+
+func (c *JSybController) GetELeCertInfoByFaceTwoOne(code string, operator_id string, operator_name string,businessType string) (string, string) {
+	DllDef := syscall.MustLoadDLL("NationEcCode.dll")
+	readCard := DllDef.MustFindProc("NationEcTrans")
+
+	pCardInfo := make([]byte, 2048)
+	pBusiCardInfo := make([]byte, 2048)
+	data := make(map[string]interface{})
+
+	inputData := make(map[string]interface{})
+	inputData["orgId"] = code
+	inputData["outBizNo"] = time.Now().Unix()
+
+	inputData["businessType"] = businessType
+	inputData["operatorId"] = operator_id
+	inputData["operatorName"] = operator_name
+	inputData["officeId"] = "001"
+	inputData["officeName"] = "血透室"
+	data["data"] = inputData
+	data["transType"] = "cn.nhsa.ec.auth"
+	data["orgId"] = code
+	bytesData, _ := json.Marshal(data)
+	pCardInfo = bytesData
+	pCardInfo = []byte(ConvertByte2String(pCardInfo, GB18030))
+	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&pCardInfo[0])), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
+	fmt.Println(ret2)
+	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(bytesData)), "gbk", "utf-8"))
+	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(pBusiCardInfo)), "gbk", "utf-8"))
+	if ret2 != 0 {
+		return "", ""
+	}
+	return ConvertByte2String([]byte(DeleteExtraSpace(string(bytesData))), GB18030), ConvertByte2String([]byte(DeleteExtraSpace(string(pBusiCardInfo))), GB18030)
+}
+
 func (c *JSybController) GetELeCertInfoByFace(code string, operator_id string, operator_name string, businessType string) (string, string) {
 	// WebSocket服务器地址
 	serverURL := "ws://127.0.0.1:8899"
@@ -2880,6 +2918,40 @@ func (c *JSybController) GetELeCertInfoByFace(code string, operator_id string, o
 
 	return "", string(receivedMessage)
 }
+func (c *JSybController) GetELeCertInfoByFaceTwoTwo(code string, operator_id string, operator_name string, authNo string, outBizNo string, businessType string)(string, string) {
+	DllDef := syscall.MustLoadDLL("NationEcCode.dll")
+	readCard := DllDef.MustFindProc("NationEcTrans")
+
+	pCardInfo := make([]byte, 2048)
+	pBusiCardInfo := make([]byte, 2048)
+	data := make(map[string]interface{})
+
+	inputData := make(map[string]interface{})
+	inputData["orgId"] = code
+	inputData["outBizNo"] = outBizNo
+	inputData["businessType"] = businessType
+	inputData["operatorId"] = operator_id
+	inputData["operatorName"] = operator_name
+	inputData["officeId"] = "001"
+	inputData["officeName"] = "血透室"
+	data["data"] = inputData
+	data["transType"] = "cn.nhsa.auth.check"
+	data["orgId"] = code
+	bytesData, _ := json.Marshal(data)
+	pCardInfo = bytesData
+	pCardInfo = []byte(ConvertByte2String(pCardInfo, GB18030))
+	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&pCardInfo[0])), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
+	fmt.Println(ret2)
+	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(bytesData)), "gbk", "utf-8"))
+	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(pBusiCardInfo)), "gbk", "utf-8"))
+	if ret2 != 0 {
+		return "", ""
+	}
+	return ConvertByte2String([]byte(DeleteExtraSpace(string(bytesData))), GB18030), ConvertByte2String([]byte(DeleteExtraSpace(string(pBusiCardInfo))), GB18030)
+}
+
+
+
 func GetELeCertInfoByFacetwo(code string, operator_id string, operator_name string, authNo string, outBizNo string, businessType string) (string, string) {
 	//	// WebSocket服务器地址
 	serverURL := "ws://127.0.0.1:8899"

controllers/sg/gdyb_controller.go

@@ -391,7 +391,7 @@ func (c *GdybController) PostSeven() {
 	id_card_type, _ := c.GetInt64("id_card_type")
 
 	certificates, _ := c.GetInt64("certificates")
-	result, log := service.Gdyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, operator, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, 0, 0, 0, 0, certificates,0)
+	result, log := service.Gdyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, operator, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, 0, 0, 0, 0, certificates,0,"0")
 	saveLogq(result, log, "2206", "预结算")
 
 	var dat map[string]interface{}

controllers/zh/zh_his_api_controller.go

@@ -1041,7 +1041,7 @@ func (c *ZHHisApiController) UploadLingBao() {
 
 			var result string
 			var requestLog string
-			if miConfig.MdtrtareaAdmvs == "150499" {
+			if miConfig.MdtrtareaAdmvs == "150404" {
 				data := make(map[string]interface{})
 				if record.MedType == 14 {
 					if record.InsutypeType == "390" {
@@ -1460,7 +1460,7 @@ func (c *ZHHisApiController) GetZHPatientInfo() {
 		var request_log string
 		var result_log string
 
-		if miConfig.MdtrtareaAdmvs == "150499" {
+		if miConfig.Code == "H15049901371" {
 			var insuplc_admdvs string
 			if len(patient.InsuplcAdmdvs) > 0 {
 				insuplc_admdvs = patient.InsuplcAdmdvs
@@ -1470,7 +1470,7 @@ func (c *ZHHisApiController) GetZHPatientInfo() {
 			//请求内网数据
 			api := "http://172.16.13.254:9532/" + "nmyb/1101?cert_no=" + patient.IdCardNo +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + role.UserName + "&fixmedins_code=" + miConfig.Code +
-				"&insuplc_admdvs=" + insuplc_admdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(2, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(1, 10) + "&name=" + patient.Name
+				"&insuplc_admdvs=" + insuplc_admdvs + "&mdtrtarea_admvs=" + "150404" + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(2, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(1, 10) + "&name=" + patient.Name
 
 			resp, requestErr := http.Get(api)
 			if requestErr != nil {

main.go

@@ -58,13 +58,13 @@ type ResultEmpty10265 struct {
 func init() {
 	//service.ConnectNMMSDB()
 	service.ConnectDB()
-	org_id, _ := beego.AppConfig.Int64("org_id")
-	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	//CreateLog(miConfig)
-	//UploadLog(miConfig)31
-	if org_id == 10191 {
-		service.GetFjAuthorizationInfo(miConfig.Code)
-	}
+	//org_id, _ := beego.AppConfig.Int64("org_id")
+	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	////CreateLog(miConfig)
+	////UploadLog(miConfig)31
+	//if org_id == 10191 {
+	//	service.GetFjAuthorizationInfo(miConfig.Code)
+	//}
 }
 func main() {
 	//service.AutoCreateStock()
@@ -78,6 +78,8 @@ func main() {
 	//深圳百霖
 	//GetblBatchSettleList()
 	//GetblpgBatchSettleList()
+	//GetgaBatchSettleList()
+	//GetlsBatchSettleList()
 
 	//GetblbrBatchSettleList()
 	//深圳百霖贝尔
@@ -709,10 +711,231 @@ type ResultSeventeen struct {
 //
 func GetblBatchSettleList() {
 	org_id, _ := beego.AppConfig.Int64("org_id")
-	org_id = 9504
+	org_id = 10138
 	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, 2185)
+			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
+			}
+
+			ID := strconv.FormatInt(int64(order.ID), 10)
+
+			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:       "000"+ID,
+				BillNo:         "000"+ID,
+				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 GetgaBatchSettleList() {
+	org_id, _ := beego.AppConfig.Int64("org_id")
+	org_id = 9504
+	var orders []*models.HisOrder
+	//var orders []*models.HisOrderError
+	orders, _ = service.GetAllHisOrder9504()
 	for _, item := range orders {
 		order_id := item.ID
 		order, _ := service.GetHisOrderByIDTwo(order_id)
@@ -928,6 +1151,227 @@ func GetblBatchSettleList() {
 	}
 }
 
+func GetlsBatchSettleList() {
+	org_id, _ := beego.AppConfig.Int64("org_id")
+	org_id = 10028
+	var orders []*models.HisOrder
+	//var orders []*models.HisOrderError
+	orders, _ = service.GetAllHisOrder10028()
+	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
+			}
+
+			ID := strconv.FormatInt(int64(order.ID), 10)
+
+			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:       "000"+ID,
+				BillNo:         "000"+ID,
+				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 GetblpgBatchSettleList() {
 	org_id, _ := beego.AppConfig.Int64("org_id")
 	org_id = 10610

models/his_models.go

@@ -242,7 +242,7 @@ type HisDoctorAdviceInfo struct {
 	IsUpload           int64 `gorm:"column:is_upload" json:"is_upload" form:"is_upload"`
 	ZeroFlag           int64 `gorm:"column:zero_flag" json:"zero_flag" form:"zero_flag"`
 
-
+	UploadDate            string   `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
 	BaseDrugLib BaseDrugLib `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
 }
 
@@ -1477,6 +1477,8 @@ type HisDoctorAdviceInfoTen struct {
 	BaseDrugLib           BaseDrugLib  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
 	HisOrderInfo          HisOrderInfo `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"order_info"`
 	DrugWayCount          string       `gorm:"column:drug_way_count" json:"drug_way_count" form:"drug_way_count"`
+	UploadDate            string   `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
+
 }
 
 func (HisDoctorAdviceInfoTen) TableName() string {

models/stock_models.go

@@ -1361,6 +1361,7 @@ type BloodHisDoctorAdviceInfo struct {
 	LmtUsedFlag           int64                       `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	ExecutionFrequencyId  int64                       `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 	DrugWayCount               string  `gorm:"column:drug_way_count" json:"drug_way_count" form:"drug_way_count"`
+	UploadDate            string   `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
 
 }
 

service/fj_service.go

@@ -1999,7 +1999,7 @@ func Fjyb4101(struct4101 Struct4101, params models.PublicParams) (string, string
 	input["setlinfo"] = inputData
 	input["payinfo"] = payinfo
 	input["opspdiseinfo"] = opspdiseinfo
-	input["diseinfo"] = diseinfo
+	//input["diseinfo"] = diseinfo
 	input["iteminfo"] = iteminfo
 
 	inputMessage["input"] = input //交易输入
@@ -3206,13 +3206,12 @@ func FJyb3506(struct3506 models.Struct3506) (string, string, string) {
 	// 生成输入报文
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	druginputData := make(map[string]interface{})
 	//druginputData2 := make(map[string]interface{})
 
 	inputMessage["infno"] = "3506"                                  // 交易编码
 	inputData["med_list_codg"] = struct3506.MedListCodg             // 定点医药机构目录编号
 	inputData["fixmedins_hilist_id"] = struct3506.FixmedinsHilistId // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3506.OrgName         // 定点医药机构目录名称
+	inputData["fixmedins_hilist_name"] = struct3506.FixmedinsHilistName         // 定点医药机构目录名称
 	inputData["fixmedins_bchno"] = struct3506.FixmedinsBchno        // 人员编号 （来自1101接口返回）
 
 	inputData["setl_id"] = struct3506.SetlId                       // 人员编号 （来自1101接口返回）
@@ -3233,10 +3232,16 @@ func FJyb3506(struct3506 models.Struct3506) (string, string, string) {
 	inputData["medins_prod_sel_no"] = ""                           // 人员编号 （来自1101接口返回）
 	inputData["mdtrt_sn"] = struct3506.MdtrtSn                     // 人员编号 （来自1101接口返回）
 
-	druginputData["drug_trac_codg"] = ""
-	//druginputData2["drugtracinfo"] = druginputData
-	inputData["drug_trac_info"] = druginputData
-
+	feedetail := make([]map[string]interface{}, 0)
+	codes := strings.Split(struct3506.DrugTracCodg, ",")
+	for _, item := range codes {
+		if len(item) > 0 {
+			druginputData := make(map[string]interface{})
+			druginputData["drug_trac_codg"] =  removeNonDigits(item)
+			feedetail = append(feedetail, druginputData)
+		}
+	}
+	inputData["drug_trac_info"] = feedetail
 	input["selinfo"] = inputData
 	inputMessage["input"] = input //交易输入
 

service/gdyb_service.go

@@ -1590,7 +1590,7 @@ func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 //	门诊预结算
 //
 // func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, secret_key string) string {
-func Gdyb2206(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, admin_user_id int64) (string, string) {
+func Gdyb2206(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, admin_user_id int64,acct_used_flag string) (string, string) {
 
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -1635,7 +1635,7 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	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["acct_used_flag"] = acct_used_flag   // 个人账户使用标志 0否 1是
 	inputData["insutype"] = insutype    // 险种类型
 	inputData["invono"] = ""            // 发票号
 
@@ -2162,7 +2162,7 @@ func Gdyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 	gdyb_url := beego.AppConfig.String("gdyb_url")
 	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
 	var url string
-	if baseParams.MdtrtareaAdmvs == "150499" || baseParams.MdtrtareaAdmvs == "450721" {
+	if baseParams.MdtrtareaAdmvs == "150404" || baseParams.MdtrtareaAdmvs == "450721" {
 		url = gdyb_url
 	} else {
 		url = gdyb_url + "3201"

service/gdyb_zifei_service.go

@@ -632,7 +632,7 @@ func Gdyb4207(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	signature := setSignature(timestamp, nonce, secret_key)
 	//生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
-	input := make(map[string]interface{})
+	//input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "4207" // 交易编码
 
@@ -641,8 +641,7 @@ func Gdyb4207(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	inputData["page_num"] = struct4207.PageNum                    // 人员姓名
 	inputData["page_size"] = struct4207.PageSize                  // 人员姓名
 
-	input["input"] = inputData
-	inputMessage["input"] = input //交易输入
+	inputMessage["input"] = inputData //交易输入
 
 	var inputLog string
 	bytesData, err := json.Marshal(inputMessage)

service/his_service.go

@@ -442,6 +442,13 @@ func GetAllDrugLibList(org_id int64) (list []*BaseDrugLib, err error) {
 	return
 }
 
+func GetDrugLibById(id int64) (list BaseDrugLib, err error) {
+	err = readDb.Model(&BaseDrugLib{}).
+		Where("id = ?  AND status = 1", id).First(&list).Error
+	return
+}
+
+
 func CreateAddtionalCharge(charge *models.HisAdditionalCharge) (err error) {
 	err = writeDb.Create(&charge).Error
 	return
@@ -1570,12 +1577,24 @@ func GetAllHisOrder10106(org_id int64) (his []*models.HisOrder, err error) {
 	return
 }
 func GetAllHisOrder10138() (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 9504  AND status = 1  AND  order_status = 2 AND  setl_id <> '' AND setl_time >= '2025-02-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 >= '2025-03-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
+	fmt.Println(err)
+	return
+}
+
+func GetAllHisOrder9504() (his []*models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 9504  AND status = 1  AND  order_status = 2 AND  setl_id <> '' AND setl_time >= '2025-03-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
+	fmt.Println(err)
+	return
+}
+
+func GetAllHisOrder10028() (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 >= '2025-02-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
 func GetAllHisOrder10610() (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10610  AND status = 1  AND  order_status = 2 AND  setl_id <> '' AND setl_time >= '2025-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 = 10610  AND status = 1  AND  order_status = 2 AND  setl_id <> '' AND setl_time >= '2025-03-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
@@ -1586,7 +1605,7 @@ func GetOrderError10138() (order []*models.HisOrderError, err error) {
 
 func GetAllHisOrder10278() (his []*models.HisOrder, err error) {
 
-	err = readDb.Model(&models.HisOrder{}).Where(" user_org_id = 10278  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND setl_time >= '2025-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 = 10278  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND setl_time >= '2025-03-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
@@ -1766,10 +1785,10 @@ func GetNewDrugFlowInfo(org_id int64, id_arr []string) (flows []*models.DrugFlow
 	return
 }
 
-func GetNewDrugFlowInfoByPatient(patient_id int64, drug_id int64, time int64, org_id int64) (flows []*models.DrugFlow, err error) {
-	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = ? and status = 1  and patient_id = ? and drug_id = ? and system_time = ?", org_id, patient_id, drug_id, time).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+func GetNewDrugFlowInfoByPatient( drug_id int64, time int64, org_id int64) (flows models.DrugFlow, err error) {
+	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = ? and status = 1   and drug_id = ? and system_time = ?", org_id, drug_id, time).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Preload("BaseDrugLib", "status=1")
-	}).Preload("NewDrugWarehouseInfo", "status = 1").Find(&flows).Error
+	}).Preload("NewDrugWarehouseInfo", "status = 1").Last(&flows).Error
 	return
 }
 
@@ -1860,10 +1879,10 @@ func GetDrugByID(drug_id int64) (drug models.BaseDrugLib, err error) {
 
 func GetDrugByIDTwo(drug_id int64,org_id int64) (drug []models.BaseDrugLib, err error) {
 	if drug_id == 0{
-		err = readDb.Model(&models.BaseDrugLib{}).Where("org_id = ?", org_id).Find(&drug).Error
+		err = readDb.Model(&models.BaseDrugLib{}).Where("org_id = ? and status = 1", org_id).Find(&drug).Error
 
 	}else{
-		err = readDb.Model(&models.BaseDrugLib{}).Where("id = ?", drug_id).Find(&drug).Error
+		err = readDb.Model(&models.BaseDrugLib{}).Where("id = ?  and status = 1", drug_id).Find(&drug).Error
 
 
 	}
@@ -1942,6 +1961,8 @@ type HisDoctorAdviceInfo struct {
 	ExecutionFrequencyId int64 `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 	IsSelfDrug           int64 `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
 	IsUpload             int64 `gorm:"column:is_upload" json:"is_upload" form:"is_upload"`
+	UploadDate            string   `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
+
 }
 
 type Drug struct {
@@ -2204,8 +2225,8 @@ func FindUploadHisAdviceDocAdvice(orgid int64, patient_id int64, stime int64, et
 	return advice, err
 }
 
-func SaveDoctoradviceStatus(id int64) {
-	writeDb.Model(&models.HisDoctorAdviceInfo{}).Where("id = ?", id).Updates(map[string]interface{}{"is_upload": 1})
+func SaveDoctoradviceStatus(id int64,upload_date string) {
+	writeDb.Model(&models.HisDoctorAdviceInfo{}).Where("id = ?", id).Updates(map[string]interface{}{"is_upload": 1,"upload_date":upload_date})
 
 }
 

service/zh_his_service.go

@@ -84,7 +84,7 @@ func ZHGdyb1101(certNo string, org_name string, doctor string, fixmedins_code st
 	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
 	url := gdyb_url + "1101"
-	if mdtrtarea_admvs == "150499" {
+	if mdtrtarea_admvs == "150404" {
 		url = gdyb_url
 	}
 	if mdtrtarea_admvs == "450721" || mdtrtarea_admvs == "450127" {