医保对接

service/his_service.go

@@ -2,12 +2,12 @@ package service
 
 import (
 	"XT_New/models"
+	"encoding/json"
 	"fmt"
 	"github.com/jinzhu/gorm"
+	"strconv"
 	"strings"
 	"time"
-	"encoding/json"
-	"strconv"
 )
 
 type VMSchedule struct {
@@ -721,7 +721,7 @@ 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).Find(&list).Error
+	err = readDb.Model(&BaseDrugLib{}).Preload("OtherDrugWarehouseInfo", "status = 1").Where("org_id = ?  AND status = 1 AND  find_in_set('停用',drug_status) = 0", org_id).Find(&list).Error
 	return
 }
 
@@ -1990,7 +1990,7 @@ func GetHisPrescriptionProjects(user_org_id int64, patient_id int64, record_time
 	defer redis.Close()
 
 	// cur_date := time.Now().Format("2006-01-02")
-	key := strconv.FormatInt(user_org_id, 10) + ":"+ strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(record_time, 10) + ":his_prescription_project"
+	key := strconv.FormatInt(user_org_id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(record_time, 10) + ":his_prescription_project"
 	his_prescription_project_str, _ := redis.Get(key).Result()
 
 	if len(his_prescription_project_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis