历史排班

controllers/base_api_controller.go

@@ -71,9 +71,9 @@ func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 796
+		userAdmin.Id = 16919
 		userAdmin.Mobile = "15717313968"
-		userAdmin.Id = 796 //4，809
+		userAdmin.Id = 16919 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = true
 		userAdmin.Status = 1
@@ -81,7 +81,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10344 //机构id 10344
+		subscibe.OrgId = 10579 //机构id 10344
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -91,8 +91,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10344 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 3244  //4
+		adminUserInfo.CurrentOrgId = 10579 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 16919 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -316,9 +316,9 @@ func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 796
+		userAdmin.Id = 16919
 		userAdmin.Mobile = "15717313968"
-		userAdmin.Id = 796 //4，809
+		userAdmin.Id = 16919 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = false
 		userAdmin.Status = 1
@@ -326,7 +326,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10344 //机构id小英10344或4
+		subscibe.OrgId = 10579 //机构id小英10344或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -336,8 +336,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10344 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 3244  //4
+		adminUserInfo.CurrentOrgId = 10579 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 16919 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/dialysis_api_controller.go

@@ -369,6 +369,7 @@ func (c *DialysisApiController) PostPrescription() {
 	washing_time := c.GetString("washing_time")
 	warsh_count := c.GetString("warsh_count")
 	blood_access_part_id := c.GetString("blood_access_part_id")
+	anticoagulant_weichi_hour := c.GetString("anticoagulant_weichi_hour")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -490,6 +491,7 @@ func (c *DialysisApiController) PostPrescription() {
 		WarshCount:                 warsh_count,
 		WashingTime:                washing_time,
 		BloodAccessPartId:          blood_access_part_id,
+		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
 	}
 
 	//长沙南雅医院，自动生成抗凝剂的临时处方
@@ -1018,6 +1020,7 @@ func (c *DialysisApiController) PostSoulution() {
 	warsh_count := c.GetString("warsh_count")
 	washing_time := c.GetString("washing_time")
 	blood_access_part_id := c.GetString("blood_access_part_id")
+	anticoagulant_weichi_hour := c.GetString("anticoagulant_weichi_hour")
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -1189,6 +1192,7 @@ func (c *DialysisApiController) PostSoulution() {
 		WarshCount:                 warsh_count,
 		WashingTime:                washing_time,
 		BloodAccessPartId:          blood_access_part_id,
+		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
 	}
 
 	if prescription.Anticoagulant == 0 {
@@ -1398,6 +1402,7 @@ func (c *DialysisApiController) PostSoulution() {
 		WarshCount:                 warsh_count,
 		WashingTime:                washing_time,
 		BloodAccessPartId:          blood_access_part_id,
+		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
 	}
 
 	if solution.Anticoagulant == 0 {
@@ -4401,12 +4406,12 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	}
 	if adminUserInfo.CurrentOrgId == 10101 || adminUserInfo.CurrentOrgId == 10445 || adminUserInfo.CurrentOrgId == 10345 {
 
-		if xttime <= 1672416000 {
+		if xttime <= 1703952000 {
 			dialysis_count, _ := service.GetDialysisOrderCountOne(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 			patientInfo.TotalDialysis = dialysis_count
 		}
 
-		if xttime >= 1672502400 {
+		if xttime >= 1704038400 {
 			dialysis_count, _ := service.GetDialysisOrderCountTwo(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 			patientInfo.TotalDialysis = dialysis_count
 		}
@@ -5909,17 +5914,20 @@ func (this *DialysisApiController) GetDialysisAdviceTemplateList() {
 	//获取长期医嘱
 	adviceList, _ := service.GetAllLongAdviceList(orgId)
 
+	longHisAdviceList, _ := service.GetHisLongAdviceList(orgId)
+
 	_, config := service.FindXTHisRecordByOrgId(orgId)
 
 	drugList, _ := service.GetAllBaseDrugListTwenty(orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list":       list,
-			"total":      total,
-			"adviceList": adviceList,
-			"config":     config,
-			"drugList":   drugList,
-			"tablelist":  tablelist,
+			"list":              list,
+			"total":             total,
+			"adviceList":        adviceList,
+			"config":            config,
+			"drugList":          drugList,
+			"tablelist":         tablelist,
+			"longHisAdviceList": longHisAdviceList,
 		})
 		return
 

controllers/dialysis_record_api_controller.go

@@ -77,6 +77,7 @@ func (this *DialysisRecordAPIController) GetSchedules() {
 	redis := service.RedisClient()
 	defer redis.Close()
 	key := "scheduals_" + schedualDate + "_" + strconv.FormatInt(orgID, 10)
+
 	patients, _ := service.GetAllPcPatientListByListEight(orgID)
 	scheduals_json_str, _ := redis.Get(key).Result()
 

controllers/doctors_api_controller.go

@@ -125,6 +125,7 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 			})
 		}
 	}
+
 	if config.IsOpen == 1 {
 		hisAdvices, err := service.GetHisDoctorAdvicesTwentyOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id, excution_way, 0, execution_frequency)
 		adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)

controllers/drug_stock_api_contorller.go

@@ -1270,6 +1270,8 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 
 				stock_count, _ := items["stock_count"].(string)
 
+				patient_id := int64(items["patient_id"].(float64))
+
 				id := int64(items["id"].(float64))
 
 				warehouseOutInfo := &models.DrugWarehouseOutInfo{
@@ -1302,6 +1304,7 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 					StockCount:              stock_count,
 					IsCheck:                 2,
 					SysRecordTime:           warehousingOutDate.Unix(),
+					PatientId:               patient_id,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1521,6 +1524,7 @@ func (c *StockDrugApiController) GetDrugWarehouseOutInfoList() {
 	houstList, _ := service.GetAllStoreHouseList(adminInfo.CurrentOrgId)
 	appId := c.GetAdminUserInfo().CurrentAppId
 	doctorList, _ := service.GetAllDoctorListSix(adminInfo.CurrentOrgId, appId)
+	patients, _ := service.GetAllpatientTwenty(adminInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list":       warehouseOutInfo,
 		"info":       warehouseOut,
@@ -1528,6 +1532,7 @@ func (c *StockDrugApiController) GetDrugWarehouseOutInfoList() {
 		"dealerList": dealerList,
 		"houstList":  houstList,
 		"doctorList": doctorList,
+		"patients":   patients,
 	})
 
 }
@@ -3323,6 +3328,7 @@ func (c *StockDrugApiController) GetAllConfig() {
 	configlist, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 	appId := c.GetAdminUserInfo().CurrentAppId
 	doctorList, _ := service.GetAllDoctorListSix(adminUserInfo.CurrentOrgId, appId)
+	patients, _ := service.GetAllpatientTwenty(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"manufacturer": manufacturer,
 		"dealer":       dealer,
@@ -3331,6 +3337,7 @@ func (c *StockDrugApiController) GetAllConfig() {
 		"list":         list,
 		"configlist":   configlist,
 		"doctorList":   doctorList,
+		"patients":     patients,
 	})
 }
 

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -386,6 +386,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			newprescribe.DialyzerPerfusionApparatus = dialysisSolution.DialyzerPerfusionApparatus
 			newprescribe.DialysisIrrigation = dialysisSolution.DialysisIrrigation
 			newprescribe.DialysisDialyszers = dialysisSolution.DialysisDialyszers
+			newprescribe.DialysisStrainer = dialysisSolution.DialysisStrainer
 			newprescribe.BodyFluidOther = dialysisSolution.BodyFluidOther
 			newprescribe.TargetKtv = dialysisSolution.TargetKtv
 
@@ -512,6 +513,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.DialyzerPerfusionApparatus = lastDialysisPrescribe.DialyzerPerfusionApparatus
 				newprescribe.DialysisDialyszers = lastDialysisPrescribe.DialysisDialyszers
 				newprescribe.DialysisIrrigation = lastDialysisPrescribe.DialysisIrrigation
+				newprescribe.DialysisStrainer = lastDialysisPrescribe.DialysisStrainer
 				newprescribe.BodyFluidOther = lastDialysisPrescribe.BodyFluidOther
 				newprescribe.TargetKtv = lastDialysisPrescribe.TargetKtv
 				newprescribe.BloodAccessPartId = lastDialysisPrescribe.BloodAccessPartId

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1815,6 +1815,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	washing_time := c.GetString("washing_time")
 	warsh_count := c.GetString("warsh_count")
 	blood_access_part_id := c.GetString("blood_access_part_id")
+	anticoagulant_weichi_hour := c.GetString("anticoagulant_weichi_hour")
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 
@@ -1979,6 +1980,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		WashingTime:                washing_time,
 		WarshCount:                 warsh_count,
 		BloodAccessPartId:          blood_access_part_id,
+		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -3710,6 +3712,7 @@ func (c *DialysisAPIController) PostSolution() {
 	washing_time := c.GetString("washing_time")
 	warsh_count := c.GetString("warsh_count")
 	blood_access_part_id := c.GetString("blood_access_part_id")
+	anticoagulant_weichi_hour := c.GetString("anticoagulant_weichi_hour")
 	if mode_id > 0 {
 
 		var str string
@@ -3871,6 +3874,7 @@ func (c *DialysisAPIController) PostSolution() {
 		WashingTime:                washing_time,
 		WarshCount:                 warsh_count,
 		BloodAccessPartId:          blood_access_part_id,
+		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -3998,6 +4002,7 @@ func (c *DialysisAPIController) PostSolution() {
 		WashingTime:                washing_time,
 		WarshCount:                 warsh_count,
 		BloodAccessPartId:          blood_access_part_id,
+		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
 	}
 
 	//针对河间咸的

controllers/mobile_api_controllers/patient_api_controller.go

@@ -716,9 +716,12 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			return
 		}
 
-		if advice.StartTime > theTime.Unix() {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExceBeforeStart)
-			return
+		//针对普宁
+		if adminUserInfo.Org.Id != 10599 {
+			if advice.StartTime > theTime.Unix() {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExceBeforeStart)
+				return
+			}
 		}
 
 		advices := models.DoctorAdvice{
@@ -3819,7 +3822,6 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 
 	if dataBody["is_infect"] != nil && reflect.TypeOf(dataBody["is_infect"]).String() == "string" {
 		is_infect, _ := dataBody["is_infect"].(string)
-		fmt.Println("is_infect================", is_infect)
 		infect, _ := strconv.ParseInt(is_infect, 10, 64)
 		evaluation.IsInfect = infect
 	}
@@ -4046,6 +4048,11 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		puncture_needle_direction, _ := dataBody["puncture_needle_direction"].(string)
 		evaluation.PunctureNeedleDirection = puncture_needle_direction
 	}
+
+	if dataBody["symptom_before_dialysis_other"] != nil && reflect.TypeOf(dataBody["symptom_before_dialysis_other"]).String() == "string" {
+		symptom_before_dialysis_other, _ := dataBody["symptom_before_dialysis_other"].(string)
+		evaluation.SymptomBeforeDialysisOther = symptom_before_dialysis_other
+	}
 	return
 }
 
@@ -4410,6 +4417,21 @@ func (c *PatientApiController) GetPatientMonitor() {
 			//获取所有的患者
 			patients, _ := service.GetAllPatientListByListOne(orgID)
 
+			for _, it := range patients {
+				if orgID == 10445 {
+					if theStartTime <= 1703952000 {
+						listOne, _ := service.GetDialysisOrderCountTwentyEight(orgID, it.ID, theStartTime)
+						it.TotalDialysis = listOne.Count
+
+					}
+
+					if theStartTime >= 1704038400 {
+						listOrder, _ := service.GetDialysisOrderCountTenEight(it.ID, theStartTime)
+						it.TotalDialysis = listOrder.Count
+					}
+				}
+			}
+
 			//获取所有透析模式
 			treatments, _ := service.GetAllTreatModeByList(orgID)
 

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -843,20 +843,17 @@ func (this *NewDialysisApiController) GetlongDialysisrecord() {
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	id, _ := this.GetInt64("id")
-	fmt.Print("id", id)
 	patient, _ := service.GetPatientDetailTwo(id)
 	start := this.GetString("startime")
 	startTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", start+" 00:00:00", loc)
 	startime := startTimes.Unix()
-	fmt.Print("startime", startime)
 	end := this.GetString("endtime")
 	endTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", end+" 00:00:00", loc)
 	endtime := endTimes.Unix()
-	fmt.Print("endtime", endtime)
 	limit, _ := this.GetInt64("limit")
-	fmt.Print("limit", limit)
+
 	page, _ := this.GetInt64("page")
-	fmt.Print("page", page)
+
 	adminInfo := this.GetMobileAdminUserInfo()
 	orgid := adminInfo.Org.Id
 	dialysisrecord, total, err := service.GetlongDialysisrecord(patient.BloodId, startime, endtime, limit, page, orgid)

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -508,6 +508,14 @@ func (this *StaffScheduleApiController) DeleteSchedule() {
 			AdminUserId: this.GetMobileAdminUserInfo().AdminUser.Id,
 		}
 		service.CreateScheduleLog(xtScheduleLog)
+
+		//针对凤凰医院
+		if org_id == 10579 || org_id == 10344 {
+			advice, _ := service.GetDoctorAdviceListTwenty(schedule.PatientId, schedule.ScheduleDate, org_id)
+			if len(advice) > 0 {
+				service.UpdateAdviceObj(schedule.PatientId, schedule.ScheduleDate, org_id)
+			}
+		}
 		redis := service.RedisClient()
 		//处方
 		keyOne := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":prescriptions_list_all"

controllers/patient_api_controller.go

@@ -3686,7 +3686,7 @@ func (c *PatientApiController) DeleteGroupAdvice() {
 		}
 	}
 
-	err := service.DeleteGroupAdvice(adminUserInfo.CurrentOrgId, groupNo, adminUserInfo.AdminUser.Id)
+	err := service.DeleteGroupAdviceOne(adminUserInfo.CurrentOrgId, groupNo, adminUserInfo.AdminUser.Id)
 
 	byterequest, _ := json.Marshal(advice)
 	doctorAdviceLog := models.XtDoctorAdviceLog{

controllers/pharmacy_controller.go

@@ -348,6 +348,7 @@ func (this *PharmacyController) GetPharmacyContent() {
 
 // 发药按钮点击
 func (this *PharmacyController) DispensingMedicine() {
+
 	var err error
 	defer func() {
 		if rec := recover(); rec != nil {
@@ -379,37 +380,35 @@ func (this *PharmacyController) DispensingMedicine() {
 		for _, item := range advicelist {
 			//查询改药品信息
 			medical, _ := service.GetBaseDrugMedical(item.DrugId)
-			//针对阜阳经沃
-			if orgid != 10480 {
-				if medical.IsPharmacy == 1 {
-					houseConfig, _ := service.GetAllStoreHouseConfig(orgid)
-					//查询该药品是否有库存
-					list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
-
-					//判断单位是否相等
-					if medical.MaxUnit == item.PrescribingNumberUnit {
-						prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-						//转化为最小单位
-						total = list.Count*medical.MinNumber + list.StockMinNumber
-						prescribing_number_total = count * medical.MinNumber
-					}
-					if medical.MinUnit == item.PrescribingNumberUnit {
-						prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-						total = list.Count*medical.MinNumber + list.StockMinNumber
-						prescribing_number_total = count
-					}
+			//如果是药房发药的方式
+			if medical.IsPharmacy == 1 {
+				houseConfig, _ := service.GetAllStoreHouseConfig(orgid)
+				//查询该药品是否有库存
+				list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
+
+				//判断单位是否相等
+				if medical.MaxUnit == item.PrescribingNumberUnit {
+					prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+					//转化为最小单位
+					total = list.Count*medical.MinNumber + list.StockMinNumber
+					prescribing_number_total = count * medical.MinNumber
+				}
+				if medical.MinUnit == item.PrescribingNumberUnit {
+					prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+					total = list.Count*medical.MinNumber + list.StockMinNumber
+					prescribing_number_total = count
+				}
 
-					if medical.IsUse != 1 {
-						//如果出库数量大于库存数量
-						if prescribing_number_total > total {
-							err := fmt.Errorf(service.FindDrugsName(item.DrugId) + "库存不足")
-							if err != nil {
-								utils.ErrorLog(err.Error())
-								this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
-								return
-							}
+				if medical.IsUse != 1 {
+					//如果出库数量大于库存数量
+					if prescribing_number_total > total {
+						err := fmt.Errorf(service.FindDrugsName(item.DrugId) + "库存不足")
+						if err != nil {
+							utils.ErrorLog(err.Error())
+							this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+							return
 						}
 					}
 				}
@@ -418,34 +417,55 @@ func (this *PharmacyController) DispensingMedicine() {
 		}
 	}
 
-	err = service.DispensingMedicine(orgid, patient_id, stime, etime, creater)
+	if orgid != 10480 {
+		//发药
+		err = service.DispensingMedicine(orgid, patient_id, stime, etime, creater)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+			return
+		}
 
-	if orgid == 10387 || orgid == 3877 {
-		advicelist, _ := service.FindeHisAdviceDocAdvice(orgid, patient_id, stime, etime)
-		if len(advicelist) > 0 {
-			for _, item := range advicelist {
-				//查询改药品信息
-				medical, _ := service.GetBaseDrugMedical(item.DrugId)
-				if medical.IsPharmacy == 1 {
-					flow, _ := service.GetFlow(item.DrugId, item.AdviceDate, orgid, item.PatientId)
-					if len(flow) > 0 {
-						service.UpdateAdviceFlow(item.ID)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": "操作成功",
+		})
+		return
+	}
+
+	if orgid == 10480 {
+		//发药逻辑
+
+		service.DispensingMedicineOne(orgid, patient_id, stime, etime, creater)
+
+		//针对桑植盛康
+		if orgid == 10387 || orgid == 3877 {
+			advicelist, _ := service.FindeHisAdviceDocAdvice(orgid, patient_id, stime, etime)
+			if len(advicelist) > 0 {
+				for _, item := range advicelist {
+					//查询改药品信息
+					medical, _ := service.GetBaseDrugMedical(item.DrugId)
+					if medical.IsPharmacy == 1 {
+						flow, _ := service.GetFlow(item.DrugId, item.AdviceDate, orgid, item.PatientId)
+						if len(flow) > 0 {
+							service.UpdateAdviceFlow(item.ID)
+						}
 					}
 				}
-			}
 
+			}
 		}
-	}
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+			return
+		}
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": "操作成功",
+		})
 		return
 	}
 
-	this.ServeSuccessJSON(map[string]interface{}{
-		"list": "操作成功",
-	})
-	return
 }
 
 // 退药按钮点击

controllers/print_data_api_controller.go

@@ -38,7 +38,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 	adminUserInfo := this.GetAdminUserInfo()
 
 	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 || this.GetAdminUserInfo().CurrentOrgId == 9905 || this.GetAdminUserInfo().CurrentOrgId == 10346 || this.GetAdminUserInfo().CurrentOrgId == 10441 || this.GetAdminUserInfo().CurrentOrgId == 9970 || this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 10495 || this.GetAdminUserInfo().CurrentOrgId == 10013 || this.GetAdminUserInfo().CurrentOrgId == 10014 {
-
+		fmt.Println("JINALADOOWOWOWOWOWOO")
 		schedules, getScheduleErr := service.GetSchedulesSeven(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 
@@ -99,14 +99,14 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 
 			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 || this.GetAdminUserInfo().CurrentOrgId == 10345 || this.GetAdminUserInfo().CurrentOrgId == 9970 || this.GetAdminUserInfo().CurrentOrgId == 10495 || this.GetAdminUserInfo().CurrentOrgId == 10013 || this.GetAdminUserInfo().CurrentOrgId == 10014 {
 
-				if item.ScheduleDate <= 1672416000 {
+				if item.ScheduleDate <= 1703952000 {
 					listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 
 					item.Patient.TotalDialysis = listOne.Count
 					item.Count = listOne.Count
 				}
 
-				if item.ScheduleDate >= 1672502400 {
+				if item.ScheduleDate >= 1704038400 {
 
 					listOne, _ := service.GetDialysisOrderCountNight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 
@@ -145,13 +145,26 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 	}
 
 	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 && this.GetAdminUserInfo().CurrentOrgId != 10188 && this.GetAdminUserInfo().CurrentOrgId != 10217 && this.GetAdminUserInfo().CurrentOrgId != 10340 && this.GetAdminUserInfo().CurrentOrgId != 9905 && this.GetAdminUserInfo().CurrentOrgId != 10346 && this.GetAdminUserInfo().CurrentOrgId != 10441 && this.GetAdminUserInfo().CurrentOrgId != 9970 && this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 10495 && this.GetAdminUserInfo().CurrentOrgId != 10013 && this.GetAdminUserInfo().CurrentOrgId != 10014 {
+
 		schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
+
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
 			if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 && this.GetAdminUserInfo().CurrentOrgId != 10345 {
 				if this.GetAdminUserInfo().CurrentOrgId == 10445 {
-					listOrder, _ := service.GetDialysisOrderCountTen(item.PatientID, item.ScheduleDate)
-					item.Count = listOrder.DialysisTotal
+					if item.ScheduleDate <= 1703952000 {
+						listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
+
+						item.Patient.TotalDialysis = listOne.Count
+						item.Count = listOne.Count
+					}
+
+					if item.ScheduleDate >= 1704038400 {
+
+						listOrder, _ := service.GetDialysisOrderCountTen(item.PatientID, item.ScheduleDate)
+						item.Count = listOrder.DialysisTotal
+					}
+
 				}
 				if this.GetAdminUserInfo().CurrentOrgId != 10445 {
 					item.Count = list.Count
@@ -162,10 +175,6 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 
 			item.Schedule = &lastSchedule
 			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 || this.GetAdminUserInfo().CurrentOrgId == 10345 {
-				//listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
-
-				//item.Patient.TotalDialysis = listOne.Count
-				//item.Count = listOne.Count
 
 				if item.ScheduleDate <= 1640966400 {
 					listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)

controllers/schedule_api_controller.go

@@ -1968,6 +1968,14 @@ func (c *ScheduleApiController) DeleteSchedule() {
 
 	service.CreateScheduleLog(scheduleLog)
 
+	//针对凤凰医院
+	if adminINfo.CurrentOrgId == 10579 || adminINfo.CurrentOrgId == 10344 {
+		advice, _ := service.GetDoctorAdviceListTwenty(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
+		if len(advice) > 0 {
+			service.UpdateAdviceObj(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
+		}
+	}
+
 	redis := service.RedisClient()
 
 	//处方

controllers/sign_api_controller.go

@@ -665,7 +665,7 @@ func (this *SignApiController) GetEnterPriseDetail() {
 
 func (this *SignApiController) UploadPrintOrder() {
 
-	list, _ := service.GetAllPatientNew(10440)
+	list, _ := service.GetAllPatientNew(10587)
 	for _, item := range list {
 
 		hans := item.Name // 要转换的汉字字符串
@@ -1216,6 +1216,14 @@ func (this *SignApiController) ToAutoDrug() {
 func (this *SignApiController) ToAutoDiagnose() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	//order, _ := service.GetDialysisOrderTotalCount()
+	//
+	//for _, item := range order {
+	//
+	//	service.ModifyPatient(item.PatientId, item.Count)
+	//}
+
 	list, _ := service.GetNewAllpatient(orgId)
 
 	for _, item := range list {
@@ -1226,9 +1234,21 @@ func (this *SignApiController) ToAutoDiagnose() {
 	//for _, item := range list {
 	//	service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, 10579, item.BedId, item.ZoneId, item.SchedualType)
 	//}
-	//this.ServeSuccessJSON(map[string]interface{}{
-	//	"msg": "ok",
-	//})
+
+	//drugList, _ := service.GetAllBaseDrugList(10571)
+	//for _, item := range drugList {
+	//	//service.UpdateDrugWarehouseInfoByDrug(item.ID, item.MinPrice, item.OrgId)
+	//
+	//	service.UpdateHisDoctorAdviceOne(item.ID, item.MinPrice, item.OrgId)
+	//}
+
+	//goodList, _ := service.GetAllGoodList(10571)
+	//for _, item := range goodList {
+	//	service.UpdasteGoodWarehouseInfoByGood(item.ID, item.PackingPrice, item.OrgId)
+	//}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
 
 }
 

controllers/stock_in_api_controller.go

@@ -1329,6 +1329,8 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 				}
 				license_number := items["license_number"].(string)
 
+				patient_id := int64(items["patient_id"].(float64))
+
 				warehouseOutInfo := &models.WarehouseOutInfo{
 					ID:                      id,
 					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -1357,13 +1359,13 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 					IsCheck:                 2,
 					RegisterNumber:          register_number,
 					SysRecordTime:           warehouseOut.WarehouseOutTime,
+					PatientId:               patient_id,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
 			}
 		}
 	}
-	fmt.Println("warehouseOut_id", warehouseOut_id)
 	if warehouseOut_id == 0 {
 		//查询是否生成出库单
 		_, errcodes := service.FindStockOutByIsSys(adminUserInfo.CurrentOrgId, 0, operation_time)
@@ -1407,6 +1409,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 			Count:                   it.Count,
 			IsCheck:                 2,
 			RegisterNumber:          it.RegisterNumber,
+			PatientId:               it.PatientId,
 		}
 		if it.ID == 0 {
 			service.AddSigleWarehouseOutInfo(warehouseOutInfo)
@@ -1712,6 +1715,8 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 
 				register_number := items["register_number"].(string)
 
+				patient_id := int64(items["patient_id"].(float64))
+
 				var productDate int64
 				if len(product_date) > 0 {
 					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", product_date+" 00:00:00", loc)
@@ -1751,6 +1756,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						AdminUserId:             admin_user_id,
 						StockCount:              stock_count,
 						RegisterNumber:          register_number,
+						PatientId:               patient_id,
 					}
 					warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1798,6 +1804,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						AdminUserId:             admin_user_id,
 						StockCount:              stock_count,
 						RegisterNumber:          register_number,
+						PatientId:               patient_id,
 					}
 					upDateWarehouseOutInfos = append(upDateWarehouseOutInfos, warehouseOutInfo)
 				}
@@ -3094,6 +3101,8 @@ func (c *StockManagerApiController) GetAllConfig() {
 	configList, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 	appId := c.GetAdminUserInfo().CurrentAppId
 	doctorList, _ := service.GetAllDoctorListSix(adminUserInfo.CurrentOrgId, appId)
+
+	patients, _ := service.GetAllpatientTwenty(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"manufacturer": manufacturer,
 		"dealer":       dealer,
@@ -3102,6 +3111,7 @@ func (c *StockManagerApiController) GetAllConfig() {
 		"list":         list,
 		"configlist":   configList,
 		"doctorList":   doctorList,
+		"patients":     patients,
 	})
 }
 func (this *StockManagerApiController) GetAllSalesReturnConfig() {
@@ -4989,6 +4999,7 @@ func (this *StockManagerApiController) GetSingleOutOrderDetail() {
 	goodType, _ := service.GetAllGoodType(orgId)
 	appId := this.GetAdminUserInfo().CurrentAppId
 	doctorlist, _ := service.GetAllDoctorListSix(orgId, appId)
+	patients, _ := service.GetAllpatientTwenty(orgId)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list":             warehouseOutInfo,
 		"dealerList":       dealerList,
@@ -4997,6 +5008,7 @@ func (this *StockManagerApiController) GetSingleOutOrderDetail() {
 		"out":              out,
 		"storelist":        storelist,
 		"doctorlist":       doctorlist,
+		"patients":         patients,
 	})
 }
 

models/dialysis.go

@@ -1624,3 +1624,16 @@ type NoHisPrescriptionProject struct {
 func (NoHisPrescriptionProject) TableName() string {
 	return "his_prescription_project"
 }
+
+type XtDialysisOrderLost struct {
+	ID           int64 `gorm:"column:id" json:"id" form:"id"`
+	DialysisDate int64 `gorm:"column:dialysis_date" json:"dialysis_date" form:"dialysis_date"`
+	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Count        int64
+	Status       int64 `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (XtDialysisOrderLost) TableName() string {
+	return "xt_dialysis_order"
+}

models/drug.go

@@ -115,6 +115,11 @@ type BaseDrugLibEleven struct {
 	DrugName         string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
 	Manufacturer     int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
 	ManufacturerName string `gorm:"column:manufacturer_name" json:"manufacturer_name"`
+	MaxUnit          string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber        int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit          string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose             string `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit         string `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
 }
 
 func (BaseDrugLibEleven) TableName() string {

models/new_monitor.go

@@ -34,6 +34,7 @@ type VMMonitorPatients struct {
 	Status             int64  `gorm:"column:status" json:"status" form:"status"`
 	DialysisNo         string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
 	UserSysBeforeCount int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+	TotalDialysis      int64  `gorm:"column:total_dialysis" json:"total_dialysis" form:"total_dialysis"`
 }
 
 func (VMMonitorPatients) TableName() string {

models/patient_models.go

@@ -380,6 +380,7 @@ type DialysisPrescription struct {
 	WarshCount                 string        `gorm:"column:warsh_count" json:"warsh_count" form:"warsh_count"`
 	WashingTime                string        `gorm:"column:washing_time" json:"washing_time" form:"washing_time"`
 	BloodAccessPartId          string        `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
+	AnticoagulantWeichiHour    string        `gorm:"column:anticoagulant_weichi_hour" json:"anticoagulant_weichi_hour" form:"anticoagulant_weichi_hour"`
 }
 
 func (DialysisPrescription) TableName() string {
@@ -618,6 +619,7 @@ type DialysisSolution struct {
 	WarshCount                 string  `gorm:"column:warsh_count" json:"warsh_count" form:"warsh_count"`
 	WashingTime                string  `gorm:"column:washing_time" json:"washing_time" form:"washing_time"`
 	BloodAccessPartId          string  `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
+	AnticoagulantWeichiHour    string  `gorm:"column:anticoagulant_weichi_hour" json:"anticoagulant_weichi_hour" form:"anticoagulant_weichi_hour"`
 }
 
 func (DialysisSolution) TableName() string {
@@ -2361,3 +2363,14 @@ type XtDeviceValusalMapVrr struct {
 func (XtDeviceValusalMapVrr) TableName() string {
 	return "xt_device_valusal_map_vrr"
 }
+
+type PatientsTwenty 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"`
+	Status    int64  `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (PatientsTwenty) TableName() string {
+	return "xt_patients"
+}

models/user_models.go

@@ -351,6 +351,9 @@ type XtDialysisSolution struct {
 	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
 	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
 	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
+	SolutionStatus             int64   `gorm:"column:solution_status" json:"solution_status" form:"solution_status"`
+	PrescriptionWater          float64 `gorm:"column:prescription_water" json:"prescription_water" form:"prescription_water"`
+	DialysisStrainer           string  `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
 }
 
 func (XtDialysisSolution) TableName() string {

service/dialysis_solution_service.go

@@ -120,6 +120,12 @@ func GetAllLongAdviceList(user_org_id int64) (advice []*models.DoctorAdvice, err
 	return advice, err
 }
 
+func GetHisLongAdviceList(user_org_id int64) (advice []*models.HisDoctorAdviceTemplate, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status=1", user_org_id).Find(&advice).Error
+	return advice, err
+}
+
 func GetAllHisAdviceTemplateList(user_org_id int64) (advice []*models.HisPrescriptionAdviceTemplate, err error) {
 
 	err = XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&advice).Error

service/gobal_config_service.go

@@ -635,7 +635,7 @@ func GetAllBaseDrugListTwo(orgid int64) (drug []*models.BaseDrugLibEleven, err e
 	if orgid > 0 {
 		db = db.Where("x.org_id =?", orgid)
 	}
-	err = db.Select("x.id,x.drug_name,p.manufacturer_name").Joins("left join xt_manufacturer as p on p.id =x.manufacturer").Scan(&drug).Error
+	err = db.Select("x.id,x.drug_name,p.manufacturer_name,x.dose,x.dose_unit,x.min_number,x.max_unit,x.min_unit").Joins("left join xt_manufacturer as p on p.id =x.manufacturer").Scan(&drug).Error
 	return drug, err
 }
 

service/manage_service.go

@@ -915,6 +915,11 @@ func GetAllpatient(orgid int64) (patients []*models.Patients, err error) {
 	return patients, err
 }
 
+func GetAllpatientTwenty(orgid int64) (patients []*models.PatientsTwenty, err error) {
+	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&patients).Error
+	return patients, err
+}
+
 func GetAllpatientThirty(orgid int64) (patients []*models.PatientsThirty, err error) {
 	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&patients).Error
 	return patients, err

service/mobile_dialysis_service.go

@@ -2810,7 +2810,7 @@ func GetDialysisOrderCountOne(orgID int64, patient_id int64, recordDate int64) (
 }
 
 func GetDialysisOrderCountTwo(orgID int64, patient_id int64, recordDate int64) (count int64, err error) {
-	err = readDb.Model(&models.DialysisOrder{}).Where("dialysis_date>=1672502400 and  dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
+	err = readDb.Model(&models.DialysisOrder{}).Where("dialysis_date>=1704038400 and  dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
 	return
 }
 
@@ -8113,7 +8113,7 @@ func GetDialysisTotalCountOne(org_id int64, patient_id int64) (models.BloodDialy
 	order := models.BloodDialysisOrderCount{}
 	db := XTReadDB().Table("xt_dialysis_order as o")
 
-	err = db.Raw("select count(o.id) as count,o.patient_id from xt_dialysis_order as o left join xt_schedule as x on x.patient_id = o.patient_id where o.status =1 and o.user_org_id = ? and o.patient_id = ? and o.dialysis_date>=1672502400 and  x.schedule_date = o.dialysis_date and x.status = 1 ", org_id, patient_id).Scan(&order).Error
+	err = db.Raw("select count(o.id) as count,o.patient_id from xt_dialysis_order as o left join xt_schedule as x on x.patient_id = o.patient_id where o.status =1 and o.user_org_id = ? and o.patient_id = ? and o.dialysis_date>=1704038400 and  x.schedule_date = o.dialysis_date and x.status = 1 ", org_id, patient_id).Scan(&order).Error
 
 	return order, err
 }
@@ -8168,6 +8168,7 @@ func GetHisDoctorAdvicesTwentyOne(orgID int64, scheduleDate int64, deliverWay st
 			db = db.Where("partition_id = ?", partitionType)
 		}
 		if patient_id > 0 {
+
 			if execution_state > 0 {
 				if cost_type > 0 {
 					if len(execution_frequency) > 0 {
@@ -8445,6 +8446,7 @@ func GetHisDoctorAdvicesTwentyOne(orgID int64, scheduleDate int64, deliverWay st
 		}
 		if patient_id > 0 {
 			if execution_state > 0 {
+				fmt.Println("execution_state---------------------", execution_state)
 				if cost_type > 0 {
 					db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id = ?", orgID, patient_id).
 						Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).

service/patient_service.go

@@ -1231,6 +1231,14 @@ func DeleteGroupAdvice(orgId int64, groupNo int64, admin_user_id int64) (err err
 	return
 }
 
+func DeleteGroupAdviceOne(orgId int64, groupNo int64, admin_user_id int64) (err error) {
+	err = writeDb.Model(&models.DoctorAdvice{}).Where("user_org_id = ? and groupno = ? and status =1 and advice_type=1", orgId, groupNo).Update(map[string]interface{}{"UpdatedTime": time.Now().Unix(), "Status": 0, "Modifier": admin_user_id}).Error
+	if err != nil {
+		return
+	}
+	return
+}
+
 func FindDoctorAdvice(orgID, id int64) (advice models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).Where("id = ? and user_org_id=? and status = 1", id, orgID).First(&advice).Error
 	return
@@ -3377,3 +3385,15 @@ func GetPatientScheudleListTwenty(org_id int64, scheduel_type int64, startime in
 	fmt.Println("err2330230320202023", err)
 	return schedule, err
 }
+
+func GetDialysisOrderCountTwentyEight(orgID int64, patient_id int64, recordDate int64) (models.VmDialysisOrder, error) {
+	order := models.VmDialysisOrder{}
+	err := XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1672502400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
+	return order, err
+}
+
+func GetDialysisOrderCountTenEight(patient_id int64, recordDate int64) (models.VmDialysisOrder, error) {
+	order := models.VmDialysisOrder{}
+	err := XTReadDB().Where("patient_id = ? and dialysis_date = ? and status = 1", patient_id, recordDate).Last(&order).Error
+	return order, err
+}

service/patientmanage_service.go

@@ -640,7 +640,7 @@ func GetDryWeightDetail(id int64) (models.SgjPatientDryweights, error) {
 }
 
 func GetlongDialysisrecord(patientid int64, startime int64, endtime int64, limit int64, page int64, orgid int64) (prescription []*models.XtDialysisSolution, total int64, err error) {
-	db := XTReadDB().Table("xt_dialysis_solution as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_dialysis_solution as x").Where("x.status = 1 and x.solution_status=1")
 	if patientid > 0 {
 		db = db.Where("x.patient_id = ?", patientid)
 	}

service/pharmacy_service.go

@@ -678,6 +678,7 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 
 	if orgid != 10480 {
 		for _, v := range advice_info {
+
 			tmp_bool := IsPharmacyConfig(orgid)
 			if tmp_bool {
 				if PettyCash(v.DrugId) {
@@ -779,6 +780,143 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 	return
 }
 
+func DispensingMedicineOne(orgid, patient_id, stime, etime, creater int64) (err error) {
+
+	//开事务
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil {
+			utils.ErrorLog("事务失败，原因为: %v", err)
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+
+	//查询当前患者未发药的列表
+	adviceList, err := GetHisPatientNoMedical(orgid, patient_id, stime, etime)
+	//发药
+	if len(adviceList) > 0 {
+		for _, item := range adviceList {
+			//扣减库存
+			err = HisDrugsDelivery(orgid, creater, item)
+			if err != nil {
+				err = fmt.Errorf("!:%v", err)
+				return
+			}
+			//修改发药状态
+			err = UpdateIsMedicalHisAdvice(item.ID)
+			if err != nil {
+				err = fmt.Errorf("!:%v", err)
+				return
+			}
+			err = UpdateHisPrescription(item.PrescriptionId)
+			if err != nil {
+				err = fmt.Errorf("!:%v", err)
+				return
+			}
+
+			//查询默认仓库
+			storeHouseConfig, _ := GetAllStoreHouseConfig(orgid)
+			//查询默认仓库剩余多少库存
+			var sum_count int64
+			stockInfo, _ := GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, orgid, item.DrugId)
+			for _, its := range stockInfo {
+				baseDrug, _ := GetBaseDrugMedical(its.DrugId)
+				if its.MaxUnit == baseDrug.MaxUnit {
+					its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+				}
+				sum_count += its.StockMaxNumber + its.StockMinNumber
+			}
+			UpdateBaseDrugSumTwo(item.DrugId, sum_count, orgid)
+			//扣减库存
+			UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+
+			over, _ := FindOverCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut)
+			UpdateActOut(over.ID, over.SumInCount, over.FlushCount, over.SumCancelCount)
+		}
+	}
+
+	advice, err := GetDocAdviceList(orgid, patient_id, stime, etime)
+
+	if len(advice) > 0 {
+		for _, item := range advice {
+			err = DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+			//查询默认仓库
+			storeHouseConfig, _ := GetAllStoreHouseConfig(orgid)
+			//查询默认仓库剩余多少库存
+			var sum_count int64
+			stockInfo, _ := GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, orgid, item.DrugId)
+			for _, its := range stockInfo {
+				baseDrug, _ := GetBaseDrugMedical(its.DrugId)
+				if its.MaxUnit == baseDrug.MaxUnit {
+					its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+				}
+				sum_count += its.StockMaxNumber + its.StockMinNumber
+			}
+			UpdateBaseDrugSumTwo(item.DrugId, sum_count, orgid)
+			//扣减库存
+			UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+
+			over, _ := FindOverCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut)
+			UpdateActOut(over.ID, over.SumInCount, over.FlushCount, over.SumCancelCount)
+			if err != nil {
+				err = fmt.Errorf("!:%v", err)
+				return
+			}
+			err = UpdateIsAdvice(item.ID)
+			if err != nil {
+				err = fmt.Errorf("!:%v", err)
+				return
+			}
+		}
+	}
+
+	//生成明细记录
+	tmp_ph := models.Pharmary{
+		UserOrgId:  orgid,
+		PatientId:  patient_id,
+		Ctime:      time.Now().Unix(),
+		Mtime:      time.Now().Unix(),
+		Status:     1,
+		RecordDate: time.Now().Unix(),
+	}
+	err = tx.Create(&tmp_ph).Error
+
+	return
+}
+
+func GetHisPatientNoMedical(user_org_id int64, patient_id int64, startime int64, end_time int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	err = XTReadDB().Where("user_org_id =? and patient_id = ? and advice_date>=? and advice_date<=? and is_medicine =0", user_org_id, patient_id, startime, end_time).Find(&advice).Error
+	return advice, err
+}
+
+func UpdateIsMedicalHisAdvice(id int64) (err error) {
+	adviceInfo := models.HisDoctorAdviceInfo{}
+	err = XTWriteDB().Model(&adviceInfo).Where("id =? and status =1", id).Update(map[string]interface{}{"is_medicine": 1, "dispensing_time": time.Now().Unix()}).Error
+	return err
+}
+func UpdateHisPrescription(id int64) (err error) {
+
+	prescriptionInfo := models.HisPrescription{}
+	err = XTWriteDB().Model(&prescriptionInfo).Where("id = ? and status=1", id).Update(map[string]interface{}{"is_medicine": 1, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func GetDocAdviceList(user_org_id int64, patient_id int64, startime int64, end_time int64) (advice []*models.DoctorAdvice, err error) {
+
+	err = XTReadDB().Where("user_org_id =? and patient_id = ? and advice_date>=? and advice_date<=? and is_medicine =0", user_org_id, patient_id, startime, end_time).Find(&advice).Error
+	return advice, err
+
+}
+
+func UpdateIsAdvice(id int64) (err error) {
+
+	err = XTWriteDB().Model(&models.DoctorAdvice{}).Where("id = ? and status =1", id).Update(map[string]interface{}{"is_medicine": 1, "dispensing_time": time.Now().Unix()}).Error
+	return err
+}
+
 // 患者退药按钮点击
 func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error) {
 	//开事务

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -229,13 +229,13 @@ func GetDialysisOrderCountTen(patient_id int64, recordDate int64) (models.VmDial
 
 func GetDialysisOrderCountEight(orgID int64, patient_id int64, recordDate int64) (models.VmDialysisOrder, error) {
 	order := models.VmDialysisOrder{}
-	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1640966400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
+	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1672502400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
 	return order, err
 }
 
 func GetDialysisOrderCountNight(orgID int64, patient_id int64, recordDate int64) (models.VmDialysisOrder, error) {
 	order := models.VmDialysisOrder{}
-	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1672502400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
+	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1704038400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
 	return order, err
 }
 

service/schedule_service.go

@@ -1763,6 +1763,18 @@ func CreateScheduleLog(log models.XtScheduleLog) error {
 	return err
 }
 
+func GetDoctorAdviceListTwenty(patient_id int64, schedule_date int64, user_org_id int64) (advice []*models.XtDoctorAdvice, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and advice_date = ? and user_org_id = ? and status=1", patient_id, schedule_date, user_org_id).Find(&advice).Error
+	return advice, err
+}
+
+func UpdateAdviceObj(patient_id int64, schedule_date int64, user_org_id int64) (err error) {
+
+	err = XTWriteDB().Model(&models.XtDoctorAdvice{}).Where("patient_id = ? and advice_date =? and status=1 and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 9}).Error
+	return err
+}
+
 func GetLastSchedule(patient_id int64, user_org_id int64) (models.XtSchedule, error) {
 
 	schedule := models.XtSchedule{}

service/sign_service.go

@@ -2099,7 +2099,7 @@ func UpdateSchPatient(patient_id int64, schedule_date int64, user_org_id int64,
 
 func GetNewAllpatient(org_id int64) (list []*models.XtPatientsNew, err error) {
 
-	err = XTReadDB().Where("status =1 and user_org_id =10551").Find(&list).Error
+	err = XTReadDB().Where("status =1 and user_org_id =10567").Find(&list).Error
 
 	return list, err
 }
@@ -2162,3 +2162,41 @@ func UpdateDialysisScheduleOne(id int64, mode_id int64, dialysis_machine_name st
 	err := XTWriteDB().Model(models.XtSchedule{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"dialysis_machine_name": dialysis_machine_name, "mode_id": mode_id}).Error
 	return err
 }
+
+func GetDialysisOrderTotalCount() (order []*models.XtDialysisOrderLost, err error) {
+
+	err = XTReadDB().Select("patient_id,Count(id) as count").Where("user_org_id = ? and status =1", 10265).Group("patient_id").Find(&order).Error
+
+	return order, err
+}
+
+func ModifyPatient(patient_id int64, count int64) (models.XtPatients, error) {
+
+	patients := models.XtPatients{}
+	err := XTReadDB().Model(&models.XtPatients{}).Where("id = ? and status =1", patient_id).Updates(map[string]interface{}{"total_dialysis": count}).Error
+	return patients, err
+}
+
+func UpdateDrugWarehouseInfoByDrug(drug_id int64, reatial_price float64, user_org_id int64) (models.DrugWarehouseInfo, error) {
+
+	drugWarehouseInfo := models.DrugWarehouseInfo{}
+
+	err := XTWriteDB().Model(&drugWarehouseInfo).Where("drug_id = ? and org_id =?", drug_id, user_org_id).Updates(map[string]interface{}{"retail_price": reatial_price}).Error
+
+	return drugWarehouseInfo, err
+}
+
+func UpdasteGoodWarehouseInfoByGood(good_id int64, packing_price float64, org_id int64) (models.WarehousingInfo, error) {
+
+	info := models.WarehousingInfo{}
+	err := XTWriteDB().Model(&models.WarehousingInfo{}).Where("good_id=? and org_id = ? and status =1", good_id, org_id).Updates(map[string]interface{}{"packing_price": packing_price}).Error
+	return info, err
+}
+
+func UpdateHisDoctorAdviceOne(drug_id int64, retail_price float64, user_org_id int64) (models.HisDoctorAdvice, error) {
+
+	advice := models.HisDoctorAdvice{}
+
+	err := XTWriteDB().Model(&models.HisDoctorAdvice{}).Where("drug_id = ? and user_org_id = ?  and status=1", drug_id, user_org_id).Updates(map[string]interface{}{"price": retail_price}).Error
+	return advice, err
+}

service/stock_service.go

@@ -1770,6 +1770,7 @@ type DrugWarehouseOutInfo struct {
 	AdminUserId             int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 	LastPrice               float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
 	StockCount              string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PatientId               int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 }
 
 func (DrugWarehouseOutInfo) TableName() string {

service/warhouse_service.go

@@ -6011,6 +6011,7 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 			RetailPrice:             drug_price, //手动出库出库价格
 			WarehousingId:           warehouse.ID,
 			SystemTime:              advice.SysRecordTime,
+			PatientId:               advice.PatientId,
 		}
 		if warehouse.RetailPrice == 0 {
 			drugflow.Price = advice.Price
@@ -6080,6 +6081,7 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 			WarehousingId:           warehouse.ID,
 			WarehousingDetailId:     warehouse.ID,
 			SystemTime:              advice.SysRecordTime,
+			PatientId:               advice.PatientId,
 		}
 
 		CreateDrugFlowOne(drugflow)