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

controllers/doctors_api_controller.go

@@ -68,7 +68,12 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 
 	scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type)
 	hisAdvices, _ := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type)
+
+	project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type)
+
 	config, _ := service.GetHisDoctorConfig(orgID)
+	project_config, _ := service.GetHisProjectConfig(orgID)
+
 	adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
 	if err != nil {
 		c.ErrorLog("获取排班信息失败:%v", err)
@@ -81,10 +86,12 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 			}
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"scheduals":  filtedScheduals,
-			"adminUser":  adminUser,
-			"hisAdvices": hisAdvices,
-			"config":     config,
+			"scheduals":      filtedScheduals,
+			"adminUser":      adminUser,
+			"hisAdvices":     hisAdvices,
+			"config":         config,
+			"project_config": project_config,
+			"project":        project,
 		})
 	}
 }

controllers/manager_center_api_controller.go

@@ -295,6 +295,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	drug_day := c.GetString("drug_day")
 	dose, _ := c.GetFloat("dose")
 	dose_unit := c.GetString("dose_unit")
+	total, _ := c.GetFloat("total")
 
 	min_price, _ := c.GetFloat("min_price")
 	hosp_appr_flag, _ := c.GetInt64("hosp_appr_flag")
@@ -367,6 +368,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		MinPrice:                    min_price,
 		DoseUnit:                    dose_unit,
 		PrescribingNumberUnit:       prescribing_number_unit,
+		Total:                       total,
 	}
 
 	err := service.UpdateBaseDrugLib(drugLib)
@@ -1594,6 +1596,8 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 	packing_price, _ := c.GetFloat("packing_price")
 	default_count_unit := c.GetString("default_count_unit")
 	min_unit := c.GetString("min_unit")
+	total, _ := c.GetFloat("total")
+
 	adminUserInfo := c.GetAdminUserInfo()
 
 	goodInfo := models.GoodInfo{
@@ -1643,6 +1647,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 		PackingPrice:                packing_price,
 		DefaultCountUnit:            default_count_unit,
 		MinUnit:                     min_unit,
+		Total:                       total,
 	}
 
 	totals := service.FindGoodInfoByNameOne(specification_name, adminUserInfo.CurrentOrgId, good_id, id, good_name)

controllers/mobile_api_controllers/doctor_advice_api_controller.go

@@ -42,7 +42,11 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 	//获取his医嘱数据
 	fmt.Println("date.un222222", date.Unix())
 	hisAdvices, _ := service.GetHisDoctorAdvices(orgID, date.Unix(), delivery_way, patientType, adminInfo.AdminUser.Id)
+
+	project, _ := service.GetMobileHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, adminInfo.AdminUser.Id)
 	config, _ := service.GetHisDoctorConfig(orgID)
+	project_config, _ := service.GetHisProjectConfig(orgID)
+
 	adminUser, _ := service.GetAllAdminUsers(orgID, adminInfo.App.Id)
 	if err != nil {
 		this.ErrorLog("获取排班信息失败:%v", err)
@@ -55,10 +59,12 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 			}
 		}
 		this.ServeSuccessJSON(map[string]interface{}{
-			"scheduals":  filtedScheduals,
-			"adminUser":  adminUser,
-			"hisAdvices": hisAdvices,
-			"config":     config,
+			"scheduals":      filtedScheduals,
+			"adminUser":      adminUser,
+			"hisAdvices":     hisAdvices,
+			"config":         config,
+			"project":        project,
+			"project_config": project_config,
 		})
 	}
 }

service/mobile_dialysis_service.go

