11月9日库存管理

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9529
+httpport = 9531
 runmode = dev
 #dev/prod
 

controllers/dialysis_api_controller.go

@@ -105,6 +105,8 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/schedule/checknewdoctoradvice", &DialysisApiController{}, "Get:CheckNewDoctorAdvice")
 
 	beego.Router("/api/schedule/settlenewdoctoradvice", &DialysisApiController{}, "Get:SettleNewDoctorAdvice")
+
+	beego.Router("/api/schedule/excutiondoctoradvicebyid", &DialysisApiController{}, "Get:ExcutionDoctorAdviceById")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -3473,7 +3475,7 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 		advice.UserOrgId = adminUserInfo.CurrentOrgId
 		advice.PatientId = patient
 		advice.AdviceDoctor = adminUserInfo.AdminUser.Id
-
+		advice.IsSettle = 2
 		if adviceNameM["advice_name"] == nil || reflect.TypeOf(adviceNameM["advice_name"]).String() != "string" {
 			utils.ErrorLog("advice_name")
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -3600,7 +3602,7 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 					child.UserOrgId = adminUserInfo.CurrentOrgId
 					child.PatientId = patient
 					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")
 						return
@@ -4767,6 +4769,14 @@ func (this *DialysisApiController) ExcutionDoctorAdvice() {
 		groupList, _ := service.GetHisExcutionDoctorAdviceListGroupList(recordIDStrs, startTime, orgId)
 		//查找未执行医嘱
 		list, _ := service.GetHisExcutionDoctorAdviceList(recordIDStrs, startTime, orgId)
+		for _, item := range list {
+			if item.Checker == this.GetAdminUserInfo().AdminUser.Id {
+				this.ServeSuccessJSON(map[string]interface{}{
+					"msg": "3",
+				})
+				return
+			}
+		}
 		for _, item := range groupList {
 			for _, it := range list {
 				if item.DrugId == it.DrugId {
@@ -5043,7 +5053,6 @@ func (this *DialysisApiController) ExcutionDoctorAdvice() {
 func (this *DialysisApiController) CheckNewDoctorAdvice() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-	is_open, _ := this.GetInt64("is_open")
 	idsStr := this.GetString("str")
 	recordIDStrs := strings.Split(idsStr, ",")
 	start_time := this.GetString("advice_date")
@@ -5060,7 +5069,9 @@ func (this *DialysisApiController) CheckNewDoctorAdvice() {
 		startTime = theTime.Unix()
 	}
 
-	if is_open == 1 {
+	config, _ := service.FindXTHisRecordByOrgIdSix(orgId)
+
+	if config.IsOpen == 1 {
 
 		creater := this.GetAdminUserInfo().AdminUser.Id
 		//查询未核对的医嘱
@@ -5075,6 +5086,23 @@ func (this *DialysisApiController) CheckNewDoctorAdvice() {
 			}
 
 			service.CheckHisDoctorAdvice(item.ID, creater)
+
+			key := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+			theTime := time.Now()
+			recordDate := theTime.Format("2006-01-02")
+			keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(orgId, 10)
+
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
+
 		}
 	} else {
 
@@ -5090,7 +5118,22 @@ func (this *DialysisApiController) CheckNewDoctorAdvice() {
 				return
 			}
 
-			service.CheckHisDoctorAdvice(item.ID, creater)
+			service.CheckDoctorAdvice(item.ID, creater)
+			key := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+			theTime := time.Now()
+			recordDate := theTime.Format("2006-01-02")
+			keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(orgId, 10)
+
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
 		}
 	}
 
@@ -5130,3 +5173,269 @@ func (this *DialysisApiController) SettleNewDoctorAdvice() {
 	})
 	return
 }
+
+func (this *DialysisApiController) ExcutionDoctorAdviceById() {
+
+	advice_id, _ := this.GetInt64("advice_id")
+	start_time := this.GetString("advice_date")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	config, _ := service.FindXTHisRecordByOrgIdSix(orgId)
+	exec_time, _ := this.GetInt64("exec_time")
+
+	//his医嘱
+	if config.IsOpen == 1 {
+
+		//查询医嘱
+		advice, _ := service.GetHisDocById(advice_id, orgId)
+		if advice.Checker == this.GetAdminUserInfo().AdminUser.Id {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"msg": "3",
+			})
+			return
+		}
+		medical, _ := service.GetBaseDrugMedical(orgId)
+		var prescribing_number int64
+		stringPrescribingNumber := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 64)
+		parseIntPrescribingNumber, _ := strconv.ParseInt(stringPrescribingNumber, 10, 64)
+		if advice.PrescribingNumberUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+			prescribing_number = parseIntPrescribingNumber * medical.MinNumber
+		}
+		if advice.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+			prescribing_number = parseIntPrescribingNumber
+		}
+		if advice.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
+			prescribing_number = parseIntPrescribingNumber
+		}
+
+		drugStockOut, _ := service.GetDrugSumOutCountByDrugId(advice.DrugId, orgId)
+		//库存不足
+		if prescribing_number > drugStockOut.FlushCount {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"msg":  "2",
+				"drug": medical,
+			})
+			return
+		}
+		info := models.HisDoctorAdviceInfo{
+			ExecutionStaff: this.GetAdminUserInfo().AdminUser.Id,
+			ExecutionTime:  exec_time,
+			ExecutionState: 1,
+			UpdatedTime:    time.Now().Unix(),
+		}
+		//执行医嘱
+		service.UpdateHisDoctorAdviceExecution(info, advice.ID)
+
+		key := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
+		redis := service.RedisClient()
+		//清空key 值
+		redis.Set(key, "", time.Second)
+		keyTwo := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+
+		redis.Set(keyTwo, "", time.Second)
+		keyThree := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_doctor_advice"
+		redis.Set(keyThree, "", time.Second)
+		toTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", start_time)
+		theTime := toTime.Format("2006-01-02")
+
+		fmt.Println("theTIME", theTime)
+		keyFour := "scheduals_" + theTime + "_" + strconv.FormatInt(orgId, 10)
+
+		redis.Set(keyFour, "", time.Second)
+		keyFive := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
+		redis.Set(keyFive, "", time.Second)
+
+		//出库
+		if prescribing_number <= drugStockOut.FlushCount {
+			pharmacyConfig, _ := service.FindPharmacyConfig(orgId)
+			//执行出库逻辑
+			hisadvice := &models.HisDoctorAdviceInfo{
+				ID:                    advice.ID,
+				UserOrgId:             advice.UserOrgId,
+				PatientId:             advice.PatientId,
+				AdviceType:            advice.AdviceType,
+				AdviceDate:            advice.AdviceDate,
+				StartTime:             advice.StartTime,
+				AdviceName:            advice.AdviceName,
+				AdviceDesc:            advice.AdviceDesc,
+				ReminderDate:          advice.ReminderDate,
+				SingleDose:            advice.SingleDose,
+				SingleDoseUnit:        advice.SingleDoseUnit,
+				DrugSpec:              advice.DrugSpec,
+				DrugSpecUnit:          advice.DrugSpecUnit,
+				PrescribingNumber:     advice.PrescribingNumber,
+				PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				DeliveryWay:           advice.DeliveryWay,
+				ExecutionFrequency:    advice.ExecutionFrequency,
+				AdviceDoctor:          advice.AdviceDoctor,
+				Status:                1,
+				CreatedTime:           advice.CreatedTime,
+				UpdatedTime:           advice.UpdatedTime,
+				AdviceAffirm:          advice.AdviceAffirm,
+				Remark:                advice.Remark,
+				StopTime:              advice.StopTime,
+				StopReason:            advice.StopReason,
+				StopDoctor:            advice.StopDoctor,
+				StopState:             advice.StopState,
+				ParentId:              advice.ParentId,
+				ExecutionTime:         advice.ExecutionTime,
+				ExecutionStaff:        this.GetAdminUserInfo().AdminUser.Id,
+				ExecutionState:        advice.ExecutionState,
+				Checker:               advice.Checker,
+				RecordDate:            advice.RecordDate,
+				DialysisOrderId:       advice.DialysisOrderId,
+				CheckTime:             advice.CheckTime,
+				CheckState:            advice.CheckState,
+				RemindType:            advice.RemindType,
+				FrequencyType:         advice.FrequencyType,
+				DayCount:              advice.DayCount,
+				WeekDay:               advice.WeekDay,
+				TemplateId:            advice.TemplateId,
+				Modifier:              advice.Modifier,
+				Way:                   advice.Way,
+				DrugId:                advice.DrugId,
+				ExecutionFrequencyId:  advice.ExecutionFrequencyId,
+			}
+			if medical.IsUse == 2 {
+				if config.IsOpen != 1 {
+					if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
+						service.HisDrugsDelivery(advice.UserOrgId, advice.ExecutionStaff, hisadvice)
+
+					}
+					//不通过药房发药
+					if pharmacyConfig.IsOpen != 1 {
+						service.HisDrugsDelivery(advice.UserOrgId, advice.ExecutionStaff, hisadvice)
+					}
+					//查询默认仓库
+					storeHouseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
+					//查询默认仓库剩余多少库存
+					var sum_count int64
+					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, advice.UserOrgId, advice.DrugId)
+					for _, its := range stockInfo {
+						if its.MaxUnit == medical.MaxUnit {
+							its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+						}
+						sum_count += its.StockMaxNumber + its.StockMinNumber
+					}
+					service.UpdateBaseDrugSumTwo(advice.DrugId, sum_count, advice.UserOrgId)
+					service.UpdateDrugStockCount(advice.DrugId, advice.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+				}
+			}
+		}
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg": "1",
+		})
+		return
+	}
+
+	if config.IsOpen == 2 || config.IsOpen == 0 {
+
+		advice, _ := service.GetBloodDocById(advice_id, orgId)
+		medical, _ := service.GetBaseDrugMedical(orgId)
+		pharmacyConfig, _ := service.FindPharmacyConfig(orgId)
+		storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+		var prescribing_number int64
+		stringPrescribingNumber := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 64)
+		parseIntPrescribingNumber, _ := strconv.ParseInt(stringPrescribingNumber, 10, 64)
+		if advice.PrescribingNumberUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+			prescribing_number = parseIntPrescribingNumber * medical.MinNumber
+		}
+		if advice.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+			prescribing_number = parseIntPrescribingNumber
+		}
+		if advice.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
+			prescribing_number = parseIntPrescribingNumber
+		}
+		drugStockOut, _ := service.GetDrugSumOutCountByDrugId(advice.DrugId, orgId)
+		//库存不足
+		if prescribing_number > drugStockOut.FlushCount {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"msg":  "2",
+				"drug": medical,
+			})
+			return
+		}
+		info := models.DoctorAdvice{
+			ExecutionStaff: this.GetAdminUserInfo().AdminUser.Id,
+			ExecutionTime:  exec_time,
+			ExecutionState: 1,
+			UpdatedTime:    time.Now().Unix(),
+		}
+		//执行医嘱
+		service.UpdateDoctorAdviceExecution(info, advice.ID)
+
+		dadvice := &models.DoctorAdvice{
+			ID:                    advice.ID,
+			UserOrgId:             advice.UserOrgId,
+			PatientId:             advice.PatientId,
+			AdviceType:            advice.AdviceType,
+			AdviceDate:            advice.AdviceDate,
+			StartTime:             advice.StartTime,
+			AdviceName:            advice.AdviceName,
+			AdviceDesc:            advice.AdviceDesc,
+			ReminderDate:          advice.ReminderDate,
+			SingleDose:            advice.SingleDose,
+			SingleDoseUnit:        advice.SingleDoseUnit,
+			DrugSpec:              advice.DrugSpec,
+			DrugSpecUnit:          advice.DrugSpecUnit,
+			PrescribingNumber:     advice.PrescribingNumber,
+			PrescribingNumberUnit: advice.PrescribingNumberUnit,
+			DeliveryWay:           advice.DeliveryWay,
+			ExecutionFrequency:    advice.ExecutionFrequency,
+			AdviceDoctor:          advice.AdviceDoctor,
+			Status:                1,
+			CreatedTime:           advice.CreatedTime,
+			UpdatedTime:           advice.UpdatedTime,
+			AdviceAffirm:          advice.AdviceAffirm,
+			Remark:                advice.Remark,
+			StopTime:              advice.StopTime,
+			StopReason:            advice.StopReason,
+			StopDoctor:            advice.StopDoctor,
+			StopState:             advice.StopState,
+			ParentId:              advice.ParentId,
+			ExecutionTime:         advice.ExecutionTime,
+			ExecutionStaff:        advice.ExecutionStaff,
+			ExecutionState:        advice.ExecutionState,
+			Checker:               advice.Checker,
+			RecordDate:            advice.ReminderDate,
+			DialysisOrderId:       advice.DialysisOrderId,
+			CheckTime:             advice.CheckTime,
+			CheckState:            advice.CheckState,
+			RemindType:            advice.RemindType,
+			FrequencyType:         advice.FrequencyType,
+			DayCount:              advice.DayCount,
+			WeekDay:               advice.WeekDay,
+			TemplateId:            advice.TemplateId,
+			Modifier:              advice.Modifier,
+			Way:                   advice.Way,
+			DrugId:                advice.DrugId,
+		}
+		if medical.IsUse == 2 {
+			if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
+				service.DrugsDelivery(advice.UserOrgId, advice.ExecutionStaff, dadvice)
+			}
+			if pharmacyConfig.IsOpen != 1 {
+				service.DrugsDelivery(advice.UserOrgId, advice.ExecutionStaff, dadvice)
+			}
+
+			//更新字典里面的库存
+			stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, advice.UserOrgId, advice.DrugId)
+			var sum_count int64
+			for _, its := range stockInfo {
+				baseDrug, _ := service.GetBaseDrugMedical(its.DrugId)
+				if its.MaxUnit == baseDrug.MaxUnit {
+					its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+				}
+				sum_count += its.StockMaxNumber + its.StockMinNumber
+			}
+			service.UpdateBaseDrugSumTwo(advice.DrugId, sum_count, advice.UserOrgId)
+			//剩余库存
+			service.UpdateDrugStockCount(advice.DrugId, advice.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+		}
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "1",
+	})
+	return
+
+}

