Merge branch 'master' of http://git.shengws.com/csx/gdyb

main.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"gdyb/models"
 	_ "gdyb/routers"
-	//"gdyb/service"
+	"gdyb/service"
 	"github.com/astaxie/beego"
 	"github.com/qiniu/api.v7/auth/qbox"
 	"github.com/qiniu/api.v7/storage"
@@ -15,12 +15,12 @@ import (
 )
 
 func init() {
-	//service.ConnectDB()
-	//org_id, _ := beego.AppConfig.Int64("org_id")
-	//
-	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	//CreateLog(miConfig)
-	//UploadLog(miConfig)
+	service.ConnectDB()
+	org_id, _ := beego.AppConfig.Int64("org_id")
+
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	CreateLog(miConfig)
+	UploadLog(miConfig)
 
 	//UploadSettleList(org_id)
 }

service/his_service.go

@@ -1428,9 +1428,6 @@ func UpdateOrder(order models.HisOrder) (err error) {
 
 func GetNewHisPrescriptionTen(org_id int64, his_patient_id int64, record_date int64) (prescription []*models.HisPrescriptionTen, err error) {
 	err = readDb.Model(&models.HisPrescriptionTen{}).
-		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
-		}).
 		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("BaseDrugLib", "status=1")
 		}).