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

controllers/his_api_controller.go

@@ -5231,6 +5231,7 @@ func (c *HisApiController) GetHisPrescriptionList() {
 	keywords := c.GetString("keywords")
 	page, _ := c.GetInt64("page")
 	limit, _ := c.GetInt64("limit")
+	sch_type, _ := c.GetInt64("sch_type")
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -5241,7 +5242,7 @@ func (c *HisApiController) GetHisPrescriptionList() {
 	}
 	recordDateTime := theTime.Unix()
 	adminInfo := c.GetAdminUserInfo()
-	prescriptionOrder, err, total := service.GetNewHisPatientPrescriptionList(adminInfo.CurrentOrgId, keywords, recordDateTime, page, limit)
+	prescriptionOrder, err, total := service.GetNewHisPatientPrescriptionList(adminInfo.CurrentOrgId, keywords, recordDateTime, page, limit, sch_type)
 
 	//adminInfo := c.GetAdminUserInfo()
 	//prescriptionOrder, err := service.GetHisPrescriptionOrderList(adminInfo.CurrentOrgId)

controllers/his_project_api_controller.go

@@ -1239,10 +1239,6 @@ func (this *HisProjectApiController) GetDoctorAdvicePrint() {
 	schIDStr := this.GetString("ids")
 	p_type, _ := this.GetInt64("p_type")
 
-	if len(schIDStr) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
 	idStrs := strings.Split(schIDStr, ",")
 
 	timeLayout := "2006-01-02"

models/his_print_models.go

@@ -1,15 +1,18 @@
 package models
 
 type PrintPatient 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"`
-	Name                    string                  `gorm:"column:name" json:"name" form:"name"`
-	Age                     string                  `gorm:"column:age" json:"age" form:"age"`
-	Gender                  int64                   `gorm:"column:gender" json:"gender" form:"gender"`
-	HomeAddress             string                  `gorm:"column:home_address" json:"home_address" form:"home_address"`
-	Phone                   string                  `gorm:"column:phone" json:"phone" form:"phone"`
-	Lapseto                 int64                   `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
-	Status                  int64                   `gorm:"column:status" json:"status" form:"status"`
+	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId          int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Name               string `gorm:"column:name" json:"name" form:"name"`
+	Age                string `gorm:"column:age" json:"age" form:"age"`
+	Gender             int64  `gorm:"column:gender" json:"gender" form:"gender"`
+	HomeAddress        string `gorm:"column:home_address" json:"home_address" form:"home_address"`
+	Phone              string `gorm:"column:phone" json:"phone" form:"phone"`
+	Lapseto            int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	Status             int64  `gorm:"column:status" json:"status" form:"status"`
+	ReimbursementWayId int64  `gorm:"column:reimbursement_way_id" json:"reimbursement_way_id" form:"reimbursement_way_id"`
+	Birthday           int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+
 	HisPrintPatient         HisPrintPatient         `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`
 	HisHospitalCheckRecord  HisHospitalCheckRecord  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_record_patient"`
 	HisPrescriptionInfoTwo  HisPrescriptionInfoTwo  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"info"`

models/schedule_models.go

@@ -671,3 +671,17 @@ type MyVmBloodSchedule struct {
 func (MyVmBloodSchedule) TableName() string {
 	return "xt_schedule"
 }
+
+type ScheduleConfig 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"`
+	IsShowMode    int64 `gorm:"column:is_show_mode" json:"is_show_mode" form:"is_show_mode"`
+	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"`
+	IsShowMachine int64 `gorm:"column:is_show_machine" json:"is_show_machine" form:"is_show_machine"`
+}
+
+func (ScheduleConfig) TableName() string {
+	return "xt_schedule_config"
+}

service/gobal_config_service.go

@@ -1010,6 +1010,31 @@ func GetAllBaseDrugListTwenty(orgid int64) (drug []*models.BaseDrugLibTwenty, er
 	return drug, err
 }
 
+func GetScheduleConfigByOrgId(org_id int64) (config models.ScheduleConfig, err error) {
+	err = XTReadDB().Model(&models.ScheduleConfig{}).Where("user_org_id = ?", org_id).First(&config).Error
+	return config, err
+}
+
+func SaveScheduleConfig(config models.ScheduleConfig) (err error) {
+	err = XTWriteDB().Save(&config).Error
+	return err
+}
+
+func CreateScheduleConfig(config models.ScheduleConfig) (err error) {
+	err = XTWriteDB().Create(&config).Error
+	return err
+}
+
+func GetScheduleConfigById(id int64) (config models.ScheduleConfig, err error) {
+	err = XTReadDB().Model(&models.ScheduleConfig{}).Where("id = ?", id).First(&config).Error
+	return config, err
+}
+
+//func Get(id int64)(config models.ScheduleConfig, err error){
+//	err = XTReadDB().Model(&models.ScheduleConfig{}).Where("id = ?", id).First(&config).Error
+//	return config, err
+//}
+
 func GetMobileScheduleList(orgid int64) (schedule []*models.MyVmBloodSchedule, err error) {
 
 	err = XTReadDB().Where("user_org_id = ? and status= 1 and schedule_date=1676563200", orgid).Preload("SchedualPatient", "user_org_id = ? and status = 1", orgid).Find(&schedule).Error

service/his_service.go

@@ -1396,17 +1396,21 @@ func DelelteAddition(id int64, user_org_id int64) (err error) {
 	return
 }
 
-func GetNewHisPatientPrescriptionList(org_id int64, keywords string, record_date int64, page int64, limit int64) (patients []*VMHisHospitalPrescriptionInfo, err error, total int64) {
+func GetNewHisPatientPrescriptionList(org_id int64, keywords string, record_date int64, page int64, limit int64, sch_type int64) (patients []*VMHisHospitalPrescriptionInfo, err error, total int64) {
 	offset := (page - 1) * limit
 	db := readDb.Model(&VMHisHospitalPrescriptionInfo{}).Where("his_prescription_info.user_org_id = ? AND his_prescription_info.status = 1 AND his_prescription_info.record_date = ? AND his_prescription_info.p_type <> 1 ", org_id, record_date)
+
 	if len(keywords) > 0 {
 		keywords = "%" + keywords + "%"
 		db = db.Joins("JOIN xt_patients  On his_prescription_info.patient_id = xt_patients.id  AND xt_patients.name like ?", keywords)
 	}
+	if sch_type > 0 {
+		db = db.Joins("JOIN xt_schedule  On xt_schedule.status = 1 AND his_prescription_info.patient_id = xt_schedule.patient_id AND xt_schedule.schedule_date = ?  AND xt_schedule.schedule_type = ?", record_date, sch_type)
+	}
 	db = db.Preload("Patients", "xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
 	db = db.Preload("HisPrescription", "his_prescription.user_org_id = ? AND his_prescription.status = 1 AND his_prescription.p_type <> 1", org_id)
 	db = db.Count(&total)
-	err = db.Limit(limit).Offset(offset).Find(&patients).Error
+	err = db.Limit(limit).Offset(offset).Group("his_prescription_info.id").Find(&patients).Error
 	return
 }
 

service/schedule_service.go

@@ -1487,3 +1487,71 @@ func GetDialysisOrderByPatientAndBed(org_id int64, record_date int64, bed_id int
 	err = readDb.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND status = 1 AND dialysis_date = ? AND bed_id = ? AND patient_id = ?", org_id, record_date, bed_id, patient_id).First(&order).Error
 	return
 }
+
+func GetScheduleTemplateTen(orgID, id int64) (models.PatientScheduleTemplateItem, error) {
+	var schedule models.PatientScheduleTemplateItem
+	var err error
+	err = readDb.Model(&models.PatientScheduleTemplateItem{}).Where("id = ? and user_org_id=? and status=1", id, orgID).First(&schedule).Error
+	return schedule, err
+}
+
+func GetScheduleTemplateCountByDate(org_id int64, week_day int8, patient_id int64, template_id int64) (total int64, err error) {
+	err = readDb.Model(&models.PatientScheduleTemplateItem{}).Where(" org_id = ? AND weekday = ? AND status = 1 AND patient_id = ? AND template_id = ?", org_id, week_day, patient_id, template_id).Count(&total).Error
+	return
+}
+
+func SaveSchTemplateTwo(sch models.PatientScheduleTemplateItem, sch_two models.PatientScheduleTemplateItem) (err error) {
+	//err = writeDb.Save(&sch).Error
+	err = writeDb.Model(&models.PatientScheduleTemplateItem{}).Where("status=1 AND id = ?", sch.ID).Updates(map[string]interface{}{"status": 0}).Error
+	err = writeDb.Model(&models.PatientScheduleTemplateItem{}).Where("status=1 AND id = ?", sch_two.ID).Updates(map[string]interface{}{"status": 0}).Error
+
+	return
+}
+
+func SaveSchTemplate(sch models.PatientScheduleTemplateItem) (err error) {
+	err = writeDb.Save(&sch).Error
+	return
+}
+
+func UpdateScheduleTemplateThree(schone models.PatientScheduleTemplateItem, schtwo models.PatientScheduleTemplateItem) {
+	utx := XTWriteDB()
+	//床位
+	var tempBedID int64
+	var tempBedIDTwo int64
+
+	//上下午
+	var tempTypeID int8
+	var tempTypeTwo int8
+
+	//周数
+	var sch_week_one int8
+	var sch_week_two int8
+
+	tempBedID = schone.DeviceNumberID
+	tempBedIDTwo = schtwo.DeviceNumberID
+
+	tempTypeID = schone.TimeType
+	tempTypeTwo = schtwo.TimeType
+
+	sch_week_one = schone.Weekday
+	sch_week_two = schtwo.Weekday
+
+	schone.DeviceNumberID = tempBedIDTwo
+	schtwo.DeviceNumberID = tempBedID
+
+	schone.TimeType = tempTypeTwo
+	schtwo.TimeType = tempTypeID
+
+	schone.Weekday = sch_week_two
+	schtwo.Weekday = sch_week_one
+
+	utx.Model(&models.PatientScheduleTemplateItem{}).Where("id = ?", schone.ID).Updates(map[string]interface{}{"device_number_id": schone.DeviceNumberID, "time_type": schone.TimeType, "weekday": schone.Weekday, "is_export": 9000})
+	utx.Model(&models.PatientScheduleTemplateItem{}).Where("id = ?", schtwo.ID).Updates(map[string]interface{}{"device_number_id": schtwo.DeviceNumberID, "time_type": schtwo.TimeType, "weekday": schtwo.Weekday, "is_export": 9000})
+
+}
+
+func GetScheduleTemplateForDeviceNumberTwo(orgID int64, deviceNumberID int64, template_id int64, week_type int64, time_type int64, patient_id int64) (models.PatientScheduleTemplateItem, error) {
+	var item models.PatientScheduleTemplateItem
+	err := readDb.Model(&models.PatientScheduleTemplateItem{}).Where("device_number_id = ? AND org_id = ? AND status = 1 AND template_id = ? AND weekday = ? AND time_type = ? AND patient_id = ?", deviceNumberID, orgID, template_id, week_type, time_type, patient_id).First(&item).Error
+	return item, err
+}