Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

controllers/zuobiao_api_controller.go

 	} else if is_upload == 2 {
 		monthPrescriptions, _ = service.GetMonthUploadHisZuoBiaoPrescription(adminInfo.CurrentOrgId, patient_id, recordStartTime, recordEndTime)
 	}
+	prescription_info, _ := service.GetZuoBiaoPrescriptionInfo(c.GetAdminUserInfo().CurrentOrgId, patient.ID)
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"prescription":        prescriptions,
 		"month_prescriptions": monthPrescriptions,
 		"patient":             patient,
+		"prescription_info":   prescription_info,
 	})
 }
 
 	patient, _ := service.GetPatientByID(c.GetAdminUserInfo().CurrentOrgId, zuobiao_info.PatientId)
 	order, _ := service.GetHisOrderByID(zuobiao_info.Oid)
 	prescription, _ := service.GetHisPrescriptionByBatchNumber(c.GetAdminUserInfo().CurrentOrgId, order.Number)
+	prescription_info, _ := service.GetZuoBiaoPrescriptionInfo(c.GetAdminUserInfo().CurrentOrgId, patient.ID)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"month_prescriptions": prescription,
 		"patient":             patient,
 		"zuobiao_info":        zuobiao_info,
+		"prescription_info":   prescription_info,
 	})
 }
 

service/zuobiao_service.go

 	err = readDb.Model(&models.HisZuobiaoAdvice{}).Where("id = ? and status = 1", id).First(&zuobiao).Error
 	return
 }
+
+func GetZuoBiaoPrescriptionInfo(user_org_id int64, patient_id int64) (models.HisPrescriptionInfo, error) {
+	info := models.HisPrescriptionInfo{}
+	err := XTReadDB().Where("user_org_id = ? and patient_id =?  and status=1", user_org_id, patient_id).Last(&info).Error
+	return info, err
+}