医保对接

controllers/his_api_controller.go

@@ -620,7 +620,6 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 	advices, _ := service.FindAllHisAdviceTemplate(adminInfo.CurrentOrgId)
 	//获取所有基础药
 	drugs, _ := service.GetAllDrugLibList(adminInfo.CurrentOrgId)
-
 	_, config := service.FindHisStockPriceRecordByOrgId(adminInfo.CurrentOrgId)
 	if config.ID > 0 && config.IsOpen == 1 {
 		for _, item := range drugs {
@@ -714,6 +713,12 @@ func (c *HisApiController) CreateHisPrescription() {
 
 	_, stockConfig := service.FindAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
 
+	redisClient := service.RedisClient()
+	redisClient.LPush("111", patient)
+	str, _ := redisClient.LPop("111").Result()
+	fmt.Println("～～～～～" + str)
+	defer redisClient.Close()
+
 	if drugStockConfig.IsOpen == 1 {
 
 		//校验库存总量
@@ -885,8 +890,8 @@ func (c *HisApiController) CreateHisPrescription() {
 		}
 	}
 
-	ch := make(chan struct{})
-	count := 2 // count 表示活动的协程个数
+	//ch := make(chan struct{})
+	//count := 2 // count 表示活动的协程个数
 
 	go func() {
 		if drugStockConfig.IsOpen == 1 {
@@ -894,6 +899,7 @@ func (c *HisApiController) CreateHisPrescription() {
 			if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 				prescriptions, _ := dataBody["prescriptions"].([]interface{})
 				if len(prescriptions) > 0 {
+
 					for _, item := range prescriptions {
 						items := item.(map[string]interface{})
 						if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
@@ -1013,7 +1019,7 @@ func (c *HisApiController) CreateHisPrescription() {
 				}
 			}
 		}
-		ch <- struct{}{}
+		//ch <- struct{}{}
 	}()
 
 	go func() {
@@ -1071,17 +1077,17 @@ func (c *HisApiController) CreateHisPrescription() {
 				}
 			}
 		}
-		ch <- struct{}{}
+		//ch <- struct{}{}
 	}()
 
-	for range ch {
-		// 每次从ch中接收数据，表明一个活动的协程结束
-		count--
-		// 当所有活动的协程都结束时，关闭管道
-		if count == 0 {
-			close(ch)
-		}
-	}
+	//for range ch {
+	//	// 每次从ch中接收数据，表明一个活动的协程结束
+	//	count--
+	//	// 当所有活动的协程都结束时，关闭管道
+	//	if count == 0 {
+	//		close(ch)
+	//	}
+	//}
 
 	info, _ := service.FindHisPatientPrescriptionInfo(adminInfo.CurrentOrgId, patient_id, recordDateTime, p_type, his_patient_id)
 	var hpInfo models.HisPrescriptionInfo
@@ -5429,17 +5435,17 @@ func (c *HisApiController) GetFaPiaoData() {
 	admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, adminUser.AdminUser.Id)
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"order_number":    order.Number,        //业务流水号
-		"id_card_no":      his.IdCardNo,        //社会保障号
-		"department_name": department.Name,     //科室
-		"number":          his.Number,          //门诊号
-		"date":            order.SettleEndTime, //结算日期
-		"name":            order.PsnName,       //姓名
-		"gender":          order.Gend,          //性别
-		"psn_cash_money":  order.PsnCashPay,    //个人支付
-		"pay_way":         "门诊",                //结算方式
-		"medfee_sumamt":   order.MedfeeSumamt,  //总费用
-		"admin_user_name": admin.UserName,      //收款员
+		"order_number":    order.Number,             //业务流水号
+		"id_card_no":      his.IdCardNo,             //社会保障号
+		"department_name": department.Name,          //科室
+		"number":          his.Number,               //门诊号
+		"date":            order.SettleAccountsDate, //结算日期
+		"name":            order.PsnName,            //姓名
+		"gender":          order.Gend,               //性别
+		"psn_cash_money":  order.PsnCashPay,         //个人支付
+		"pay_way":         "门诊",                     //结算方式
+		"medfee_sumamt":   order.MedfeeSumamt,       //总费用
+		"admin_user_name": admin.UserName,           //收款员
 
 		"bedCostTotal":                                bedCostTotal,
 		"bedCostSelfTotal":                            bedCostSelfTotal,

service/his_service.go

@@ -722,7 +722,9 @@ func (BaseDrugLib) TableName() string {
 }
 
 func GetAllDrugLibList(org_id int64) (list []*BaseDrugLib, err error) {
-	err = readDb.Model(&BaseDrugLib{}).Where("org_id = ?  AND status = 1 AND  find_in_set('停用',drug_status) = 0", org_id).Preload("OtherDrugWarehouseInfo", "status = 1 and (stock_max_number > 0 or stock_min_number >0)").Find(&list).Error
+	err = readDb.Model(&BaseDrugLib{}).Where("org_id = ?  AND status = 1 AND  find_in_set('停用',drug_status) = 0", org_id).Preload("OtherDrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 and (stock_max_number > 0 or stock_min_number >0)")
+	}).Find(&list).Error
 	return
 }
 
@@ -2237,7 +2239,6 @@ func GetBaiLinOrderData() (order []*models.NewCustomHisOrder) {
 	return
 }
 
-
 func GetHisDoctorAdviceInfo(id int64) (models.HisDoctorAdviceInfo, error) {
 
 	info := models.HisDoctorAdviceInfo{}