controllers/dialysis_record_api_controller.go

@@ -787,7 +787,8 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 	blood_access_id, _ := this.GetInt64("blood_access_id")
 	bedID, _ := this.GetInt64("bed")
 	nuclein_date := this.GetString("nuclein_date")
-
+	schedule_remark := this.GetString("schedule_remark")
+	order_remark := this.GetString("order_remark")
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1001,9 +1002,13 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		DialysisIrrigation:     dialysis_irrigation,
 		BloodAccessId:          blood_access_id,
 		NucleinDate:            theNucleinDate,
+		ScheduleRemark:         schedule_remark,
+		OrderRemark:            order_remark,
 	}
 
 	createErr := service.MobileCreateDialysisOrder(adminUserInfo.CurrentOrgId, patientID, dialysisRecord)
+	//更新患者表排班备注
+	service.UpdateMobilePatient(adminUserInfo.CurrentOrgId, patientID, schedule_remark)
 	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_order"
 	redis := service.RedisClient()
 	//清空key 值
@@ -1539,6 +1544,8 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 	dialysis_irrigation := this.GetString("dialysis_irrigation")
 	blood_access_id, _ := this.GetInt64("blood_access_id")
 	nuclein_date := this.GetString("nuclein_date")
+	schedule_remark := this.GetString("schedule_remark")
+	order_remark := this.GetString("order_remark")
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1680,7 +1687,7 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 		}
 
 	}
-	fmt.Println("theNucleinDate", theNucleinDate)
+
 	dialysisRecord := &models.DialysisOrder{
 		ID:                     record_id,
 		UserOrgId:              adminUserInfo.CurrentOrgId,
@@ -1702,9 +1709,16 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 		DialysisIrrigation:     dialysis_irrigation,
 		BloodAccessId:          blood_access_id,
 		NucleinDate:            theNucleinDate,
+		ScheduleRemark:         schedule_remark,
+		OrderRemark:            order_remark,
 	}
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)
+
+	order, _ := service.GetLastPatientOrder(record_id)
+
+	service.UpdateMobilePatient(adminUserInfo.CurrentOrgId, order.PatientId, schedule_remark)
+
 	redis := service.RedisClient()
 	key := strconv.FormatInt(tempDialysisRecord.UserOrgId, 10) + ":" + strconv.FormatInt(tempDialysisRecord.PatientId, 10) + ":" + strconv.FormatInt(tempDialysisRecord.DialysisDate, 10) + ":dialysis_order"
 	redis.Set(key, "", time.Second)

controllers/his_api_controller.go

@@ -5341,7 +5341,9 @@ func (c *HisApiController) GetUploadInfo() {
 
 		var goods []*models.DialysisBeforePrepareGoods
 		var newGoods []*models.NewDialysisBeforePrepareGoods
+		var oldGoods []*models.OldDialysisBeforePrepareGoods
 		var infos []*models.HisDoctorAdviceInfo
+		var infoList []*models.HisDoctorAdviceInfo
 		var hisAdvice []*models.HisDoctorAdviceInfo
 		var newGoodOne []*models.NewDialysisBeforePrepareGoods
 		houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.CurrentOrgId)