@@ -902,6 +902,7 @@ func GetHisDoctorAdvices(orgID int64, scheduleDate int64, deliverWay string, pat
 				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ?", orgID, scheduleDate, deliverWay).
+				Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 				Where("status = 1 AND user_org_id = ?", orgID)
 			if scheduleDate != 0 {
 				db = db.Where("schedule_date = ?", scheduleDate)
@@ -919,6 +920,7 @@ func GetHisDoctorAdvices(orgID int64, scheduleDate int64, deliverWay string, pat
 				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, deliverWay, adminUserId, adminUserId).
+				Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 				Where("status = 1 AND user_org_id = ?", orgID)
 			if scheduleDate != 0 {
 				db = db.Where("schedule_date = ?", scheduleDate)
@@ -938,6 +940,7 @@ func GetHisDoctorAdvices(orgID int64, scheduleDate int64, deliverWay string, pat
 				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? ", orgID, scheduleDate).
+				Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 				Where("status = 1 AND user_org_id = ?", orgID)
 			if scheduleDate != 0 {
 				db = db.Where("schedule_date = ?", scheduleDate)
@@ -956,6 +959,7 @@ func GetHisDoctorAdvices(orgID int64, scheduleDate int64, deliverWay string, pat
 				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
+				Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 				Where("status = 1 AND user_org_id = ?", orgID)
 			if scheduleDate != 0 {
 				db = db.Where("schedule_date = ?", scheduleDate)
@@ -968,6 +972,52 @@ func GetHisDoctorAdvices(orgID int64, scheduleDate int64, deliverWay string, pat
 	return vms, err
 }
 
+func GetMobileHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay string, patientType int, adminUserId int64) ([]*HisMScheduleProjectVM, error) {
+	var vms []*HisMScheduleProjectVM
+	if patientType == 0 {
+		db := readDb.
+			Table("xt_schedule").
+			Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+			}).
+			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+			}).
+			Where("status = 1 AND user_org_id = ?", orgID)
+		if scheduleDate != 0 {
+			db = db.Where("schedule_date = ?", scheduleDate)
+		}
+		err = db.Find(&vms).Error
+	}
+
+	if patientType > 0 {
+		db := readDb.
+			Table("xt_schedule").
+			Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+			}).
+			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
+			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+			}).
+			Where("status = 1 AND user_org_id = ?", orgID)
+		if scheduleDate != 0 {
+			db = db.Where("schedule_date = ?", scheduleDate)
+		}
+		err = db.Find(&vms).Error
+	}
+
+	return vms, err
+}
+
 func MobileCreateDialysisOrder(orgID int64, patientID int64, order *models.DialysisOrder) error {
 	now := time.Now()
 	tx := writeDb.Begin()
@@ -1775,26 +1825,48 @@ func GetLastDialysisPrescriptionByPatientId(orgid int64, patientid int64, record
 }
 
 type HisMScheduleDoctorAdviceVM struct {
-	ID                  int64                            `gorm:"column:id" json:"id"`
-	UserOrgId           int64                            `gorm:"column:user_org_id" json:"user_org_id"`
-	PartitionId         int64                            `gorm:"column:partition_id" json:"partition_id"`
-	BedId               int64                            `gorm:"column:bed_id" json:"bed_id"`
-	PatientId           int64                            `gorm:"column:patient_id" json:"patient_id"`
-	ScheduleDate        int64                            `gorm:"column:schedule_date" json:"schedule_date"`
-	ScheduleType        int64                            `gorm:"column:schedule_type" json:"schedule_type"`
-	ModeId              int64                            `gorm:"column:mode_id" json:"mode_id"`
-	Status              int64                            `gorm:"column:status" json:"status"`
-	DialysisOrder       *MDialysisOrderVM                `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
-	SchedualPatient     *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
-	DeviceNumber        *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
-	Prescription        *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
-	HisDoctorAdviceInfo []*models.HisDoctorAdviceInfo    `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
+	ID                     int64                            `gorm:"column:id" json:"id"`
+	UserOrgId              int64                            `gorm:"column:user_org_id" json:"user_org_id"`
+	PartitionId            int64                            `gorm:"column:partition_id" json:"partition_id"`
+	BedId                  int64                            `gorm:"column:bed_id" json:"bed_id"`
+	PatientId              int64                            `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate           int64                            `gorm:"column:schedule_date" json:"schedule_date"`
+	ScheduleType           int64                            `gorm:"column:schedule_type" json:"schedule_type"`
+	ModeId                 int64                            `gorm:"column:mode_id" json:"mode_id"`
+	Status                 int64                            `gorm:"column:status" json:"status"`
+	DialysisOrder          *MDialysisOrderVM                `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
+	SchedualPatient        *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	DeviceNumber           *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
+	Prescription           *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
+	HisDoctorAdviceInfo    []*models.HisDoctorAdviceInfo    `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
+	HisPrescriptionProject []*models.HisPrescriptionProject `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"project"`
 }
 
 func (HisMScheduleDoctorAdviceVM) TableName() string {
 	return "xt_schedule"
 }
 
+type HisMScheduleProjectVM struct {
+	ID                     int64                            `gorm:"column:id" json:"id"`
+	UserOrgId              int64                            `gorm:"column:user_org_id" json:"user_org_id"`
+	PartitionId            int64                            `gorm:"column:partition_id" json:"partition_id"`
+	BedId                  int64                            `gorm:"column:bed_id" json:"bed_id"`
+	PatientId              int64                            `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate           int64                            `gorm:"column:schedule_date" json:"schedule_date"`
+	ScheduleType           int64                            `gorm:"column:schedule_type" json:"schedule_type"`
+	ModeId                 int64                            `gorm:"column:mode_id" json:"mode_id"`
+	Status                 int64                            `gorm:"column:status" json:"status"`
+	DialysisOrder          *MDialysisOrderVM                `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
+	SchedualPatient        *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	DeviceNumber           *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
+	Prescription           *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
+	HisPrescriptionProject []*models.HisPrescriptionProject `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"project"`
+}
+
+func (HisMScheduleProjectVM) TableName() string {
+	return "xt_schedule"
+}
+
 func GetHisDoctorConfig(orgid int64) (models.XtHisConfig, error) {
 	config := models.XtHisConfig{}
 	err := XTReadDB().Model(&config).Where("user_org_id = ? and status =1", orgid).Find(&config).Error
@@ -2121,3 +2193,48 @@ func GetHisPrescriptionProject(org_id int64, patient_id int64, record_date int64
 
 	return
 }
+
+func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay string, patientType int, adminUserId int64) ([]*HisMScheduleProjectVM, error) {
+	var vms []*HisMScheduleProjectVM
+	if patientType == 0 {
+		db := readDb.
+			Table("xt_schedule").
+			Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+			}).
+			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+			}).Where("status = 1 AND user_org_id = ?", orgID)
+		if scheduleDate != 0 {
+			db = db.Where("schedule_date = ?", scheduleDate)
+		}
+		err = db.Find(&vms).Error
+	}
+
+	if patientType > 0 {
+		db := readDb.
+			Table("xt_schedule").
+			Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+			}).
+			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
+			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+			}).
+			Where("status = 1 AND user_org_id = ?", orgID)
+		if scheduleDate != 0 {
+			db = db.Where("schedule_date = ?", scheduleDate)
+		}
+		err = db.Find(&vms).Error
+	}
+
+	return vms, err
+}