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

controllers/dialysis_api_controller.go

@@ -508,8 +508,12 @@ func (c *DialysisApiController) PostSoulution() {
 		//		}
 		//	}
 		//}
+		if dialysisPrescription.Creater == 0 {
+			prescription.Creater = adminUserInfo.AdminUser.Id
+		} else {
+			prescription.Creater = dialysisPrescription.Creater
+		}
 
-		prescription.Creater = adminUserInfo.AdminUser.Id
 		prescription.CreatedTime = dialysisPrescription.CreatedTime
 		prescription.UpdatedTime = time.Now().Unix()
 		prescription.Modifier = adminUserInfo.AdminUser.Id
@@ -2164,6 +2168,8 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	//上次透前评估
 	lastPredialysisEvaluation, _ := service.GetLastTimePredialysisEvaluation(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 
+	lastOrder, _ := service.GetLastTimeOrder(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+
 	//透析处方
 	dialysisPrescription, _ := service.FindPatientPrescribeWidyDevideById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	if dialysisPrescription.PrescriptionDoctor > 0 {
@@ -2264,6 +2270,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 		"FinishNuse":                FinishNuse,
 		"lastPredialysisEvaluation": lastPredialysisEvaluation,
 		"dialysiscount":             dialysiscount,
+		"last_order":                lastOrder,
 	})
 
 }

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1883,11 +1883,16 @@ func (c *DialysisAPIController) PostSolution() {
 		prescription.PrescriptionDoctor = prescription_doctor
 
 	}
+
 	if dialysisPrescription.ID == 0 { //新增
 		prescription.Creater = adminUserInfo.AdminUser.Id
 
 	} else { //修改
-		prescription.Creater = dialysisPrescription.Creater
+		if dialysisPrescription.Creater == 0 {
+			prescription.Creater = adminUserInfo.AdminUser.Id
+		} else {
+			prescription.Creater = dialysisPrescription.Creater
+		}
 
 		//if/**/
 		//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
@@ -2878,6 +2883,7 @@ func (this *DialysisAPIController) GetLastOrNextDoctorAdvice() {
 func (c *DialysisAPIController) CreateConsumables() {
 	record_date := c.GetString("record_time")
 	patient_id, _ := c.GetInt64("patient_id", 0)
+	adminUser := c.GetMobileAdminUserInfo()
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -2935,12 +2941,20 @@ func (c *DialysisAPIController) CreateConsumables() {
 					Creater:    adminUser.AdminUser.Id,
 					Modifier:   0,
 				}
-				beforePrepares = append(beforePrepares, prepare)
+				record_count := service.FindDialysisBeforePrepare(prepare.PatientId, prepare.GoodId, prepare.GoodTypeId, adminUser.Org.Id, record_time)
+				fmt.Println(record_count)
+				if record_count == 0 {
+					beforePrepares = append(beforePrepares, prepare)
+				}
 
 			}
 		}
 	}
-	errs := service.CreateDialysisBeforePrepare(beforePrepares)
+
+	if len(beforePrepares) > 0 {
+		service.CreateDialysisBeforePrepare(beforePrepares)
+	}
+	var errs error
 
 	if dataBody["update_goods"] != nil && reflect.TypeOf(dataBody["update_goods"]).String() == "[]interface {}" {
 		goods, _ := dataBody["update_goods"].([]interface{})
@@ -3005,7 +3019,6 @@ func (c *DialysisAPIController) CreateConsumables() {
 				}
 				ctime := int64(items["ctime"].(float64))
 
-				adminUser := c.GetMobileAdminUserInfo()
 				prepare := &models.DialysisBeforePrepare{
 					ID:         id,
 					UserOrgId:  adminUser.Org.Id,
@@ -3026,22 +3039,19 @@ func (c *DialysisAPIController) CreateConsumables() {
 		}
 		if len(updateBeforePrepares) > 0 {
 			for _, item := range updateBeforePrepares {
-				errs = service.UpdateDialysisBeforePrepare(item)
+				errs = service.UpdateDialysisBeforePrepareTwo(item)
 			}
 		}
 	}
-
 	if errs == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "提交成功",
 		})
 		return