@@ -5538,13 +5540,14 @@ func (c *HisApiController) GetUploadInfo() {
 		if err == nil {
 			for _, info := range prescriptions {
 				if info.Type == 1 {
-					infos = append(infos, info.HisDoctorAdviceInfo...)
+					infoList = append(infoList, info.HisDoctorAdviceInfo...)
 				}
 				if info.Type == 2 {
 					for _, sumItem := range info.HisPrescriptionProject {
 						if sumItem.Type == 3 {
 							var good models.DialysisBeforePrepareGoods
 							var newGood models.NewDialysisBeforePrepareGoods
+							var oldGood models.OldDialysisBeforePrepareGoods
 							good.GoodId = sumItem.GoodInfo.ID
 							good.GoodTypeId = sumItem.GoodInfo.GoodTypeId
 							count, _ := strconv.Atoi(sumItem.Count)
@@ -5560,6 +5563,16 @@ func (c *HisApiController) GetUploadInfo() {
 							newGood.StorehouseId = houseConfig.StorehouseOutInfo
 							newGood.ProjectId = sumItem.ID
 							newGoods = append(newGoods, &newGood)
+
+							oldGood.GoodId = sumItem.GoodInfo.ID
+							oldGood.GoodTypeId = sumItem.GoodInfo.GoodTypeId
+							count3, _ := strconv.Atoi(sumItem.Count)
+							oldGood.Count = int64(count3)
+							oldGood.StorehouseId = houseConfig.StorehouseOutInfo
+							oldGood.ProjectId = sumItem.ID
+							oldGood.RecordDate = sumItem.RecordDate
+
+							oldGoods = append(oldGoods, &oldGood)
 						}
 
 					}
@@ -5567,10 +5580,62 @@ func (c *HisApiController) GetUploadInfo() {
 				}
 			}
 			if settConfig.IsOpen == 1 {
-				for _, item := range infos {
+				fmt.Println("infos23233232232323323233223wo", infoList)
+				for _, item := range infoList {
+					medical, _ := service.GetBaseDrugMedical(item.DrugId)
 					service.HisDrugsDelivery(item.UserOrgId, adminUser.AdminUser.Id, item)
+					//查询默认仓库
+					storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+					//查询默认仓库剩余多少库存
+					var sum_count int64
+					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+					for _, its := range stockInfo {
+						if its.MaxUnit == medical.MaxUnit {
+							its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+						}
+						sum_count += its.StockMaxNumber + its.StockMinNumber
+					}
+					service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+					service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+				}
+
+				for _, item := range oldGoods {
+					dialyPrepareOne := models.DialysisBeforePrepare{
+						GoodTypeId:   item.GoodTypeId,
+						GoodId:       item.GoodId,
+						PatientId:    item.PatientId,
+						RecordDate:   item.RecordDate,
+						UserOrgId:    item.UserOrgId,
+						Count:        item.Count,
+						Ctime:        time.Now().Unix(),
+						Creater:      adminUser.AdminUser.Id,
+						CommdityCode: item.CommdityCode,
+						Status:       1,
+						StorehouseId: houseConfig.StorehouseOutInfo,
+					}
+					err = service.CreateDialysisBeforePrepareOne(&dialyPrepareOne)
 				}
+
 				service.ConsumablesDeliveryTotal(adminUser.CurrentOrgId, his.PatientId, his.RecordDate, goods, newGoods, adminUser.AdminUser.Id)
+				//查询默认仓库
+				//storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminUser.CurrentOrgId)
+				//stockList, _ := service.GetStockCountByGoodId(goods.GoodId, storeHouseConfig.StorehouseOutInfo,adminUser.CurrentOrgId)
+				//var total_count int64
+				//for _, it := range stockList {
+				//  total_count += it.StockCount
+				//}
+				////基础库插入数据
+				//service.UpdateGoodInfoReduceSumCount(goods.GoodId, total_count, adminUser.CurrentOrgId)
+				//
+				//////更新剩余库存
+				//
+				//goodList, _ := service.GetSumGoodList(adminUser.CurrentOrgId, storeHouseConfig.StorehouseOutInfo, goods.GoodId)
+				//var flush_count int64
+				//for _, it := range goodList {
+				//  flush_count += it.StockCount
+				//}
+				//errs := service.UpdateSumGood(adminUser.CurrentOrgId, storeHouseConfig.StorehouseOutInfo, goods.GoodId, flush_count)
+				//fmt.Println(errs)
 			}
 
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -5607,7 +5672,10 @@ func (c *HisApiController) GetUploadInfo() {
 				var goods []*models.DialysisBeforePrepareGoods
 				var newGoods []*models.NewDialysisBeforePrepareGoods
 				var infos []*models.HisDoctorAdviceInfo
-
+				var hisAdvice []*models.HisDoctorAdviceInfo
+				var newGoodOne []*models.NewDialysisBeforePrepareGoods
+				var infolist []*models.HisDoctorAdviceInfo
+				var oldGoods []*models.OldDialysisBeforePrepareGoods
 				for _, info := range prescriptions {
 					if info.Type == 1 {
 						infos = append(infos, info.HisDoctorAdviceInfo...)
@@ -5638,11 +5706,159 @@ func (c *HisApiController) GetUploadInfo() {
 
 					}
 				}
+
 				settConfig, _ := service.GetSettleOpenConfigByOrgId(adminUser.CurrentOrgId)
 				if settConfig.IsOpen == 1 {
-					for _, item := range infos {
+
+					//判断库存的地方
+					for _, info := range prescriptions {
+						if info.Type == 1 {
+							infolist = append(infolist, info.HisDoctorAdviceInfo...)
+
+						}
+						if info.Type == 2 {
+							for _, sumItem := range info.HisPrescriptionProject {
+								if sumItem.Type == 3 {
+									var good models.DialysisBeforePrepareGoods
+									var newGood models.NewDialysisBeforePrepareGoods
+									var oldGood models.OldDialysisBeforePrepareGoods
+									good.GoodId = sumItem.GoodInfo.ID
+									good.GoodTypeId = sumItem.GoodInfo.GoodTypeId
+									count, _ := strconv.Atoi(sumItem.Count)
+									good.Count = int64(count)
+									good.StorehouseId = houseConfig.StorehouseOutInfo
+									good.ProjectId = sumItem.ID
+									goods = append(goods, &good)
+
+									newGood.GoodId = sumItem.GoodInfo.ID
+									newGood.GoodTypeId = sumItem.GoodInfo.GoodTypeId
+									count2, _ := strconv.Atoi(sumItem.Count)
+									newGood.Count = int64(count2)
+									newGood.StorehouseId = houseConfig.StorehouseOutInfo
+									newGood.ProjectId = sumItem.ID
+									newGoods = append(newGoods, &newGood)
+
+									oldGood.GoodId = sumItem.GoodInfo.ID
+									oldGood.GoodTypeId = sumItem.GoodInfo.GoodTypeId
+									count3, _ := strconv.Atoi(sumItem.Count)
+									oldGood.Count = int64(count3)
+									oldGood.StorehouseId = houseConfig.StorehouseOutInfo
+									oldGood.ProjectId = sumItem.ID
+									oldGood.RecordDate = sumItem.RecordDate
+
+									oldGoods = append(oldGoods, &oldGood)
+								}
+							}
+						}
+					}
+
+					for _, info := range prescriptionsOne {
+						if info.Type == 1 {
+							hisAdvice = append(hisAdvice, info.HisDoctorAdviceInfo...)
+						}
+
+						if info.Type == 2 {
+							for _, sumItem := range info.HisPrescriptionProject {
+								if sumItem.Type == 3 {
+									var newGood models.NewDialysisBeforePrepareGoods
+
+									newGood.GoodId = sumItem.GoodInfo.ID
+									newGood.GoodTypeId = sumItem.GoodInfo.GoodTypeId
+									count2, _ := strconv.Atoi(sumItem.Count)
+									newGood.Count = int64(count2)
+									newGood.StorehouseId = houseConfig.StorehouseOutInfo
+									newGood.ProjectId = sumItem.ID
+									newGoodOne = append(newGoodOne, &newGood)
+								}
+							}
+						}
+					}
+
+					//判断
+					for _, itemOne := range infos {
+						for _, itemTwo := range hisAdvice {
+							if itemOne.DrugId == itemTwo.DrugId {
+								itemTwo.Child = append(itemTwo.ChildDoctorAdvice, itemOne)
+							}
+						}
+					}
+
+					for _, itemTwo := range hisAdvice {
+						medical, _ := service.GetBaseDrugMedical(itemTwo.DrugId)
+						var sum_out_count int64
+						for _, itemThree := range itemTwo.Child {
+							var prescribing_number int64
+							stringPrescribingNumber := strconv.FormatFloat(itemThree.PrescribingNumber, 'f', -1, 64)
+							parseIntPrescribingNumber, _ := strconv.ParseInt(stringPrescribingNumber, 10, 64)
+							if itemThree.PrescribingNumberUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+								prescribing_number = parseIntPrescribingNumber * medical.MinNumber
+							}
+							if itemThree.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+								prescribing_number = parseIntPrescribingNumber
+							}
+							if itemThree.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
+								prescribing_number = parseIntPrescribingNumber
+							}
+							sum_out_count += prescribing_number
+						}
+						drugStockOut, _ := service.GetDrugSumOutCountByDrugId(itemTwo.DrugId, adminUser.CurrentOrgId)
+
+						if sum_out_count > drugStockOut.FlushCount {
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":  "2",
+								"drug": medical,
+							})
+							return
+						}
+					}
+
+					for _, itemOne := range newGoods {
+						for _, item := range newGoodOne {
+							if itemOne.ProjectId == item.ProjectId {
+								item.ChildNewDialysisBeforePrepareGoods = append(item.ChildNewDialysisBeforePrepareGoods, item)
+							}
+						}
+					}
+
+					for _, item := range newGoodOne {
+						var sum_out_count_one int64
+						good, _ := service.GetGoodInformationByGoodIdOne(item.GoodId)
+
+						for _, itemOne := range item.ChildNewDialysisBeforePrepareGoods {
+							sum_out_count_one += itemOne.Count
+						}
+						list, _ := service.GetStockGoodList(item.GoodId, adminUser.CurrentOrgId)
+						fmt.Println("sum_out_count_one", sum_out_count_one)
+						fmt.Println("list.FlushCount", list.FlushCount)
+						if sum_out_count_one > list.FlushCount {
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":  "3",
+								"good": good,
+							})
+							return
+						}
+					}
+
+					fmt.Println("infos233232323223323232323232323232", infolist)
+					for _, item := range infolist {
 						service.HisDrugsDelivery(item.UserOrgId, adminUser.AdminUser.Id, item)
 					}
+					for _, item := range oldGoods {
+						dialyPrepareOne := models.DialysisBeforePrepare{
+							GoodTypeId:   item.GoodTypeId,
+							GoodId:       item.GoodId,
+							PatientId:    item.PatientId,
+							RecordDate:   item.RecordDate,
+							UserOrgId:    item.UserOrgId,
+							Count:        item.Count,
+							Ctime:        time.Now().Unix(),
+							Creater:      adminUser.AdminUser.Id,
+							CommdityCode: item.CommdityCode,
+							Status:       1,
+							StorehouseId: houseConfig.StorehouseOutInfo,
+						}
+						err = service.CreateDialysisBeforePrepareOne(&dialyPrepareOne)
+					}
 					service.ConsumablesDeliveryTotal(adminUser.CurrentOrgId, his.PatientId, his.RecordDate, goods, newGoods, adminUser.AdminUser.Id)
 				}
 
@@ -5710,7 +5926,8 @@ func (c *HisApiController) Refund() {
 			}
 		}
 	}
