历史排班

controllers/dialysis_api_controller.go

@@ -2536,13 +2536,14 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		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 || adminUserInfo.CurrentOrgId == 10585 {
+
+		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 && adminUserInfo.CurrentOrgId != 10585 {
+				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10579 && adminUserInfo.CurrentOrgId != 10580 && adminUserInfo.CurrentOrgId != 10585 && adminUserInfo.CurrentOrgId != 10344 {
 					dewater_amount = dewater_amount * 1000
 				}
 
@@ -2586,8 +2587,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			// 插入透析处方
 			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
@@ -2659,8 +2660,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			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
@@ -2889,8 +2890,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		// 插入透析处方
 		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
@@ -2961,8 +2962,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		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/self_drug_api_congtroller.go

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

service/patient_service.go

@@ -75,7 +75,13 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 
 	}
 	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
+		}
 
 	}
 

service/self_drug_service.go

@@ -2841,13 +2841,13 @@ func GetStartLastFLow(goodid int64, orgid int64, startime int64, storehouse_id i
 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
 }
 
@@ -2884,14 +2884,14 @@ func GetDrugNewPurchaseStockQuery(good_type int64, keyword string, page int64, l
 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

@@ -2077,7 +2077,7 @@ func UpdateBaseList(id int64, firstleterr string) error {
 
 func GetAutoDrugList(user_org_id int64) (advice []*models.HisDoctorAdviceInfo, err error) {
 
-	err = XTReadDB().Where("user_org_id =? and status =1 and advice_date = 1698681600 and drug_id =239", user_org_id).Find(&advice).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
 }