Merge remote-tracking branch 'origin/20230223_xt_api_new_branch' into 20230223_xt_api_new_branch

controllers/dialysis_api_controller.go

@@ -582,7 +582,7 @@ func (c *DialysisApiController) PostPrescription() {
 			if filedConfig.ID > 0 {
 				str = dialyzerPerfusionApparatus
 			} else {
-				str = dialysis_dialyszers + "/" + dialysis_irrigation + "/" + dialysis_strainer
+				str = dialysis_dialyszers + "/" + dialysis_irrigation + " " + dialysis_strainer
 			}
 			service.ModifyScheduleMode(mode_id, patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, str)
 		}
@@ -858,7 +858,8 @@ func (c *DialysisApiController) PostSoulution() {
 		if filedConfig.ID > 0 {
 			str = dialyzerPerfusionApparatus
 		} else {
-			str = dialysis_dialyszers + "/" + dialysis_irrigation + "/" + dialysis_strainer
+			str = dialysis_dialyszers + "/" + dialysis_irrigation + " " + dialysis_strainer
+
 		}
 		service.ModifyScheduleMode(mode_id, patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, str)
 	}
@@ -4391,7 +4392,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 			}
 
 			//长沙南雅
-			if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 || adminInfo.CurrentOrgId == 10432 || adminInfo.CurrentOrgId == 10441 || adminInfo.CurrentOrgId == 10445 || adminInfo.CurrentOrgId == 9829 || adminInfo.CurrentOrgId == 10440 || adminInfo.CurrentOrgId == 10469 {
+			if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 || adminInfo.CurrentOrgId == 10432 || adminInfo.CurrentOrgId == 10441 || adminInfo.CurrentOrgId == 10445 || adminInfo.CurrentOrgId == 9829 || adminInfo.CurrentOrgId == 10440 || adminInfo.CurrentOrgId == 10469 || adminInfo.CurrentOrgId == 10471 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -4420,7 +4421,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 	}
 
 	//长沙南雅
-	if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10432 || adminInfo.CurrentOrgId == 10441 || adminInfo.CurrentOrgId == 10445 || adminInfo.CurrentOrgId == 10469 {
+	if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10432 || adminInfo.CurrentOrgId == 10441 || adminInfo.CurrentOrgId == 10445 || adminInfo.CurrentOrgId == 10469 || adminInfo.CurrentOrgId == 10471 {
 
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
@@ -6033,14 +6034,17 @@ func (this *DialysisApiController) GetDialysisAdviceToday() {
 
 	schedule_type, _ := this.GetInt64("schedule_type")
 
-	partion_type, _ := this.GetInt64("partion_type")
+	//partion_type, _ := this.GetInt64("partion_type")
 
+	partion_type := this.GetString("partion_type")
+	var ids []string
+	ids = strings.Split(partion_type, ",")
 	start_time := this.GetString("selected_date")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 
-	list, err := service.GetDialysisAdviceSchedulistTen(orgId, schedule_type, partion_type, startTime.Unix())
+	list, err := service.GetDialysisAdviceSchedulistTen(orgId, schedule_type, ids, startTime.Unix())
 
 	drug, _ := service.GetAllBaseDrugListTwenty(orgId)
 	_, config := service.FindXTHisRecordByOrgId(orgId)

controllers/gobal_config_api_controller.go

@@ -121,10 +121,48 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/changesettleopenconfig", &GobalConfigApiController{}, "Get:ChangeSettleOpenConfig")
 
 	beego.Router("/api/changegoodoutopen", &GobalConfigApiController{}, "Get:ChangeGoodOutOpen")
+
+	beego.Router("/api/schedule/config/commit", &GobalConfigApiController{}, "post:PostScheduleConfig")
+	beego.Router("/api/schedule/config/get", &GobalConfigApiController{}, "get:GetScheduleConfig")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
 
+func (c *GobalConfigApiController) PostScheduleConfig() {
+	is_show_mode, _ := c.GetInt64("is_show_mode", 0)
+	is_show_machine, _ := c.GetInt64("is_show_machine", 0)
+	id, _ := c.GetInt64("id", 0)
+
+	config, _ := service.GetScheduleConfigById(id)
+	var err error
+	if config.ID == 0 {
+		config.IsShowMode = is_show_mode
+		config.IsShowMachine = is_show_machine
+		config.UserOrgId = c.GetAdminUserInfo().CurrentOrgId
+		config.Ctime = time.Now().Unix()
+		config.Mtime = time.Now().Unix()
+		config.Status = 1
+		err = service.CreateScheduleConfig(config)
+	} else {
+		config.IsShowMachine = is_show_machine
+		config.IsShowMode = is_show_mode
+		config.Mtime = time.Now().Unix()
+		err = service.SaveScheduleConfig(config)
+	}
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"config": config,
+		})
+	}
+}
+
+func (c *GobalConfigApiController) GetScheduleConfig() {
+	config, _ := service.GetScheduleConfigByOrgId(c.GetAdminUserInfo().CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"config": config,
+	})
+}
+
 func (c *GobalConfigApiController) PostStockConfig() {
 	is_open, _ := c.GetInt64("is_open", 0)
 	adminUserInfo := c.GetAdminUserInfo()

controllers/his_api_controller.go

@@ -1054,8 +1054,201 @@ func (c *HisApiController) CreateHisPrescription() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeChargeWrong)
 		return
 	}
-	//已发药和已收费限制逻辑
 
