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

controllers/sg/his_api_controller.go

@@ -3855,7 +3855,8 @@ func (c *HisApiController) GetSettleAccounts() {
 	order, _ := service.GetHisOrderByID(order_id)
 	his, _ := service.GetHisPatientByNumber(order.MdtrtId)
 	orderInfos, _ := service.GetHisOrderInfoByNumber(order.Number)
-
+	orderInfos_two, _ := service.GetHisOrderInfoByNumberTwo(order.Number)
+	orderInfos = append(orderInfos, orderInfos_two...)
 	diagnosisConfig, _ := service.FindDiagnoseById(his.Diagnosis)
 
 	var bedCostTotal float64 = 0         //床位总费

service/his_service.go

@@ -894,10 +894,17 @@ func GetHisOrderInfoByNumber(order_number string) (order []*models.HisOrderInfo,
 	db := readDb.Model(&models.HisOrderInfo{}).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
 		return db.Preload("BaseDrugLib", "status = 1").Where("status = 1")
 	})
+
+	err = db.Where("order_number = ? AND status = 1 AND advice_id > 0", order_number).Find(&order).Error
+	return
+}
+
+func GetHisOrderInfoByNumberTwo(order_number string) (order []*models.HisOrderInfo, err error) {
+	db := readDb.Model(&models.HisOrderInfo{})
 	db = db.Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 		return db.Preload("HisProject", "status = 1").Where("status = 1")
 	})
-	err = db.Where("order_number = ? AND status = 1", order_number).Find(&order).Error
+	err = db.Where("order_number = ? AND status = 1 AND project_id > 0", order_number).Find(&order).Error
 	return
 }