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

controllers/base_api_controller.go

 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10138 //机构id 10344
+		subscibe.OrgId = 10344 //机构id 10344
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10138 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10344 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 3244  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10138 //机构id小英10344或4
+		subscibe.OrgId = 10344 //机构id小英10344或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10138 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10344 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 3244  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/dialysis_api_controller.go

 		if dialysisFinish.ID == 0 {
 			service.CreateDialysisFinish(finish)
 		}
-		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 {
+
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 {
 			var dewater_amount float64
 			dewater_amount = 0
 			if dry_weight > 0 {
 				dewater_amount = weight_before - dry_weight - additional_weight
 
-				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10579 && adminUserInfo.CurrentOrgId != 10580 {
+				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10579 && adminUserInfo.CurrentOrgId != 10580 && adminUserInfo.CurrentOrgId != 10585 && adminUserInfo.CurrentOrgId != 10344 {
 					dewater_amount = dewater_amount * 1000
 				}
 
 			// 插入透析处方
 			if dialysisPrescribe == nil && dialysisSolution != nil {
 				var newprescribe models.DialysisPrescription
-				newprescribe.UserOrgId = dialysisSolution.UserOrgId
-				newprescribe.PatientId = dialysisSolution.PatientId
+				newprescribe.UserOrgId = adminUserInfo.CurrentOrgId
+				newprescribe.PatientId = patient
 				newprescribe.Anticoagulant = dialysisSolution.Anticoagulant
 				newprescribe.AnticoagulantShouji = dialysisSolution.AnticoagulantShouji
 				newprescribe.AnticoagulantWeichi = dialysisSolution.AnticoagulantWeichi
 			if dialysisPrescribe == nil && dialysisSolution == nil {
 				if lastDialysisPrescribe != nil {
 					var newprescribe models.DialysisPrescription
-					newprescribe.UserOrgId = lastDialysisPrescribe.UserOrgId
-					newprescribe.PatientId = lastDialysisPrescribe.PatientId
+					newprescribe.UserOrgId = adminUserInfo.CurrentOrgId
+					newprescribe.PatientId = patient
 					newprescribe.Anticoagulant = lastDialysisPrescribe.Anticoagulant
 					newprescribe.AnticoagulantShouji = lastDialysisPrescribe.AnticoagulantShouji
 					newprescribe.AnticoagulantWeichi = lastDialysisPrescribe.AnticoagulantWeichi
 		// 插入透析处方
 		if dialysisPrescribe == nil && dialysisSolution != nil {
 			var newprescribe models.DialysisPrescription
-			newprescribe.UserOrgId = dialysisSolution.UserOrgId
-			newprescribe.PatientId = dialysisSolution.PatientId
+			newprescribe.UserOrgId = adminUserInfo.CurrentOrgId
+			newprescribe.PatientId = patient
 			newprescribe.Anticoagulant = dialysisSolution.Anticoagulant
 			newprescribe.AnticoagulantShouji = dialysisSolution.AnticoagulantShouji
 			newprescribe.AnticoagulantWeichi = dialysisSolution.AnticoagulantWeichi
 		if dialysisPrescribe == nil && dialysisSolution == nil {
 			if lastDialysisPrescribe != nil {
 				var newprescribe models.DialysisPrescription
-				newprescribe.UserOrgId = lastDialysisPrescribe.UserOrgId
-				newprescribe.PatientId = lastDialysisPrescribe.PatientId
+				newprescribe.UserOrgId = adminUserInfo.CurrentOrgId
+				newprescribe.PatientId = patient
 				newprescribe.Anticoagulant = lastDialysisPrescribe.Anticoagulant
 				newprescribe.AnticoagulantShouji = lastDialysisPrescribe.AnticoagulantShouji
 				newprescribe.AnticoagulantWeichi = lastDialysisPrescribe.AnticoagulantWeichi

controllers/mobile_api_controllers/patient_api_controller.go

 	if evaluation.DryWeight > 0 {
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 
-		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 || adminUserInfo.Org.Id == 10579 || adminUserInfo.Org.Id == 10580 {
+		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 || adminUserInfo.Org.Id == 10579 || adminUserInfo.Org.Id == 10580 || adminUserInfo.Org.Id == 10585 {
 
-			if adminUserInfo.Org.Id != 10551 && adminUserInfo.Org.Id != 10579 && adminUserInfo.Org.Id != 10580 {
+			if adminUserInfo.Org.Id != 10551 && adminUserInfo.Org.Id != 10579 && adminUserInfo.Org.Id != 10580 && adminUserInfo.Org.Id != 10585 {
 				dewater_amount = dewater_amount * 1000
 			}
 

controllers/patient_api_controller.go

 	isscheduling, _ := c.GetInt64("isscheduling", 0)
 	isprescription, _ := c.GetInt64("isprescription", 0)
 	patientSoureType, _ := c.GetInt64("patientSoureType")
+	nurse, _ := c.GetInt64("nurse")
 	if page <= 0 {
 		page = 1
 	}
 
 	var patients []*models.Patients
 	var total int64
-	patients, total, err = service.GetPatientList(adminUserInfo.CurrentOrgId, keywords, page, limit, schedulType, bindingState, lapseto, source, theStartTIme, theEndtTIme, contagion, reimbursement_way, isscheduling, isprescription, isStartTime, isEndTime, patientSoureType)
+	patients, total, err = service.GetPatientList(adminUserInfo.CurrentOrgId, keywords, page, limit, schedulType, bindingState, lapseto, source, theStartTIme, theEndtTIme, contagion, reimbursement_way, isscheduling, isprescription, isStartTime, isEndTime, patientSoureType, nurse)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"patients": patients,

controllers/self_drug_api_congtroller.go

 
 		//获取期末结余
 		endFlow, _ := service.GetDrugEndFlow(item.ID, orgId, endTime)
-
+		fmt.Println("endFlow2222222222222222", endFlow)
 		item.DrugEndFlow = endFlow
 		//获取期初结余入库数量
 		//startDrugInfo, _ := service.GetDrugWarehouseInfoStart(item.ID, orgId, startTime)

controllers/sign_api_controller.go

 
 	beego.Router("/api/device/tocheckinformation", &SignApiController{}, "Get:ToCheckInformation")
 
+	beego.Router("/api/device/toautodrug", &SignApiController{}, "Get:ToAutoDrug")
+
 }
 
 // 短信服务接口
 		"informationOne": informationOne,
 	})
 }
+
+func (this *SignApiController) ToAutoDrug() {
+
+	//advice, _ := service.GetAutoDrugList(9919)
+	//
+	//for _, item := range advice {
+	//	//查找该患者是否出库过
+	//	outList, _ := service.GetDrugAutoWarehouseOutList(item.PatientId, item.UserOrgId, item.DrugId, item.AdviceDate)
+	//	if outList.ID == 0 {
+	//		service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+	//	}
+	//}
+
+	prescriptionList, _ := service.GetAllPrescriptionList(10579)
+
+	for _, item := range prescriptionList {
+		var DialysisMachineName string
+		if len(item.DialysisDialyszers) > 0 {
+			DialysisMachineName = item.DialysisDialyszers
+		}
+		if len(item.DialyzerPerfusionApparatus) > 0 {
+			DialysisMachineName = DialysisMachineName + "," + item.DialyzerPerfusionApparatus
+		}
+
+		if len(item.DialysisIrrigation) > 0 {
+			DialysisMachineName = DialysisMachineName + "," + item.DialysisIrrigation
+		}
+
+		if len(item.DialysisStrainer) > 0 {
+			DialysisMachineName = DialysisMachineName + "," + item.DialysisStrainer
+		}
+		DialysisMachineName = DialysisMachineName
+		service.UpdateSchPatient(item.PatientId, item.RecordDate, item.UserOrgId, DialysisMachineName)
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+}

service/patient_service.go

 
 import (
 	"XT_New/models"
+	"XT_New/utils"
 	"encoding/json"
 	"fmt"
 	"strconv"
 )
 
 // GetPatientList 返回患者的列表
-func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bindingState, lapseto, source, startTime, endTime, contagion, reimbursementWay, isscheduling, isprescription int64, isStartTime, isEndTime bool, patientSoureType int64) (patients []*models.Patients, total int64, err error) {
+func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bindingState, lapseto, source, startTime, endTime, contagion, reimbursementWay, isscheduling, isprescription int64, isStartTime, isEndTime bool, patientSoureType int64, nurse int64) (patients []*models.Patients, total int64, err error) {
 
 	db := readDb.Table("xt_patients as p").Where("p.status=1")
 	if orgID > 0 {
 	if patientSoureType > 0 {
 		db = db.Where("p.patient_source =?", patientSoureType)
 	}
+	if nurse > 0 {
+		db = db.Where("p.head_nurse_id = ?", nurse)
+	}
 
 	offset := (page - 1) * limit
 	if lapseto == 2 || lapseto == 3 {
 
 	}
 	if lapseto != 2 && lapseto != 3 {
-		err = db.Order("p.id desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time,p.is_infectious").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
+		if orgID != 10579 {
+			err = db.Order("p.id desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time,p.is_infectious").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
+		}
+
+		if orgID == 10579 {
+			err = db.Order("p.dialysis_no asc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time,p.is_infectious").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
+		}
 
 	}
 
 
 func GetAllSchedulesByPatientInfo(org_id int64, patient_id int64, mode_id int64) ([]Schedule, error) {
 	var record []Schedule
-	loc, _ := time.LoadLocation("Local")
-	date, _ := time.ParseInLocation("2006-01-02 15:04:05", time.Now().Format("2006-01-02")+" 00:00:00", loc)
-
-	err := readDb.Model(&Schedule{}).Where("status = 1 AND schedule_date >= ? AND patient_id = ? AND user_org_id = ? AND mode_id= ?", date, patient_id, org_id, mode_id).Find(&record).Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return nil, nil
-		} else {
-			return nil, err
+	if org_id == 10597 {
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+		err := readDb.Model(&Schedule{}).Where("status = 1 AND schedule_date >? AND patient_id = ? AND user_org_id = ? AND mode_id= ?", timeNewDate.Unix(), patient_id, org_id, mode_id).Find(&record).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		}
+	} else {
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+		err := readDb.Model(&Schedule{}).Where("status = 1 AND schedule_date >= ? AND patient_id = ? AND user_org_id = ? AND mode_id= ?", timeNewDate.Unix(), patient_id, org_id, mode_id).Find(&record).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
 		}
 	}
+
 	return record, nil
 }
 
 	err := XTReadDB().Where("id = ? and status=1 and user_org_id =?", patient_id, org_id).Find(&patients).Error
 	return patients, err
 }
+
+func GetAllPrescriptionList(org_id int64) (prescription []*models.DialysisPrescription, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status =1", org_id).Find(&prescription).Error
+
+	return prescription, err
+}

service/self_drug_service.go

 func GetStartLastFLowTwenty(goodid int64, orgid int64, startime int64) (models.VmStockFlowTwenty, error) {
 
 	flwo := models.VmStockFlowTwenty{}
-	err := XTReadDB().Where("good_id = ? and user_org_id = ? and status = 1 and ctime < ?", goodid, orgid, startime).Last(&flwo).Error
+	err := XTReadDB().Where("good_id = ? and user_org_id = ? and status = 1 and ctime < ?", goodid, orgid, startime).Order("ctime desc").Last(&flwo).Error
 	return flwo, err
 }
 
 func GetEndLastFlow(goodid int64, orgid int64, endtime int64, storehouse_id int64) (models.VmStockFlowTwenty, error) {
 	flwo := models.VmStockFlowTwenty{}
-	err := XTReadDB().Where("good_id = ? and user_org_id = ? and status = 1 and ctime <= ? and storehouse_id= ?", goodid, orgid, endtime, storehouse_id).Last(&flwo).Error
+	err := XTReadDB().Where("good_id = ? and user_org_id = ? and status = 1 and ctime <= ? and storehouse_id= ?", goodid, orgid, endtime, storehouse_id).Order("ctime desc").Last(&flwo).Error
 	return flwo, err
 }
 
 func GetDrugStartFlow(drug_id int64, user_org_id int64, startime int64) (models.DrugFlowTwenty, error) {
 
 	flow := models.DrugFlowTwenty{}
-	err := XTReadDB().Where("drug_id = ? and user_org_id = ? and ctime<? and status = 1", drug_id, user_org_id, startime).Last(&flow).Error
+	err := XTReadDB().Where("drug_id = ? and user_org_id = ? and ctime<? and status = 1", drug_id, user_org_id, startime).Order("ctime desc").Last(&flow).Error
 	return flow, err
 }
 
 func GetDrugEndFlow(drug_id int64, user_org_id int64, endtime int64) (models.DrugFlowTwenty, error) {
 
 	flow := models.DrugFlowTwenty{}
-	err := XTReadDB().Where("drug_id = ? and user_org_id = ? and ctime<=? and status = 1", drug_id, user_org_id, endtime).Last(&flow).Error
+	err := XTReadDB().Where("drug_id = ? and user_org_id = ? and ctime<=? and status = 1", drug_id, user_org_id, endtime).Order("ctime desc").Last(&flow).Error
 	return flow, err
 }
 

service/sign_service.go

 	err := XTWriteDB().Model(&models.BaseDrugLib{}).Where("id = ? and status =1", id, firstleterr).Updates(map[string]interface{}{"first_letter": firstleterr}).Error
 	return err
 }
+
+func GetAutoDrugList(user_org_id int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	err = XTReadDB().Where("user_org_id =? and status =1 and advice_date = 1700582400 and drug_id =239", user_org_id).Find(&advice).Error
+
+	return advice, err
+}
+
+func GetDrugAutoWarehouseOutList(patient_id int64, user_org_id int64, drug_id int64, advice_date int64) (models.DrugWarehouseOutInfo, error) {
+
+	info := models.DrugWarehouseOutInfo{}
+
+	err2 := XTReadDB().Where("patient_id = ? and org_id = ? and drug_id = ? and sys_record_time =? and status=1", patient_id, user_org_id, drug_id, advice_date).Find(&info).Error
+
+	return info, err2
+}
+
+func UpdateSchPatient(patient_id int64, schedule_date int64, user_org_id int64, DialysisMachineName string) error {
+
+	err := XTWriteDB().Model(&models.XtSchedule{}).Where("patient_id =? and schedule_date =? and user_org_id =?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"dialysis_machine_name": DialysisMachineName}).Error
+	return err
+}