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

controllers/his_api_controller.go

 							}
 						}
 					}
-
 				}
-
 			}
-
 			sch_prescriptions = append(sch_prescriptions, cus)
-
 		}
 
 		for _, item := range sch_prescriptions {
 
 		}
 	}
+	_, config := service.FindHisStockPriceRecordByOrgId(admin.CurrentOrgId)
+	if config.ID > 0 && config.IsOpen == 1 {
+		for _, item := range sch_prescriptions {
+			for _, subItem := range item.HisPrescriptionAdviceTemplate {
+				info, _ := service.GetWarehoseInfoByDrugId(subItem.DrugId, admin.CurrentOrgId)
+				if info.RetailPrice > 0 {
+					subItem.Drug.MinPrice = info.RetailPrice
+				}
+			}
+		}
+	}
 
 	//prescriptions, _ := service.GetHisPrescription(admin.CurrentOrgId, patient_id, his_patient_id, recordDateTime)
 	//monthPrescriptions, _ := service.GetMonthHisPrescriptionTwo(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, p_type)

models/his_models.go

 	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
 	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
 	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
-	HisPrescriptionInfo    HisPrescriptionInfo       `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"info"`
+	HisPrescriptionInfo    HisPrescriptionInfo       `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,RecordDate" json:"info"`
 	HisOrder               HisOrder                  `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
 	Total                  string                    `gorm:"-" json:"total" form:"total"`
 	PType                  int64                     `gorm:"column:p_type" json:"p_type" form:"p_type"`
 	return "his_doctor_advice_template"
 }
 
+type HisPrintPrescriptionProject struct {
+	ID                 int64      `gorm:"column:id" json:"id" form:"id"`
+	ProjectId          int64      `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price              float64    `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId          int64      `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status             int64      `gorm:"column:status" json:"status" form:"status"`
+	Ctime              int64      `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64      `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId          int64      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId       int64      `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate         int64      `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId     int64      `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count              string     `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn          string     `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg        string     `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose         string     `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay        string     `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency string     `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                string     `gorm:"column:day" json:"day" form:"day"`
+	HisProject         HisProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
+	GoodInfo           GoodInfo   `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
+	Remark             string     `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit               string     `gorm:"column:unit" json:"unit" form:"unit"`
+	Type               int64      `gorm:"column:type" json:"type" form:"type"`
+	Doctor             int64      `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	ExecutionTime      int64      `gborm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff     int64      `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState     int64      `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	CheckTime          int64      `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState         int64      `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	Checker            int64      `gorm:"column:checker" json:"checker" form:"checker"`
+	StartTime          int64      `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	TeamId             int64      `gorm:"column:team_id" json:"team_id" form:"team_id"`
+
+	XtHisProjectTeam XtHisProjectTeam `gorm:"ForeignKey:TeamId;AssociationForeignKey:ID" json:"team"`
+
+	FrequencyType int64  `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount      int64  `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay       string `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	IsCheckTeam   int64  `gorm:"-" json:"is_check_team" form:"is_check_team"`
+}
+
+func (HisPrintPrescriptionProject) TableName() string {
+	return "his_prescription_project"
+}
+
 type HisPrescriptionProject struct {
 	ID                 int64      `gorm:"column:id" json:"id" form:"id"`
 	ProjectId          int64      `gorm:"column:project_id" json:"project_id" form:"project_id"`

models/his_print_models.go

 }
 
 type HisPrintPrescription struct {
-	ID                     int64                     `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId              int64                     `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	RecordDate             int64                     `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PatientId              int64                     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HisPatientId           int64                     `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	Status                 int64                     `gorm:"column:status" json:"status" form:"status"`
-	Ctime                  int64                     `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                  int64                     `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Number                 string                    `gorm:"column:number" json:"number" form:"number"`
-	Type                   int64                     `gorm:"column:type" json:"type" form:"type"`
-	Doctor                 string                    `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	Creator                int64                     `gorm:"column:creator" json:"creator" form:"creator"`
-	Modifier               int64                     `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	OrderStatus            int64                     `gorm:"column:order_status" json:"order_status" form:"order_status"`
-	PreTime                int64                     `gorm:"column:pre_time" json:"pre_time" form:"pre_time"`
-	BatchNumber            string                    `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	PrescriptionNumber     string                    `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
-	Patients               Patients                  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
-	HisPatient             VMHisPatient              `gorm:"ForeignKey:PatientId;AssociationForeignKey:patient_id" json:"hisPatient"`
-	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
-	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
-	Total                  string                    `gorm:"-" json:"total" form:"total"`
-	PType                  int64                     `gorm:"column:p_type" json:"p_type" form:"p_type"`
-	MedType                string                    `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	ID                     int64                          `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId              int64                          `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate             int64                          `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId              int64                          `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId           int64                          `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	Status                 int64                          `gorm:"column:status" json:"status" form:"status"`
+	Ctime                  int64                          `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                  int64                          `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Number                 string                         `gorm:"column:number" json:"number" form:"number"`
+	Type                   int64                          `gorm:"column:type" json:"type" form:"type"`
+	Doctor                 string                         `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Creator                int64                          `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier               int64                          `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	OrderStatus            int64                          `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	PreTime                int64                          `gorm:"column:pre_time" json:"pre_time" form:"pre_time"`
+	BatchNumber            string                         `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PrescriptionNumber     string                         `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo         `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
+	HisPrescriptionProject []*HisPrintPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
+	Total                  string                         `gorm:"-" json:"total" form:"total"`
+	PType                  int64                          `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	MedType                string                         `gorm:"column:med_type" json:"med_type" form:"med_type"`
 }
 
 func (HisPrintPrescription) TableName() string {

service/his_print_service.go

 		Preload("HisPrintPrescription", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND type <> 1 AND p_type = 2", user_org_id, record_time).
 				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-					return db.Where("status = 1 ").Preload("HisProject", "status = 1 AND cost_classify = 3")
+					return db.Where("status = 1 ").Preload("XtHisProjectTeam", "status = 1").Preload("HisProject", "status = 1 AND cost_classify = 3")
 				})
 		}).
 		Preload("HisPrescriptionInfoTwo", "status = 1 AND record_date = ?", record_time).

service/his_project_service.go

 		return db.Where("status = 1 and user_org_id = ?", orgid).Preload("Drug", "status = 1")
 	}).Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1 AND user_org_id = ?", orgid).Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
-	}).Preload("HisPrescriptionInfo", "status =1 and user_org_id = ? and p_type = ? ", orgid, p_type).Preload("HisAdditionalCharge", "status = 1 and user_org_id = ?", orgid).Find(&prescription).Error
+	}).Preload("HisPrescriptionInfo", "status =1 and user_org_id = ? and p_type = ? AND record_date = ?", orgid, p_type).Preload("HisAdditionalCharge", "status = 1 and user_org_id = ?", orgid).Find(&prescription).Error
 
 	return prescription, err
 }

service/his_service.go

 	tx.Commit()
 	return
 }
+func GetWarehoseInfoByDrugId(drug_id int64, org_id int64) (info OtherDrugWarehouseInfo, err error) {
+	err = readDb.Model(&OtherDrugWarehouseInfo{}).Where("(drug_id = ? AND org_id = ? AND  status = 1 and stock_max_number > 0)  or  (drug_id = ? AND org_id = ? AND status = 1  AND stock_min_number >0)", drug_id, org_id, drug_id, org_id).First(&info).Error
+	return
+}