-	if adminUser.CurrentOrgId == 9671 {
+	settConfig, _ := service.GetSettleOpenConfigByOrgId(adminUser.CurrentOrgId)
+	if settConfig.IsOpen == 1 {
 		for _, item := range infos {
 
 			service.DrugAutoAddCancelInfo(item, adminUser.AdminUser.Id)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1847,7 +1847,7 @@ func (c *DialysisAPIController) Finish() {
 
 	}
 
-	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 {
+	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10223 {
 		evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.Org.Id, id, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
 			evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
@@ -2129,7 +2129,8 @@ func (this *DialysisAPIController) StartDialysis() {
 	zone_id, _ := this.GetInt64("zone_id")
 	elecsign := this.GetString("url")
 	nuclein_date_str := this.GetString("nuclein_date_str")
-
+	schedule_remark := this.GetString("schedule_remark")
+	order_remark := this.GetString("order_remark")
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -2212,7 +2213,7 @@ func (this *DialysisAPIController) StartDialysis() {
 		}
 		theNucleinDate = theTime.Unix()
 	}
-	fmt.Println("wo2o3o23o2o2323oo232o3swo", theNucleinDate)
+
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
 	//查询更改的机号，是否有人用了,如果只是排班了，但是没上机，直接替换，如果排班且上机了，就提示他无法上机
@@ -2330,13 +2331,15 @@ func (this *DialysisAPIController) StartDialysis() {
 		BloodAccessId:          blood_access_id,
 		Url:                    elecsign,
 		NucleinDate:            theNucleinDate,
+		ScheduleRemark:         schedule_remark,
+		OrderRemark:            order_remark,
 	}
 	//查询该床位是否有人用了
 	_, errorscode := service.GetDialysisOrderByBedId(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
 	if errorscode == gorm.ErrRecordNotFound {
 
 		createErr := service.MobileCreateDialysisOrder(adminUserInfo.Org.Id, patientID, dialysisRecord)
-
+		service.UpdateMobilePatient(adminUserInfo.Org.Id, patientID, schedule_remark)
 		redis := service.RedisClient()
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_order"
 		redis.Set(key, "", time.Second)
@@ -3140,6 +3143,8 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 	dialysis_irrigation := this.GetString("dialysis_irrigation")
 	blood_access_id, _ := this.GetInt64("blood_access_id")
 	nuclein_date_str := this.GetString("nuclein_date_str")
+	order_remark := this.GetString("order_remark")
+	schedule_remark := this.GetString("schedule_remark")
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -3302,9 +3307,13 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 		DialysisIrrigation:     dialysis_irrigation,
 		BloodAccessId:          blood_access_id,
 		NucleinDate:            theNucleinDate,
+		OrderRemark:            order_remark,
+		ScheduleRemark:         schedule_remark,
 	}
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)
+	order, _ := service.GetLastPatientOrder(record_id)
+	service.UpdateMobilePatient(adminUserInfo.Org.Id, order.PatientId, schedule_remark)
 	redis := service.RedisClient()
 
 	key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(record_date, 10) + ":dialysis_order"
@@ -3809,7 +3818,7 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
 		advice.UserOrgId = adminUserInfo.Org.Id
 		advice.PatientId = patient
 		advice.AdviceDoctor = adminUserInfo.AdminUser.Id
-
+		advice.IsSettle = 2
 		if adviceNameM["advice_name"] == nil || reflect.TypeOf(adviceNameM["advice_name"]).String() != "string" {
 			utils.ErrorLog("advice_name")
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -3936,7 +3945,7 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
 					child.UserOrgId = adminUserInfo.Org.Id
 					child.PatientId = patient
 					child.AdviceDoctor = adminUserInfo.AdminUser.Id
-
+					child.IsSettle = 1
 					if childMap["advice_name"] == nil || reflect.TypeOf(childMap["advice_name"]).String() != "string" {
 						utils.ErrorLog("child advice_name")
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -7099,3 +7108,420 @@ func (this *DialysisAPIController) SavePatientPicture() {
 		"order": order,
 	})
 }
+
+func (this *DialysisAPIController) ExectionMobileAdvice() {
+
+	ids := this.GetString("ids")
+	idSplit := strings.Split(ids, ",")
+	orgId := this.GetMobileAdminUserInfo().Org.Id
+
+	config, _ := service.FindXTHisRecordByOrgIdSix(orgId)
+	execution_time := this.GetString("exce_time")
+	timeLayout2 := "2006-01-02 15:04:05"
+	loc, _ := time.LoadLocation("Local")
+
+	theTime, errs := time.ParseInLocation(timeLayout2, execution_time, loc)
+	if errs != nil {
+		utils.ErrorLog(errs.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	//his客户
+	if config.IsOpen == 1 {
+
+		list, _ := service.GetHisMobileAdviceGroupList(orgId, idSplit)
+		adviceList, _ := service.GetHisMobileAdviceList(orgId, idSplit)
+		for _, item := range list {
+			for _, it := range adviceList {
+				if item.DrugId == it.DrugId {
+					item.ChildDoctorAdvice = append(item.ChildDoctorAdvice, it)
+				}
+			}
+		}
+
+		for _, item := range list {
+			medical, _ := service.GetBaseDrugMedical(item.DrugId)
+			var sum_out_count int64
+			for _, itemThree := range item.ChildDoctorAdvice {
+				var prescribing_number int64
+				stringPrescribingNumber := strconv.FormatFloat(itemThree.PrescribingNumber, 'f', -1, 64)
+				parseIntPrescribingNumber, _ := strconv.ParseInt(stringPrescribingNumber, 10, 64)
+				if itemThree.PrescribingNumberUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+					prescribing_number = parseIntPrescribingNumber * medical.MinNumber
+				}
+				if itemThree.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+					prescribing_number = parseIntPrescribingNumber
+				}
+				if itemThree.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
+					prescribing_number = parseIntPrescribingNumber
+				}
+				sum_out_count += prescribing_number
+			}
+			drugStockOut, _ := service.GetDrugSumOutCountByDrugId(item.DrugId, orgId)
+
+			//库存不足
+			if sum_out_count > drugStockOut.FlushCount {
+				this.ServeSuccessJSON(map[string]interface{}{
+					"msg":  "2",
+					"drug": medical,
+					"ids":  ids,
+				})
+				return
+			}
+		}
+		creater := this.GetMobileAdminUserInfo().AdminUser.Id
+		//执行医嘱
+		errs := service.ExectionMobileAdvice(orgId, idSplit, theTime.Unix(), creater)
+		advices, _ := service.FindHisDoctorAdviceByIds(orgId, idSplit)
+		for _, item := range advices {
+			key := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+			recordDate := theTime.Format("2006-01-02")
+			keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(orgId, 10)
+
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
+
+			defer redis.Close()
+		}
+		if errs == nil {
+
+			//药品管理信息
+			_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(orgId)
+			storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+			if drugStockConfig.IsOpen == 1 {
+				for _, item := range advices {
+					advice, _ := service.FindHisDoctorAdviceById(orgId, item.ID)
+					config, _ := service.GetDrugOpenConfigOne(orgId)
+					if config.IsOpen != 1 {
+						//查询该药品是否有库存
+						medical, _ := service.GetBaseDrugMedical(item.DrugId)
+						pharmacyConfig, _ := service.FindPharmacyConfig(advice.UserOrgId)
+						if medical.IsUse == 2 {
+							if config.IsOpen != 1 {
+								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
+									service.HisDrugsDelivery(orgId, creater, &advice)
+								}
+								if pharmacyConfig.IsOpen != 1 {
+									service.HisDrugsDelivery(orgId, creater, &advice)
+								}
+
+								//更新字典里面的库存
+								stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+								var sum_count int64
+								for _, its := range stockInfo {
+									if its.MaxUnit == medical.MaxUnit {
+										its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+									}
+									sum_count += its.StockMaxNumber + its.StockMinNumber
+								}
+								service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+								//剩余库存
+								service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+							}
+
+						}
+
+					}
+				}
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"msg": "1",
+				"ids": ids,
+			})
+			return
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		}
+	}
+
+	fmt.Println("config233322333223", config.IsOpen)
+
+	//血透客户
+	if config.IsOpen == 2 || config.IsOpen == 0 {
+
+		//药品管理信息
+		_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(orgId)
+		if drugStockConfig.IsOpen == 1 {
+			list, _ := service.GetBloodMobileAdviceGroupList(orgId, idSplit)
+			adviceList, _ := service.GetBloodMobileAdviceList(orgId, idSplit)
+			for _, item := range list {
+				for _, it := range adviceList {
+					if item.DrugId == it.DrugId {
+						item.ChildDoctorAdvice = append(item.ChildDoctorAdvice, it)
+					}
+				}
+			}
+			for _, item := range list {
+				medical, _ := service.GetBaseDrugMedical(item.DrugId)
+				var sum_out_count int64
+				for _, itemThree := range item.ChildDoctorAdvice {
+					var prescribing_number int64
+					stringPrescribingNumber := strconv.FormatFloat(itemThree.PrescribingNumber, 'f', -1, 64)
+					parseIntPrescribingNumber, _ := strconv.ParseInt(stringPrescribingNumber, 10, 64)
+					if itemThree.PrescribingNumberUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+						prescribing_number = parseIntPrescribingNumber * medical.MinNumber
+					}
+					if itemThree.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+						prescribing_number = parseIntPrescribingNumber
+					}
+					if itemThree.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
+						prescribing_number = parseIntPrescribingNumber
+					}
+					sum_out_count += prescribing_number
+				}
+				drugStockOut, _ := service.GetDrugSumOutCountByDrugId(item.DrugId, orgId)
+
+				//库存不足
+				if sum_out_count > drugStockOut.FlushCount {
+					this.ServeSuccessJSON(map[string]interface{}{
+						"msg":  "2",
+						"drug": medical,
+						"ids":  ids,
+					})
+					return
+				}
+			}
+
+			creater := this.GetMobileAdminUserInfo().AdminUser.Id
+			fmt.Println("creater2332243244224242424", creater)
+			//执行医嘱
+			errs := service.ExectionBloodMobileAdvice(orgId, idSplit, theTime.Unix(), creater)
+			advices, _ := service.FindAllDoctorAdviceByIds(orgId, idSplit)
+			for _, item := range advices {
+				key := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+				redis := service.RedisClient()
+				//清空key 值
+				redis.Set(key, "", time.Second)
+				keyTwo := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+				redis.Set(keyTwo, "", time.Second)
+				keyThree := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_doctor_advice"
+				redis.Set(keyThree, "", time.Second)
+				recordDate := theTime.Format("2006-01-02")
+				keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(orgId, 10)
+
+				redis.Set(keyFour, "", time.Second)
+				keyFive := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
+				redis.Set(keyFive, "", time.Second)
+
+				defer redis.Close()
+			}
+			if errs == nil {
+
+				for _, item := range advices {
+					storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+					medical, _ := service.GetBaseDrugMedical(item.DrugId)
+					//查询是否出库按钮开启
+					adviceSetting, _ := service.FindAdviceSettingById(item.UserOrgId)
+					if adviceSetting.IsAdviceOpen == 1 {
+						//查询是否出库按钮开启
+						prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
+						pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
+						if prescriptionConfig.IsOpen == 1 {
+							if medical.IsUse == 2 {
+								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
+									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+								}
+								if pharmacyConfig.IsOpen != 1 {
+									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+								}
+
+								//更新字典里面的库存
+								stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+								var sum_count int64
+								for _, its := range stockInfo {
+									if its.MaxUnit == medical.MaxUnit {
+										its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+									}
+									sum_count += its.StockMaxNumber + its.StockMinNumber
+								}
+								service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+								//剩余库存
+								service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+							}
+						}
+					} else {
+						pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
+						if medical.IsUse == 2 {
+							if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
+								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+							}
+							if pharmacyConfig.IsOpen != 1 {
+								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+							}
+
+							stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+							var sum_count int64
+							for _, its := range stockInfo {
+								if its.MaxUnit == medical.MaxUnit {
+									its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+								}
+								sum_count += its.StockMaxNumber + its.StockMinNumber
+							}
+							service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+							//剩余库存
+							service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+						}
+					}
+				}
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"msg": "1",
+				"ids": ids,
+			})
+			return
+
+		} else {
+
+			creater := this.GetMobileAdminUserInfo().AdminUser.Id
+			//执行医嘱
+			service.ExectionBloodMobileAdvice(orgId, idSplit, theTime.Unix(), creater)
+			advices, _ := service.FindAllDoctorAdviceByIds(orgId, idSplit)
+			for _, item := range advices {
+				key := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+				redis := service.RedisClient()
+				//清空key 值
+				redis.Set(key, "", time.Second)
+				keyTwo := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+				redis.Set(keyTwo, "", time.Second)
+				keyThree := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_doctor_advice"
+				redis.Set(keyThree, "", time.Second)
+				recordDate := theTime.Format("2006-01-02")
+				keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(orgId, 10)
+
+				redis.Set(keyFour, "", time.Second)
+				keyFive := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
+				redis.Set(keyFive, "", time.Second)
+
+				defer redis.Close()
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"msg": "1",
+				"ids": ids,
+			})
+			return
+		}
+
+	}
+
+}
+
+func (this *DialysisAPIController) GetSettleMobileAdvice() {
+
+	ids := this.GetString("ids")
+	idSplit := strings.Split(ids, ",")
+	orgId := this.GetMobileAdminUserInfo().Org.Id
+	config, _ := service.FindXTHisRecordByOrgIdSix(orgId)
+
+	if config.IsOpen == 1 {
+		service.UpdateSettleMobileHisAdvice(orgId, idSplit)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg": "1",
+			"ids": ids,
+		})
+		return
+	}
+
+	if config.IsOpen == 0 || config.IsOpen == 2 {
+
+		service.UpdateSettleMobileBloodAdvice(orgId, idSplit)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg": "1",
+			"ids": ids,
+		})
+		return
+	}
+}
+
+func (this *DialysisAPIController) GetCheckMobileAdvice() {
+
+	ids := this.GetString("ids")
+	idSplit := strings.Split(ids, ",")
+	orgId := this.GetMobileAdminUserInfo().Org.Id
+
+	config, _ := service.FindXTHisRecordByOrgIdSix(orgId)
+
+	//his
+	if config.IsOpen == 1 {
+		checker := this.GetMobileAdminUserInfo().AdminUser.Id
+		theTime := time.Now()
+
+		advices := models.HisDoctorAdviceThirty{
+			CheckTime:   theTime.Unix(),
+			Checker:     checker,
+			UpdatedTime: time.Now().Unix(),
+		}
+		service.CheckHisMobileDoctorAdvice(orgId, idSplit, advices)
+
+		list, _ := service.FindDoctorAdviceByIds(orgId, idSplit)
+		for _, item := range list {
+			key := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+			recordDate := theTime.Format("2006-01-02")
+			keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(orgId, 10)
+
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
+			defer redis.Close()
+		}
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg": "1",
+			"ids": ids,
+		})
+		return
+	}
+
+	//血透
+	if config.IsOpen == 0 || config.IsOpen == 2 {
+
+		checker := this.GetMobileAdminUserInfo().AdminUser.Id
+		theTime := time.Now()
+
+		advices := models.DoctorAdvice{
+			CheckTime:   theTime.Unix(),
+			Checker:     checker,
+			UpdatedTime: time.Now().Unix(),
+		}
+
+		service.CheckBloodDoctorAdvice(orgId, idSplit, advices)
+		list, _ := service.FindDoctorAdviceByIds(orgId, idSplit)
+		for _, item := range list {
+			key := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+			recordDate := theTime.Format("2006-01-02")
+			keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(orgId, 10)
+
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
+			defer redis.Close()
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg": "1",
+			"ids": ids,
+		})
+		return
+	}
+
+}

controllers/mobile_api_controllers/doctor_advice_api_controller.go

@@ -5,6 +5,7 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
+	"fmt"
 	"strconv"
 	"time"
 )
@@ -26,7 +27,7 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 		adviceType = 0
 	}
 