+	pharmacyConfig, _ := service.FindPharmacyConfig(adminInfo.CurrentOrgId)
+
+	fmt.Println("0230032032032032032032023---------------", pharmacyConfig.IsOpen)
+	//药品发药出库
+	if pharmacyConfig.IsOpen == 1 {
+		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+			prescriptions, _ := dataBody["prescriptions"].([]interface{})
+			if len(prescriptions) > 0 {
+				for _, item := range prescriptions {
+					items := item.(map[string]interface{})
+					if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+						advices := items["advices"].([]interface{})
+						if len(advices) > 0 {
+							for _, advice := range advices {
+								var drug_id int64
+								var prescribing_number float64
+								var prescribingNumberUnit string
+
+								var adviceId int64
+								if advice.(map[string]interface{})["id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["id"]).String() == "float64" {
+									drug_id = int64(advice.(map[string]interface{})["id"].(float64))
+								}
+								if advice.(map[string]interface{})["prescribing_number"] != nil || reflect.TypeOf(advice.(map[string]interface{})["prescribing_number"]).String() == "string" {
+									prescribing_number_str := advice.(map[string]interface{})["prescribing_number"].(string)
+									prescribing_number, _ = strconv.ParseFloat(prescribing_number_str, 64)
+								}
+
+								if advice.(map[string]interface{})["prescribing_number_unit"] != nil && reflect.TypeOf(advice.(map[string]interface{})["prescribing_number_unit"]).String() == "string" {
+									prescribingNumberUnit, _ = advice.(map[string]interface{})["prescribing_number_unit"].(string)
+								}
+
+								if advice.(map[string]interface{})["advice_id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["advice_id"]).String() == "float64" {
+									adviceId = int64(advice.(map[string]interface{})["advice_id"].(float64))
+								}
+
+								drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, drug_id)
+								if drug.ID == 0 {
+									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+									return
+								}
+
+								//查询药品的所有库存
+								list, _ := service.GetDrugWarehouseInfoPrescriptionSeven(drug_id, adminInfo.CurrentOrgId, storeConfig.DrugStorehouseOut)
+
+								var total_count int64
+								for _, it := range list {
+									total_count += it.StockMaxNumber*drug.MinNumber + it.StockMinNumber
+								}
+								totals := strconv.FormatInt(total_count, 10)
+								//查询该药品是否存在开药记录
+								advicelist, _ := service.GetHisAdviceListByDrugIdEight(drug_id, patient_id, recordDateTime, adviceId)
+
+								//新增处方
+								if advicelist.ID == 0 {
+									all_count, _ := strconv.ParseFloat(totals, 64)
+									if prescribingNumberUnit == drug.MinUnit {
+
+										if drug.IsUse != 1 {
+											if prescribing_number > all_count {
+												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+												return
+											}
+
+										}
+
+									}
+									if prescribingNumberUnit == drug.MaxUnit {
+										num := prescribing_number * float64(drug.MinNumber)
+										if drug.IsUse != 1 {
+											if num > all_count {
+												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+												return
+											}
+										}
+									}
+								}
+
+								drugOutConfig, _ := service.GetDrugOpenConfigOne(adminInfo.CurrentOrgId)
+								if drugOutConfig.IsOpen != 1 {
+									//修改处方
+									for _, advice := range advices {
+										var drug_id int64
+										var prescribing_number float64
+										var prescribingNumberUnit string
+										var prescribingNumber string
+
+										var adviceId int64
+										if advice.(map[string]interface{})["id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["id"]).String() == "float64" {
+											drug_id = int64(advice.(map[string]interface{})["id"].(float64))
+										}
+										if advice.(map[string]interface{})["prescribing_number"] != nil || reflect.TypeOf(advice.(map[string]interface{})["prescribing_number"]).String() == "string" {
+											prescribing_number_str := advice.(map[string]interface{})["prescribing_number"].(string)
+											prescribing_number, _ = strconv.ParseFloat(prescribing_number_str, 64)
+											prescribingNumber = advice.(map[string]interface{})["prescribing_number"].(string)
+										}
+
+										if advice.(map[string]interface{})["prescribing_number_unit"] != nil && reflect.TypeOf(advice.(map[string]interface{})["prescribing_number_unit"]).String() == "string" {
+											prescribingNumberUnit, _ = advice.(map[string]interface{})["prescribing_number_unit"].(string)
+										}
+
+										if advice.(map[string]interface{})["advice_id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["advice_id"]).String() == "float64" {
+											adviceId = int64(advice.(map[string]interface{})["advice_id"].(float64))
+										}
+
+										drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, drug_id)
+										if drug.ID == 0 {
+											c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+											return
+										}
+										//查询药品的所有库存
+										list, _ := service.GetDrugWarehouseInfoPrescriptionSeven(drug_id, adminInfo.CurrentOrgId, storeConfig.DrugStorehouseOut)
+										var total_count int64
+										for _, it := range list {
+											total_count += it.StockMaxNumber*drug.MinNumber + it.StockMinNumber
+										}
+										totals := strconv.FormatInt(total_count, 10)
+										//查询该药品是否存在开药记录
+										advicelist, _ := service.GetHisAdviceListByDrugIdEight(drug_id, patient_id, recordDateTime, adviceId)
+
+										//新增处方
+										if advicelist.ID == 0 {
+
+											all_count, _ := strconv.ParseFloat(totals, 64)
+											if prescribingNumberUnit == drug.MinUnit {
+												if drug.IsUse != 1 {
+													if prescribing_number > all_count {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+														return
+													}
+
+												}
+
+											} else {
+												if prescribingNumberUnit == drug.MaxUnit {
+													num := prescribing_number * float64(drug.MinNumber)
+													if drug.IsUse != 1 {
+														if num > all_count {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+															return
+														}
+
+													}
+
+												}
+											}
+										}
+										//修改处方
+										if advicelist.ID > 0 {
+
+											var device_number int64
+
+											if advicelist.PrescribingNumberUnit == drug.MaxUnit {
+												prescribingNumberOne := strconv.FormatFloat(advicelist.PrescribingNumber, 'f', -1, 64)
+												prescribingNumberInt, _ := strconv.ParseInt(prescribingNumberOne, 10, 64)
+												device_number = prescribingNumberInt * drug.MinNumber
+											}
+											if advicelist.PrescribingNumberUnit == drug.MinUnit {
+												prescribingNumberOne := strconv.FormatFloat(advicelist.PrescribingNumber, 'f', -1, 64)
+												prescribingNumberInt, _ := strconv.ParseInt(prescribingNumberOne, 10, 64)
+												device_number = prescribingNumberInt
+											}
+
+											var number_count int64
+											if prescribingNumberUnit == drug.MaxUnit {
+												prescribingNumberInt, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+												number_count = prescribingNumberInt * drug.MinNumber
+											}
+											if prescribingNumberUnit == drug.MinUnit {
+												prescribingNumberInt, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+												number_count = prescribingNumberInt
+											}
+
+											//如果修改的数量大于之前修改的数量
+											if (number_count - device_number) > 0 {
+												//如果修改的差数量 大于库存数量
+												if drug.IsUse != 1 {
+													if (number_count - device_number) > total_count {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+														return
+													}
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	//已发药和已收费限制逻辑
 	if drugStockConfig.IsOpen == 1 || settleConfig.IsOpen == 1 {
 		//校验库存总量
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
@@ -2388,7 +2581,7 @@ func (c *HisApiController) CreateHisPrescription() {
 						//如果历史数和当前数据不想等才进行退库出库
 						if out_count != parseIntCount {
 							service.ConsumablePrescriptionDelivery(adminInfo.CurrentOrgId, item.PatientId, item.RecordDate, &dialyPrepareOne, &lastOut, creater, parseIntCount)
-							fmt.Println("9999999----------------------------------------")
+
 							service.UpdateAutomaticReduce(item.PatientId, item.RecordDate, item.ProjectId, item.ID)
 							detail := models.AutomaticReduceDetail{
 								WarehouseOutId:          0,

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -269,7 +269,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10138 || adminUserInfo.Org.Id == 10278 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10138 || adminUserInfo.Org.Id == 10278 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10471 {
 		if adminUserInfo.Org.Id != 10447 {
 			dewater_amount = dewater_amount * 1000
 		}
@@ -378,6 +378,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			newprescribe.RecordDate = theAssessmentDateTime
 			newprescribe.DewaterAmount = dewater_amount
 			newprescribe.TargetUltrafiltration = dewater_amount
+			newprescribe.PrescriptionWater = dewater_amount
 			newprescribe.Status = 1
 			if adminUserInfo.Org.Id != 10013 && adminUserInfo.Org.Id != 10014 {
 				newprescribe.Remark = dialysisSolution.Remark
@@ -461,6 +462,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.RecordDate = theAssessmentDateTime
 				newprescribe.DewaterAmount = dewater_amount
 				newprescribe.TargetUltrafiltration = dewater_amount
+				newprescribe.PrescriptionWater = dewater_amount
 				newprescribe.Status = 1
 				newprescribe.Remark = lastDialysisPrescribe.Remark
 				if adminUserInfo.Org.Id == 10340 {
@@ -681,7 +683,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 					evaluation.VenousCatheterization = lastPredialysisEvaluation.VenousCatheterization
 				}
 
-				if adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10469 {
+				if adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10471 {
 					evaluation.PulseFrequency = 80
 				}
 				if adminUserInfo.Org.Id == 10440 {
@@ -690,6 +692,9 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				if adminUserInfo.Org.Id == 10469 {
 					evaluation.Temperature = 36.5
 				}
+				if adminUserInfo.Org.Id == 10471 {
+					evaluation.Temperature = 36.5
+				}
 			}
 		} else {
 			evaluation.UpdatedTime = time.Now().Unix()

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1490,7 +1490,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		if filedConfig.ID > 0 {
 			str = dialyzerPerfusionApparatus
 		} else {
-			str = dialysis_dialyszers + "/" + dialysis_irrigation + "/" + dialysis_strainer
+			str = dialysis_dialyszers + "/" + dialysis_irrigation + " " + dialysis_strainer
 		}
 		service.ModifyScheduleMode(mode_id, id, recordDate.Unix(), adminUserInfo.Org.Id, str)
 	}
@@ -2391,6 +2391,19 @@ func (c *DialysisAPIController) Finish() {
 		dialysisOrder.FinishModifier = adminUserInfo.AdminUser.Id
 		dialysisOrder.EndTime = endDate.Unix()
 
+		// 长沙南雅需求
+		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10340 {
+
+			//获取最后1条监测的数据
+			fristrecordone, _ := service.FindFirstMonitorRecordToday(dialysisOrder.PatientId, dialysisOrder.UserOrgId, dialysisOrder.DialysisDate)
+			lastrecord, _ := service.FindLastMonitorRecordToday(dialysisOrder.PatientId, dialysisOrder.UserOrgId, dialysisOrder.DialysisDate)
+			var accumulatedBloodVolume float64
+			accumulatedBloodVolume = (lastrecord.BloodFlowVolume - 25) * (math.Floor(float64(lastrecord.OperateTime-fristrecordone.OperateTime)/3600) * 60) / 1000
+			fmt.Println("累计血容量", accumulatedBloodVolume)
+			err := service.UpdateLastMonitorRecordToday(accumulatedBloodVolume, lastrecord.ID)
+			fmt.Println(err)
+		}
+
 		go func() {
 			ssoDomain := beego.AppConfig.String("call_domain")
 			api := ssoDomain + "/index/downpatient"
@@ -2449,7 +2462,6 @@ func (c *DialysisAPIController) GetSchedualPatientsList() {
 // @param nurse:int 上机护士
 // @param bed:int 床位号
 func (this *DialysisAPIController) StartDialysis() {
-
 	patientID, _ := this.GetInt64("patient_id")
 	recordDateStr := this.GetString("record_date")
 	nurseID, _ := this.GetInt64("nurse")
@@ -2599,19 +2611,11 @@ func (this *DialysisAPIController) StartDialysis() {
 			} else { //2022-11-04 更变需求，如果改床位有排班，但是没上机，则进行互换床位操作
 				daySchedule, _ := service.GetDaySchedule(adminUserInfo.Org.Id, schedulestartTime, scheduleendTime, patientID)
 				if daySchedule.ID > 0 {
-					//daySchedule.PartitionId = deviceNumber.ZoneID
-					//daySchedule.BedId = bedID
-					//daySchedule.ScheduleType = schedual_type
-					//daySchedule.UpdatedTime = time.Now().Unix()
-					//err := service.UpdateSchedule(&daySchedule)
-					//xtSchedule := models.Schedule{
-					//	PartitionId:  deviceNumber.ZoneID,
-					//	BedId:        bedID,
-					//	ScheduleType: schedual_type,
-					//	UpdatedTime:  time.Now().Unix(),
-					//}
-					//err := service.UpdateScheduleOne(daySchedule.ID, xtSchedule)
-					service.UpdateScheduleTwo(daySchedule, schedule)
+					err := service.UpdateScheduleTwo(daySchedule, schedule)
+					if err != nil {
+						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
 
 				}
 			}
@@ -3031,7 +3035,7 @@ func (c *DialysisAPIController) PostSolution() {
 		if filedConfig.ID > 0 {
 			str = dialyzerPerfusionApparatus
 		} else {
-			str = dialysis_dialyszers + "/" + dialysis_irrigation + "/" + dialysis_strainer
+			str = dialysis_dialyszers + "/" + dialysis_irrigation + " " + dialysis_strainer
 		}
 		service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id, str)
 	}
@@ -3613,10 +3617,9 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			fmt.Println("adminiNof2323323232", adminInfo.Org.Id)
-			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 9829 || adminInfo.Org.Id == 10440 || adminInfo.Org.Id == 10469 {
+			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 9829 || adminInfo.Org.Id == 10440 || adminInfo.Org.Id == 10469 || adminInfo.Org.Id == 10471 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
-				fmt.Println("ooooooooooo", ultrafiltration_rate)
+
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 			//if template.TemplateId == 47 {
@@ -3645,19 +3648,19 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	}
 
 	//长沙南雅
-	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 10469 {
-		fmt.Println("ultrafiltration_rate-------", ultrafiltration_rate)
+	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 10469 || adminInfo.Org.Id == 10471 {
+
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
-			fmt.Println("ultrafiltration_volume=======", ultrafiltration_volume)
+
 			record.UltrafiltrationVolume = ultrafiltration_volume
 		}
 
 	}
 	//长沙南雅累计血容量自动计算
-	if adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 9671 {
-		record.AccumulatedBloodVolume = (record.BloodFlowVolume - 25) * (math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime)/3600) * 60) / 1000
-	}
+	//if adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 9671 ||  adminInfo.Org.Id == 3877{
+	//	record.AccumulatedBloodVolume = (record.BloodFlowVolume - 25) * (math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime)/3600) * 60) / 1000
+	//}
 
 	if template.TemplateId == 47 || template.TemplateId == 54 {
 		record.DisplacementQuantity = record.DisplacementQuantity + record.DisplacementQuantity
@@ -4573,6 +4576,7 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
 	}
 
 	if len(advices) > 0 {
+
 		list, err := service.CreateMGroupAdvice(adminUserInfo.Org.Id, advices, groupNo)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(RecordDate, 10) + ":doctor_advices"
 		redis := service.RedisClient()

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -514,7 +514,7 @@ func (this *DialysisAPIController) AddUrgentSchedule() {
 				UpdatedTime:  time.Now().Unix(),
 				IsExport:     5,
 			}
-			createErr := service.CreateSchedule(newSchedule)
+			createErr := service.CreateScheduleTwo(newSchedule)
 			redis := service.RedisClient()
 			timeStr := time.Now().Format("2006-01-02")
 			key := "scheduals_" + timeStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -3640,7 +3640,6 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			return
 		}
 		advice_date, _ := dataBody["advice_date"].(string)
-		fmt.Println("advice_date----------------------------------", advice_date)
 
 		var advicedateunix int64
 		if len(advice_date) > 0 {
@@ -3674,12 +3673,16 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			return
 		}
 		startTime, _ := dataBody["start_time"].(string)
+
 		if len(startTime) == 0 {
 			utils.ErrorLog("len(start_time) == 0")
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
 		}
 		theTime, err = time.ParseInLocation(timeLayout+" 15:04:05", startTime, loc)
+
+		theTimeOne, _ := time.ParseInLocation("2006-01-02 15:04:05", startTime2+" 00:00:00", loc)
+
 		if err != nil {
 			utils.ErrorLog(err.Error())
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -3707,8 +3710,15 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			advice.Remark = Remark
 			advice.AdviceType = adviceType
 			advice.StartTime = StartTime
-			advice.AdviceDate = AdviceDate
-			advice.RecordDate = RecordDate
+			if adminUserInfo.Org.Id == 10340 {
+				advice.AdviceDate = AdviceDate
+				advice.RecordDate = RecordDate
+			}
+			if adminUserInfo.Org.Id != 10340 {
+				advice.AdviceDate = theTimeOne.Unix()
+				advice.RecordDate = theTimeOne.Unix()
+			}
+
 			advice.Status = 1
 			advice.CreatedTime = time.Now().Unix()
 			advice.UpdatedTime = time.Now().Unix()

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -1255,3 +1255,17 @@ func RemoveRepeatedPatient(patient []*service.Patients) (newArr []*service.Patie
 	}
 	return
 }
+
+func (c *MobileHisApiController) GetPatientPlan() {
+
+	plan, _ := service.GetPatientPlan(10340)
+
+	for _, item := range plan {
+		service.UpdatePatienPlan(item.ID, item.TreatmentPlan)
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"plan": plan,
+		"msg":  "ok",
+	})
+	return
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -180,4 +180,6 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/hisproject/delete", &MobileHisApiController{}, "Post:DeleteProject")
 	beego.Router("/m/api/prescription/create", &MobileHisApiController{}, "Post:CreateHisPrescription")
 
+	beego.Router("/m/api/patient/getpatientplan", &MobileHisApiController{}, "Get:GetPatientPlan")
+
 }

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -377,43 +377,45 @@ func (this *StaffScheduleApiController) GetPatientScheduleList() {
 
 func (this *StaffScheduleApiController) DeleteSchedule() {
 	id, _ := this.GetInt64("id")
-	fmt.Println("id", id)
-
 	org_id := this.GetMobileAdminUserInfo().Org.Id
 	err := service.DeleteSchedule(id)
-	schedule, _ := service.GetScheduleNight(org_id, id)
-
-	redis := service.RedisClient()
+	if err == nil {
+		schedule, _ := service.GetScheduleNight(org_id, id)
+		redis := service.RedisClient()
+		//处方
+		keyOne := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":prescriptions_list_all"
+		redis.Set(keyOne, "", time.Second)
 
-	//处方
-	keyOne := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":prescriptions_list_all"
-	redis.Set(keyOne, "", time.Second)
+		//医嘱
+		keyTwo := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":advice_list_all"
+		redis.Set(keyTwo, "", time.Second)
 
-	//医嘱
-	keyTwo := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":advice_list_all"
-	redis.Set(keyTwo, "", time.Second)
+		keySix := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_befores_list_all"
+		redis.Set(keySix, "", time.Second)
+		keyThree := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_after_dislysis_list_all"
+		redis.Set(keyThree, "", time.Second)
 
-	keySix := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_befores_list_all"
-	redis.Set(keySix, "", time.Second)
-	keyThree := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_after_dislysis_list_all"
-	redis.Set(keyThree, "", time.Second)
+		keyFour := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":monitor_record_list_all"
+		redis.Set(keyFour, "", time.Second)
 
-	keyFour := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":monitor_record_list_all"
-	redis.Set(keyFour, "", time.Second)
+		keyFive := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":treatment_summarys_list_all"
+		redis.Set(keyFive, "", time.Second)
 
-	keyFive := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":treatment_summarys_list_all"
-	redis.Set(keyFive, "", time.Second)
+		keySeven := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_orders_list_all"
+		redis.Set(keySeven, "", time.Second)
 
-	keySeven := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_orders_list_all"
-	redis.Set(keySeven, "", time.Second)
+		defer redis.Close()
+		fmt.Println(err)
 
-	defer redis.Close()
-	fmt.Println(err)
+		returnData := make(map[string]interface{}, 0)
+		returnData["msg"] = "ok"
+		this.ServeSuccessJSON(returnData)
+		return
 
-	returnData := make(map[string]interface{}, 0)
-	returnData["msg"] = "ok"
-	this.ServeSuccessJSON(returnData)
-	return
+	} else {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除失败")
+		return
+	}
 }
 
 func (this *StaffScheduleApiController) SearchPatient() {
@@ -758,7 +760,7 @@ func (c *StaffScheduleApiController) CreateMobileSchedulePatient() {
 	}
 
 	redis := service.RedisClient()
-	err = service.CreateSchedule(&schedule)
+	err = service.CreateScheduleTwo(&schedule)
 	key := "scheduals_" + scheduleDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
 	redis.Set(key, "", time.Second)
 	defer redis.Close()
@@ -842,7 +844,6 @@ func (c *StaffScheduleApiController) ChangeScheduleType() {
 			PatientId: schedule.PatientId,
 			ModeId:    schedule.ModeId,
 		}
-
 		var DialysisMachineName string
 		so, _ := service.GetDialysisSolutionTwo(org_id, sch.PatientId, sch.ModeId)
 		filedRecordOne, _ := service.FindFiledBy(org_id, "透析器")
@@ -871,8 +872,6 @@ func (c *StaffScheduleApiController) ChangeScheduleType() {
 			}
 		}
 		sch.DialysisMachineName = DialysisMachineName
-		service.UpdateScheduleById(id, sch)
-
 		schedu := models.Schedule{
 			PatientId: patient_id,
 			ModeId:    mode_id,
@@ -900,7 +899,15 @@ func (c *StaffScheduleApiController) ChangeScheduleType() {
 			}
 		}
 		schedu.DialysisMachineName = DialysisMachineName1
-		service.UpdateScheduleById(schedule.ID, schedu)
+		err := service.UpdateScheduleById(schedule.ID, schedu, id, sch)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "ok",
+			})
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
 	} else {
 		xtSchedule := models.Schedule{
 			ScheduleDate: schedule_date,
@@ -909,11 +916,17 @@ func (c *StaffScheduleApiController) ChangeScheduleType() {
 			UserOrgId:    org_id,
 		}
 
-		service.ChangeScheduleClass(xtSchedule)
+		err := service.ChangeScheduleClass(xtSchedule)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "ok",
+			})
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
 	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "ok",
-	})
+
 }
 func (c *StaffScheduleApiController) ChangeScheduleBed() {
 	schedule_type, _ := c.GetInt64("schedule_type")
@@ -972,7 +985,7 @@ func (c *StaffScheduleApiController) ChangeScheduleBed() {
 			}
 		}
 		sch.DialysisMachineName = DialysisMachineName
-		service.UpdateScheduleById(id, sch)
+
 		schedu := models.Schedule{
 			PatientId:           patient_id,
 			ModeId:              mode_id,
@@ -1002,7 +1015,18 @@ func (c *StaffScheduleApiController) ChangeScheduleBed() {
 			}
 		}
 		schedu.DialysisMachineName = DialysisMachineName1
-		service.UpdateScheduleById(schedule.ID, schedu)
+		err := service.UpdateScheduleById(schedule.ID, schedu, id, sch)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "ok",
+			})
+
+		} else {
+
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+
 	} else {
 		var str string
 		//查找该机构用的是什么透析器
@@ -1029,10 +1053,16 @@ func (c *StaffScheduleApiController) ChangeScheduleBed() {
 			IsExport:            20000,
 			DialysisMachineName: str,
 		}
-		service.DeleteSchedule(id)
-		service.CreateSchedule(&xtSchedule)
+		var err error
+		err = service.CreateSchedule(&xtSchedule, id)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "ok",
+			})
+			return
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
 	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "ok",
-	})
 }

controllers/patient_api_controller.go

@@ -1470,6 +1470,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 					child.PatientId = patientInfo.ID
 					child.AdviceDoctor = adminUserInfo.AdminUser.Id
 					child.IsSettle = 2
+
 					if childMap["advice_name"] == nil || reflect.TypeOf(childMap["advice_name"]).String() != "string" {
 						utils.ErrorLog("child advice_name")
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1535,6 +1536,20 @@ func (c *PatientApiController) CreateGroupAdvice() {
 
 					child.DeliveryWay = advice.DeliveryWay
 					child.ExecutionFrequency = advice.ExecutionFrequency
+
+					if adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10340 || adminUserInfo.CurrentOrgId == 9671 {
+						if child.PrescribingNumber == 0 {
+							child.PrescribingNumber = 1
+						}
+						//查询该患者今日有没有双人核对
+						check, _ := service.MobileGetDoubleCheckSix(adminUserInfo.CurrentOrgId, patientInfo.ID, child.AdviceDate)
+
+						if check.ID > 0 {
+							child.Checker = check.Modifier
+							child.CheckState = 1
+							child.CheckTime = time.Now().Unix()
+						}
+					}
 					advice.Children = append(advice.Children, &child)
 				}
 			}

controllers/pharmacy_controller.go

@@ -7,6 +7,8 @@ import (
 	"XT_New/utils"
 	"fmt"
 	"github.com/astaxie/beego"
+	"math"
+	"strconv"
 	"time"
 )
 
@@ -78,16 +80,7 @@ func (this *PharmacyController) TodayNumber() {
 	times := this.GetString("time", "")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	//shift, err := this.GetInt64("shift", 0) //班次
-	//if err != nil {
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//	return
-	//}
-	//partition, err := this.GetInt64("partition", 0) //分区
-	//if err != nil {
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//	return
-	//}
+
 	var stime, etime int64
 	if times == "" {
 		stime, etime = service.GetNowTime()
@@ -96,26 +89,47 @@ func (this *PharmacyController) TodayNumber() {
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
-	//查询表里当天的数据
-	var wtotal int
-	wtotal, err = service.GetTodayPharmacy(stime, etime, orgid, 1)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+
+	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 {
+		//查询表里当天的数据
+		var wtotal int
+		wtotal, err = service.GetTodayPharmacy(stime, etime, orgid, 1)
+
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+
+		var itotal int
+		itotal, err = service.GetTodayPharmacy(stime, etime, orgid, 0)
+
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"wtotal": wtotal,
+			"itotal": itotal,
+		})
 		return
 	}
-	var itotal int
-	itotal, err = service.GetTodayPharmacy(stime, etime, orgid, 0)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+
+	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 {
+		var wtotal int
+		var itotal int
+		//查找出库数量
+		wtotal, _ = service.GetTodayAdviceCount(stime, etime, orgid, 1)
+
+		itotal, _ = service.GetTodayAdviceCount(stime, etime, orgid, 0)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"wtotal": wtotal,
+			"itotal": itotal,
+		})
 		return
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"wtotal": wtotal,
-		"itotal": itotal,
-	})
-	return
+
 }
 func (this *PharmacyController) IssuedDrug() {
 	var err error
@@ -150,24 +164,43 @@ func (this *PharmacyController) IssuedDrug() {
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
-	//查询表里当天的数据
-	var flist []*models.TmpPatient
-	flist, err = service.GetTodayDrug(stime, etime, orgid, 1, keyword)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+
+	if orgid == 10164 || orgid == 3877 || orgid == 10188 || orgid == 10217 || orgid == 9671 {
+		list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 1)
+		fmt.Println("list23323232323232", list)
+		var flist []models.TmpPatientOne
+		if len(list) > 0 {
+			for _, item := range list {
+				patientlist, _ := service.GetPatientByAdviceId(item.PatientId)
+				flist = append(flist, patientlist)
+			}
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": flist,
+		})
 	}