-
 	} else {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
-
 }
 
 func (c *DialysisAPIController) CreateStockOutInfo() {
@@ -3184,20 +3194,27 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 					if outInfo.ID > 0 {
 						service.UpdateStockOutInfoCount2(adminInfo.Org.Id, outInfo.ID, item.Count)
 					}
-					details := &models.AutomaticReduceDetail{
-						WarehouseOutId:          outInfo.ID,
-						WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
-						PatientId:               patient_id,
-						Ctime:                   time.Now().Unix(),
-						Mtime:                   time.Now().Unix(),
-						Status:                  1,
-						RecordTime:              record_time,
-						OrgId:                   adminInfo.Org.Id,
-						GoodId:                  item.GoodId,
-						GoodTypeId:              item.GoodTypeId,
-						Count:                   item.Count,
+
+					count, _ := service.FindPatientAutomaticReduceRecord(adminInfo.Org.Id, record_time, item.GoodId, item.GoodTypeId, patient_id)
+					if count == 0 {
+						details := &models.AutomaticReduceDetail{
+							WarehouseOutId:          outInfo.ID,
+							WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
+							PatientId:               patient_id,
+							Ctime:                   time.Now().Unix(),
+							Mtime:                   time.Now().Unix(),
+							Status:                  1,
+							RecordTime:              record_time,
+							OrgId:                   adminInfo.Org.Id,
+							GoodId:                  item.GoodId,
+							GoodTypeId:              item.GoodTypeId,
+							Count:                   item.Count,
+						}
+						service.AddSigleAutoReduceRecordInfo(details)
+					} else if count == 1 {
+						service.UpdateUserInfoDetails(item.GoodTypeId, item.GoodId, record_time, adminInfo.Org.Id, patient_id, item.Count, &outInfo)
 					}
-					service.AddSigleAutoReduceRecordInfo(details)
+
 				}
 			}
 		}
@@ -3211,7 +3228,6 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 	}
 
 }
-
 func (c *DialysisAPIController) EditConsumables() {
 	patient_id, _ := c.GetInt64("patient_id", 0)
 	record_date := c.GetString("record_time")
@@ -3373,6 +3389,7 @@ func (c *DialysisAPIController) EditConsumables() {
 					newBeforePrepares = append(newBeforePrepares, prepare)
 
 				}
+				newBeforePrepares = RemoveRepeatedGood(newBeforePrepares)
 			}
 			service.CreateDialysisBeforePrepare(newBeforePrepares)
 		}
