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

controllers/his_api_controller.go

@@ -2076,7 +2076,7 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
 		project.Checker = temp_project.Checker
 		project.CheckState = temp_project.CheckState
 		project.CheckTime = temp_project.CheckTime
-
+		project.TeamId = temp_project.TeamId
 	}
 	if json["type"] != nil || reflect.TypeOf(json["type"]).String() == "float64" {
 		types := int64(json["type"].(float64))
@@ -2088,12 +2088,13 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
 		fmt.Println(project_id)
 		fmt.Println(project.ProjectId)
 	}
-	// if json["price"] != nil || reflect.TypeOf(json["price"]).String() == "float64" {
-	// 	price := int64(json["price"].(float64))
-	// 	formatInt_price := strconv.FormatInt(price, 10)
-	// 	float_price, _ := strconv.ParseFloat(formatInt_price, 64)
-	// 	project.Price = float_price
-	// }
+
+	if json["team_id"] != nil && reflect.TypeOf(json["team_id"]).String() == "float64" {
+		team_id := int64(json["team_id"].(float64))
+		project.TeamId = team_id
+
+	}
+
 	if json["price"] != nil || reflect.TypeOf(json["price"]).String() == "string" {
 		price, _ := strconv.ParseFloat(json["price"].(string), 64)
 		project.Price = price
@@ -3829,14 +3830,11 @@ func (c *HisApiController) GetFaPiaoData() {
 	decimal.DivisionPrecision = 2
 
 	if his.BalanceAccountsType == 2 {
-
 		orderInfos_two, _ := service.GetHisOrderDetailByNumber(order.Number, adminUser.CurrentOrgId)
-
 		for _, item := range orderInfos_two {
 			item.FulamtOwnpayAmt = item.DetItemFeeSumamt
 			if item.HisDoctorAdviceInfo.ID > 0 && item.HisPrescriptionProject.ID == 0 { //药品
 				item.MedChrgitmType = "09"
-
 			}
 			if item.HisPrescriptionProject.ID > 0 && item.HisDoctorAdviceInfo.ID == 0 {
 				if item.HisPrescriptionProject.Type == 2 {

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -931,6 +931,11 @@ func (c *MobileHisApiController) setProjectWithJSON(project *models.HisPrescript
 		fmt.Println(project_id)
 		fmt.Println(project.ProjectId)
 	}
+	if json["team_id"] != nil || reflect.TypeOf(json["team_id"]).String() == "float64" {
+		team_id := int64(json["team_id"].(float64))
+		project.TeamId = team_id
+
+	}
 	// if json["price"] != nil || reflect.TypeOf(json["price"]).String() == "float64" {
 	// 	price := int64(json["price"].(float64))
 	// 	formatInt_price := strconv.FormatInt(price, 10)

models/his_models.go

@@ -506,13 +506,12 @@ type HisPrescription struct {
 	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"`
-
-	HisAdditionalCharge []*HisAdditionalCharge `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
-	HisPrescriptionInfo HisPrescriptionInfo    `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"info"`
-	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"`
-	TempHisOrder        TempHisOrder           `gorm:"ForeignKey:Number,MedType;AssociationForeignKey:BatchNumber,MedType" json:"order"`
+	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
+	HisPrescriptionInfo    HisPrescriptionInfo       `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"info"`
+	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"`
+	TempHisOrder           TempHisOrder              `gorm:"ForeignKey:Number,MedType;AssociationForeignKey:BatchNumber,MedType" json:"order"`
 }
 
 func (HisPrescription) TableName() string {
@@ -772,6 +771,9 @@ type HisPrescriptionProject struct {
 	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"`
 }
 
 func (HisPrescriptionProject) TableName() string {

service/his_project_service.go

@@ -407,7 +407,7 @@ func GetDoctorAdvicePrint(his_patient_id int64, recorddate int64, schIDs []strin
 	err = XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and id in(?) and  status = 1 ", his_patient_id, recorddate, schIDs).Preload("Patients", "status = 1 and user_org_id = ?", orgid).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
 		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")
+		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 = ?", orgid).Preload("HisAdditionalCharge", "status = 1 and user_org_id = ?", orgid).Find(&prescription).Error
 
 	return prescription, err

service/his_service.go

@@ -714,11 +714,7 @@ func (BaseDrugLib) TableName() string {
 }
 
 func GetAllDrugLibList(org_id int64) (list []*BaseDrugLib, err error) {
-	err = readDb.Model(&BaseDrugLib{}).Preload("OtherDrugWarehouseInfo", "status = 1 AND org_id = ?", org_id).
-		Preload("VMDrugSalesReturnInfo", "status = 1 AND org_id = ?", org_id).
-		Preload("VMDrugWarehouseOutInfo", "status = 1 AND org_id = ?", org_id).
-		Preload("VMDrugCancelStockInfo", "status = 1 AND org_id = ?", org_id).
-		Where("org_id = ?  AND status = 1 AND  find_in_set('停用',drug_status) = 0", org_id).Find(&list).Error
+	err = readDb.Model(&BaseDrugLib{}).Where("org_id = ?  AND status = 1 AND  find_in_set('停用',drug_status) = 0", org_id).Find(&list).Error
 	return
 }
 
@@ -1521,6 +1517,7 @@ type HisPrescriptionProject struct {
 	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"`
 }
 
 func (HisPrescriptionProject) TableName() string {