-	listt, err := service.PartitionAndLayout(stime, etime, orgid, shift, partition, flist)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+
+	if orgid != 10164 && orgid == 3877 && orgid != 10188 && orgid != 10217 && orgid != 9671 {
+		//查询表里当天的数据
+		var flist []*models.TmpPatient
+		flist, err = service.GetTodayDrug(stime, etime, orgid, 1, keyword)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		listt, err := service.PartitionAndLayout(stime, etime, orgid, shift, partition, flist)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": listt,
+		})
 		return
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"list": listt,
-	})
-	return
+
 }
 func (this *PharmacyController) WaitingDrug() {
 	var err error
@@ -202,24 +235,47 @@ func (this *PharmacyController) WaitingDrug() {
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
-	//查询表里当天的数据
-	var flist []*models.TmpPatient
-	flist, err = service.GetTodayDrug(stime, etime, orgid, 0, keyword)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+
+	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 {
+		//查询表里当天的数据
+		var flist []*models.TmpPatient
+		flist, err = service.GetTodayDrug(stime, etime, orgid, 0, keyword)
+
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		listt, err := service.PartitionAndLayout(stime, etime, orgid, shift, partition, flist)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": listt,
+		})
 		return
 	}
-	listt, err := service.PartitionAndLayout(stime, etime, orgid, shift, partition, flist)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+
+	//当天已发药的人数
+	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 {
+
+		list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 0)
+
+		var flist []models.TmpPatientOne
+		if len(list) > 0 {
+			for _, item := range list {
+				patientlist, _ := service.GetPatientByAdviceId(item.PatientId)
+				flist = append(flist, patientlist)
+			}
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": flist,
+		})
 		return
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"list": listt,
-	})
-	return
+
 }
 
 //