-	if patientType != 1 && patientType != 2 {
+	if patientType != 1 && patientType != 2 && patientType != 3 && patientType != 4 {
 
 		patientType = 0
 	}
@@ -43,6 +44,8 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 	key := strconv.FormatInt(orgID, 10) + ":" + ":patient_list_all"
 	redis.Set(key, "", time.Second)
 	scheduals, err := service.MobileGetScheduleDoctorAdvicesTwo(orgID, date.Unix(), adviceType, patientType, adminInfo.AdminUser.Id, delivery_way)
+
+	fmt.Println("scheduals00923923999233223", scheduals)
 	//获取所有的患者
 	blood_patients, _ := service.GetAllPatientListByListSeven(orgID)
 	//获取透析处方
@@ -78,6 +81,7 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 	config, _ := service.GetHisDoctorConfig(orgID)
 	project_config, _ := service.GetHisProjectConfig(orgID)
 
+	fmt.Println("project_config23323232322323", project_config.IsOpen)
 	if project_config.IsOpen == 1 || project_config.IsOpen == 2 {
 		//获取his医嘱数据
 		project, _ := service.GetMobileHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, adminInfo.AdminUser.Id)
@@ -153,7 +157,7 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 		} else {
 			filtedScheduals := []*service.MScheduleDoctorAdviceVMOne{}
 			for _, schedual := range scheduals {
-				if len(schedual.DoctorAdvices) > 0 {
+				if len(schedual.DoctorAdvices) > 0 || len(hisAdvices) > 0 {
 					filtedScheduals = append(filtedScheduals, schedual)
 				}
 			}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -177,4 +177,10 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/getscheduletypebyidlist", &DialysisAPIController{}, "Get:GetScheduleTypeByIdList")
 
 	beego.Router("/m/api/savepatientpicture", &DialysisAPIController{}, "Get:SavePatientPicture")
+
+	beego.Router("/m/api/exectionmobileadvice", &DialysisAPIController{}, "Get:ExectionMobileAdvice")
+
+	beego.Router("/m/api/settlemobileadvice", &DialysisAPIController{}, "Get:GetSettleMobileAdvice")
+
+	beego.Router("/m/api/checkmobileadvice", &DialysisAPIController{}, "Get:GetCheckMobileAdvice")
 }

controllers/mobile_api_controllers/patient_api_controller.go

@@ -3696,7 +3696,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			advice.UserOrgId = adminUserInfo.Org.Id
 			advice.PatientId = patientInfo.ID
 			advice.AdviceDoctor = adminUserInfo.AdminUser.Id
-
+			advice.IsSettle = 2
 			//入口
 			errcode := c.setAdviceWithJSON(&advice, adviceNameM)
 			if errcode > 0 {
@@ -3722,7 +3722,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 						s.UserOrgId = adminUserInfo.Org.Id
 						s.PatientId = patientInfo.ID
 						s.AdviceDoctor = adminUserInfo.AdminUser.Id
-
+						s.IsSettle = 2
 						errcode := c.setAdviceWithJSON(&s, subdrug.(map[string]interface{}))
 						if errcode > 0 {
 							c.ServeFailJSONWithSGJErrorCode(errcode)
@@ -3809,7 +3809,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		advice.UserOrgId = adminUserInfo.Org.Id
 		advice.PatientId = patient
 		advice.AdviceDoctor = adminUserInfo.AdminUser.Id
-
+		advice.IsSettle = 2
 		err := service.CreateDoctorAdvice(&advice)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 		redis := service.RedisClient()
@@ -3817,7 +3817,6 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		redis.Set(key, "", time.Second)
 		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
 		redis.Set(keyOne, "", time.Second)
-		fmt.Println("key`2232333332233223233232", key)
 		defer redis.Close()
 		if err != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)

controllers/patient_api_controller.go

@@ -1279,7 +1279,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		advice.UserOrgId = adminUserInfo.CurrentOrgId
 		advice.PatientId = patientInfo.ID
 		advice.AdviceDoctor = adminUserInfo.AdminUser.Id
-
+		advice.IsSettle = 2
 		if adviceNameM["advice_name"] == nil || reflect.TypeOf(adviceNameM["advice_name"]).String() != "string" {
 			utils.ErrorLog("advice_name")
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1432,7 +1432,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 					child.UserOrgId = adminUserInfo.CurrentOrgId
 					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)
@@ -1508,13 +1508,12 @@ func (c *PatientApiController) CreateGroupAdvice() {
 
 	list, err := service.CreateMGroupAdvice(adminUserInfo.CurrentOrgId, advices, groupNo)
 	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(AdviceDate, 10) + ":doctor_advices"
-	//fmt.Println("key23323323232323223233223232323",key)
+
 	redis := service.RedisClient()
 	defer redis.Close()
 	redis.Set(key, "", time.Second)
 	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(AdviceDate, 10) + ":advice_list_all"
 	redis.Set(keyOne, "", time.Second)
-	//fmt.Println("keyOne23322322323232323233232332",keyOne)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
 		return

controllers/schedule_api_controller.go

@@ -41,6 +41,7 @@ func ScheduleApiRegistRouters() {
 
 	beego.Router("/api/schedule_template/cancel", &ScheduleApiController{}, "post:CancelScheduleTemplate")
 	beego.Router("/api/schedule/getnextscheduleweekday", &ScheduleApiController{}, "Get:GetNextWeekDaySchedule")
+	beego.Router("/api/schedule/getnextscheduleweekdayone", &ScheduleApiController{}, "Get:GetNextWeekDayScheduleOne")
 
 	beego.Router("/api/schedule/getthreeweeklist", &ScheduleApiController{}, "Get:GetThreeWeekList")
 
@@ -2078,17 +2079,59 @@ func (c *ScheduleApiController) CancelScheduleTemplate() {
 		return
 	}
 }
+func (this *ScheduleApiController) GetNextWeekDayScheduleOne() {
+	week_type, _ := this.GetInt64("week_type", -1)
+	week_time, _ := this.GetInt64("week_time")
+	record_date := this.GetString("record_date")
+
+	zons := this.GetString("zone")
+	zone := strings.Split(zons, ",")
+
+	start_time, _ := this.GetInt64("start_time")
+	end_time, _ := this.GetInt64("end_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	//theTimeStart, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	//theTimeEnd, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+
+	adminUserInfo := this.GetAdminUserInfo()
+	var theStartTIme int64
+	if len(record_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theStartTIme = theTime.Unix()
+	}
+
+	schedule, err := service.GetNextWeekDaySchedule(week_type, week_time, start_time, end_time, adminUserInfo.CurrentOrgId, zone, theStartTIme)
+	for _, item := range schedule {
+		order, _ := service.GetLastDialysisOrder(adminUserInfo.CurrentOrgId, item.PatientId, theStartTIme)
+		item.XtDialysisOrderSix = order
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10340 {
+
+			dialysisprescription, _ := service.GetLastDialysisSolution(adminUserInfo.CurrentOrgId, item.PatientId, item.ModeId, item.ScheduleDate)
+			item.DialysisPrescription = dialysisprescription
+		}
+	}
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"schedule": schedule,
+	})
+}
 
 func (this *ScheduleApiController) GetNextWeekDaySchedule() {
 
 	week_type, _ := this.GetInt64("week_type", -1)
 	week_time, _ := this.GetInt64("week_time")
-	//start_time, _ := this.GetInt64("start_time")
-	//end_time, _ := this.GetInt64("end_time")
 	record_date := this.GetString("record_date")
 
 	zons := this.GetString("zone")
 	zone := strings.Split(zons, ",")
+
 	start_time := this.GetString("start_time")
 	end_time := this.GetString("end_time")
 	timeLayout := "2006-01-02"
@@ -2501,7 +2544,16 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	if week_type > 0 {
 		list, err := service.GetWeekDayScheduleByIdThee(orgId, targetDay.Unix(), week_time, zone)
+		for _, item := range list {
+			order, _ := service.GetLastDialysisOrder(orgId, item.PatientId, targetDay.Unix())
+			item.XtDialysisOrderSix = order
+			if orgId == 9671 || orgId == 9675 || orgId == 10340 {
 
+				solution, _ := service.GetLastDialysisSolution(orgId, item.PatientId, item.ModeId, item.ScheduleDate)
+				item.DialysisPrescription = solution
+			}
+
+		}
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
@@ -2516,7 +2568,17 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 	if week_type == 0 {
 		startDate, _ := utils.ParseTimeStringToTime("2006-01-02", startTime)
 		list, err := service.GetWeekDayScheduleByIdTwo(orgId, targetDay.Unix(), week_time, startDate.Unix(), zone)
+		for _, item := range list {
+
+			order, _ := service.GetLastDialysisOrder(orgId, item.PatientId, targetDay.Unix())
+			item.XtDialysisOrderSix = order
+			if orgId == 9671 || orgId == 9675 || orgId == 10340 {
 
+				solution, _ := service.GetLastDialysisSolution(orgId, item.PatientId, item.ModeId, item.ScheduleDate)
+				item.DialysisPrescription = solution
+			}
+
+		}
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return

models/dialysis.go

@@ -457,6 +457,7 @@ type DoctorAdvice struct {
 	DrugNameId            int64           `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
 	IsMedicine            int64           `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
 	PushStartTime         int64           `gorm:"column:push_start_time" json:"push_start_time" form:"push_start_time"`
+	IsSettle              int64           `gorm:"column:is_settle" json:"is_settle" form:"is_settle"`
 }
 
 func (DoctorAdvice) TableName() string {
@@ -846,6 +847,8 @@ type DialysisOrder struct {
 	BloodAccessId              int64         `gorm:"column:blood_access_id" json:"blood_access_id" form:"blood_access_id"`
 	Mission                    string        `gorm:"column:mission" json:"mission" form:"mission"`
 	NucleinDate                int64         `gorm:"column:nuclein_date" json:"nuclein_date" form:"nuclein_date"`
+	ScheduleRemark             string        `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
+	OrderRemark                string        `gorm:"column:order_remark" json:"order_remark" form:"order_remark"`
 }
 
 func (DialysisOrder) TableName() string {
@@ -1108,6 +1111,25 @@ type NewDialysisBeforePrepareGoods struct {
 	ChildNewDialysisBeforePrepareGoods []*NewDialysisBeforePrepareGoods `gorm:"ForeignKey:GoodId;AssociationForeignKey:GoodId" json:"child"`
 }
 
+type OldDialysisBeforePrepareGoods 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"`
+	PatientId    int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate   int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	GoodId       int64  `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	GoodTypeId   int64  `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	Count        int64  `gorm:"column:count" json:"count" form:"count"`
+	Ctime        int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Creater      int64  `gorm:"column:creater" json:"creater" form:"creater"`
+	Modifier     int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	CommdityCode string `gorm:"column:commdity_code" json:"commdity_code" form:"commdity_code"`
+	NewCount     int64  `gorm:"column:new_count" json:"new_count" form:"new_count"`
+	ProjectId    int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	StorehouseId int64  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+}
+
 type QueueCallConfig struct {
 	ID         int64 `gorm:"column:id" json:"id" form:"id"`
 	OrgId      int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
@@ -1341,3 +1363,17 @@ type DoctorAdviceThrity struct {
 func (DoctorAdviceThrity) TableName() string {
 	return "xt_doctor_advice"
 }
+
+type XtDialysisOrderSix 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"`
+	BloodAccessId      int64  `gorm:"column:blood_access_id" json:"blood_access_id" form:"blood_access_id"`
+	DialysisIrrigation string `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	DialysisDialyszers string `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+}
+
+func (XtDialysisOrderSix) TableName() string {
+	return "xt_dialysis_order"
+}

models/patient_models.go

@@ -786,6 +786,7 @@ type XtPatientsNew struct {
 	TrobleShoot                  int64   `gorm:"column:troble_shoot" json:"troble_shoot" form:"troble_shoot"`
 	TreatmentPlan                string  `gorm:"column:treatment_plan" json:"treatment_plan" form:"treatment_plan"`
 	Doctor                       int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	ScheduleRemark               string  `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
 }
 
 func (XtPatientsNew) TableName() string {
@@ -1151,6 +1152,7 @@ type XtPatients struct {
 	ContactName                  string  `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
 	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"`
 }
 
 func (XtPatients) TableName() string {

models/schedule_models.go

@@ -198,6 +198,7 @@ type VmSchedulesRemind struct {
 	DialysisSolution           DialysisSolution           `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId;"`
 	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
 	LastAfterWeight            AssessmentAfterDislysis    `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
+	XtDialysisOrderSix         XtDialysisOrderSix         `json:"dialysis_order" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
 }
 
 func (VmSchedulesRemind) TableName() string {
@@ -205,28 +206,32 @@ func (VmSchedulesRemind) TableName() string {
 }
 
 type WeekScheduleSix 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"`
-	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
-	BedId        int64 `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
-	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
-	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
-	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
-	ModeId       int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
-	Status       int64 `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime  int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime  int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
-	IsExport     int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
-
+	ID                         int64                      `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                  int64                      `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId                int64                      `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId                      int64                      `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId                  int64                      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate               int64                      `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType               int64                      `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek               int64                      `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId                     int64                      `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status                     int64                      `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime                int64                      `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime                int64                      `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	IsExport                   int64                      `gorm:"column:is_export" json:"is_export" form:"is_export"`
+	IdCardNo                   string                     `gorm:"-" json:"id_card_no" form:"id_card_no"`
+	Gender                     string                     `gorm:"-" json:"gender" form:"gender"`
+	Phone                      string                     `gorm:"-" json:"phone" form:"phone"`
+	DialysisNo                 string                     `gorm:"-" json:"dialysis_no" form:"dialysis_no"`
 	Patient                    string                     `gorm:"-" json:"patient" form:"patient"`
 	DeviceZone                 DeviceZone                 `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
 	DeviceNumber               DeviceNumber               `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
-	DialysisPrescription       DialysisSolution           `json:"prescription" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
 	DoctorAdvice               []*DoctorAdvice            `json:"doctoradvice" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
 	HisDoctorAdviceInfo        []*HisDoctorAdviceInfo     `json:"hisdoctoradviceinfo" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
 	DialysisSolution           DialysisSolution           `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
 	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,ScheduleDate"`
+	XtDialysisOrderSix         XtDialysisOrderSix         `json:"dialysis_order" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	DialysisPrescription       DialysisPrescription       `json:"prescription" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
 }
 
 func (WeekScheduleSix) TableName() string {

service/dialysis_service.go

@@ -1906,7 +1906,7 @@ func UpdateHisDoctorAdviceExecution(info models.HisDoctorAdviceInfo, id int64) e
 
 func UpdateDoctorAdviceExecution(info models.DoctorAdvice, id int64) error {
 
-	err := XTWriteDB().Where("id = ? and status = 1", id).Update(map[string]interface{}{"execution_staff": info.ExecutionStaff, "execution_state": info.ExecutionState, "execution_time": info.ExecutionTime, "updated_time": info.ExecutionTime}).Error
+	err := XTWriteDB().Model(&models.DoctorAdvice{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"execution_staff": info.ExecutionStaff, "execution_state": info.ExecutionState, "execution_time": info.ExecutionTime, "updated_time": info.ExecutionTime}).Error
 	return err
 }
 
@@ -1928,6 +1928,13 @@ func GetHisCheckDoctorAdvice(orgid int64, patinentids []string, advice_date int6
 	return advice, err
 }
 
+func CheckDoctorAdvice(id int64, creater int64) (models.DoctorAdviceThrity, error) {
+
+	doctoradvice := models.DoctorAdviceThrity{}
+	err := XTWriteDB().Model(&doctoradvice).Where("id = ? and status = 1", id).Update(map[string]interface{}{"checker": creater, "check_time": time.Now().Unix()}).Error
+	return doctoradvice, err
+}
+
 func CheckHisDoctorAdvice(id int64, creater int64) (models.HisDoctorAdviceThirty, error) {
 
 	doctoradvice := models.HisDoctorAdviceThirty{}
@@ -1952,3 +1959,71 @@ func SettleNewDoctorAdvice(patinentids []string, advice_date int64, orgid int64)
 	err = XTWriteDB().Model(&advice).Where("patient_id in(?) and advice_date = ? and user_org_id = ? and status = 1", patinentids, advice_date, orgid).Update(map[string]interface{}{"is_settle": 1}).Error
 	return advice, err
 }
+
+func GetHisMobileAdviceGroupList(orgid int64, ids []string) (advice []*models.HisDoctorAdvice, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Group("drug_id").Find(&advice).Error
+	return advice, err
+}
+
+func GetHisMobileAdviceList(orgid int64, ids []string) (advice []*models.HisDoctorAdvice, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Find(&advice).Error
+	return advice, err
+}
+
+func ExectionMobileAdvice(orgid int64, ids []string, execution_time int64, execution_staff int64) error {
+
+	advice := models.HisDoctorAdvice{}
+	err := XTWriteDB().Model(&advice).Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Updates(map[string]interface{}{"execution_time": execution_time, "execution_staff": execution_staff, "execution_state": 1}).Error
+	return err
+}
+
+func GetBloodMobileAdviceGroupList(orgid int64, ids []string) (advice []*models.DoctorAdviceThrity, err error) {
+
+	err = XTReadDB().Model(&advice).Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Group("drug_id").Find(&advice).Error
+	return advice, err
+}
+
+func GetBloodMobileAdviceList(orgid int64, ids []string) (advice []*models.DoctorAdviceThrity, err error) {
+
+	err = XTReadDB().Model(&advice).Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Find(&advice).Error
+	return advice, err
+}
+
+func FindAllDoctorAdviceByIds(orgID int64, ids []string) (advice []models.DoctorAdvice, err error) {
+	err = readDb.Model(&models.DoctorAdvice{}).Where("user_org_id=?  AND id in(?)  AND status = 1", orgID, ids).Find(&advice).Error
+	return
+}
+
+func ExectionBloodMobileAdvice(orgid int64, ids []string, execution_time int64, execution_staff int64) error {
+	fmt.Println("ids2323232323323223233223wode", ids)
+	advice := models.DoctorAdviceThrity{}
+	err := XTWriteDB().Model(&advice).Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Updates(map[string]interface{}{"execution_time": execution_time, "execution_staff": execution_staff, "execution_state": 1}).Error
+	return err
+}
+
+func UpdateSettleMobileHisAdvice(orgid int64, ids []string) error {
+
+	advice := models.HisDoctorAdviceThirty{}
+	err := XTWriteDB().Model(&advice).Where("user_org_id = ? and id in(?) and status =1", orgid, ids).Updates(map[string]interface{}{"is_settle": 1}).Error
+	return err
+}
+
+func UpdateSettleMobileBloodAdvice(orgid int64, ids []string) error {
+
+	advice := models.DoctorAdvice{}
+	err := XTWriteDB().Model(&advice).Where("user_org_id = ? and id in(?) and status =1", orgid, ids).Updates(map[string]interface{}{"is_settle": 1}).Error
+	return err
+}
+
+func CheckBloodDoctorAdvice(orgid int64, ids []string, advice models.DoctorAdvice) error {
+
+	err := XTWriteDB().Model(&advice).Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Updates(map[string]interface{}{"check_time": advice.CheckTime, "checker": advice.Checker, "check_state": 1}).Error
+	return err
+}
+
+func CheckHisMobileDoctorAdvice(orgid int64, ids []string, advice models.HisDoctorAdviceThirty) error {
+	err := XTWriteDB().Model(&advice).Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Updates(map[string]interface{}{"check_time": advice.CheckTime, "checker": advice.Checker, "check_state": 1}).Error
+	return err
+}

service/mobile_dialysis_service.go

@@ -1303,21 +1303,21 @@ func (MScheduleDoctorAdviceVM) TableName() string {
 }
 
 type MScheduleDoctorAdviceVMOne struct {
-	ID              int64                              `gorm:"column:id" json:"id"`
-	UserOrgId       int64                              `gorm:"column:user_org_id" json:"user_org_id"`
-	PartitionId     int64                              `gorm:"column:partition_id" json:"partition_id"`
-	BedId           int64                              `gorm:"column:bed_id" json:"bed_id"`
-	PatientId       int64                              `gorm:"column:patient_id" json:"patient_id"`
-	ScheduleDate    int64                              `gorm:"column:schedule_date" json:"schedule_date"`
-	ScheduleType    int64                              `gorm:"column:schedule_type" json:"schedule_type"`
-	ModeId          int64                              `gorm:"column:mode_id" json:"mode_id"`
-	Status          int64                              `gorm:"column:status" json:"status"`
-	DialysisOrder   *MDialysisOrderVM                  `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
-	SchedualPatient *MSchedualPatientVM                `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
-	DeviceNumber    *MDeviceNumberVM                   `gorm:"ForeignKey:BedId" json:"device_number"`
-	DoctorAdvices   []*MDoctorAdviceVM                 `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
-	Prescription    *models.DialysisPrescriptionTwenty `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
-	//DialysisAssesmentBefor *models.DialysisAssesmentBefor   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysisassesmentbefor"`
+	ID                     int64                              `gorm:"column:id" json:"id"`
+	UserOrgId              int64                              `gorm:"column:user_org_id" json:"user_org_id"`
+	PartitionId            int64                              `gorm:"column:partition_id" json:"partition_id"`
+	BedId                  int64                              `gorm:"column:bed_id" json:"bed_id"`
+	PatientId              int64                              `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate           int64                              `gorm:"column:schedule_date" json:"schedule_date"`
+	ScheduleType           int64                              `gorm:"column:schedule_type" json:"schedule_type"`
+	ModeId                 int64                              `gorm:"column:mode_id" json:"mode_id"`
+	Status                 int64                              `gorm:"column:status" json:"status"`
+	DialysisOrder          *MDialysisOrderVM                  `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
+	SchedualPatient        *MSchedualPatientVM                `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	DeviceNumber           *MDeviceNumberVM                   `gorm:"ForeignKey:BedId" json:"device_number"`
+	DoctorAdvices          []*MDoctorAdviceVM                 `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
+	Prescription           *models.DialysisPrescriptionTwenty `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
+	DialysisAssesmentBefor *models.DialysisAssesmentBefor     `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysisassesmentbefor"`
 }
 
 func (MScheduleDoctorAdviceVMOne) TableName() string {
@@ -1487,6 +1487,12 @@ func MobileGetScheduleDoctorAdvicesTwo(orgID int64, scheduleDate int64, adviceTy
 		} else if patientType == 2 {
 			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1)"
 			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+		} else if patientType == 3 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and is_settle = 1"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+		} else if patientType == 4 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and (is_settle = 0 or is_settle = 2)"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
 		}
 
 	} else if adviceType == 1 {
@@ -1502,6 +1508,12 @@ func MobileGetScheduleDoctorAdvicesTwo(orgID int64, scheduleDate int64, adviceTy
 			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND execution_staff = 0"
 			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
 
+		} else if patientType == 3 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ?  and is_settle = 1"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+		} else if patientType == 4 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ?  and (is_settle = 0 or is_settle = 2)"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
 		}
 
 	} else if adviceType == 3 {
@@ -1515,6 +1527,12 @@ func MobileGetScheduleDoctorAdvicesTwo(orgID int64, scheduleDate int64, adviceTy
 		} else if patientType == 2 {
 			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3  AND execution_staff = 0"
 			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+		} else if patientType == 3 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3  and is_settle = 1"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+		} else if patientType == 4 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3  and (is_settle = 0 or is_settle = 2)"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
 		}
 
 	} else if adviceType == 2 && len(deliverWay) > 0 {
@@ -1528,6 +1546,12 @@ func MobileGetScheduleDoctorAdvicesTwo(orgID int64, scheduleDate int64, adviceTy
 		} else if patientType == 2 {
 			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0 and delivery_way = ?"
 			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay)
+		} else if patientType == 3 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2   and delivery_way = ? and is_settle = 1"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay)
+		} else if patientType == 4 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2   and delivery_way = ? and (is_settle = 0 or is_settle =2)"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay)
 		}
 
 	} else if adviceType == 2 && len(deliverWay) <= 0 {
@@ -1542,6 +1566,12 @@ func MobileGetScheduleDoctorAdvicesTwo(orgID int64, scheduleDate int64, adviceTy
 		} else if patientType == 2 {
 			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0"
 			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+		} else if patientType == 3 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 and is_settle = 1"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+		} else if patientType == 4 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 and (is_settle = 0 or is_settle = 2)"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
 		}
 
 	}
@@ -1554,7 +1584,7 @@ func MobileGetScheduleDoctorAdvicesTwo(orgID int64, scheduleDate int64, adviceTy
 		//}).
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-		//Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+		Preload("DialysisAssesmentBefor", "status = 1 AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).
 		Preload("DoctorAdvices", adviceCondition...).
 		Where("status = 1 AND user_org_id = ?", orgID)
 	if scheduleDate != 0 {
@@ -1661,6 +1691,7 @@ func GetHisDoctorAdvicesTwo(orgID int64, scheduleDate int64, deliverWay string,
 				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
 					return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
 				}).
+				Preload("DialysisAssesmentBefor", "status = 1 AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).
 				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 				Where("status = 1 AND user_org_id = ?", orgID)
@@ -1670,21 +1701,79 @@ func GetHisDoctorAdvicesTwo(orgID int64, scheduleDate int64, deliverWay string,
 			err = db.Find(&vms).Error
 		}
 		if patientType > 0 {
-			db := readDb.
-				Table("xt_schedule").
-				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
-				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
-				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, deliverWay, adminUserId, adminUserId).
-				Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
-				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
-					return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-				}).Where("status = 1 AND user_org_id = ?", orgID)
-			if scheduleDate != 0 {
-				db = db.Where("schedule_date = ?", scheduleDate)
+			if patientType == 1 {
+				db := readDb.
+					Table("xt_schedule").
+					Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+					Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+					Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, deliverWay, adminUserId, adminUserId).
+					Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+					Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+					Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+					Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+					}).Preload("DialysisAssesmentBefor", "status = 1 AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).
+					Where("status = 1 AND user_org_id = ?", orgID)
+				if scheduleDate != 0 {
+					db = db.Where("schedule_date = ?", scheduleDate)
+				}
+				err = db.Find(&vms).Error
 			}
