更新

controllers/nm/nm_controller.go

@@ -68,7 +68,7 @@ func NmybRegistRouters() {
 	beego.Router("/nmyb/3502", &NmController{}, "get:Post3502")
 	beego.Router("/nmyb/3503", &NmController{}, "get:Post3503")
 	beego.Router("/nmyb/3504", &NmController{}, "get:Post3504")
-	beego.Router("/nmyb/3505", &NmController{}, "get:Post3505")
+	beego.Router("/nmyb/3505", &NmController{}, "post:Post3505")
 	beego.Router("/nmyb/3506", &NmController{}, "get:Post3506")
 	beego.Router("/nmyb/3507", &NmController{}, "get:Post3507")
 	beego.Router("/nmyb/3508", &NmController{}, "get:Post3508")

controllers/zh/zh_his_api_controller.go

@@ -1709,6 +1709,16 @@ func (c *ZHHisApiController) GetZHPatientInfo() {
 		if len(insutypes) == 0 {
 			insutype = "310"
 		}
+		var InsuplcAdmdvs string
+		for _, item := range res.Output.Iinfo {
+			utils.ErrorLog("解析失败：%v", item.Insutype)
+			utils.ErrorLog("解析失败：%v", insutype)
+
+			if item.Insutype == insutype {
+				InsuplcAdmdvs = item.InsuplcAdmdvs
+			}
+		}
+		utils.ErrorLog("解析失败：%v", InsuplcAdmdvs)
 
 		Iinfos, _ := json.Marshal(res.Output.Iinfo)
 		Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
@@ -1727,6 +1737,7 @@ func (c *ZHHisApiController) GetZHPatientInfo() {
 			Insuinfo:     infoStr,
 			UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
 			VerifyNumber: "",
+			InsuplcAdmdvs: InsuplcAdmdvs,
 		}
 		service.CreateHisPsn(psn)
 

main.go

@@ -57,7 +57,7 @@ type ResultEmpty10265 struct {
 
 func init() {
 	//service.ConnectNMMSDB()
-	service.ConnectDB()
+	//service.ConnectDB()
 	//org_id, _ := beego.AppConfig.Int64("org_id")
 	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
 	//////CreateLog(miConfig)
@@ -79,7 +79,7 @@ func main() {
 	//GetblBatchSettleList()
 	//GetblbrBatchSettleList()
 	//深圳百霖贝尔
-	//GetbrBatchSettleList()
+	//GetblbrBatchSettleList()
 
 	//a, _ := service.GetResultRecord("2023-01-01")
 	//ticker := time.Tick(2 * time.Hour)
@@ -924,7 +924,7 @@ type ResultSeventeen struct {
 
 func GetblbrBatchSettleList() {
 	org_id, _ := beego.AppConfig.Int64("org_id")
-	org_id = 10278
+	org_id = 10537
 	var orders []*models.HisOrder
 	//var orders []*models.HisOrderError
 	orders, _ = service.GetAllHisOrder10278()
@@ -933,26 +933,26 @@ func GetblbrBatchSettleList() {
 		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)
+			//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, 2791)
+			curRoles, _ := service.GetAdminUserInfoByID(org_id, 2234)
 			for _, item := range diagnosis_idstwo {
 				id, _ := strconv.ParseInt(item, 10, 64)
 				diagnosisConfig, _ := service.FindDiagnoseById(id)
 				configTwo = append(configTwo, &diagnosisConfig)
 			}
-			patient, _ := service.GetPatientByIDTwo(10278, order.PatientId)
+			patient, _ := service.GetPatientByIDTwo(10537, order.PatientId)
 
-			sickConfig, _ := service.FindSickById(his.SickType)
+			//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"))
+			//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)

models/new_stock_models.go

@@ -423,7 +423,7 @@ type DrugFlow struct {
 	LastStockMaxNumber        int64                `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
 	LastStockMinNumber        int64                `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
 	AdviceId                  int64                `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
-	HisDoctorAdviceInfo       HisDoctorAdviceInfo  `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"advice"`
+	HisDoctorAdviceInfo       HisDoctorAdviceInfo  `gorm:"ForeignKey:PatientId,RecordDate,DrugId;AssociationForeignKey:PatientId,SystemTime,DrugId" json:"advice"`
 	SupplyWarehouseId         int64                `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	SupplyCancelOutId         int64                `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
 	SupplyWarehouseDetailInfo int64                `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`

service/ahyb_service.go

@@ -87,7 +87,7 @@ func AHyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	//request.Header.Set("_api_version", "1.0.0")
 	//request.Header.Set("_api_access_key", access_key)
 	//request.Header.Set("_api_signature", "")
-	AHyb1901(request_url)
+	//AHyb1901(request_url)
 	client := http.Client{}
 	resp, err := client.Do(request)
 	if err != nil {

service/his_service.go

@@ -1430,6 +1430,11 @@ func UpdateHisPatientStatus(his *models.VMHisPatient) {
 	writeDb.Save(&his)
 }
 
+func UpdateHisPatient123(his *Patients) {
+	writeDb.Save(&his)
+}
+
+
 func GetLastHisOrder(org_id int64) (his models.HisOrder, err error) {
 	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND fa_piao_code <> '' AND fa_piao_number <> ''", org_id).Last(&his).Error
 	return
@@ -1532,6 +1537,10 @@ func GetPsnByPatientIdtWO(patient_id int64, record_date int64) (psn models.HisPs
 	return
 }
 
+func GetHisPatientByPatientId(patient_id int64) (psn models.HisPatient, err error) {
+	err = readDb.Model(&models.HisPatient{}).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 = ? AND stage = 1", patient_id, record_date).Last(&psn).Error
 //	return
@@ -1570,7 +1579,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 >= '2024-10-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 = 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
 	fmt.Println(err)
 	return
 }
@@ -1735,6 +1744,12 @@ func GetNewDrugWarehouseInfo(org_id int64, id_arr []string) (newDrugWarehouse []
 	return
 }
 
+
+func GetNewDrugWarehouseInfobytime(org_id int64, s_time int64,e_time int64 ) (newDrugWarehouse []*models.NewDrugWarehouseInfo, err error) {
+	readDb.Model(&models.NewDrugWarehouseInfo{}).Where("org_id = ? and status = 1 and ctime > ? and ctime < ? and drug_code <> '' ", org_id, s_time,e_time).Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&newDrugWarehouse)
+	return
+}
+
 func GetNewDrugFlowInfo(org_id int64, id_arr []string) (flows []*models.DrugFlow, err error) {
 	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = ? and status = 1 and id in (?)", org_id, id_arr).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Preload("BaseDrugLib", "status=1")
@@ -1771,7 +1786,7 @@ func GetNewDrugFlowInfothree() (flows []*models.DrugFlow, err error) {
 }
 
 func GetNewDrugFlowInfothree123() (flows []*models.DrugFlow, err error) {
-	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = 10217 and status = 1 and length(drug_code) > 0   and consumable_type = 3 and is_sale = 0").Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = 10217 and status = 1 and length(drug_code) > 0   and consumable_type = 3 and is_sale = 0 and id > 2739716").Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Preload("BaseDrugLib", "status=1")
 	}).Preload("NewDrugWarehouseInfo", "status = 1").Find(&flows).Error
 	return

service/jsyb_service.go

@@ -9,6 +9,7 @@ import (
 	//"io/ioutil"
 	"net"
 	"strings"
+	"regexp"
 	//"net/http"
 	"strconv"
 	"time"
@@ -1920,7 +1921,7 @@ func Jsyb3505(struct3505 models.Struct3505) (string, string) {
 	inputData["stoout_no"] = struct3505.StooutNo   // 人员编号 （来自1101接口返回）
 	inputData["MDTRT_SETL_TYPE"] = struct3505.MdtrtSetlType // 人员编号 （来自1101接口返回）
 	inputData["bchno"] = struct3505.Bchno                          // 人员编号 （来自1101接口返回）
-	inputData["drug_trac_codg"] = struct3505.DrugTracCodg          // 人员编号 （来自1101接口返回）
+	inputData["drug_trac_codg"] = "---"          // 人员编号 （来自1101接口返回）
 	inputData["drug_prod_barc"] = struct3505.DrugProdBarc          // 人员编号 （来自1101接口返回）
 	inputData["shelf_posi"] = struct3505.ShelfPosi                 // 人员编号 （来自1101接口返回）
 	inputData["sel_retn_cnt"] = struct3505.SelRetnCnt              // 人员编号 （来自1101接口返回）
@@ -1933,8 +1934,14 @@ func Jsyb3505(struct3505 models.Struct3505) (string, string) {
 	codes := strings.Split(struct3505.DrugTracCodg, ",")
 	for _, item := range codes {
 		if len(item) > 0 {
+			fmt.Println(item)
+
+			re := regexp.MustCompile("[^0-9]")
+			// 替换所有非数字字符为空字符串
+			fmt.Println(re.ReplaceAllString(item, ""))
+
 			druginputData := make(map[string]interface{})
-			druginputData["drug_trac_codg"] = item
+			druginputData["drug_trac_codg"] = re.ReplaceAllString(item, "")
 			feedetail = append(feedetail, druginputData)
 		}
 	}

service/jx_service.go

@@ -69,6 +69,62 @@ func Jxyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	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()
+	//生成输入报文
+	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"] = id_card_no        // 证件号码
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+
+
+		} 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
+}
+
 //人员基本信息版本2
 func Jxyb1101A(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, pBusiCardInfo string, id_card_no string, cainfo string) (string, string) {
 	timestamp := time.Now().Unix()

service/nm_service.go

@@ -1288,7 +1288,7 @@ func NMyb3505(struct3505 models.Struct3505, secret_key string) (string,string) {
 	signature := setSignature(timestamp, nonce, secret_key)
 
 	// 生成输入报文
-	inputMessage := SetGdInputMessage(timestamp, struct3505.OrgName, struct3505.Opter, struct3505.FixmedinsHilistId, struct3505.InsuplcAdmdvs, struct3505.MdtrtareaAdmvs, struct3505.Cainfo)
+	inputMessage := SetGdInputMessage(timestamp, struct3505.OrgName, struct3505.Opter, struct3505.Code, struct3505.InsuplcAdmdvs, struct3505.MdtrtareaAdmvs, struct3505.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3505"                                  // 交易编码
@@ -1327,13 +1327,24 @@ func NMyb3505(struct3505 models.Struct3505, secret_key string) (string,string) {
 	inputData["stoout_no"] = struct3505.StooutNo   // 人员编号 （来自1101接口返回）
 
 	inputData["bchno"] = struct3505.Bchno                          // 人员编号 （来自1101接口返回）
-	inputData["drug_trac_codg"] = struct3505.DrugTracCodg          // 人员编号 （来自1101接口返回）
+	inputData["drug_trac_codg"] = "---"         // 人员编号 （来自1101接口返回）
 	inputData["drug_prod_barc"] = struct3505.DrugProdBarc          // 人员编号 （来自1101接口返回）
 	inputData["shelf_posi"] = struct3505.ShelfPosi                 // 人员编号 （来自1101接口返回）
 	inputData["sel_retn_cnt"] = struct3505.SelRetnCnt              // 人员编号 （来自1101接口返回）
 	inputData["sel_retn_time"] = struct3505.SelRetnTime            // 人员编号 （来自1101接口返回）
 	inputData["sel_retn_opter_name"] = struct3505.SelRetnOpterName // 人员编号 （来自1101接口返回）
 	inputData["memo"] = struct3505.Memo                            // 人员编号 （来自1101接口返回）
+	feedetail := make([]map[string]interface{}, 0)
+
+	codes := strings.Split(struct3505.DrugTracCodg, ",")
+	for _, item := range codes {
+		if len(item) > 0 {
+			druginputData := make(map[string]interface{})
+			druginputData["drug_trac_codg"] = item
+			feedetail = append(feedetail, druginputData)
+		}
+	}
+	inputData["drugtracinfo"] = feedetail
 	input["selinfo"] = inputData
 	inputMessage["input"] = input //交易输入