@@ -290,6 +346,47 @@ func (this *PharmacyController) DispensingMedicine() {
 		etime = stime + 86399
 	}
 
+	advicelist, _ := service.FindeHisAdviceDocAdvice(orgid, patient_id, stime, etime)
+	if len(advicelist) > 0 {
+		var total int64
+		var prescribing_number_total int64
+		for _, item := range advicelist {
+			houseConfig, _ := service.GetAllStoreHouseConfig(orgid)
+			//查询该药品是否有库存
+			list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
+
+			//查询改药品信息
+			medical, _ := service.GetBaseDrugMedical(item.DrugId)
+			//判断单位是否相等
+			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
+					}
+				}
+			}
+
+		}
+	}
+
 	err = service.DispensingMedicine(orgid, patient_id, stime, etime, creater)
 	if err != nil {
 		utils.ErrorLog(err.Error())

controllers/print_data_api_controller.go

@@ -37,7 +37,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 	idStrs := strings.Split(schIDStr, ",")
 	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 {
+	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 {
 		schedules, getScheduleErr := service.GetSchedulesSeven(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 
@@ -136,7 +136,7 @@ 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 {
+	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 {
 		schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
@@ -259,6 +259,8 @@ func (this *PrintDataAPIController) CourseRecordPrintData() {
 	patient, _ := service.GetPatientDetail(adminUserInfo.CurrentOrgId, patient_id)
 
 	adminUser, _ := service.GetAllAdminUsers(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+
+	operators, err := service.GetAdminUserEsTwo(adminUserInfo.CurrentOrgId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
@@ -267,6 +269,7 @@ func (this *PrintDataAPIController) CourseRecordPrintData() {
 			"record":    record,
 			"patient":   patient,
 			"adminUser": adminUser,
+			"operators": operators,
 		})
 	}
 }

controllers/schedule_api_controller.go

@@ -79,11 +79,8 @@ func ScheduleApiRegistRouters() {
 	beego.Router("/api/patient/smartpatientschtemplate", &ScheduleApiController{}, "Get:GetPatientSmartSchTemplate")
 
 	beego.Router("/api/device/get", &ScheduleApiController{}, "Get:GetDevicesNumbers")
-
 	beego.Router("/api/smartsch/batch", &ScheduleApiController{}, "Post:BatchPostSmartSch")
-
 	beego.Router("/api/smartsch/get", &ScheduleApiController{}, "Get:GetSmartSch")
-
 	beego.Router("/api/sch/exchange", &ScheduleApiController{}, "Get:ExchangeSch")
 	beego.Router("/api/sch/coversch", &ScheduleApiController{}, "Get:CoverSch")
 	beego.Router("/api/schedule/delete_two", &ScheduleApiController{}, "Delete:DeleteScheduleTwo")
@@ -122,13 +119,22 @@ func (c *ScheduleApiController) CoverSch() {
 	new_sch.ScheduleType = sch_two.ScheduleType
 	new_sch.ID = 0
 	//删除原来的排班
-	service.SaveSchTwo(sch, sch_two)
+	err := service.SaveSchTwo(sch, sch_two)
 	//生成新的排班
-	service.SaveSch(new_sch)
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "覆盖成功",
-	})
-
+	if err == nil {
+		err2 := service.SaveSch(new_sch)
+		if err2 == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "覆盖成功",
+			})
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
 }
 func (c *ScheduleApiController) ExchangeSch() {
 	id_one, _ := c.GetInt64("id_one")
@@ -161,10 +167,18 @@ func (c *ScheduleApiController) ExchangeSch() {
 		}
 	}
 
-	service.UpdateScheduleThree(sch, sch_two)
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "交换成功",
-	})
+	err := service.UpdateScheduleThree(sch, sch_two)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "交换成功",
+		})
+
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+
+	}
+
 }
 func (c *ScheduleApiController) BatchPostSmartSch() {
 	patient_id, _ := c.GetInt64("patient_id")
@@ -186,7 +200,6 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 
 	//数据校验
 	if dataBody["smart_schs"] != nil && reflect.TypeOf(dataBody["smart_schs"]).String() == "[]interface {}" {
-
 		schs, _ := dataBody["smart_schs"].([]interface{})
 		if len(schs) > 0 {
 			for _, item := range schs {
@@ -1000,7 +1013,7 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 							service.SaveSch(daySchedule)
 						} else {
 							existSchedule.IsExport = 3003
-							service.CreateSchedule(&schedule)
+							service.CreateScheduleTwo(&schedule)
 						}
 					}
 				}
@@ -1527,7 +1540,7 @@ func (c *ScheduleApiController) CreateSchedule() {
 
 	redis := service.RedisClient()
 	schedule.IsExport = 1000
-	err = service.CreateSchedule(&schedule)
+	err = service.CreateScheduleTwo(&schedule)
 
 	key := "scheduals_" + scheduleDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
 
@@ -2670,26 +2683,18 @@ func (this *ScheduleApiController) ExportSchedule() {
 				for _, item := range schedules {
 					if item.ScheduleDate > clear_schedule_date {
 						//查询该患者是否转出获取死亡
-						fmt.Println("11111323242423")
-
 						//查找当天日期是否存在
 						_, errcode := service.GetTodayScheduleIsExistOne(item.PatientId, item.ScheduleDate, item.UserOrgId)
 						if errcode == gorm.ErrRecordNotFound {
 							//查询该床位是否有患者
-							fmt.Println("errcodes")
 							sch, errcodes := service.GetPatientByBed(item.ScheduleDate, item.BedId, item.ScheduleType, item.UserOrgId)
-							fmt.Println("errcodes")
-							fmt.Println(errcodes)
-							fmt.Println(sch)
 
 							if errcodes == gorm.ErrRecordNotFound {
-								fmt.Println("1111111")
-								service.CreateSchedule(item)
+								service.CreateScheduleTwo(item)
 							} else if errcodes == nil {
-								fmt.Println("1111222222222")
 								//清除当天该床位已有的患者
 								service.ModeFyScheduleById(sch.ScheduleDate, sch.BedId, sch.ScheduleType, sch.UserOrgId)
-								service.CreateSchedule(item)
+								service.CreateScheduleTwo(item)
 							}
 
 						} else if errcode == nil {
@@ -2704,8 +2709,6 @@ func (this *ScheduleApiController) ExportSchedule() {
 								Status:              1,
 								DialysisMachineName: item.DialysisMachineName,
 							}
-							fmt.Println("1111222222223333333333333333332")
-
 							service.UpdateScheduleByOrgIdOne(item.PatientId, item.ScheduleDate, item.UserOrgId, &schedule)
 						}
 					}
@@ -4556,38 +4559,45 @@ func (c *ScheduleApiController) DeleteScheduleTwo() {
 	schedule.Status = 0
 	schedule.UpdatedTime = time.Now().Unix()
 	err = service.UpdateSchedule(schedule)
-	redis := service.RedisClient()
 
-	//处方
-	keyOne := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":prescriptions_list_all"
-	redis.Set(keyOne, "", time.Second)
+	if err == nil {
+		redis := service.RedisClient()
+		//处方
+		keyOne := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":prescriptions_list_all"
+		redis.Set(keyOne, "", time.Second)
 
-	//医嘱
-	keyTwo := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":advice_list_all"
-	redis.Set(keyTwo, "", time.Second)
+		//医嘱
+		keyTwo := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":advice_list_all"
+		redis.Set(keyTwo, "", time.Second)
 
-	keySix := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_befores_list_all"
-	redis.Set(keySix, "", time.Second)
-	keyThree := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_after_dislysis_list_all"
-	redis.Set(keyThree, "", time.Second)
+		keySix := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_befores_list_all"
+		redis.Set(keySix, "", time.Second)
+		keyThree := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":assessment_after_dislysis_list_all"
+		redis.Set(keyThree, "", time.Second)
 
-	keyFour := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":monitor_record_list_all"
-	redis.Set(keyFour, "", time.Second)
+		keyFour := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":monitor_record_list_all"
+		redis.Set(keyFour, "", time.Second)
 
-	keyFive := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":treatment_summarys_list_all"
-	redis.Set(keyFive, "", time.Second)
+		keyFive := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":treatment_summarys_list_all"
+		redis.Set(keyFive, "", time.Second)
 
-	keySeven := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_orders_list_all"
-	redis.Set(keySeven, "", time.Second)
-	fmt.Println(err)
-	defer redis.Close()
-	if err != nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteScheduleFail)
+		keySeven := strconv.FormatInt(adminINfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_orders_list_all"
+		redis.Set(keySeven, "", time.Second)
+		defer redis.Close()
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteScheduleFail)
+			return
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg":      "ok",
+			"schedule": &schedule,
+		})
+
+	} else {
+
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
+
 	}
 
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg":      "ok",
-		"schedule": &schedule,
-	})
 }