-			err = db.Find(&vms).Error
+
+			if patientType == 2 {
+				db := readDb.
+					Table("xt_schedule").
+					Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+					Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+					Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ? and  (advice_doctor = ? or execution_staff = ?)", orgID, scheduleDate, deliverWay, adminUserId, adminUserId).
+					Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+					Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+					Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+					Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+					}).Preload("DialysisAssesmentBefor", "status = 1 AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).Where("status = 1 AND user_org_id = ?", orgID)
+				if scheduleDate != 0 {
+					db = db.Where("schedule_date = ?", scheduleDate)
+				}
+				err = db.Find(&vms).Error
+			}
+
+			if patientType == 3 {
+				db := readDb.
+					Table("xt_schedule").
+					Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+					Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+					Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ? and  (advice_doctor = ? or execution_staff = ?) and is_settle = 1", orgID, scheduleDate, deliverWay, adminUserId, adminUserId).
+					Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+					Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+					Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+					Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+					}).Preload("DialysisAssesmentBefor", "status = 1 AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).Where("status = 1 AND user_org_id = ?", orgID)
+				if scheduleDate != 0 {
+					db = db.Where("schedule_date = ?", scheduleDate)
+				}
+				err = db.Find(&vms).Error
+			}
+
+			if patientType == 4 {
+				db := readDb.
+					Table("xt_schedule").
+					Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+					Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+					Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ? and  (advice_doctor = ? or execution_staff = ?) and (is_settle = 0 or  is_settle = 2)", orgID, scheduleDate, deliverWay, adminUserId, adminUserId).
+					Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+					Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+					Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+					Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+					}).Preload("DialysisAssesmentBefor", "status = 1 AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).Where("status = 1 AND user_org_id = ?", orgID)
+				if scheduleDate != 0 {
+					db = db.Where("schedule_date = ?", scheduleDate)
+				}
+				err = db.Find(&vms).Error
+			}
+
 		}
 
 	} else {
@@ -1700,6 +1789,7 @@ func GetHisDoctorAdvicesTwo(orgID int64, scheduleDate int64, deliverWay string,
 				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+				Preload("DialysisAssesmentBefor", "status = 1 AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).
 				Where("status = 1 AND user_org_id = ?", orgID)
 			if scheduleDate != 0 {
 				db = db.Where("schedule_date = ?", scheduleDate)
@@ -1707,21 +1797,81 @@ func GetHisDoctorAdvicesTwo(orgID int64, scheduleDate int64, deliverWay string,
 			err = db.Find(&vms).Error
 		}
 		if patientType > 0 {
-			db := readDb.
-				Table("xt_schedule").
-				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
-				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
-				Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
-				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
-				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
-					return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-				}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-				Where("status = 1 AND user_org_id = ?", orgID)
-			if scheduleDate != 0 {
-				db = db.Where("schedule_date = ?", scheduleDate)
+			if patientType == 1 {
+				db := readDb.
+					Table("xt_schedule").
+					Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+					Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
+					Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+					Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+					Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+					}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+					Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+					Preload("DialysisAssesmentBefor", "status = 1 AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).
+					Where("status = 1 AND user_org_id = ?", orgID)
+				if scheduleDate != 0 {
+					db = db.Where("schedule_date = ?", scheduleDate)
+				}
+				err = db.Find(&vms).Error
 			}
-			err = db.Find(&vms).Error
+			if patientType == 2 {
+				db := readDb.
+					Table("xt_schedule").
+					Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+					Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
+					Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+					Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+					Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+					}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+					Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+					Preload("DialysisAssesmentBefor", "status = 1 AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).
+					Where("status = 1 AND user_org_id = ?", orgID)
+				if scheduleDate != 0 {
+					db = db.Where("schedule_date = ?", scheduleDate)
+				}
+				err = db.Find(&vms).Error
+			}
+
+			if patientType == 3 {
+				db := readDb.
+					Table("xt_schedule").
+					Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+					Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) and is_settle = 1", orgID, scheduleDate, adminUserId, adminUserId).
+					Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+					Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+					Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+					}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+					Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+					Preload("DialysisAssesmentBefor", "status = 1 AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).
+					Where("status = 1 AND user_org_id = ?", orgID)
+				if scheduleDate != 0 {
+					db = db.Where("schedule_date = ?", scheduleDate)
+				}
+				err = db.Find(&vms).Error
+			}
+
+			if patientType == 4 {
+				db := readDb.
+					Table("xt_schedule").
+					Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+					Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) and (is_settle = 0 or is_settle =2) ", orgID, scheduleDate, adminUserId, adminUserId).
+					Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+					Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+					Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+					}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+					Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+					Preload("DialysisAssesmentBefor", "status = 1 AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).
+					Where("status = 1 AND user_org_id = ?", orgID)
+				if scheduleDate != 0 {
+					db = db.Where("schedule_date = ?", scheduleDate)
+				}
+				err = db.Find(&vms).Error
+			}
+
 		}
 
 	}
@@ -1813,7 +1963,6 @@ func GetMobileHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
-			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
 			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
 			}).
