1

controllers/his_api_controller.go

@@ -2802,7 +2802,9 @@ func (c *HisApiController) GetUploadInfo() {
  	ids_arr := strings.Split(ids_str,  ",")
 	if tempOrder.ID == 0 {
 		if settle_accounts_type == 1 { //日结
+			fmt.Println(reg_type)
 			if reg_type == 11{
+				fmt.Println(reg_type)
 				prescriptions,_ = service.GetPrescriptionByIds(ids_arr,adminUser.CurrentOrgId)
 			   }else{
 				prescriptions, _ = service.GetSettleHisPrescription(adminUser.CurrentOrgId, id, his_patient_id, recordDateTime, reg_type)
@@ -2841,13 +2843,14 @@ func (c *HisApiController) GetUploadInfo() {
 		strconv.FormatInt(his.PatientId, 10)
 
 		var ids []int64
-
+		fmt.Println(prescriptions)
 		for _, item := range prescriptions {
 			ids = append(ids, item.ID)
 		}
-
 		var total float64
+		fmt.Println(prescriptions)
 		for _, item := range prescriptions {
+			fmt.Println(item)
 			if item.Type == 1 { //药品
 				for _, subItem := range item.HisDoctorAdviceInfo {
 					total = total + (subItem.Price * subItem.PrescribingNumber)
@@ -4465,7 +4468,7 @@ func (c *HisApiController) PreSettle() {
 	ids_str := c.GetString("ids")
 	ids_arr := strings.Split(ids_str,  ",")
 
-
+	fmt.Println(reg_type)
 
 	if settle_accounts_type == 1 { //日结
 
@@ -4476,7 +4479,7 @@ func (c *HisApiController) PreSettle() {
 			prescriptions, _ = service.GetSettleHisPrescription(adminUser.CurrentOrgId, id, his_patient_id, recordDateTime, reg_type)
 		}
 
-		
+		fmt.Println(prescriptions)
 	} else { //月结
 		start_time_str := c.GetString("start_time")
 		end_time_str := c.GetString("end_time")
@@ -4512,8 +4515,11 @@ func (c *HisApiController) PreSettle() {
 		ids = append(ids, item.ID)
 	}
 
+	fmt.Println(ids)
+
 	var total float64
 	for _, item := range prescriptions {
+		fmt.Println(item)
 		if item.Type == 1 { //药品
 			for _, subItem := range item.HisDoctorAdviceInfo {
 				total = total + (subItem.Price * subItem.PrescribingNumber)
@@ -4560,7 +4566,7 @@ func (c *HisApiController) PreSettle() {
 
 	var customs []*Custom
 	for _, item := range prescriptions {
-
+		fmt.Println(item.Type)
 		if item.Type == 1 { //药品
 			for _, subItem := range item.HisDoctorAdviceInfo {
 				cus := &Custom{
@@ -4613,6 +4619,8 @@ func (c *HisApiController) PreSettle() {
 
 	}
 
+	fmt.Println(customs)
+
 	for _, item := range customs {
 		var advice_id int64 = 0
 		var project_id int64 = 0

service/his_service.go

@@ -2048,6 +2048,20 @@ func SaveHisOrder(his *models.HisOrder) (err error) {
 
 
 func GetPrescriptionByIds(ids []string, org_id int64) (prescription []*models.HisPrescription, err error) {
-	err = readDb.Model(&models.HisPrescription{}).Where("id in (?) AND user_org_id = ? AND status = 1", ids, org_id).Find(&prescription).Error
+	err = readDb.Model(&models.HisPrescription{}).
+		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("Drug", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
+		}).Preload("TempHisOrder", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ?", org_id)
+	}).
+		Where("id in (?) AND user_org_id = ? AND status = 1", ids,org_id).
+		Find(&prescription).Error
+	
 	return
 }