enums/error_code.go

@@ -273,6 +273,8 @@ const ( // ErrorCode
 	ErrorCodePatientDialysisOrderTwo      = 60000001
 	ErrorCodePatientScheduleRepeat        = 60000002
 	ErrorCodeDelScheduleFailByDialysisTwo = 60000003
+
+	ErrorCodeSyncWrong = 60000006
 )
 
 var ErrCodeMsgs = map[int]string{

models/patient_models.go

@@ -1176,6 +1176,7 @@ type XtPatients struct {
 	UserSysBeforeCount           int64   `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 	SchRemark                    string  `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 	ScheduleRemark               string  `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
+	TreatmentPlan                string  `gorm:"column:treatment_plan" json:"treatment_plan" form:"treatment_plan"`
 }
 
 func (XtPatients) TableName() string {

models/pharmacy_models.go

@@ -31,6 +31,17 @@ type TmpPatient struct {
 	PatientID  int64
 	Name       string
 	DialysisNo string //透析号
+
+}
+
+type TmpPatientOne struct {
+	PatientID  int64  `gorm:"column:id" json:"PatientID" form:"id"`
+	DialysisNo string `gorm:"column:dialysis_no" json:"DialysisNo" form:"dialysis_no"`
+	Name       string `gorm:"column:name" json:"Name" form:"name"`
+}
+
+func (TmpPatientOne) TableName() string {
+	return "xt_patients"
 }
 
 //药品信息

routers/router.go

@@ -11,7 +11,7 @@ import (
 func init() {
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
 		//AllowAllOrigins:  true,
-		AllowOrigins: []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://localhost:9529", "http://localhost:9531", "http://xt.test.shengws.com", "http://new_mobile.test.sgjyun.com", "https://api.xt.test.sgjyun.com", "https://xt.test.shengws.com", "http://xt.test.sgjyun.com", "https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com", "https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com", "http://mobile.sgjyun.com", "http://mobile.kuyicloud.com"},
+		AllowOrigins: []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://localhost:9529", "http://localhost:9531", "http://xt.test.shengws.com", "http://new_mobile.test.sgjyun.com", "https://api.xt.test.sgjyun.com", "https://xt.test.shengws.com", "http://xt.test.sgjyun.com", "https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com", "https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com", "http://mobile.sgjyun.com", "http://mobile.kuyicloud.com", "https://mobile.kuyicloud.com"},
 		//AllowOrigins:     []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://xt.test.shengws.com","https://xt.test.shengws.com", "http://xt.test.sgjyun.com","https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com","https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com","http://mobile.sgjyun.com","http://mobile.kuyicloud.com"},
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
 		AllowHeaders:     []string{"Origin", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type", "X-XSRF-TOKEN", "Permission", "KyToken"},

service/device_service.go

@@ -831,9 +831,18 @@ func GetPartionId(bed_id int64, org_id int64) (models.XtDeviceNumber, error) {
 	return number, err
 }
 
-func UpdateScheduleById(id int64, schedule models.Schedule) error {
+func UpdateScheduleById(id int64, schedule models.Schedule, id_two int64, schedule_two models.Schedule) error {
+	utx := XTWriteDB().Begin()
 
-	err := XTWriteDB().Model(&models.Schedule{}).Where("id = ? and status =1", id).Update(map[string]interface{}{"patient_id": schedule.PatientId, "mode_id": schedule.ModeId, "is_export": 10000, "dialysis_machine_name": schedule.DialysisMachineName}).Error
+	if err = utx.Model(&models.Schedule{}).Where("id = ? and status =1", id).Update(map[string]interface{}{"patient_id": schedule.PatientId, "mode_id": schedule.ModeId, "is_export": 50000, "dialysis_machine_name": schedule.DialysisMachineName}).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+	if err = utx.Model(&models.Schedule{}).Where("id = ? and status =1", id_two).Update(map[string]interface{}{"patient_id": schedule_two.PatientId, "mode_id": schedule_two.ModeId, "is_export": 50000, "dialysis_machine_name": schedule_two.DialysisMachineName}).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+	utx.Commit()
 	return err
 }
 

service/dialysis_service.go

@@ -2084,3 +2084,9 @@ func UpdateDoctorAdviceList(id int64, checker int64) error {
 	err := XTWriteDB().Model(&advice).Where("id = ? and status =1", id).Updates(map[string]interface{}{"checker": checker, "check_state": 1, "check_time": time.Now().Unix()}).Error
 	return err
 }
+
+func UpdateLastMonitorRecordToday(accumulated_blood_volume float64, id int64) error {
+
+	err := XTWriteDB().Model(&models.MonitoringRecord{}).Where(" id = ? and status= 1", id).Update(map[string]interface{}{"accumulated_blood_volume": accumulated_blood_volume}).Error
+	return err
+}

service/dialysis_solution_service.go

@@ -495,7 +495,7 @@ func GetDialysisAdviceSchedulistSeven(orgID int64, schedule_type int64, partitio
 
 }
 
-func GetDialysisAdviceSchedulistTen(orgID int64, schedule_type int64, partition_id int64, scheduleDate int64) (schedule []*models.VmBloodScheduleOne, err error) {
+func GetDialysisAdviceSchedulistTen(orgID int64, schedule_type int64, partition_id []string, scheduleDate int64) (schedule []*models.VmBloodScheduleOne, err error) {
 
 	db := XTReadDB().Model(&models.VmBloodScheduleOne{}).Where("status = 1")
 
@@ -505,8 +505,8 @@ func GetDialysisAdviceSchedulistTen(orgID int64, schedule_type int64, partition_
 	if schedule_type > 0 {
 		db = db.Where("schedule_type = ?", schedule_type)
 	}
-	if partition_id > 0 {
-		db = db.Where("partition_id = ?", partition_id)
+	if len(partition_id) > 0 {
+		db = db.Where("partition_id in(?)", partition_id)
 	}
 
 	if orgID > 0 {

service/his_print_service.go

@@ -23,7 +23,7 @@ func GetBatchProjectHisPrescription(ids []string, record_time int64, user_org_id
 		Preload("HisPrintPrescription", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND type <> 1 AND p_type = 2", user_org_id, record_time).
 				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-					return db.Where("his_prescription_project.status = 1 AND his_prescription_project.user_org_id = ?", user_org_id).Where("his_prescription_project.status = 1 ").Preload("HisProject", "status = 1").Preload("GoodInfo", "status=1")
+					return db.Joins("Join xt_his_project p On p.id = his_prescription_project.project_id  AND p.cost_classify != 3").Where("his_prescription_project.status = 1 AND his_prescription_project.user_org_id = ?", user_org_id).Where("his_prescription_project.status = 1 ").Preload("HisProject", "status = 1").Preload("GoodInfo", "status=1")
 				})
 		}).
 		Preload("HisPrescriptionInfoTwo", "status = 1 AND record_date = ?", record_time).

service/his_service.go

@@ -2702,3 +2702,15 @@ func GetLastOrderTX(user_org_id int64) (models.HisOrder, error) {
 	err := XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Last(&order).Error
 	return order, err
 }
+
+func GetPatientPlan(orgid int64) (patient []*models.XtPatients, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status=  1", orgid).Find(&patient).Error
+	return patient, err
+}
+
+func UpdatePatienPlan(id int64, trement_plan string) error {
+
+	err := XTWriteDB().Model(&models.XtPatientsNew{}).Where("blood_id = ? and status = 1", id).Update(map[string]interface{}{"treatment_plan": trement_plan}).Error
+	return err
+}

service/patient_schedule_template_service.go

@@ -34,17 +34,10 @@ func GetOrgPatientScheduleTemplateIDs(orgID int64) ([]*models.PatientScheduleTem
 	return ids, nil
 }
 
-func GetOrgPatientScheduleTemplateIDByTemplateID(orgID int64, templateID int64) (*models.PatientScheduleTemplateId, error) {
-	var id models.PatientScheduleTemplateId
-	err := readDb.Model(&models.PatientScheduleTemplateId{}).Where("org_id = ? AND id = ? AND status = 1", orgID, templateID).First(&id).Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return nil, nil
-		} else {
-			return nil, err
-		}
-	}
-	return &id, nil
+func GetOrgPatientScheduleTemplateIDByTemplateID(orgID int64, templateID int64) (id models.PatientScheduleTemplateId, err error) {
+	err = readDb.Model(&models.PatientScheduleTemplateId{}).Where("org_id = ? AND id = ? AND status = 1", orgID, templateID).First(&id).Error
+
+	return id, nil
 }
 
 type PatientsTwo struct {
@@ -954,3 +947,48 @@ func UpdateTemplateItemModeWeek(orgID int64, id int64, week_time int64) {
 	readDb.Model(&models.PatientScheduleTemplateMode{}).Where("org_id = ? AND status = 1 AND id = ? ", orgID, id).Updates(map[string]interface{}{"original_week": week_time, "week": week_time})
 	return
 }
+
+func ClearAndCreateSyncSch(user_org_id int64, start_time int64, schs []models.Schedule) (err error) {
+	utx := writeDb.Begin()
+	err = utx.Table("xt_schedule as s").
+		Where("s.schedule_date > ? AND s.status = 1 AND "+
+			"s.user_org_id = ?", start_time, user_org_id).
+		Updates(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
+	if err != nil {
+		utx.Rollback()
+		return
+	}
+	if len(schs) > 0 {
+		if len(schs) > 0 {
+			thisSQL := "INSERT INTO xt_schedule (user_org_id, partition_id, bed_id, patient_id, schedule_date,schedule_type,schedule_week,mode_id,status,created_time,updated_time,is_export,dialysis_machine_name,remark) VALUES "
+			insertParams := make([]string, 0)
+			insertData := make([]interface{}, 0)
+			for _, info := range schs {
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertData = append(insertData, info.UserOrgId)
+				insertData = append(insertData, info.PartitionId)
+				insertData = append(insertData, info.BedId)
+				insertData = append(insertData, info.PatientId)
+				insertData = append(insertData, info.ScheduleDate)
+				insertData = append(insertData, info.ScheduleType)
+				insertData = append(insertData, info.ScheduleWeek)
+				insertData = append(insertData, info.ModeId)
+				insertData = append(insertData, info.Status)
+				insertData = append(insertData, info.CreatedTime)
+				insertData = append(insertData, info.UpdatedTime)
+				insertData = append(insertData, info.IsExport)
+				insertData = append(insertData, info.DialysisMachineName)
+				insertData = append(insertData, "")
+			}
+			thisSQL += strings.Join(insertParams, ", ")
+			err = utx.Exec(thisSQL, insertData...).Error
+			if err != nil {
+				utx.Rollback()
+				return
+			}
+		}
+		utx.Commit()
+	}
+	return
+
+}

service/pharmacy_service.go

@@ -46,11 +46,11 @@ func GetTodayPharmacy(stime, etime, orgid, is_medicine int64) (num int, err erro
 	var tmp []*models.TmpTTT
 	if is_medicine == 0 {
 		err = XTReadDB().Raw("select distinct patient_id from his_doctor_advice_info where "+
-			"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = 0 and "+
+			"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = 0 and "+
 			"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) "+
 			"union "+
 			"select distinct patient_id from xt_doctor_advice where "+
-			"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = 0 and "+
+			"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = 0 and "+
 			"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) ",
 			stime, etime, orgid, orgid, stime, etime, orgid, orgid).Scan(&tmp).Error
 		if err != nil {
@@ -58,11 +58,11 @@ func GetTodayPharmacy(stime, etime, orgid, is_medicine int64) (num int, err erro
 		}
 	} else {
 		err = XTReadDB().Raw("select distinct patient_id from his_doctor_advice_info where "+
-			"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = 1 and "+
+			"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = 1 and "+
 			"drug_id in (select id from xt_base_drug where org_id = ? and status = 1) "+
 			"union "+
 			"select distinct patient_id from xt_doctor_advice where "+
-			"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = 1 and "+
+			"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = 1 and "+
 			"drug_id in (select id from xt_base_drug where org_id = ? and status = 1) ",
 			stime, etime, orgid, orgid, stime, etime, orgid, orgid).Scan(&tmp).Error
 		if err != nil {
@@ -74,6 +74,52 @@ func GetTodayPharmacy(stime, etime, orgid, is_medicine int64) (num int, err erro
 
 }
 
+func GetTodayAdviceCount(stime, etime, orgid, is_medicine int64) (num int, err error) {
+
+	//orgid = 9675
+	InitDrugidIsNil(orgid, stime, etime)
+	var tmp []*models.TmpTTT
+	if is_medicine == 0 {
+		err = XTReadDB().Raw("select * from his_doctor_advice_info where status= 1 and advice_date>=? and advice_date<=? and user_org_id=? and is_medicine=0 group by patient_id",
+			stime, etime, orgid).Scan(&tmp).Error
+		if err != nil {
+			return
+		}
+	} else {
+		err = XTReadDB().Raw("select * from his_doctor_advice_info where status= 1 and advice_date>=? and advice_date<=? and user_org_id=? and is_medicine=1 group by patient_id",
+			stime, etime, orgid).Scan(&tmp).Error
+		if err != nil {
+			return
+		}
+	}
+
+	return len(tmp), err
+}
+
+func GetTodayAdviceCountOne(stime int64, etime int64, orgid int64, is_medicine int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	db := XTReadDB().Model(&advice).Where("status=1 and is_medicine = ?", is_medicine)
+	if stime > 0 {
+		db = db.Where("advice_date>=?", stime)
+	}
+	if etime > 0 {
+		db = db.Where("advice_date<=?", stime)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+
+	err = db.Group("patient_id").Find(&advice).Error
+	return advice, err
+}
+
+func GetPatientByAdviceId(patient_id int64) (models.TmpPatientOne, error) {
+
+	patient := models.TmpPatientOne{}
+	err = XTReadDB().Where("id = ?", patient_id).Find(&patient).Error
+	return patient, err
+}
+
 // (改)
 func GetTodayDrug(stime, etime, orgid, is_medicine int64, keyword string) (list []*models.TmpPatient, err error) {
 	InitDrugidIsNil(orgid, stime, etime)
@@ -84,22 +130,22 @@ func GetTodayDrug(stime, etime, orgid, is_medicine int64, keyword string) (list
 		if keyword != "" {
 			keyword = "%" + keyword + "%"
 			err = XTReadDB().Raw("select a.* from(select distinct patient_id,dispensing_time from his_doctor_advice_info where "+
-				"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"patient_id in (select id from xt_patients where user_org_id = ? and name like ? or dialysis_no like ?) and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) "+
 				"union "+
 				"select distinct patient_id,dispensing_time from xt_doctor_advice where "+
-				"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"patient_id in (select id from xt_patients where user_org_id = ? and name like ? or dialysis_no like ?) and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1))a order by dispensing_time desc ",
 				stime, etime, orgid, is_medicine, orgid, keyword, keyword, orgid, stime, etime, orgid, is_medicine, orgid, keyword, keyword, orgid).Scan(&tmp).Error
 		} else {
 			err = XTReadDB().Raw("select a.* from(select distinct patient_id,dispensing_time from his_doctor_advice_info where "+
-				"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) "+
 				"union "+
 				"select distinct patient_id,dispensing_time from xt_doctor_advice where "+
-				"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1))a order by dispensing_time desc",
 				stime, etime, orgid, is_medicine, orgid, stime, etime, orgid, is_medicine, orgid).Scan(&tmp).Error
 		}
@@ -172,13 +218,13 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 	var tmp []*models.HisDoctorAdviceInfoL
 	if is_medicine == 0 {
 		err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
-			"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
+			"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
 		if err != nil {
 			return pp, err
 		}
 	} else {
 		err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
-			"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
+			"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
 		if err != nil {
 			return pp, err
 		}
@@ -201,13 +247,13 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 	var tmp_advice []*models.XtDoctorAdviceL
 	if is_medicine == 0 {
 		err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
-			"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
+			"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
 		if err != nil {
 			return pp, err
 		}
 	} else {
 		err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
-			"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
+			"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
 		if err != nil {
 			return pp, err
 		}
@@ -580,7 +626,7 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 	time_now := time.Now().Unix()
 	var hids []*models.TmpID
 	var xids []*models.TmpID
-	err = tx.Raw("select id from his_doctor_advice_info where status = 1 and created_time >= ? and created_time <= ? "+
+	err = tx.Raw("select id from his_doctor_advice_info where status = 1 and advice_date >= ? and advice_date <= ? "+
 		"and user_org_id = ? and patient_id = ? and is_medicine = 0 and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) ", stime, etime, orgid, patient_id, orgid).Scan(&hids).Error
 	if err != nil {
 		return
@@ -600,7 +646,7 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 			if PettyCash(v.DrugId) {
 				continue
 			}
-			//判断药品库存是否充足
+			////判断药品库存是否充足
 			kou := FenDrugInventory(v, orgid)
 			if !kou {
 				err = fmt.Errorf(FindDrugsName(v.DrugId) + "库存不足")
@@ -629,48 +675,52 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 		return err1
 	}
 
-	err = tx.Raw("select id from xt_doctor_advice where status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and "+
-		"user_org_id = ? and patient_id = ? and is_medicine = 0 and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, orgid).Scan(&xids).Error
-	if err != nil {
-		return
-	}
-	xid := make([]int64, 0)
-	for _, v := range xids {
-		xid = append(xid, v.Id)
-	}
-	var advice []*models.HisDoctorAdviceInfo
-	err = tx.Raw("select * from xt_doctor_advice where id in (?) and status = 1", xid).Scan(&advice).Error
-	if err != nil {
-		return
-	}
-	for _, v := range advice {
-		tmp_bool := IsPharmacyConfig(orgid)
-		if tmp_bool {
-			if PettyCash(v.DrugId) {
-				continue
-			}
-			kou := FenDrugInventory(v, orgid)
-			if !kou {
-				err = fmt.Errorf(FindDrugsName(v.DrugId) + "库存不足")
-				return
-			}
-			//扣减库存
-			err = FenStock(orgid, creater, v)
-			if err != nil {
-				err = fmt.Errorf("!:%v", err)
-				return
+	//针对大丰响水
+	if orgid != 10217 && orgid != 10188 && orgid != 9671 && orgid != 10164 {
+		err = tx.Raw("select id from xt_doctor_advice where status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and "+
+			"user_org_id = ? and patient_id = ? and is_medicine = 0 and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, orgid).Scan(&xids).Error
+		if err != nil {
+			return
+		}
+		xid := make([]int64, 0)
+		for _, v := range xids {
+			xid = append(xid, v.Id)
+		}
+		var advice []*models.HisDoctorAdviceInfo
+		err = tx.Raw("select * from xt_doctor_advice where id in (?) and status = 1", xid).Scan(&advice).Error
+		if err != nil {
+			return
+		}
+
+		for _, v := range advice {
+			tmp_bool := IsPharmacyConfig(orgid)
+			if tmp_bool {
+				if PettyCash(v.DrugId) {
+					continue
+				}
+				kou := FenDrugInventory(v, orgid)
+				if !kou {
+					err = fmt.Errorf(FindDrugsName(v.DrugId) + "库存不足")
+					return
+				}
+				//扣减库存
+				err = FenStock(orgid, creater, v)
+				if err != nil {
+					err = fmt.Errorf("!:%v", err)
+					return
+				}
 			}
 		}
-	}
-	//修改状态
-	errs1 := XTWriteDB().Model(&models.XtDoctorAdviceL{}).Where("id in (?)", xid).Updates(map[string]interface{}{
-		"is_medicine":     1,
-		"people":          0,
-		"dispensing_time": time_now,
-		"updated_time":    time.Now().Unix(),
-	}).Error
-	if errs1 != nil {
-		return errs1
+		//修改状态
+		errs1 := XTWriteDB().Model(&models.XtDoctorAdviceL{}).Where("id in (?)", xid).Updates(map[string]interface{}{
+			"is_medicine":     1,
+			"people":          0,
+			"dispensing_time": time_now,
+			"updated_time":    time.Now().Unix(),
+		}).Error
+		if errs1 != nil {
+			return errs1
+		}
 	}
 
 	//生成明细记录
@@ -1911,3 +1961,24 @@ func GetAllValidDeviceZones02(orgID int64) ([]*models.DeviceZone, error) {
 	}
 	return zones, nil
 }
+
+func FindeHisAdviceDocAdvice(orgid int64, patient_id int64, stime int64, etime int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	db := XTReadDB().Model(&advice).Where("status= 1")
+
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if stime > 0 {
+		db = db.Where("advice_date >=?", stime)
+	}
+	if etime > 0 {
+		db = db.Where("advice_date<=?", etime)
+	}
+	err = db.Find(&advice).Error
+
+	return advice, err
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -104,6 +104,7 @@ type DialysisOrderVM struct {
 	WashpipeNurse  int64           `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
 	UserOrgId      int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	QualityNurseId int64           `gorm:"column:quality_nurse_id" json:"quality_nurse_id" form:"quality_nurse_id"`
+	Url            string          `gorm:"column:url" json:"url" form:"url"`
 }
 
 func (DialysisOrderVM) TableName() string {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -479,3 +479,11 @@ func GetBatchSummerVM(orgid int64, patient_id int64, assessment_date int64) (*Su
 	err := p_service.XTReadDB().Where("user_org_id = ? and patient_id = ? and assessment_date =? and status = 1", orgid, patient_id, assessment_date).Find(&SummerVM).Error
 	return &SummerVM, err
 }
+
+func GetAdminUserEsTwo(orgid int64) (admin []*models.UserAdminRoles, err error) {
+	db := p_service.UserReadDB().Table("sgj_user_admin_role as x").Where("x.status =1")
+	table := p_service.UserReadDB().Table("sgj_user_admin_electronic_signature as s")
+	fmt.Println("table", table)
+	err = db.Select("x.id,x.admin_user_id,x.user_name,x.org_id,s.creator,s.url,s.hash").Joins("left join sgj_user_admin_electronic_signature as s on s.creator = x.admin_user_id").Where("x.org_id = ?", orgid).Scan(&admin).Error
+	return admin, err
+}

service/schedule_service.go

@@ -226,9 +226,19 @@ func GetPointSchedule(orgID, scheduleDate, scheduleWeek, scheduleType, bedId int
 	return
 }
 
-func CreateSchedule(m *models.Schedule) error {
+func CreateSchedule(m *models.Schedule, id int64) (err error) {
 	utx := XTWriteDB().Begin()
-	err := utx.Create(&m).Error
+	schedule := models.XtSchedule{}
+	err = utx.Model(&schedule).Where("id=? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	if err != nil {
+		utx.Rollback()
+		return err
+	}
+	err = utx.Create(&m).Error
+	if err != nil {
+		utx.Rollback()
+		return err
+	}
 	utx.Commit()
 	return err
 }
@@ -346,8 +356,8 @@ func UpdateScheduleOne(id int64, schedule models.Schedule) error {
 }
 
 // 参数一：当前操作的患者的排班     参数二被替换床位对应的排班
-func UpdateScheduleTwo(schone models.Schedule, schtwo models.Schedule) {
-	utx := XTWriteDB()
+func UpdateScheduleTwo(schone models.Schedule, schtwo models.Schedule) (err error) {
+	utx := XTWriteDB().Begin()
 	//床位
 	var tempBedID int64
 	var tempBedIDTwo int64
@@ -377,16 +387,22 @@ func UpdateScheduleTwo(schone models.Schedule, schtwo models.Schedule) {
 
 	schone.ScheduleType = tempTypeTwo
 	schtwo.ScheduleType = tempTypeID
-	schone.IsExport = 9000
-	schtwo.IsExport = 9000
 
-	utx.Model(&models.Schedule{}).Where("id = ?", schone.ID).Updates(map[string]interface{}{"partition_id": schone.PartitionId, "bed_id": schone.BedId, "schedule_type": schone.ScheduleType, "is_export": 9000})
-	utx.Model(&models.Schedule{}).Where("id = ?", schtwo.ID).Updates(map[string]interface{}{"partition_id": schtwo.PartitionId, "bed_id": schtwo.BedId, "schedule_type": schtwo.ScheduleType, "is_export": 9000})
+	if err = utx.Model(&models.Schedule{}).Where("id = ?", schone.ID).Updates(map[string]interface{}{"partition_id": schone.PartitionId, "bed_id": schone.BedId, "schedule_type": schone.ScheduleType, "is_export": 90000}).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
 
+	if err = utx.Model(&models.Schedule{}).Where("id = ?", schtwo.ID).Updates(map[string]interface{}{"partition_id": schtwo.PartitionId, "bed_id": schtwo.BedId, "schedule_type": schtwo.ScheduleType, "is_export": 90000}).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+	utx.Commit()
+	return err
 }
 
-func UpdateScheduleThree(schone *models.Schedule, schtwo *models.Schedule) {
-	utx := XTWriteDB()
+func UpdateScheduleThree(schone *models.Schedule, schtwo *models.Schedule) (err error) {
+	utx := XTWriteDB().Begin()
 	//床位
 	var tempBedID int64
 	var tempBedIDTwo int64
@@ -407,6 +423,7 @@ func UpdateScheduleThree(schone *models.Schedule, schtwo *models.Schedule) {
 	var sch_week_one int64
 	var sch_week_two int64
 
+	//原数据
 	tempBedID = schone.BedId
 	tempBedIDTwo = schtwo.BedId
 
@@ -422,6 +439,7 @@ func UpdateScheduleThree(schone *models.Schedule, schtwo *models.Schedule) {
 	sch_week_one = schone.ScheduleWeek
 	sch_week_two = schtwo.ScheduleWeek
 
+	//交换数据
 	schone.BedId = tempBedIDTwo
 	schtwo.BedId = tempBedID
 
@@ -437,12 +455,18 @@ func UpdateScheduleThree(schone *models.Schedule, schtwo *models.Schedule) {
 	schone.ScheduleWeek = sch_week_two
 	schtwo.ScheduleWeek = sch_week_one
 
-	schone.IsExport = 9000
-	schtwo.IsExport = 9000
+	if err = utx.Model(&models.Schedule{}).Where("id = ?", schone.ID).Updates(map[string]interface{}{"partition_id": schone.PartitionId, "bed_id": schone.BedId, "schedule_type": schone.ScheduleType, "schedule_date": schone.ScheduleDate, "schedule_week": schone.ScheduleWeek, "is_export": 80000}).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
 
-	utx.Model(&models.Schedule{}).Where("id = ?", schone.ID).Updates(map[string]interface{}{"partition_id": schone.PartitionId, "bed_id": schone.BedId, "schedule_type": schone.ScheduleType, "schedule_date": schone.ScheduleDate, "schedule_week": schone.ScheduleWeek, "is_export": 9000})
-	utx.Model(&models.Schedule{}).Where("id = ?", schtwo.ID).Updates(map[string]interface{}{"partition_id": schtwo.PartitionId, "bed_id": schtwo.BedId, "schedule_type": schtwo.ScheduleType, "schedule_date": schtwo.ScheduleDate, "schedule_week": schtwo.ScheduleWeek, "is_export": 9000})
+	if err = utx.Model(&models.Schedule{}).Where("id = ?", schtwo.ID).Updates(map[string]interface{}{"partition_id": schtwo.PartitionId, "bed_id": schtwo.BedId, "schedule_type": schtwo.ScheduleType, "schedule_date": schtwo.ScheduleDate, "schedule_week": schtwo.ScheduleWeek, "is_export": 80000}).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+	utx.Commit()
 
+	return err
 }
 
 func GetPatientScheduleFormToday(orgId, id, start int64) (schedules []*models.PatientSchedule, err error) {
@@ -1500,21 +1524,43 @@ func GetScheduleTemplateCountByDate(org_id int64, week_day int8, patient_id int6
 	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
+func SaveSchTemplateTwo(sch models.PatientScheduleTemplateItem, sch_two models.PatientScheduleTemplateItem, new_sch models.PatientScheduleTemplateItem) (err error) {
+	utx := writeDb.Begin()
+	if err = utx.Model(&models.PatientScheduleTemplateItem{}).Where("status=1 AND id = ?", sch.ID).Updates(map[string]interface{}{"status": 0}).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+	if err = utx.Model(&models.PatientScheduleTemplateItem{}).Where("status=1 AND id = ?", sch_two.ID).Updates(map[string]interface{}{"status": 0}).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+	if err = utx.Save(&new_sch).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+	utx.Commit()
 
-	return
+	return err
 }
 
-func SaveSchTemplate(sch models.PatientScheduleTemplateItem) (err error) {
-	err = writeDb.Save(&sch).Error
-	return
+func SaveSchTemplate(sch models.PatientScheduleTemplateItem, sch_two models.PatientScheduleTemplateItem) (err error) {
+	utx := writeDb.Begin()
+	if err = utx.Save(&sch).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+
+	if err = utx.Save(&sch_two).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+	utx.Commit()
+
+	return err
 }
 
-func UpdateScheduleTemplateThree(schone models.PatientScheduleTemplateItem, schtwo models.PatientScheduleTemplateItem) {
-	utx := XTWriteDB()
+func UpdateScheduleTemplateThree(schone models.PatientScheduleTemplateItem, schtwo models.PatientScheduleTemplateItem) error {
+	utx := XTWriteDB().Begin()
 	//床位
 	var tempBedID int64
 	var tempBedIDTwo int64
@@ -1544,10 +1590,17 @@ func UpdateScheduleTemplateThree(schone models.PatientScheduleTemplateItem, scht
 
 	schone.Weekday = sch_week_two
 	schtwo.Weekday = sch_week_one
+	if err = 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": 70000}).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+	if err = 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": 70000}).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+	utx.Commit()
 
-	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})
-
+	return err
 }
 
 func GetScheduleTemplateForDeviceNumberTwo(orgID int64, deviceNumberID int64, template_id int64, week_type int64, time_type int64, patient_id int64) (models.PatientScheduleTemplateItem, error) {
@@ -1555,3 +1608,22 @@ func GetScheduleTemplateForDeviceNumberTwo(orgID int64, deviceNumberID int64, te
 	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
 }
+
+func ClearSchedules(user_org_id int64, start_time int64) (err error) {
+	err = writeDb.Table("xt_schedule as s").
+		Where("s.schedule_date > ? AND s.status = 1 AND "+
+			"s.user_org_id = ?", start_time, user_org_id).
+		Updates(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
+	return
+}
+
+func CreateScheduleTwo(m *models.Schedule) error {
+	utx := XTWriteDB().Begin()
+	err = utx.Create(&m).Error
+	if err != nil {
+		utx.Rollback()
+		return err
+	}
+	utx.Commit()
+	return err
+}