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

controllers/his_api_controller.go

@@ -1868,9 +1868,7 @@ func (c *HisApiController) CreateHisPrescription() {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														return
 													}
-
 												}
-
 											} else {
 												if prescribingNumberUnit == drug.MaxUnit {
 													num := prescribing_number * float64(drug.MinNumber)
@@ -8529,6 +8527,9 @@ func (c *HisApiController) GetFaPiaoData() {
 
 	his, _ := service.GetHisPatientInfoThree(adminUser.CurrentOrgId, order.MdtrtId)
 
+	prescriptions, _ := service.GetHisPrescriptionByBatchNumber(adminUser.CurrentOrgId, order.Number)
+
+	doctor_info, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, prescriptions[0].Creator)
 	his_hospital_record, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
 
 	patient, _ := service.GetFaPiaoPatientByID(adminUser.CurrentOrgId, patient_id)
@@ -8907,6 +8908,7 @@ func (c *HisApiController) GetFaPiaoData() {
 		"his_hospital_record":         his_hospital_record,
 		"pre_pay_money":               pre_pay_money,
 		"refund_sum":                  sum,
+		"doctor_info":                 doctor_info,
 	})
 
 }

service/his_service.go

@@ -2824,3 +2824,19 @@ func GetGoodByIdIsStop(good_id int64, org_id int64) (models.GoodInfoSeven, error
 	err = XTReadDB().Where("org_id = ? and status = 1 and find_in_set('停用',good_status) = 0 and id =?", org_id, good_id).Find(&goodInfoSeven).Error
 	return goodInfoSeven, err
 }
+
+func GetHisPrescriptionByBatchNumber(org_id int64, number string) (prescription []*models.HisPrescription, err 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("XtHisProjectTeam", "status = 1")
+		}).
+		Where("user_org_id = ? AND status = 1 AND batch_number = ?", org_id, number).
+		Find(&prescription).Error
+	return
+}