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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10106
+org_id = 9504
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/sg/his_api_controller.go

@@ -5212,38 +5212,6 @@ func (c *HisApiController) GetSettleAccounts() {
 	his, _ := service.GetHisPatientByNumber(order.MdtrtId)
 	orderInfos, _ := service.GetHisOrderInfoByNumber(order.Number)
 	orderInfos_two, _ := service.GetHisOrderInfoByNumberTwo(order.Number)
-	orderInfos_three, _ := service.GetHisOrderInfoByNumberThree(order.Number)
-
-	var orderInfos_four []*models.HisOrderInfo
-	for _, item := range orderInfos_three {
-		if item.HisPrescriptionProject.HisProject.CostClassify == 3 {
-			item.HisPrescriptionProject.IsCheckTeam = 1
-			orderInfos_four = append(orderInfos_four, item)
-
-		}
-		if item.HisPrescriptionProject.HisProject.CostClassify != 3 {
-			item.HisPrescriptionProject.IsCheckTeam = 2
-			orderInfos_two = append(orderInfos_two, item)
-		}
-	}
-
-	new_order_info := RemoveRepeatedTeam(orderInfos_four)
-	var cus_slice []CustomOrderInfo
-	for _, item := range new_order_info {
-		var cus CustomOrderInfo
-		cus.Name = item.HisPrescriptionProject.XtHisProjectTeam.ProjectTeam
-		cus.Unit = ""
-		cus.Spec = ""
-		for _, subItem := range orderInfos_four {
-			if item.HisPrescriptionProject.TeamId == subItem.HisPrescriptionProject.TeamId {
-				cus.Count = cus.Count + subItem.Cnt
-				cus.Price = cus.Price + subItem.Pric
-				cus.Total = cus.Total + (cus.Price * cus.Count)
-			}
-		}
-		cus_slice = append(cus_slice, cus)
-	}
-
 	orderInfos = append(orderInfos, orderInfos_two...)
 	//diagnosisConfig, _ := service.FindDiagnoseById(his.Diagnosis)
 

service/his_service.go

@@ -953,7 +953,7 @@ func GetHisOrderInfoByNumber(order_number string) (order []*models.HisOrderInfo,
 
 func GetHisOrderInfoByNumberTwo(order_number string) (order []*models.HisOrderInfo, err error) {
 	db := readDb.Model(&models.HisOrderInfo{})
-	db = db.Joins("Join his_prescription_project as p  On p.id = his_order_info.project_id AND p.team_id = 0")
+	db = db.Joins("Join his_prescription_project as p  On p.id = his_order_info.project_id")
 	db = db.Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 		return db.Preload("XtHisProjectTeam", "status = 1").Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("status = 1")
 	})