@@ -2043,7 +2192,7 @@ func BatchUpdateMonitors(monitors []*models.MonitoringRecord) error {
 func ModifyStartDialysisOrder(order *models.DialysisOrder) error {
 	tx := writeDb.Begin()
 	updateTime := time.Now().Unix()
-	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"start_nurse": order.StartNurse, "updated_time": updateTime, "bed_id": order.BedID, "puncture_nurse": order.PunctureNurse, "start_time": order.StartTime, "modifier": order.Modifier, "schedual_type": order.SchedualType, "washpipe_nurse": order.WashpipeNurse, "change_nurse": order.ChangeNurse, "difficult_puncture_nurse": order.DifficultPunctureNurse, "new_fistula_nurse": order.NewFistulaNurse, "quality_nurse_id": order.QualityNurseId, "puncture_needle": order.PunctureNeedle, "puncture_way": order.PunctureWay, "dialysis_dialyszers": order.DialysisDialyszers, "dialysis_irrigation": order.DialysisIrrigation, "blood_access_id": order.BloodAccessId, "nuclein_date": order.NucleinDate}).Error
+	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"start_nurse": order.StartNurse, "updated_time": updateTime, "bed_id": order.BedID, "puncture_nurse": order.PunctureNurse, "start_time": order.StartTime, "modifier": order.Modifier, "schedual_type": order.SchedualType, "washpipe_nurse": order.WashpipeNurse, "change_nurse": order.ChangeNurse, "difficult_puncture_nurse": order.DifficultPunctureNurse, "new_fistula_nurse": order.NewFistulaNurse, "quality_nurse_id": order.QualityNurseId, "puncture_needle": order.PunctureNeedle, "puncture_way": order.PunctureWay, "dialysis_dialyszers": order.DialysisDialyszers, "dialysis_irrigation": order.DialysisIrrigation, "blood_access_id": order.BloodAccessId, "nuclein_date": order.NucleinDate, "schedule_remark": order.ScheduleRemark, "order_remark": order.OrderRemark}).Error
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -3021,6 +3170,7 @@ type HisMScheduleDoctorAdviceVM struct {
 	Prescription           *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
 	HisDoctorAdviceInfo    []*models.HisDoctorAdviceInfo    `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
 	HisPrescriptionProject []*models.HisPrescriptionProject `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"project"`
+	DialysisAssesmentBefor *models.DialysisAssesmentBefor   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysisassesmentbefor"`
 }
 
 func (HisMScheduleDoctorAdviceVM) TableName() string {
@@ -3043,6 +3193,7 @@ type HisMScheduleDoctorAdviceVMOne struct {
 	Prescription           *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
 	HisDoctorAdviceInfo    []*models.HisDoctorAdviceInfo    `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
 	HisPrescriptionProject []*models.HisPrescriptionProject `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"project"`
+	DialysisAssesmentBefor *models.DialysisAssesmentBefor   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysisassesmentbefor"`
 }
 
 func (HisMScheduleDoctorAdviceVMOne) TableName() string {
@@ -3544,7 +3695,7 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
 						Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ? and patient_id = ? and is_settle", orgID, scheduleDate, deliverWay, patient_id, cost_type).
 						Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
 							return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-						}).
+						}).Preload("DialysisAssesmentBefor", "status =1 AND user_org_id = ? and assessment_date =?", orgID, scheduleDate).
 						Where("status = 1 AND user_org_id = ?", orgID)
 					if scheduleDate != 0 {
 						db = db.Where("schedule_date = ?", scheduleDate)
@@ -3558,7 +3709,7 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
 						Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ? and patient_id = ?", orgID, scheduleDate, deliverWay, patient_id).
 						Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
 							return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-						}).
+						}).Preload("DialysisAssesmentBefor", "status =1 AND user_org_id = ? and assessment_date =?", orgID, scheduleDate).
 						Where("status = 1 AND user_org_id = ?", orgID)
 					if scheduleDate != 0 {
 						db = db.Where("schedule_date = ?", scheduleDate)
@@ -3578,7 +3729,7 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
 						Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ? and execution_state = ? and is_settle = ?", orgID, scheduleDate, deliverWay, execution_state, cost_type).
 						Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
 							return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-						}).