@@ -3449,6 +3466,7 @@ func (c *DialysisAPIController) EditConsumables() {
 		} else if err == nil {
 
 			if len(newBeforePrepares) > 0 { //新增
+
 				for _, item := range newBeforePrepares {
 					outInfo, err := service.FindStockOutInfoByTypeId(adminInfo.Org.Id, item.GoodTypeId, item.GoodId, out.ID, out.WarehouseOutOrderNumber)
 
@@ -3474,9 +3492,38 @@ func (c *DialysisAPIController) EditConsumables() {
 						warehouseOutInfo.Count = item.Count
 						err := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
 						if err == nil {
+
+							count, _ := service.FindPatientAutomaticReduceRecord(adminInfo.Org.Id, record_time, item.GoodId, item.GoodTypeId, patient_id)
+							if count == 0 {
+								details := &models.AutomaticReduceDetail{
+									WarehouseOutId:          warehouseOutInfo.ID,
+									WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+									PatientId:               patient_id,
+									Ctime:                   time.Now().Unix(),
+									Mtime:                   time.Now().Unix(),
+									Status:                  1,
+									RecordTime:              record_time,
+									OrgId:                   adminInfo.Org.Id,
+									GoodId:                  item.GoodId,
+									GoodTypeId:              item.GoodTypeId,
+									Count:                   item.Count,
+								}
+								service.AddSigleAutoReduceRecordInfo(details)
+							} else if count == 1 {
+								service.UpdateUserInfoDetails(item.GoodTypeId, item.GoodId, record_time, adminInfo.Org.Id, patient_id, item.Count, &outInfo)
+							}
+
+						}
+					} else if err == nil { //记录存在，则将加数量
+						if outInfo.ID > 0 {
+							service.UpdateStockOutInfoCount2(adminInfo.Org.Id, outInfo.ID, item.Count)
+						}
+
+						count, _ := service.FindPatientAutomaticReduceRecord(adminInfo.Org.Id, record_time, item.GoodId, item.GoodTypeId, patient_id)
+						if count == 0 {
 							details := &models.AutomaticReduceDetail{
-								WarehouseOutId:          warehouseOutInfo.ID,
-								WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+								WarehouseOutId:          outInfo.ID,
+								WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
 								PatientId:               patient_id,
 								Ctime:                   time.Now().Unix(),
 								Mtime:                   time.Now().Unix(),
@@ -3488,43 +3535,45 @@ func (c *DialysisAPIController) EditConsumables() {
 								Count:                   item.Count,
 							}
 							service.AddSigleAutoReduceRecordInfo(details)
+						} else if count == 1 {
+							service.UpdateUserInfoDetails(item.GoodTypeId, item.GoodId, record_time, adminInfo.Org.Id, patient_id, item.Count, &outInfo)
 						}
-					} else if err == nil { //记录存在，则将加数量
-						if outInfo.ID > 0 {
-							service.UpdateStockOutInfoCount2(adminInfo.Org.Id, outInfo.ID, item.Count)
-						}
-						details := &models.AutomaticReduceDetail{
-							WarehouseOutId:          outInfo.ID,
-							WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
-							PatientId:               patient_id,
-							Ctime:                   time.Now().Unix(),
-							Mtime:                   time.Now().Unix(),
-							Status:                  1,
-							RecordTime:              record_time,
-							OrgId:                   adminInfo.Org.Id,
-							GoodId:                  item.GoodId,
-							GoodTypeId:              item.GoodTypeId,
-							Count:                   item.Count,
-						}
-						service.AddSigleAutoReduceRecordInfo(details)
+						//details := &models.AutomaticReduceDetail{
+						//	WarehouseOutId:          outInfo.ID,
+						//	WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
+						//	PatientId:               patient_id,
+						//	Ctime:                   time.Now().Unix(),
+						//	Mtime:                   time.Now().Unix(),
+						//	Status:                  1,
+						//	RecordTime:              record_time,
+						//	OrgId:                   adminInfo.Org.Id,
+						//	GoodId:                  item.GoodId,
+						//	GoodTypeId:              item.GoodTypeId,
+						//	Count:                   item.Count,
+						//}
+						//service.AddSigleAutoReduceRecordInfo(details)
 					}
 				}
 
 			}
 
-			if len(consumables_source) > 0 { //修改
+			if len(beforePrepares) > 0 { //修改
 				for _, consumable := range consumables_source {
 					for _, before := range beforePrepares {
-						if consumable.GoodId == before.GoodId && consumable.GoodTypeId == before.GoodTypeId {
-							if consumable.Count != before.Count {
 
-								_, out := service.FindStockOutOrderNumberByTime(record_time, adminInfo.Org.Id)
+						if consumable.GoodId == before.GoodId {
+							fmt.Println(consumable.Count)
+							fmt.Println(before.Count)
 
+							if consumable.Count != before.Count {
+								fmt.Println("111111111")
+								_, out := service.FindStockOutOrderNumberByTime(record_time, adminInfo.Org.Id)
 								//_, out := service.FindOldOrderInfoByGoodId(record_time, adminInfo.Org.Id)
-
 								//判断前端更改后的商品id的出库记录在数据库中是否存在
 								err, newOut := service.FindOrderInfoByGoodId(consumable.GoodTypeId, consumable.GoodId, out.WarehouseOutOrderNumber, adminInfo.Org.Id)
 								if err == gorm.ErrRecordNotFound { //不存在，则新增出库记录，并更改使用人商品信息
+									fmt.Println("222222222")
+
 									warehouseOutInfo := &models.WarehouseOutInfo{
 										WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
 										WarehouseOutId:          out.ID,
@@ -3571,6 +3620,8 @@ func (c *DialysisAPIController) EditConsumables() {
 										}
 									}
 								} else if err == nil { //存在，则更改使用人商品信息
+									fmt.Println("333333333")
+
 									//处理原来的数据
 									if newOut.ID > 0 {
 										if consumable.Count > before.Count { // 减少
@@ -3609,17 +3660,20 @@ func (c *DialysisAPIController) EditConsumables() {
 									}
 								}
 
+								fmt.Println("444444444")
+
 							}
 						}
 					}
 				}
 			}
 		}
+		fmt.Println("655555555")
 
 		var errs error
 		if len(beforePrepares) > 0 {
 			for _, item := range beforePrepares {
-				errs = service.UpdateDialysisBeforePrepare(item)
+				errs = service.UpdateDialysisBeforePrepareTwo(item)
 			}
 		}
 		if errs == nil {
@@ -3767,7 +3821,7 @@ func (c *DialysisAPIController) EditConsumables() {
 		var errs error
 		if len(beforePrepares) > 0 {
 			for _, item := range beforePrepares {
-				errs = service.UpdateDialysisBeforePrepare(item)
+				errs = service.UpdateDialysisBeforePrepareTwo(item)
 			}
 		}
 		if errs == nil {
@@ -3916,7 +3970,7 @@ func (c *DialysisAPIController) GetStockInGoodInfo() {
 	good_info, _ := service.FindAllGoodInfo(adminUser.Org.Id)
 
 	goodUser, _ := service.GetAllStockOutUserDetail(patient_id, adminUser.Org.Id, date.Unix())
-	lastGoodUserDetial, _ := service.GetLastDialysisBeforePrepare(patient_id, adminUser.Org.Id, date.Unix())
+	lastGoodUserDetial, _ := service.GetLastDialysisGoods(patient_id, adminUser.Org.Id, date.Unix())
 	c.ServeSuccessJSON(map[string]interface{}{
 		"good_type":      goodTypes,
 		"good_user":      goodUser,
@@ -3926,7 +3980,6 @@ func (c *DialysisAPIController) GetStockInGoodInfo() {
 	return
 
 }
-
 func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 	patient_id, _ := c.GetInt64("patient_id", 0)
 	record_date := c.GetString("record_time")
@@ -4149,3 +4202,19 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 	}
 
 }
+func RemoveRepeatedGood(arr []*models.DialysisBeforePrepare) (newArr []*models.DialysisBeforePrepare) {
+	newArr = make([]*models.DialysisBeforePrepare, 0)
+	for i := 0; i < len(arr); i++ {
+		repeat := false
+		for j := i + 1; j < len(arr); j++ {
+			if arr[i].GoodId == arr[j].GoodId && arr[i].GoodTypeId == arr[j].GoodTypeId {
+				repeat = true
+				break
+			}
+		}
+		if !repeat {
+			newArr = append(newArr, arr[i])
+		}
+	}
+	return
+}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2149,6 +2149,8 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 		}
 	}
 
+	last_order, _ := service.GetLastTimeOrder(adminUserInfo.Org.Id, patientInfo.ID, xttime)
+
 	//透前评估
 	PredialysisEvaluation, _ := service.FindPredialysisEvaluationById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 
@@ -2213,6 +2215,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 		"org_template_info":       templateInfo,
 		"check":                   check,
 		"dialysiscount":           dialysiscount,
+		"last_order":              last_order,
 	})
 
 }

controllers/verify_login_controller.go

@@ -237,7 +237,7 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 							role, _ := service.GetRoleByRoleID(id)
 							var system_ids = ""
 							if role.RoleName == "子管理员" && role.IsSystem > 0 {
-								purviews, _ := service.GetSystemPurview()
+								purviews, _ := service.GetAllSystemPurview()
 								for _, purview := range purviews {
 									if len(system_ids) == 0 {
 										system_ids = strconv.FormatInt(purview.Id, 10)

models/monitor_models.go

@@ -1,5 +1,32 @@
 package models
 
+type VMMonitorDialysisSchedule 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"`
+
+	MonitorPatients MonitorPatients `gorm:"ForeignKey:PatientId" json:"patient"`
+	DeviceNumber    DeviceNumber    `gorm:"ForeignKey:BedId" json:"device_number"`
+	DeviceZone      DeviceZone      `gorm:"ForeignKey:PartitionId" json:"device_zone"`
+	TreatmentMode   TreatmentMode   `gorm:"ForeignKey:ModeId" json:"treatment_mode"`
+
+	DialysisOrder            MonitorDialysisOrder    `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
+	Prescription             DialysisPrescription    `gorm:"ForeignKey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"prescription"`
+	AssessmentBeforeDislysis PredialysisEvaluation   `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"assessment_before_dislysis"`
+	AssessmentAfterDislysis  AssessmentAfterDislysis `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"assessment_after_dislysis"`
+	MonitoringRecord         []MonitoringRecord      `gorm:"ForeignKey:MonitoringDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"monitoring_record"`
+}
+
+func (VMMonitorDialysisSchedule) TableName() string {
+	return "xt_schedule"
+}
+
 type MonitorDialysisSchedule struct {
 	ID           int64 `gorm:"column:id" json:"id"`
 	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id"`

service/auto_clear_schedules_service.go

@@ -39,7 +39,8 @@ func AutoClearSchedules() {
 				"s.user_org_id = ? AND "+
 				"NOT EXISTS (Select * FROM `xt_dialysis_order` as d Where  d.`status` = 1 AND"+
 				" d.`patient_id` = s.patient_id AND "+
-				" d.user_org_id = s.user_org_id AND d.dialysis_date = s.schedule_date)", scheduleDate.Unix(), item.UserOrgId).Updates(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()})
+				" d.user_org_id = s.user_org_id AND d.dialysis_date = s.schedule_date)", scheduleDate.Unix(), item.UserOrgId).
+			Updates(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()})
 	}
 	utils.SuccessLog("自动清除排班任务完成")
 }

service/dialysis_service.go

@@ -36,11 +36,11 @@ func GetSchedualPatientList(orgID int64, schedulDate int64, schedulType int64, p
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		// Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
 		Preload("TreatmentMode", "status = 1").
-		Preload("Prescription", "status = 1 AND user_org_id = ?", orgID).
-		Preload("AssessmentBeforeDislysis", "status = 1 AND  user_org_id = ?", orgID).
-		Preload("AssessmentAfterDislysis", "status = 1 AND  user_org_id = ?", orgID).
-		Preload("MonitoringRecord", "status = 1 AND  user_org_id = ?", orgID).
-		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
+		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, schedulDate).
+		Preload("AssessmentBeforeDislysis", "status = 1 AND  user_org_id = ? AND assessment_date = ?", orgID, schedulDate).
+		Preload("AssessmentAfterDislysis", "status = 1 AND  user_org_id = ? AND assessment_date = ?", orgID, schedulDate).
+		Preload("MonitoringRecord", "status = 1 AND  user_org_id = ? AND monitoring_date = ?", orgID, schedulDate).
+		Preload("DialysisOrder", "status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, schedulDate).
 		Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)
 	db = db.Where("status = 1")
 	if schedulDate > 0 {
@@ -609,10 +609,12 @@ func GetDialysisScheduals(orgID int64, scheduleDate int64) ([]*MDialysisSchedule
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 		// Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
-		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
-		Preload("AssessmentBeforeDislysis", "status = 1 AND user_org_id = ?", orgID).
-		Preload("Prescription", "status = 1 AND user_org_id = ?", orgID).
-		Preload("TreatmentSummary", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DialysisOrder", "status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).
+		Preload("AssessmentBeforeDislysis", "status = 1 AND user_org_id = ? AND  assessment_date = ?", orgID, scheduleDate).
+		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+		Preload("TreatmentSummary", "status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).
+		Preload("Advices", "status = 1 AND user_org_id = ? AND advice_date = ? ", orgID, scheduleDate).
+
 		// Preload("DialysisOrder.MonitoringRecords", "status = 1 AND user_org_id = ?", orgID).
 		Where("status = 1 AND user_org_id = ?", orgID)
 	if scheduleDate != 0 {
@@ -1066,6 +1068,14 @@ func UpdateDialysisBeforePrepare(info *models.DialysisBeforePrepare) (err error)
 	return err
 }
 
+func UpdateDialysisBeforePrepareTwo(info *models.DialysisBeforePrepare) (err error) {
+	err = writeDb.Model(&models.DialysisBeforePrepare{}).
+		Where("status = 1 AND good_id = ? AND good_type_id = ? AND patient_id = ? AND user_org_id = ? AND record_date = ?", info.GoodId, info.GoodTypeId, info.PatientId, info.UserOrgId, info.RecordDate).
+		Updates(map[string]interface{}{"count": info.Count, "updated_time": time.Now().Unix(), "modifier": info.Modifier}).Error
+
+	return err
+}
+
 func UpdateOrderCountSub(good_type_id int64, good_id int64, number string, org_id int64, count int64) {
 	writeDb.Model(&models.WarehouseOutInfo{}).Where("good_id = ? AND good_type_id = ? AND org_id = ? AND status = 1 AND is_sys = 1 AND warehouse_out_order_number = ? ", good_id, good_type_id, org_id, number).UpdateColumn("count", gorm.Expr("count - ?", count))
 
@@ -1081,3 +1091,9 @@ func UpdateUserInfoDetails(good_type_id int64, good_id int64, time int64, org_id
 	//writeDb.Model(&models.AutomaticReduceDetail{}).Where("good_id = ? AND good_type_id = ? AND org_id = ? AND status = 1 AND is_sys = 1 AND warehouse_out_order_number = ? ", good_id, good_type_id, org_id, out.WarehouseOutOrderNumber).UpdateColumn("count", count)
 
 }
+
+func FindDialysisBeforePrepare(patient_id int64, good_id int64, good_type_id int64, user_org_id int64, record_time int64) (count int64) {
+	readDb.Model(&models.DialysisBeforePrepare{}).Where("user_org_id = ? AND patient_id = ?  AND good_id = ? AND good_type_id = ? AND record_date = ? AND status = 1", user_org_id, patient_id, good_id, good_type_id, record_time).Count(&count)
+	return
+
+}

service/mobile_dialysis_service.go

@@ -30,13 +30,13 @@ func MobileGetDialysisScheduals(orgID int64, scheduleDate int64, scheduleType in
 		Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-		Preload("Advices", "status = 1 AND user_org_id = ? AND advice_type = 2", orgID).
+		Preload("Advices", "status = 1 AND user_org_id = ? AND advice_type = 2 AND advice_date = ? ", orgID, scheduleDate).
 		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 		Preload("AssessmentBeforeDislysis", "status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).
-		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DialysisOrder", "status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).
 		Preload("DialysisOrder.DeviceNumber", "status = 1 AND org_id = ?", orgID).
-		Preload("TreatmentSummary", "status = 1  AND user_org_id = ?", orgID).
-		Preload("AssessmentAfterDislysis", "status = 1  AND user_org_id = ?", orgID).
+		Preload("TreatmentSummary", "status = 1  AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).
+		Preload("AssessmentAfterDislysis", "status = 1  AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).
 
 		// Preload("DialysisOrder.MonitoringRecords", func(rdb *gorm.DB) *gorm.DB {
 		// 	return rdb.Where("status = 1 AND user_org_id = ?", orgID).Order("operate_time DESC")
@@ -115,13 +115,13 @@ type MDialysisScheduleVM struct {
 
 	SchedualPatient          *MSchedualPatientVMList           `gorm:"ForeignKey:PatientId" json:"patient"`
 	DeviceNumber             *MDeviceNumberVM                  `gorm:"ForeignKey:BedId" json:"device_number"`
-	DialysisOrder            *MDialysisOrderVMList             `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
-	Prescription             *models.DialysisPrescriptionList  `gorm:"ForeignKey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"prescription"`
-	AssessmentBeforeDislysis *models.PredialysisEvaluationList `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"assessment_before_dislysis"`
-	AssessmentAfterDislysis  *AssessmentAfterDislysis          `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"assessment_after_dislysis"`
+	DialysisOrder            *MDialysisOrderVMList             `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
+	Prescription             *models.DialysisPrescriptionList  `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
+	AssessmentBeforeDislysis *models.PredialysisEvaluationList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_before_dislysis"`
+	AssessmentAfterDislysis  *AssessmentAfterDislysis          `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_after_dislysis"`
 
-	Advices          []*VMDoctorAdvice   `gorm:"ForeignKey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"doctor_advice"`
-	TreatmentSummary *VMTreatmentSummary `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"treatment_summary"`
+	Advices          []*VMDoctorAdvice   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
+	TreatmentSummary *VMTreatmentSummary `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"treatment_summary"`
 }
 
 func (MDialysisScheduleVM) TableName() string {
@@ -290,6 +290,8 @@ type VMDoctorAdvice struct {
 	Status         int64 `gorm:"column:status" json:"status" form:"status"`
 	ExecutionState int64 `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
 	RecordDate     int64 `gorm:"column:record_date" json:"record_date"`
+	CheckTime      int64 `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState     int64 `gorm:"column:check_state" json:"check_state" form:"check_state"`
 }
 
 func (VMDoctorAdvice) TableName() string {
@@ -1173,6 +1175,19 @@ func GetLastTimePredialysisEvaluation(orgID int64, patientID int64, maxDate int6
 	return &record, nil
 }
 
+func GetLastTimeOrder(orgID int64, patientID int64, maxDate int64) (*models.DialysisOrder, error) {
+	var record models.DialysisOrder
+	err := readDb.Model(&models.DialysisOrder{}).Where("patient_id = ? and user_org_id = ? and status = 1 and dialysis_date < ?", patientID, orgID, maxDate).Order("dialysis_date desc").First(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &record, nil
+}
+
 func GetLastMonitorRecord(orgID int64, patientID int64, beforeDate int64) (*models.MonitoringRecord, error) {
 	var record models.MonitoringRecord
 	err := readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? and user_org_id = ? and status = 1 and monitoring_date = ?", patientID, orgID, beforeDate).Order("operate_time desc").First(&record).Error
@@ -1301,7 +1316,7 @@ func GetDialysisCountByPatientId(startime int64, endtime int64, patientid int64,
 }
 
 func FindConsumablesByDate(orgID int64, patient_id int64, recordDate int64) (consumables []*models.DialysisBeforePrepare, err error) {
-	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND status = 1 	AND count > 0", orgID, patient_id, recordDate).Find(&consumables).Error
+	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND status = 1", orgID, patient_id, recordDate).Find(&consumables).Error
 	return
 }
 

service/patient_service.go

@@ -994,10 +994,10 @@ func GetPatientScheduleList(orgID int64, patientID int64, page int64, limit int6
 	return
 }
 
-func GetMonitorRecord(orgID int64, date int64, partition int64) ([]*models.MonitorDialysisSchedule, error) {
-	var mds []*models.MonitorDialysisSchedule
+func GetMonitorRecord(orgID int64, date int64, partition int64) ([]*models.VMMonitorDialysisSchedule, error) {
+	var mds []*models.VMMonitorDialysisSchedule
 	db := readDb.
-		Model(&models.MonitorDialysisSchedule{}).
+		Model(&models.VMMonitorDialysisSchedule{}).
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
 		Preload("TreatmentMode", "status = 1").
@@ -1019,7 +1019,7 @@ func GetMonitorRecord(orgID int64, date int64, partition int64) ([]*models.Monit
 	return mds, err
 }
 
-func MobileGetMonitorsWithPatient(orgID int64, keyword string, page int) ([]*models.MonitorDialysisSchedule, error) {
+func MobileGetMonitorsWithPatient(orgID int64, keyword string, page int) ([]*models.VMMonitorDialysisSchedule, error) {
 	var patients []*models.Patients
 	getPatientErr := readDb.Model(&models.Patients{}).Where("status = 1 AND user_org_id = ? AND (name like ? OR dialysis_no like ?)", orgID, "%"+keyword+"%", "%"+keyword+"%").Find(&patients).Error
 	if getPatientErr != nil {
@@ -1031,7 +1031,7 @@ func MobileGetMonitorsWithPatient(orgID int64, keyword string, page int) ([]*mod
 	}
 
 	db := readDb.
-		Model(&models.MonitorDialysisSchedule{}).
+		Model(&models.VMMonitorDialysisSchedule{}).
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
 		Preload("TreatmentMode", "status = 1").
@@ -1043,7 +1043,7 @@ func MobileGetMonitorsWithPatient(orgID int64, keyword string, page int) ([]*mod
 		Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID).
 		Where("status = 1 AND user_org_id = ? AND patient_id in (?)", orgID, patientIDs)
 
-	var schedules []*models.MonitorDialysisSchedule
+	var schedules []*models.VMMonitorDialysisSchedule
 	err := db.Offset(20 * (page - 1)).Limit(20).Order("schedule_date desc").Find(&schedules).Error
 	return schedules, err
 }

service/role_service.go

@@ -761,3 +761,8 @@ func GetSystemPurview() (purview []*models.Purview, err error) {
 	err = readUserDb.Model(&models.Purview{}).Where("status = 1 AND module = 3 AND super_admin_exclusive = 1").Find(&purview).Error
 	return
 }
+
+func GetAllSystemPurview() (purview []*models.Purview, err error) {
+	err = readUserDb.Model(&models.Purview{}).Where("status = 1 AND module = 3 ").Find(&purview).Error
+	return
+}

service/stock_service.go

@@ -1257,6 +1257,13 @@ func UpdateStockOutInfoCount2(org_id int64, id int64, count int64) {
 
 }
 
+func FindPatientAutomaticReduceRecord(org_id int64, record_time int64, good_id int64, good_type_id int64, patient_id int64) (count int64, err error) {
+
+	err = readDb.Model(&models.AutomaticReduceDetail{}).Where("org_id = ? AND status = 1 AND good_id = ? AND good_type_id = ? AND patient_id = ? AND record_time = ?", org_id, good_id, good_type_id, patient_id, record_time).Count(&count).Error
+	return
+
+}
+
 type VMWarehousingInfo struct {
 	ID            int64    `gorm:"column:id" json:"id"`
 	WarehousingId int64    `gorm:"column:warehousing_id" json:"warehousing_id"`