+						}).Preload("DialysisAssesmentBefor", "status =1 AND user_org_id = ? and assessment_date =?", orgID, scheduleDate).
 						Where("status = 1 AND user_org_id = ?", orgID)
 					if scheduleDate != 0 {
 						db = db.Where("schedule_date = ?", scheduleDate)
@@ -3592,7 +3743,7 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
 						Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ? and execution_state = ?", orgID, scheduleDate, deliverWay, execution_state).
 						Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
 							return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-						}).
+						}).Preload("DialysisAssesmentBefor", "status =1 AND user_org_id = ? and assessment_date =?", orgID, scheduleDate).
 						Where("status = 1 AND user_org_id = ?", orgID)
 					if scheduleDate != 0 {
 						db = db.Where("schedule_date = ?", scheduleDate)
@@ -3609,7 +3760,7 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
 						Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ? and is_settle = ?", orgID, scheduleDate, deliverWay, cost_type).
 						Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
 							return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-						}).
+						}).Preload("DialysisAssesmentBefor", "status =1 AND user_org_id = ? and assessment_date =?", orgID, scheduleDate).
 						Where("status = 1 AND user_org_id = ?", orgID)
 					if scheduleDate != 0 {
 						db = db.Where("schedule_date = ?", scheduleDate)
@@ -3623,7 +3774,7 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
 						Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ?", orgID, scheduleDate, deliverWay).
 						Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
 							return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-						}).
+						}).Preload("DialysisAssesmentBefor", "status =1 AND user_org_id = ? and assessment_date =?", orgID, scheduleDate).
 						Where("status = 1 AND user_org_id = ?", orgID)
 					if scheduleDate != 0 {
 						db = db.Where("schedule_date = ?", scheduleDate)
@@ -3653,7 +3804,7 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
 						Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and patient_id = ? and execution_state = ? and is_settle = ?", orgID, scheduleDate, patient_id, execution_state, cost_type).
 						Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
 							return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-						}).
+						}).Preload("DialysisAssesmentBefor", "status =1 AND user_org_id = ? and assessment_date =?", orgID, scheduleDate).
 						Where("status = 1 AND user_org_id = ?", orgID)
 					if scheduleDate != 0 {
 						db = db.Where("schedule_date = ?", scheduleDate)
@@ -3667,7 +3818,7 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
 						Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and patient_id = ? and execution_state = ?", orgID, scheduleDate, patient_id, execution_state).
 						Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
 							return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-						}).
+						}).Preload("DialysisAssesmentBefor", "status =1 AND user_org_id = ? and assessment_date =?", orgID, scheduleDate).
 						Where("status = 1 AND user_org_id = ?", orgID)
 					if scheduleDate != 0 {
 						db = db.Where("schedule_date = ?", scheduleDate)
@@ -3684,7 +3835,7 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
 						Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and patient_id = ? and is_settle = ?", orgID, scheduleDate, patient_id, cost_type).
 						Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
 							return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-						}).
+						}).Preload("DialysisAssesmentBefor", "status =1 AND user_org_id = ? and assessment_date =?", orgID, scheduleDate).
 						Where("status = 1 AND user_org_id = ?", orgID)
 					if scheduleDate != 0 {
 						db = db.Where("schedule_date = ?", scheduleDate)
@@ -3698,7 +3849,7 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
 						Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and patient_id = ?", orgID, scheduleDate, patient_id).
 						Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
 							return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-						}).
+						}).Preload("DialysisAssesmentBefor", "status =1 AND user_org_id = ? and assessment_date =?", orgID, scheduleDate).
 						Where("status = 1 AND user_org_id = ?", orgID)
 					if scheduleDate != 0 {
 						db = db.Where("schedule_date = ?", scheduleDate)
@@ -3718,7 +3869,7 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
 						Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and execution_state = ? and is_settle = ?", orgID, scheduleDate, execution_state, cost_type).
 						Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
 							return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-						}).
+						}).Preload("DialysisAssesmentBefor", "status =1 AND user_org_id = ? and assessment_date =?", orgID, scheduleDate).
 						Where("status = 1 AND user_org_id = ?", orgID)
 					if scheduleDate != 0 {
 						db = db.Where("schedule_date = ?", scheduleDate)
@@ -3732,7 +3883,7 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
 						Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and execution_state = ?", orgID, scheduleDate, execution_state).
 						Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
 							return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-						}).
+						}).Preload("DialysisAssesmentBefor", "status =1 AND user_org_id = ? and assessment_date =?", orgID, scheduleDate).
 						Where("status = 1 AND user_org_id = ?", orgID)
 					if scheduleDate != 0 {
 						db = db.Where("schedule_date = ?", scheduleDate)
@@ -3749,7 +3900,7 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
 						Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and is_settle = ?", orgID, scheduleDate, cost_type).
 						Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
 							return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-						}).
+						}).Preload("DialysisAssesmentBefor", "status =1 AND user_org_id = ? and assessment_date =?", orgID, scheduleDate).
 						Where("status = 1 AND user_org_id = ?", orgID)
 					if scheduleDate != 0 {
 						db = db.Where("schedule_date = ?", scheduleDate)
@@ -3763,7 +3914,7 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
 						Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ?", orgID, scheduleDate).
 						Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
 							return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-						}).
+						}).Preload("DialysisAssesmentBefor", "status =1 AND user_org_id = ? and assessment_date =?", orgID, scheduleDate).
 						Where("status = 1 AND user_org_id = ?", orgID)
 					if scheduleDate != 0 {
 						db = db.Where("schedule_date = ?", scheduleDate)
@@ -5018,3 +5169,19 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 	err := db.Find(&vms).Error
 	return vms, err
 }
+
+func GetLastPatientOrder(id int64) (models.XtDialysisOrder, error) {
+
+	order := models.XtDialysisOrder{}
+	err := XTReadDB().Where("id = ? and status = 1", id).Find(&order).Error
+	return order, err
+}
+
+func UpdateMobilePatient(org_id int64, patient_id int64, schedule_remark string) error {
+
+	order := models.XtPatients{}
+	err := XTWriteDB().Model(&order).Where("user_org_id = ? and id = ? and status = 1", org_id, patient_id).Updates(map[string]interface{}{"schedule_remark": schedule_remark}).Error
+
+	err = XTWriteDB().Model(models.XtPatientsNew{}).Where("user_org_id = ? and id = ? and status = 1", org_id, patient_id).Updates(map[string]interface{}{"schedule_remark": schedule_remark}).Error
+	return err
+}

service/schedule_service.go

@@ -688,7 +688,7 @@ func GetWeekDayScheduleById(orgid int64, scheduleDate int64, scheduleType int64,
 
 func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType int64, zone []string) (list []*models.VmSchedulesRemind, err error) {
 
-	db := readDb2.Table("xt_schedule as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
@@ -715,7 +715,7 @@ func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType in
 
 func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int64, startDate int64, zone []string) (list []*models.VmSchedulesRemind, err error) {
 
-	db := readDb2.Table("xt_schedule as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
@@ -729,7 +729,7 @@ func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int
 		db = db.Where("x.partition_id in (?)", zone)
 	}
 
-	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1 and dialysis_date =?", scheduleDate).Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date =?", scheduleDate).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
+	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export,x.mode_id").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1 and dialysis_date =?", scheduleDate).Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date =?", scheduleDate).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ?", scheduleDate).Preload("DialysisPrescription", "status = 1 and record_date = ?", scheduleDate).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1").Order("id asc")
@@ -894,7 +894,7 @@ func UpdateNewScheduleTemplateStatus(id int64, org_id int64) (err error) {
 
 func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endtime int64, orgID int64, zone []string, record_date int64) (schedules []*models.WeekScheduleSix, err error) {
 
-	db := readDb2.Table("xt_schedule as s ").Where("s.status =1")
+	db := XTReadDB().Table("xt_schedule as s ").Where("s.status =1")
 	if orgID > 0 {
 		db = db.Where("s.user_org_id = ?", orgID)
 	}
@@ -925,7 +925,7 @@ func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endt
 	}).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0 and advice_date = ?", record_date).Preload("ChildDoctorAdvice", "status = 1 and advice_date = ?", record_date)
 	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ?", record_date).Joins("JOIN xt_patients as p ON p.id = s.patient_id").
-		Select("s.id,s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time, p.name as patient").
+		Select("s.id,s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time, p.name as patient,p.id_card_no as id_card_no,p.dialysis_no as dialysis_no,p.gender as gender,p.phone as phone").
 		Order("s.partition_id desc").
 		Find(&schedules).Error
 	return schedules, err
@@ -1089,7 +1089,7 @@ func GetDataPrint(orgid int64) (models.XtDataPrint, error) {
 
 func GetNextWeekPanels(startime int64, endtime int64, orgid int64) (schedule []*models.XtSchedule, err error) {
 
-	err = readDb2.Model(&schedule).Where("schedule_date >=? and schedule_date<=? and status = 1 and user_org_id = ?", startime, endtime, orgid).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
+	err = XTReadDB().Model(&schedule).Where("schedule_date >=? and schedule_date<=? and status = 1 and user_org_id = ?", startime, endtime, orgid).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
 		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, endtime)
 	}).Find(&schedule).Error
 	return schedule, err
@@ -1205,3 +1205,18 @@ func ChangeScheduleClass(schedule models.Schedule) error {
 	err := XTWriteDB().Model(&schedule).Where("patient_id = ? and schedule_date = ? and user_org_id = ? and status = 1", schedule.PatientId, schedule.ScheduleDate, schedule.UserOrgId).Update(map[string]interface{}{"schedule_type": schedule.ScheduleType}).Error
 	return err
 }
+
+func GetLastDialysisOrder(org_id int64, patient_id int64, dialysis_date int64) (models.XtDialysisOrderSix, error) {
+
+	order := models.XtDialysisOrderSix{}
+	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and dialysis_date < ? and status = 1", org_id, patient_id, dialysis_date).Order("id desc").First(&order).Error
+	return order, err
+}
+
+func GetLastDialysisSolution(org_id int64, patient_id int64, mode_id int64, schedule_date int64) (models.DialysisPrescription, error) {
+
+	dialysisprescription := models.DialysisPrescription{}
+	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and mode_id = ? and status = 1 and record_date<?", org_id, patient_id, mode_id, schedule_date).Order("id desc").First(&dialysisprescription).Error
+	return dialysisprescription, err
+
+}

service/stock_service.go

@@ -7113,6 +7113,13 @@ func GetDrugOpenConfigOne(orgid int64) (models.DrugOutConfig, error) {
 	return config, err
 }
 
+func FindXTHisRecordByOrgIdSix(org_id int64) (models.XtHisConfig, error) {
+
+	config := models.XtHisConfig{}
+	err = readDb.Model(&models.XtHisConfig{}).Where("status = 1 AND user_org_id = ?", org_id).Find(&config).Error
+	return config, err
+}
+
 func CreateDrugOutConfig(config models.DrugOutConfig) error {
 
 	err := XTWriteDB().Create(&config).Error
@@ -8142,3 +8149,17 @@ func GetGoodInformationByGoodIdOne(good_id int64) (models.GoodInformationFourty,
 	err := XTReadDB().Where("id = ? and status = 1", good_id).Find(&info).Error
 	return info, err
 }
+
+func GetHisDocById(id int64, orgid int64) (models.HisDoctorAdvice, error) {
+
+	advice := models.HisDoctorAdvice{}
+	err := XTReadDB().Where("id = ? and user_org_id= ? and status = 1", id, orgid).Find(&advice).Error
+	return advice, err
+}
+
+func GetBloodDocById(id int64, orgid int64) (models.DoctorAdvice, error) {
+
+	advice := models.DoctorAdvice{}
+	err := XTReadDB().Where("id = ? and user_org_id= ? and status = 1", id, orgid).Find(&advice).Error
+	return advice, err
+}