2024/6/17

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10721 //机构id
+		subscibe.OrgId = 10742 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,8 +93,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10721 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 14655 //4
+		adminUserInfo.CurrentOrgId = 10742 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10721 //机构id小英9675或4
+		subscibe.OrgId = 10742 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,8 +339,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10721 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 14655 //4
+		adminUserInfo.CurrentOrgId = 10742 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/dialysis_api_controller.go

@@ -2178,6 +2178,18 @@ func (c *DialysisApiController) PostReceiveTreatmentAsses() {
 	}
 
 	_, receiveTreatment := service.FindReceiveTreatmentAssesByReordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+
+	if adminUserInfo.CurrentOrgId == 10340 {
+		if condition == 1 {
+			lastAcceptTreatment, _ := service.GetLastAcceptTreatment(adminUserInfo.CurrentOrgId, id)
+			if admission_number == "" {
+				admission_number = lastAcceptTreatment.AdmissionNumber
+				his_bed = lastAcceptTreatment.HisBed
+				his_department = lastAcceptTreatment.HisDepartment
+				tumble = lastAcceptTreatment.Tumble
+			}
+		}
+	}
 	receiveTreatmentAsses := models.ReceiveTreatmentAsses{
 		UserOrgId:                    adminUserInfo.CurrentOrgId,
 		PatientId:                    id,
@@ -2858,7 +2870,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			service.CreateDialysisFinish(finish)
 		}
 
-		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10751 {
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10752 {
 			var dewater_amount float64
 			dewater_amount = 0
 			if dry_weight > 0 {
@@ -3505,7 +3517,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		}
 
 		//针对孝昌康桥超滤率计算问题
-		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10742 || adminUserInfo.CurrentOrgId == 10751 {
+		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10742 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10752 {
 			if assessmentBeforeDislysis.ID == 0 {
 				dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
 				if dialysisPrescribeOne.ID > 0 && assessmentBeforeDislysis.ID > 0 {
@@ -4957,6 +4969,55 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	lastSchedule, _ := service.FindLastSchedule(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 
 	numberList, _ := service.GetAllBedNumberList(adminUserInfo.CurrentOrgId)
+
+	now := time.Now()
+
+	// 计算当前是周几，周一为第1天，周日为第0天
+	weekday := now.Weekday()
+
+	// 计算当前日期是周几，并计算出周一的日期
+	// 通过减去当前是周几的偏移量再加1来实现（因为Weekday()返回的是从周日开始的索引，而我们想要从周一开始）
+	mondayone := now.AddDate(0, 0, -(int(weekday)+6)%7) // 或者使用 monday := now.Add(-time.Hour * 24 * (int(weekday)+6)%7)
+
+	// 设置开始时间为周一的00:00:00
+	startOfTheWeek := time.Date(mondayone.Year(), mondayone.Month(), mondayone.Day(), 0, 0, 0, 0, mondayone.Location())
+
+	// 设置结束时间为周日的23:59:59（周一的日期基础上加6天）
+	endOfTheWeek := startOfTheWeek.AddDate(0, 0, 6).Add(24*time.Hour - time.Second) // 或者使用 endOfTheWeek := monday.AddDate(0, 0, 7).Add(-time.Second)
+
+	var start_time = startOfTheWeek.Format("2006-01-02")
+
+	var end_time = endOfTheWeek.Format("2006-01-02")
+
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	scheduleDialyCount, _ := service.GetPatientScheduleDialyCount(patientInfo.ID, startTime, endTime, adminUserInfo.CurrentOrgId)
+
+	dialysis_count := len(scheduleDialyCount)
+
+	var dialysis_count_str = "一周" + strconv.Itoa(dialysis_count) + "次"
+	if adminUserInfo.CurrentOrgId == 10742 {
+		PredialysisEvaluation.DialysisCount = dialysis_count_str
+	}
+
 	//if config.IsOpen == 1 && project_config.IsOpen == 1 && len(projects) > 0 {
 	//	for _, item := range projects {
 	//		var advice *models.HisDoctorAdviceInfo
@@ -5666,6 +5727,11 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 			}
 		}
 
+		if advice.DrugId == 0 {
+			drug, _ := service.GetDoctorAdviceByAdviceName(advice.AdviceName, adminUserInfo.CurrentOrgId)
+			advice.DrugId = drug.ID
+		}
+
 		advices = append(advices, &advice)
 	}
 

controllers/drug_stock_api_contorller.go

@@ -1170,7 +1170,7 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 	warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
 	number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
 	number = number + total
-	warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+	warehousing_out_order = "YPCKM" + strconv.FormatInt(number, 10)
 	operation_time := time.Now().Unix()
 	creater := adminUserInfo.AdminUser.Id
 	//创建一个出库单
@@ -1189,7 +1189,9 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 
 	if warehouse_out_id == 0 {
 		//查询是否生成出库单
-		outIsExit, _ := service.GetNewDrugWarehouseOutIsExit(adminUserInfo.CurrentOrgId, 0, operation_time, warehousing_out_order, tx)
+		outIsExit, _ := service.GetNewDrugWarehouseOutIsExit(adminUserInfo.CurrentOrgId, 0, warehousingOutDate.Unix(), warehousing_out_order, tx)
+
+		fmt.Println("outIsExit---------------------", outIsExit)
 		if outIsExit.ID == 0 {
 			service.AddNewSigleDrugWarehouseOut(&warehouseOut, tx)
 		}
@@ -3246,15 +3248,37 @@ func (c *StockDrugApiController) GetDrugOutOrderPrint() {
 	dealerList, _ := service.GetAllDealerList(orgId)
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	if order_type == 2 {
-		list, err := service.GetDrugOutOrderInfoPrintList(startTime, endTime, orgId, storehouse_id, drug_id, order_way)
-		if err == nil {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"list":             list,
-				"dealerList":       dealerList,
-				"manufacturerList": manufacturerList,
-			})
-			return
+		list, _ := service.GetDrugOutOrderInfoPrintList(startTime, endTime, orgId, storehouse_id, drug_id, order_way)
+		if len(list) > 0 {
+			if orgId == 10721 {
+
+				if len(list) > 0 {
+					for _, item := range list {
+						if item.IsSys == 1 {
+							var is_number = item.Count % item.XtBaseDrug.MinNumber
+							if is_number == 0 {
+								item.Count = item.Count / item.XtBaseDrug.MinNumber
+								item.TotalPrice = float64(item.Count) * item.Price
+								item.CountUnit = item.XtBaseDrug.MaxUnit
+							}
+							if is_number != 0 {
+								item.TotalPrice = float64(item.Count) * item.Price
+								item.CountUnit = item.XtBaseDrug.MinUnit
+							}
+
+						}
+					}
+				}
+			}
 		}
+
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list":             list,
+			"dealerList":       dealerList,
+			"manufacturerList": manufacturerList,
+		})
+		return
+
 	}
 
 }
@@ -3281,6 +3305,7 @@ func (c *StockDrugApiController) GetConfigList() {
 func (c *StockDrugApiController) CheckWarehousingInfo() {
 
 	warehousing_id, _ := c.GetInt64("warehousing_id")
+
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	// 开始外部循环的事务
 	db := service.XTWriteDB()
@@ -3447,6 +3472,8 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 		}
 
 		flowList, _ := service.GetNewDrugFlowList(item.DrugId, item.OrgId, item.ID, tx)
+
+		fmt.Println("FlowList=================", flowList)
 		var his_count int64
 		if len(flowList) > 0 {
 			for _, item := range flowList {
@@ -3462,6 +3489,8 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 				}
 			}
 		}
+		fmt.Println("incount_0000000000000000", in_cout)
+		fmt.Println("his_count--------------", his_count)
 
 		if in_cout != his_count {
 			is_success = 1
@@ -3737,6 +3766,8 @@ func (c *StockDrugApiController) CheckDrugOut() {
 				}
 			}
 
+			fmt.Println("now_count=-------------------", now_count)
+			fmt.Println("flow_count_one=-------------------", flow_count_one)
 			if now_count != flow_count_one {
 				is_success = 1
 				tx.Rollback()

controllers/gobal_config_api_controller.go

@@ -1862,6 +1862,27 @@ func (c *GobalConfigApiController) GetDrugOutDetail() {
 	drug_id, _ := c.GetInt64("drug_id")
 	order_way, _ := c.GetInt64("order_way")
 	order, total, err := service.GetDrugOutOrder(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit, storehouse_id, drug_id, order_way)
+	if adminInfo.CurrentOrgId == 10721 {
+
+		if len(order) > 0 {
+			for _, item := range order {
+				if item.IsSys == 1 {
+
+					var is_number = item.Count % item.MinNumber
+
+					if is_number == 0 {
+						item.Count = item.Count / item.MinNumber
+						item.TotalPrice = float64(item.Count) * item.Price
+						item.CountUnit = item.MaxUnit
+					}
+					if is_number != 0 {
+						item.TotalPrice = float64(item.Count) * item.Price
+						item.CountUnit = item.MinUnit
+					}
+				}
+			}
+		}
+	}
 
 	houseList, _ := service.GetAllStoreHouseList(adminInfo.CurrentOrgId)
 	patientsList, _ := service.GetAllpatient(adminInfo.CurrentOrgId)
@@ -2509,11 +2530,19 @@ func (c *GobalConfigApiController) GetDrugFlow() {
 
 	list, total, _ := service.GetDrugFlow(drug_id, orgId, limit, page, startTime, endTime, stock_type)
 
+	if len(list) > 0 {
+		for _, item := range list {
+			adviceMap, _ := service.HisDoctorAdviceMap(item.PatientId, item.SystemTime, item.DrugId, item.UserOrgId)
+			item.DrugCode = adviceMap.DrugCode
+		}
+	}
+
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	dealerList, _ := service.GetAllDealerList(orgId)
 	medical, _ := service.GetBaseDrugMedical(drug_id)
 	houseList, _ := service.GetAllStoreHouseList(orgId)
 	patientList, _ := service.GetAllPatientListSix(orgId)
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list":             list,
 		"total":            total,

controllers/his_api_controller.go

@@ -3487,7 +3487,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10571 || adminInfo.CurrentOrgId == 10724 || adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10653 || adminInfo.CurrentOrgId == 10567 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10571 || adminInfo.CurrentOrgId == 10724 || adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10653 || adminInfo.CurrentOrgId == 10567 || adminInfo.CurrentOrgId == 10751 || adminInfo.CurrentOrgId == 10752 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -3516,6 +3516,7 @@ func (c *HisApiController) CreateHisPrescription() {
 					new_prescription, _ := service.GetPrescriptionById(id, adminInfo.CurrentOrgId)
 					tempPrescription = &new_prescription
 					if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
+
 						utils.ErrorLog("type")
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 						return
@@ -3864,13 +3865,13 @@ func (c *HisApiController) CreateHisPrescription() {
 											}
 										}
 
-										fmt.Println("药品名称----------------------", drug.DrugName)
-										fmt.Println("药品名称----------------------", drug.IsUse)
-										fmt.Println("drug_iiiiiiiiiiiiiiiiiiii", drug.ID)
-										fmt.Println("is_user_total-------------------------", is_user_total)
-										fmt.Println("no_user_total-------------------------", no_user_total)
-										fmt.Println("drug.IsUse---------------", drug.IsUse)
-										fmt.Println("00000000000000000000", s.UserOrgId)
+										//fmt.Println("药品名称----------------------", drug.DrugName)
+										//fmt.Println("药品名称----------------------", drug.IsUse)
+										//fmt.Println("drug_iiiiiiiiiiiiiiiiiiii", drug.ID)
+										//fmt.Println("is_user_total-------------------------", is_user_total)
+										//fmt.Println("no_user_total-------------------------", no_user_total)
+										//fmt.Println("drug.IsUse---------------", drug.IsUse)
+										//fmt.Println("00000000000000000000", s.UserOrgId)
 
 										if is_user_total != no_user_total {
 											//出库
@@ -4013,8 +4014,8 @@ func (c *HisApiController) CreateHisPrescription() {
 													history_count += prescribingNumberSevenTy
 												}
 
-												fmt.Println("local_count---------------", local_count)
-												fmt.Println("history_count---------------", history_count)
+												//fmt.Println("local_count---------------", local_count)
+												//fmt.Println("history_count---------------", history_count)
 
 												//如果当前出库数量大于历史出库数量则需要出库
 												if local_count > history_count {
@@ -4471,6 +4472,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 									//用机构ID区分
 									if adminInfo.CurrentOrgId != 9671 {
+
 										if goodOutConfig.IsOpen == 1 {
 											//耗材出库
 											if p.Type == 3 {
@@ -4521,7 +4523,10 @@ func (c *HisApiController) CreateHisPrescription() {
 												//	}
 												//}
 
+												fmt.Println("nowCount222=================", nowCount)
+												fmt.Println("historyCount-333----------------", historyCount)
 												//如果当前处方数量大于历史数据,则需要出库
+
 												if nowCount > historyCount {
 
 													var cha_count int64
@@ -4644,6 +4649,7 @@ func (c *HisApiController) CreateHisPrescription() {
 												}
 
 												if nowCount == historyCount {
+
 													if historyCount == 0 {
 														recordDateStr := time.Now().Format("2006-01-02")
 														recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
@@ -6063,6 +6069,7 @@ func (c *HisApiController) CreateHisPrescription() {
 				}
 			}
 
+			fmt.Println("耗材----------------------------------", goodOutConfig.IsOpen)
 			//耗材保存处方出库
 			if goodOutConfig.IsOpen == 1 {
 
@@ -6080,6 +6087,8 @@ func (c *HisApiController) CreateHisPrescription() {
 
 					parseIntCount, _ := strconv.ParseInt(item.Count, 10, 64)
 
+					fmt.Println("out_count_five-------------------", out_count_five)
+					fmt.Println("parseIntCount---------------", parseIntCount)
 					if out_count_five != parseIntCount {
 
 						//查询耗材最后一次出库记录

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1327,6 +1327,9 @@ func (c *DialysisAPIController) PostAcceptsAssessment() {
 			lastAcceptTreatment, _ := service.GetLastAcceptTreatment(adminUserInfo.Org.Id, id)
 			if admission_number == "" {
 				admission_number = lastAcceptTreatment.AdmissionNumber
+				his_bed = lastAcceptTreatment.HisBed
+				his_department = lastAcceptTreatment.HisDepartment
+				tumble = lastAcceptTreatment.Tumble
 			}
 		}
 	}
@@ -4036,6 +4039,11 @@ func (this *DialysisAPIController) StartDialysis() {
 				ultrafiltration_rate = ultrafiltration_rate / 1000
 			}
 
+			if adminUserInfo.Org.Id == 10752 {
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater * 1000 / float64(totalMin) * 60 * 1000)
+				ultrafiltration_rate = ultrafiltration_rate / 1000
+			}
+
 			if adminUserInfo.Org.Id == 10723 {
 				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater * 1000 / float64(totalMin) * 60 * 1000)
 				ultrafiltration_rate = ultrafiltration_rate / 1000
@@ -4061,6 +4069,25 @@ func (this *DialysisAPIController) StartDialysis() {
 				}
 			}
 
+			fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhh", adminUserInfo.Org.Id)
+			if adminUserInfo.Org.Id == 10752 {
+
+				if prescription.ModeId == 2 {
+					totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
+					if totalMin == 0 {
+						totalMin = 240
+					}
+					if prescription.ReplacementTotal == 0 {
+						prescription.ReplacementTotal = 15
+					}
+
+					//乘10 除10是为了保留一位小数
+					replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
+
+					fmt.Println("hhhhhhhhhhhhhhhhhhhhh", replacement_rate)
+				}
+			}
+
 			if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10731 || adminUserInfo.Org.Id == 10727 {
 				if prescription.ModeId == 2 {
 					totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
@@ -5308,6 +5335,11 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
 			}
 
+			if adminInfo.Org.Id == 10752 {
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater * 1000 / float64(totalMin) * 60 * 1000)
+				record.UltrafiltrationRate = ultrafiltration_rate / 1000
+			}
+
 			if adminInfo.Org.Id == 10597 || adminInfo.Org.Id == 10599 || adminInfo.Org.Id == 10679 {
 				record.UltrafiltrationRate = 0
 			}
@@ -5425,7 +5457,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		record.UltrafiltrationVolume = 0
 	}
 
-	if adminInfo.Org.Id == 10721 || adminInfo.Org.Id == 10164 || adminInfo.Org.Id == 10731 {
+	if adminInfo.Org.Id == 10721 || adminInfo.Org.Id == 10164 || adminInfo.Org.Id == 10731 || adminInfo.Org.Id == 10752 {
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume / 1000
@@ -5454,7 +5486,19 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		var displacement_quantity float64
 		totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
 		replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*60) / 1000
+		record.ReplacementRate = replacement_rate
+		fmt.Println("hhhhhhhhhhhhhhhhhh", record.ReplacementRate)
+		fmt.Println(math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600))
+		displacement_quantity = math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime)/3600) * replacement_rate
+		record.DisplacementQuantity = displacement_quantity
+
+	}
 
+	if adminInfo.Org.Id == 10752 {
+		var replacement_rate float64
+		var displacement_quantity float64
+		totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
+		replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*60) / 1000
 		record.ReplacementRate = replacement_rate
 
 		fmt.Println(math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600))
@@ -6168,6 +6212,7 @@ func (c *DialysisAPIController) GetLongAdviceOne() {
 
 		advices, err := service.GetLastLongAdviceByGroupNo(adminUserInfo.Org.Id, patient_id, theStartTime)
 
+		fmt.Println("theStartTime-----------------------", theStartTime)
 		advices_two, err := service.GetLastLongAdviceByGroupNoThree(adminUserInfo.Org.Id, patient_id, theStartTime)
 
 		for _, advice := range advices {
@@ -6226,7 +6271,7 @@ func (c *DialysisAPIController) GetLongAdviceOne() {
 			count, _ := strconv.ParseInt(dayStr2, 10, 64)
 			oldTime := time.Now().AddDate(0, 0, int(count)).Unix()
 			advices, _ := service.FindAllDoctorAdviceByTime(now, oldTime, patient_id, adminUserInfo.Org.Id, advice.TemplateId)
-
+			fmt.Println("advices-==---------------", advices)
 			for _, ad := range advices {
 				advice_three = append(advice_three, ad)
 			}
@@ -11513,6 +11558,14 @@ func (c *DialysisAPIController) GetControlMonitorList() {
 		}
 	}
 
+	if pat_type == 13 {
+		for _, item := range monitor {
+			if len(item.MonitoringRecord) < 3 {
+				mds = append(mds, item)
+			}
+		}
+	}
+
 	if pat_type == 10 {
 		for _, item := range monitor {
 			if len(item.MonitoringRecord) == 0 {
@@ -11590,7 +11643,8 @@ func (c *DialysisAPIController) GetAdviceListNoExecution() {
 func (c *DialysisAPIController) GetLastAcceptRecrods() {
 
 	patient_id, _ := c.GetInt64("patient_id")
-	recrods, _ := service.GetLastAcceptRecrods(patient_id)
+	org_id := c.GetMobileAdminUserInfo().Org.Id
+	recrods, _ := service.GetLastAcceptRecrods(patient_id, org_id)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"recrods": recrods,
 	})

controllers/mobile_api_controllers/patient_api_controller.go

@@ -339,25 +339,29 @@ func (c *PatientApiController) EditDoctorAdvice() {
 				}
 			}
 			//判断前端上传上来的开始时间和数据库中想要修改的那条医嘱的开始时间是否相同，如果不同，需要修改子医嘱的开始时间，如果相同直接修改，不需要修改子医嘱的开始时间
-			if advice.StartTime == sourceAdvice.StartTime {
-				err = service.UpdateDoctorAdvice(&advice)
-				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
-
-				defer redis.Close()
-				redis.Set(key, "", time.Second)
-				keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
-				redis.Set(keyOne, "", time.Second)
-				isChangeGroup = false
-			} else {
-				err = service.UpdateDoctorAdviceAndSubAdvice(&advice)
-				isChangeGroup = false
-				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
-
-				defer redis.Close()
-				redis.Set(key, "", time.Second)
-				keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":advice_list_all"
-				redis.Set(keyOne, "", time.Second)
+			if adminUserInfo.Org.Id != 9779 {
+
+				if advice.StartTime == sourceAdvice.StartTime {
+					err = service.UpdateDoctorAdvice(&advice)
+					key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
+
+					defer redis.Close()
+					redis.Set(key, "", time.Second)
+					keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+					redis.Set(keyOne, "", time.Second)
+					isChangeGroup = false
+				} else {
+					err = service.UpdateDoctorAdviceAndSubAdvice(&advice)
+					isChangeGroup = false
+					key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
+
+					defer redis.Close()
+					redis.Set(key, "", time.Second)
+					keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":advice_list_all"
+					redis.Set(keyOne, "", time.Second)
+				}
 			}
+
 		} else if len(adviceSlice) > 1 {
 			infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
 			if infor.ID > 0 {
@@ -382,31 +386,36 @@ func (c *PatientApiController) EditDoctorAdvice() {
 				}
 			}
 			//判断前端上传上来的开始时间和数据库中想要修改的那条医嘱的开始时间是否相同，如果不同，需要重新分配组，如果相同直接修改，不需要分配组
-			if advice.StartTime == sourceAdvice.StartTime {
-				err = service.UpdateDoctorAdvice(&advice)
-				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
 
-				defer redis.Close()
-				redis.Set(key, "", time.Second)
-				keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":advice_list_all"
-				redis.Set(keyOne, "", time.Second)
-				isChangeGroup = false
+			if adminUserInfo.Org.Id != 9779 {
 
-			} else {
-				gruopNo := service.GetMaxAdviceGroupID(adminUserInfo.Org.Id)
-				gruopNo = gruopNo + 1
-				advice.GroupNo = gruopNo
-				advice.AdviceDoctor = adminUserInfo.AdminUser.Id
-				err = service.UpdateDoctorAdviceAndSubAdvice(&advice)
-				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
+				if advice.StartTime == sourceAdvice.StartTime {
+					err = service.UpdateDoctorAdvice(&advice)
+					key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
 
-				defer redis.Close()
-				redis.Set(key, "", time.Second)
-				keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":advice_list_all"
-				redis.Set(keyOne, "", time.Second)
-				isChangeGroup = true
+					defer redis.Close()
+					redis.Set(key, "", time.Second)
+					keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":advice_list_all"
+					redis.Set(keyOne, "", time.Second)
+					isChangeGroup = false
+
+				} else {
+					gruopNo := service.GetMaxAdviceGroupID(adminUserInfo.Org.Id)
+					gruopNo = gruopNo + 1
+					advice.GroupNo = gruopNo
+					advice.AdviceDoctor = adminUserInfo.AdminUser.Id
+					err = service.UpdateDoctorAdviceAndSubAdvice(&advice)
+					key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
+
+					defer redis.Close()
+					redis.Set(key, "", time.Second)
+					keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":advice_list_all"
+					redis.Set(keyOne, "", time.Second)
+					isChangeGroup = true
 
+				}
 			}
+
 		}
 	} else {
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
@@ -757,6 +766,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				service.CreateDoctorAdviceLog(adviceLog)
 			}
 			advicesOne, _ := service.FindAllDoctorAdviceByGoroupNoOne(adminUserInfo.Org.Id, groupno)
+
 			for _, item := range advicesOne {
 
 				//自备药
@@ -775,13 +785,14 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}()
 
 					if strings.Contains(item.AdviceName, "自备") {
-						fmt.Println("hahhahahahahhh")
 						if item.DrugId == 0 {
+
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg":    "12",
 								"advice": item,
 								"ids":    ids,
 							})
+							tx.Rollback()
 							return
 						}
 					}
@@ -810,6 +821,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									"advice": item,
 									"ids":    ids,
 								})
+								tx.Rollback()
 								return
 							}
 						}
@@ -843,6 +855,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									"msg":    "3",
 									"advice": item,
 								})
+								tx.Rollback()
 								return
 							}
 						}
@@ -1114,7 +1127,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 				}
 				//恒泰中医院
-				if item.UserOrgId == 10490 || item.UserOrgId == 10602 {
+				if item.UserOrgId == 10490 || item.UserOrgId == 10602 || item.UserOrgId == 10697 {
 					if item.DrugId == 0 || item.DrugNameId == 0 {
 						//从字典里面查找
 						drug, _ := service.GetBaseDrugByName(item.AdviceName, item.UserOrgId)
@@ -1147,6 +1160,19 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 					selfBasedrug, _ := service.GetSelfBasedrugById(item.DrugId, item.UserOrgId, tx)
 
+					if strings.Contains(item.AdviceName, "自备") {
+						if item.DrugId == 0 {
+
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":    "12",
+								"advice": item,
+								"ids":    ids,
+							})
+							tx.Rollback()
+							return
+						}
+					}
+
 					if selfBasedrug.IsSelfDrug == 1 {
 
 						//查询是否有库存
@@ -1170,6 +1196,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									"advice": item,
 									"ids":    ids,
 								})
+								tx.Rollback()
 								return
 							}
 						}
@@ -1202,6 +1229,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									"msg":    "3",
 									"advice": item,
 								})
+								tx.Rollback()
 								return
 							}
 						}
@@ -1521,6 +1549,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 				}
 			}
+
 			err = service.BatchExceOldDoctorAdvice(&advices, ids)
 
 			//记录日志
@@ -1576,9 +1605,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		//药品管理信息
 		_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminUserInfo.Org.Id)
 
-		//自备药信息
-		//privateDrugConfig, _ := service.GetDrugSetByUserOrgId(adminUserInfo.Org.Id)
-
 		storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.Org.Id)
 
 		if drugStockConfig.IsOpen == 1 {
@@ -1997,6 +2023,55 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		//	}
 		//}
 
+		//自备药
+		selfPrescriptionOutOpen, _ := service.GetSelfPrescriptionOutOpen(adminUserInfo.Org.Id)
+
+		if selfPrescriptionOutOpen.IsOpen == 1 {
+
+			if groupno > 0 {
+				advices, _ := service.FindAllDoctorAdviceByGoroupNoThree(adminUserInfo.Org.Id, groupno, patient_id, record_date)
+
+				if len(advices) > 0 {
+
+					for _, item := range advices {
+
+						if item.DrugId > 0 && item.ExecutionStaff == 0 {
+
+							//查询这个病人 这个药是否已经出库
+							outInfo, _ := service.GetSelfDrugOutInfo(item.PatientId, item.AdviceDate, item.DrugId)
+
+							if len(outInfo) > 0 {
+
+								service.ModifyExecutionAdvice(item.ID, execution_staff, theTime.Unix())
+							}
+						}
+
+					}
+				}
+
+			} else {
+				advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
+
+				if len(advices) > 0 {
+
+					for _, item := range advices {
+
+						if item.DrugId > 0 && item.ExecutionStaff == 0 {
+
+							//查询这个病人 这个药是否已经出库
+							outInfo, _ := service.GetSelfDrugOutInfo(item.PatientId, item.AdviceDate, item.DrugId)
+
+							if len(outInfo) > 0 {
+
+								service.ModifyExecutionAdvice(item.ID, execution_staff, theTime.Unix())
+							}
+						}
+
+					}
+				}
+			}
+		}
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg":    "1",
 			"advice": advice,
@@ -3753,9 +3828,9 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	if evaluation.DryWeight > 0 {
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 
-		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 || adminUserInfo.Org.Id == 10579 || adminUserInfo.Org.Id == 10580 || adminUserInfo.Org.Id == 10585 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10727 || adminUserInfo.Org.Id == 10751 {
+		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 || adminUserInfo.Org.Id == 10579 || adminUserInfo.Org.Id == 10580 || adminUserInfo.Org.Id == 10585 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10727 || adminUserInfo.Org.Id == 10751 || adminUserInfo.Org.Id == 10752 {
 
-			if adminUserInfo.Org.Id != 10551 && adminUserInfo.Org.Id != 10579 && adminUserInfo.Org.Id != 10580 && adminUserInfo.Org.Id != 10585 {
+			if adminUserInfo.Org.Id != 10551 && adminUserInfo.Org.Id != 10579 && adminUserInfo.Org.Id != 10580 && adminUserInfo.Org.Id != 10585 && adminUserInfo.Org.Id != 10752 {
 				dewater_amount = dewater_amount * 1000
 			}
 
@@ -4478,7 +4553,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	}
 
 	//针对孝昌康桥超滤率计算问题
-	if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10726 || adminUserInfo.Org.Id == 10164 || adminUserInfo.Org.Id == 10751 {
+	if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10726 || adminUserInfo.Org.Id == 10164 || adminUserInfo.Org.Id == 10751 || adminUserInfo.Org.Id == 10752 {
 		if evaluation.ID == 0 {
 			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {
@@ -6107,6 +6182,53 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 	dialysiscount, err := service.GetDialysisCountByPatientId(firstMonthDate, xttime, patientInfo.ID, adminUserInfo.Org.Id)
 	lastWeight, _ := service.MobileGetLast(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 	numberList, _ := service.GetAllBedNumberList(adminUserInfo.Org.Id)
+
+	now := time.Now()
+
+	// 计算当前是周几，周一为第1天，周日为第0天
+	weekday := now.Weekday()
+
+	// 计算当前日期是周几，并计算出周一的日期
+	// 通过减去当前是周几的偏移量再加1来实现（因为Weekday()返回的是从周日开始的索引，而我们想要从周一开始）
+	mondayone := now.AddDate(0, 0, -(int(weekday)+6)%7) // 或者使用 monday := now.Add(-time.Hour * 24 * (int(weekday)+6)%7)
+
+	// 设置开始时间为周一的00:00:00
+	startOfTheWeek := time.Date(mondayone.Year(), mondayone.Month(), mondayone.Day(), 0, 0, 0, 0, mondayone.Location())
+
+	// 设置结束时间为周日的23:59:59（周一的日期基础上加6天）
+	endOfTheWeek := startOfTheWeek.AddDate(0, 0, 6).Add(24*time.Hour - time.Second) // 或者使用 endOfTheWeek := monday.AddDate(0, 0, 7).Add(-time.Second)
+
+	var start_time = startOfTheWeek.Format("2006-01-02")
+
+	var end_time = endOfTheWeek.Format("2006-01-02")
+
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	scheduleDialyCount, _ := service.GetPatientScheduleDialyCount(patientInfo.ID, startTime, endTime, adminUserInfo.Org.Id)
+
+	dialysis_count_one := len(scheduleDialyCount)
+
+	var dialysis_count_str = "一周" + strconv.Itoa(dialysis_count_one) + "次"
+	PredialysisEvaluation.DialysisCount = dialysis_count_str
+
 	if config.IsOpen == 1 {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"users":                   adminUser,

controllers/new_mobile_api_controllers/index_evaluation_api_controller.go

@@ -1,12 +1,13 @@
 package new_mobile_api_controllers
 
 import (
+	"fmt"
+	"time"
+
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service/statistics_service"
 	"XT_New/utils"
-	"fmt"
-	"time"
 )
 
 type IndexEvaluationApiController struct {
@@ -912,7 +913,9 @@ func (this *IndexEvaluationApiController) GetDefaultPatient() {
 }
 
 func (this *IndexEvaluationApiController) GetAllPatients() {
+
 	adminUserInfo := this.GetMobileAdminUserInfo()
+
 	patients, _ := statistics_service.GetOrgPatients(adminUserInfo.Org.Id)
 	if patients == nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOrgNoPatient)

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

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

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -1039,13 +1039,13 @@ func (c *StaffScheduleApiController) CreateMobileSchedulePatient() {
 	}
 	schedule.ScheduleDate = theTime.Unix()
 
-	timeNow := time.Now().Format("2006-01-02")
-	if timeNow > scheduleDate {
-		utils.ErrorLog(timeNow)
-		utils.ErrorLog(scheduleDate)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCantSetScheduleBeforeNow)
-		return
-	}
+	//timeNow := time.Now().Format("2006-01-02")
+	//if timeNow > scheduleDate {
+	//	utils.ErrorLog(timeNow)
+	//	utils.ErrorLog(scheduleDate)
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCantSetScheduleBeforeNow)
+	//	return
+	//}
 
 	if dataBody["schedule_type"] == nil || reflect.TypeOf(dataBody["schedule_type"]).String() != "float64" {
 		utils.ErrorLog("schedule_type")

controllers/patient_api_controller.go

@@ -1981,6 +1981,11 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			}
 		}
 
+		if advice.DrugId == 0 {
+			drug, _ := service.GetDoctorAdviceByAdviceName(advice.AdviceName, adminUserInfo.CurrentOrgId)
+			advice.DrugId = drug.ID
+		}
+
 		advices = append(advices, &advice)
 	}
 
@@ -4482,7 +4487,9 @@ func (c *PatientApiController) DeleteDoctorAdvice() {
 }
 
 func (c *PatientApiController) DeleteGroupAdvice() {
+
 	groupNo, _ := c.GetInt64("groupno", 0)
+
 	if groupNo <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return

controllers/print_data_api_controller.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"fmt"
+	"strconv"
 	"strings"
 	"time"
 
@@ -63,6 +64,58 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 
 			//透前评估
 			assessmentBeforeDislysisVM, _ := service.GetBatchAssessmentBeforeDislysisVM(this.GetAdminUserInfo().CurrentOrgId, item.PatientID, item.ScheduleDate)
+
+			now := time.Now()
+
+			// 计算当前是周几，周一为第1天，周日为第0天
+			weekday := now.Weekday()
+
+			// 计算当前日期是周几，并计算出周一的日期
+			// 通过减去当前是周几的偏移量再加1来实现（因为Weekday()返回的是从周日开始的索引，而我们想要从周一开始）
+			mondayone := now.AddDate(0, 0, -(int(weekday)+6)%7) // 或者使用 monday := now.Add(-time.Hour * 24 * (int(weekday)+6)%7)
+
+			// 设置开始时间为周一的00:00:00
+			startOfTheWeek := time.Date(mondayone.Year(), mondayone.Month(), mondayone.Day(), 0, 0, 0, 0, mondayone.Location())
+
+			// 设置结束时间为周日的23:59:59（周一的日期基础上加6天）
+			endOfTheWeek := startOfTheWeek.AddDate(0, 0, 6).Add(24*time.Hour - time.Second) // 或者使用 endOfTheWeek := monday.AddDate(0, 0, 7).Add(-time.Second)
+
+			var start_time = startOfTheWeek.Format("2006-01-02")
+
+			var end_time = endOfTheWeek.Format("2006-01-02")
+
+			timeLayout := "2006-01-02"
+			loc, _ := time.LoadLocation("Local")
+
+			var startTime int64
+			if len(start_time) > 0 {
+				theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+				if err != nil {
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				startTime = theTime.Unix()
+			}
+			var endTime int64
+			if len(end_time) > 0 {
+				theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+				if err != nil {
+					utils.ErrorLog(err.Error())
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				endTime = theTime.Unix()
+			}
+			scheduleDialyCount, _ := service.GetPatientScheduleDialyCount(item.PatientID, startTime, endTime, adminUserInfo.CurrentOrgId)
+
+			dialysis_count := len(scheduleDialyCount)
+
+			var dialysis_count_str = "一周" + strconv.Itoa(dialysis_count) + "次"
+
+			if adminUserInfo.CurrentOrgId == 10742 {
+				assessmentBeforeDislysisVM.DialysisCount = dialysis_count_str
+			}
+
 			item.AssessmentBeforeDislysis = assessmentBeforeDislysisVM
 
 			//透后评估
@@ -159,6 +212,63 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 		schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 
+			//透前评估
+			assessmentBeforeDislysisVM, _ := service.GetBatchAssessmentBeforeDislysisVM(this.GetAdminUserInfo().CurrentOrgId, item.PatientID, item.ScheduleDate)
+
+			now := time.Now()
+
+			// 计算当前是周几，周一为第1天，周日为第0天
+			weekday := now.Weekday()
+
+			// 计算当前日期是周几，并计算出周一的日期
+			// 通过减去当前是周几的偏移量再加1来实现（因为Weekday()返回的是从周日开始的索引，而我们想要从周一开始）
+			mondayone := now.AddDate(0, 0, -(int(weekday)+6)%7) // 或者使用 monday := now.Add(-time.Hour * 24 * (int(weekday)+6)%7)
+
+			// 设置开始时间为周一的00:00:00
+			startOfTheWeek := time.Date(mondayone.Year(), mondayone.Month(), mondayone.Day(), 0, 0, 0, 0, mondayone.Location())
+
+			// 设置结束时间为周日的23:59:59（周一的日期基础上加6天）
+			endOfTheWeek := startOfTheWeek.AddDate(0, 0, 6).Add(24*time.Hour - time.Second) // 或者使用 endOfTheWeek := monday.AddDate(0, 0, 7).Add(-time.Second)
+
+			var start_time = startOfTheWeek.Format("2006-01-02")
+
+			var end_time = endOfTheWeek.Format("2006-01-02")
+
+			timeLayout := "2006-01-02"
+			loc, _ := time.LoadLocation("Local")
+
+			var startTime int64
+			if len(start_time) > 0 {
+				theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+				if err != nil {
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				startTime = theTime.Unix()
+			}
+			var endTime int64
+			if len(end_time) > 0 {
+				theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+				if err != nil {
+					utils.ErrorLog(err.Error())
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				endTime = theTime.Unix()
+			}
+
+			scheduleDialyCount, _ := service.GetPatientScheduleDialyCount(item.PatientID, startTime, endTime, adminUserInfo.CurrentOrgId)
+
+			fmt.Println("scheduleDialyCount------------------", scheduleDialyCount)
+			dialysis_count := len(scheduleDialyCount)
+
+			var dialysis_count_str = "一周" + strconv.Itoa(dialysis_count) + "次"
+			if adminUserInfo.CurrentOrgId == 10742 {
+				assessmentBeforeDislysisVM.DialysisCount = dialysis_count_str
+			}
+
+			item.AssessmentBeforeDislysis = assessmentBeforeDislysisVM
+
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
 			if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 && this.GetAdminUserInfo().CurrentOrgId != 10345 {
 				if this.GetAdminUserInfo().CurrentOrgId == 10445 {

controllers/schedule_template_api_controller.go

@@ -1,15 +1,16 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
 	"encoding/json"
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
 
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+
 	"github.com/astaxie/beego"
 )
 
@@ -1166,7 +1167,6 @@ func (this *PatientScheduleTemplateAPIController) InitData() {
 
 	deviceNumbers, getDeviceNumbersErr := service.GetScheduleValidDeviceNumbers(adminUserInfo.CurrentOrgId, ids)
 
-	fmt.Println("deviceNumbers233323232332232323223233223323232323", deviceNumbers)
 	if getDeviceNumbersErr != nil {
 		this.ErrorLog("获取床位号失败：%v", getDeviceNumbersErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1747,6 +1747,7 @@ type ParamModelSchedule struct {
 }
 
 func (this *PatientScheduleTemplateAPIController) GetPatientList() {
+
 	patients, err := service.GetSchTemplatePatientList(this.GetAdminUserInfo().CurrentOrgId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

controllers/self_drug_api_congtroller.go

@@ -195,6 +195,8 @@ func SelfDrugRouters() {
 
 	beego.Router("/api/drug/getpatientadvicelistdetail", &SelfDrugApiController{}, "Get:GetPatientAdviceListDetail")
 
+	beego.Router("/api/drug/getselfdrugwarehouseinfo", &SelfDrugApiController{}, "Get:GetSelfDrugWarhouseInfo")
+
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -6514,8 +6516,11 @@ func (this *SelfDrugApiController) GetPatientAdviceList() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 
 	adviceList, _ := service.GetNewPatientAdviceList(patient_id, startTime, endTime, orgId)
+
+	drugInfo, _ := service.GetSelfDrugWarehouseInfoByPatientId(patient_id, orgId)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"adviceList": adviceList,
+		"drugInfo":   drugInfo,
 	})
 }
 
@@ -6560,3 +6565,18 @@ func (this *SelfDrugApiController) GetPatientAdviceListDetail() {
 	})
 
 }
+
+func (this *SelfDrugApiController) GetSelfDrugWarhouseInfo() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	patient_id, _ := this.GetInt64("patient_id")
+
+	drug_id, _ := this.GetInt64("drug_id")
+
+	drugInfo, _ := service.GetSelfDrugWarhouseInfoByPatient(drug_id, patient_id, orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"drugInfo": drugInfo,
+	})
+
+}

controllers/sign_api_controller.go

@@ -1439,6 +1439,149 @@ func (this *SignApiController) ToAutoDiagnose() {
 	//}
 	//tx.Commit()
 
+	//adminInfo := this.GetAdminUserInfo()
+	//prescriptionList, _ := service.GetHisPRrescriptionByUserOrgId(10752)
+	//
+	//fmt.Println("prescriptionList", prescriptionList)
+	//
+	//db := service.XTWriteDB()
+	//tx := db.Begin()
+	//if len(prescriptionList) > 0 {
+	//	for _, item := range prescriptionList {
+	//
+	//		// 在函数结束时处理事务回滚
+	//		defer func() {
+	//			if r := recover(); r != nil {
+	//				tx.Rollback()
+	//			}
+	//		}()
+	//		var cha_count int64
+	//
+	//		historyCount, _ := strconv.ParseInt(item.Count, 10, 64)
+	//
+	//		cha_count = historyCount
+	//
+	//		timeStr := "2025-02-04"
+	//		timeArr := strings.Split(timeStr, "-")
+	//
+	//		total, _ := service.FindAllWarehouseOut(adminInfo.CurrentOrgId)
+	//
+	//		total = total + 1
+	//		warehousing_out_order := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+	//		number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+	//		number = number + total
+	//		warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+	//
+	//		operation_time := item.RecordDate
+	//		creater := this.GetAdminUserInfo().AdminUser.Id
+	//
+	//		recordDateStr := "2025-02-04"
+	//		recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+	//		nowtime := recordDate.Unix()
+	//		storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
+	//		warehouseOut := models.WarehouseOut{
+	//			WarehouseOutOrderNumber: warehousing_out_order,
+	//			OperationTime:           operation_time,
+	//			OrgId:                   adminInfo.CurrentOrgId,
+	//			Creater:                 5685,
+	//			Ctime:                   nowtime,
+	//			Status:                  1,
+	//			WarehouseOutTime:        nowtime,
+	//			Type:                    1,
+	//			StorehouseId:            storeConfig.StorehouseOutInfo,
+	//			IsCheck:                 1,
+	//			IsSys:                   1,
+	//		}
+	//		//查询是否生成出库单
+	//		out, _ := service.FindNewPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime, tx)
+	//		if out.ID == 0 {
+	//			service.AddNewSigleWarehouseOut(&warehouseOut, tx)
+	//		}
+	//
+	//		lastOut, _ := service.FindNewLastPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime, tx)
+	//
+	//		goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(item.ProjectId, tx)
+	//		houseConfig, _ := service.GetNewAllStoreHouseConfig(item.UserOrgId, tx)
+	//
+	//		dialyPrepareOne := models.DialysisBeforePrepare{
+	//			GoodTypeId:   goodObj.GoodTypeId,
+	//			GoodId:       item.ProjectId,
+	//			PatientId:    item.PatientId,
+	//			RecordDate:   item.RecordDate,
+	//			UserOrgId:    adminInfo.CurrentOrgId,
+	//			Count:        cha_count,
+	//			Ctime:        time.Now().Unix(),
+	//			Creater:      5685,
+	//			Status:       1,
+	//			StorehouseId: houseConfig.StorehouseOutInfo,
+	//			ProjectId:    item.ID,
+	//		}
+	//		//出库
+	//		service.ConsumableNewHisPrescriptionDelivery(adminInfo.CurrentOrgId, item.PatientId, item.RecordDate, &dialyPrepareOne, &lastOut, creater, tx)
+	//	}
+	//}
+	//tx.Commit()
+	//return
+
+	//
+
+	adviceInfo, _ := service.GetHisDoctorAdviceByUserOrgId(10752)
+	adminInfo := this.GetAdminUserInfo()
+	db := service.XTWriteDB()
+	tx := db.Begin()
+	if len(adviceInfo) > 0 {
+		for _, item := range adviceInfo {
+
+			drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, item.DrugId)
+			var local_count int64
+			if item.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+
+				prescribingNumberTenty := strconv.FormatFloat(item.PrescribingNumber, 'f', -1, 64)
+				prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+
+				local_count += prescribingNumberSevenTy * drug.MinNumber
+			}
+
+			if item.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+
+				prescribingNumberTenty := strconv.FormatFloat(item.PrescribingNumber, 'f', -1, 64)
+				prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+				local_count += prescribingNumberSevenTy
+			}
+
+			if item.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+
+				prescribingNumberTenty := strconv.FormatFloat(item.PrescribingNumber, 'f', -1, 64)
+				prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+				local_count += prescribingNumberSevenTy
+			}
+
+			item.PrescribingNumberUnit = drug.MinUnit
+
+			service.BloodNewHisDrugsDelivery(item.UserOrgId, 5685, item, tx)
+
+			storeConfig, _ := service.GetNewAllStoreHouseConfig(item.UserOrgId, tx)
+
+			stockInfo, _ := service.GetNewDrugAllStockInfo(storeConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId, tx)
+			var sum_count int64
+			for _, its := range stockInfo {
+				baseDrug, _ := service.GetNewBaseDrugMedical(its.DrugId, tx)
+				if its.MaxUnit == baseDrug.MaxUnit {
+					its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+				}
+				sum_count += its.StockMaxNumber + its.StockMinNumber
+			}
+			//更新基础库存
+			service.UpdateNewBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId, tx)
+			//剩余库存
+			service.UpdateNewDrugStockCount(item.DrugId, item.UserOrgId, storeConfig.DrugStorehouseOut, sum_count, tx)
+
+			over, _ := service.FindNewOverCount(item.DrugId, item.UserOrgId, storeConfig.DrugStorehouseOut, tx)
+			service.UpdateNewActOut(over.ID, over.SumInCount, over.FlushCount, over.SumCancelCount, tx)
+		}
+	}
+
+	tx.Commit()
 	this.ServeSuccessJSON(map[string]interface{}{
 		"msg": "ok",
 	})

controllers/stock_in_api_controller.go

@@ -1238,7 +1238,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 	warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
 	number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
 	number = number + total
-	warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+	warehousing_out_order = "CKM" + strconv.FormatInt(number, 10)
 
 	operation_time := time.Now().Unix()
 	creater := adminUserInfo.AdminUser.Id
@@ -1277,7 +1277,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 
 	if warehouseOut_id == 0 {
 		//查询是否生成出库单
-		warehouseOutObj, _ := service.FindStockOutByIsSysOne(adminUserInfo.CurrentOrgId, 0, operation_time, warehousing_out_order, tx)
+		warehouseOutObj, _ := service.FindStockOutByIsSysOne(adminUserInfo.CurrentOrgId, 0, warehousingOutDate.Unix(), warehousing_out_order, tx)
 
 		if warehouseOutObj.ID == 0 {
 			service.AddSigleWarehouseOut(&warehouseOut, tx)
@@ -5171,10 +5171,18 @@ func (this *StockManagerApiController) GetStockFlow() {
 	}
 
 	list, total, _ := service.GetStockFlowList(limit, page, consumable_type, orgId, startTime, endTime, good_id)
+
+	//if len(list) > 0 {
+	//	for _, item := range list {
+	//		hisPrescription, _ := service.GetHidsDoctorAdvice(item.GoodId, orgId, item.PatientId, item.SystemTime)
+	//		item.GoodCode = hisPrescription.good
+	//	}
+	//}
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	good, _ := service.GetGoodInformationByGoodId(good_id)
 	houseList, _ := service.GetAllStoreHouseList(adminUserInfo.CurrentOrgId)
 	patients, _ := service.GetAllPatientListSix(adminUserInfo.CurrentOrgId)
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list":             list,
 		"total":            total,

models/patient_models.go

@@ -1150,11 +1150,12 @@ type VmInspection struct {
 }
 
 type BloodXtPatients 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"`
-	DialysisNo string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
-	Name       string `gorm:"column:name" json:"name" form:"name"`
-	IdCardNo   string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	DialysisNo  string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	Name        string `gorm:"column:name" json:"name" form:"name"`
+	IdCardNo    string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	PatientType int64  `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
 }
 
 func (BloodXtPatients) TableName() string {

models/smart_sch.go

@@ -1,11 +1,13 @@
 package models
 
 type SmartSchPatient struct {
-	ID         int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Name       string `gorm:"column:name" json:"name" form:"name"`
-	DialysisNo string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
-	Lapseto    int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Name        string `gorm:"column:name" json:"name" form:"name"`
+	DialysisNo  string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	Lapseto     int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	PatientType int64  `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
+
 	//SmartSchedule []*SmartSchedule `gorm:"-" json:"sch"`
 }
 

service/common_service.go

@@ -482,7 +482,7 @@ func GetDialysisAgeData(orgID int64, lapsetotype int64, sourcetype int64) (count
 
 func GetCurentOrgPatients(orgid int64) (patients []*models.BloodXtPatients, err error) {
 
-	err = XTReadDB().Where("user_org_id = ? and status =1", orgid).Order("created_time desc").Find(&patients).Error
+	err = XTReadDB().Where("user_org_id = ? and status =1 and patient_type =1", orgid).Order("created_time desc").Find(&patients).Error
 	return patients, err
 }
 

service/his_service.go

@@ -1066,6 +1066,13 @@ func GetLastHisProject(patient_id int64, user_org_id int64, record_date int64, t
 	return prescriptionProject, err
 }
 
+func GetHisWarehouseOutInfo(patient_id int64, user_org_id int64, sys_record_time int64, tx *gorm.DB, good_id int64) (outinfo []*models.WarehouseOutInfo, err error) {
+
+	err = tx.Where("patient_id = ? and user_org_id = ? and sys_record_time = ? and good_id = ? an status=1", patient_id, user_org_id, sys_record_time, good_id).Find(&outinfo).Error
+
+	return outinfo, err
+}
+
 func CreateHisProjectThree(project *models.HisPrescriptionProject) (err error) {
 	tx := writeDb.Begin()
 	if err = tx.Model(&models.HisPrescriptionProject{}).Save(project).Error; err != nil {

service/mobile_dialysis_service.go

@@ -2120,9 +2120,10 @@ func MobileCreateDialysisOrder(orgID int64, patientID int64, order *models.Dialy
 }
 
 type MobileUrgentSchedulePatientVM struct {
-	ID         int64  `gorm:"column:id" json:"id"`
-	Name       string `gorm:"column:name" json:"name"`
-	DialysisNo string `gorm:"column:dialysis_no" json:"dialysis_no"`
+	ID          int64  `gorm:"column:id" json:"id"`
+	Name        string `gorm:"column:name" json:"name"`
+	DialysisNo  string `gorm:"column:dialysis_no" json:"dialysis_no"`
+	PatientType int64  `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
 }
 
 func (MobileUrgentSchedulePatientVM) TableName() string {
@@ -2140,7 +2141,8 @@ func (MobileUrgentScheduleTreatmentModeVM) TableName() string {
 
 func MobileGetAllPatientsForUrgentSchedule(orgID int64, record_date int64) ([]*MobileUrgentSchedulePatientVM, error) {
 	var vms []*MobileUrgentSchedulePatientVM = make([]*MobileUrgentSchedulePatientVM, 0)
-	rows, err := readDb.Raw("SELECT p.*  FROM xt_patients as p  WHERE (p.user_org_id = ? AND p.status = 1 AND p.lapseto = 1) AND NOT EXISTS (Select * FROM `xt_dialysis_order` as d Where d.`dialysis_date` = ? AND d.`status` = 1 AND d.`patient_id` = p.id AND  d.user_org_id = p.user_org_id  )", orgID, record_date).Rows()
+
+	rows, err := readDb.Raw("SELECT p.*  FROM xt_patients as p  WHERE (p.user_org_id = ? AND p.status = 1 AND p.lapseto = 1 and p.patient_type =1) AND NOT EXISTS (Select * FROM `xt_dialysis_order` as d Where d.`dialysis_date` = ? AND d.`status` = 1 AND d.`patient_id` = p.id AND  d.user_org_id = p.user_org_id  )", orgID, record_date).Rows()
 	defer rows.Close()
 	if err != nil {
 		return nil, err
@@ -10049,3 +10051,11 @@ func GetDrugIsShow(id int64, org_id int64) (models.XtBaseDrug, error) {
 
 	return baseDrug, err
 }
+
+func GetDoctorAdviceByAdviceName(advice_name string, user_org_id int64) (models.BaseDrugLibSeven, error) {
+
+	drugLib := models.BaseDrugLibSeven{}
+	err := XTReadDB().Where("drug_name = ? and org_id = ? and status=1", advice_name, user_org_id).Find(&drugLib).Error
+
+	return drugLib, err
+}

service/patient_schedule_template_service.go

@@ -301,6 +301,7 @@ type PatientScheduleTemplatePatientVM struct {
 	DialysisNo  string                      `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
 	FirstLetter string                      `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 	Contagions  []*PatientScheduleContagion `gorm:"ForeignKey:PatientID" json:"contagions"`
+	PatientType int64                       `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
 }
 
 func (PatientScheduleTemplatePatientVM) TableName() string {
@@ -319,11 +320,12 @@ func (PatientScheduleContagion) TableName() string {
 }
 
 func PatientScheduleTemplateGetAllValidPatient(orgID int64) ([]*PatientScheduleTemplatePatientVM, error) {
+
 	var vms []*PatientScheduleTemplatePatientVM
 	err := readDb.
 		Model(&PatientScheduleTemplatePatientVM{}).
 		Preload("Contagions", "status = 1").
-		Where("user_org_id = ? and lapseto=1 AND status = 1", orgID).
+		Where("user_org_id = ? and lapseto=1 AND status = 1 and patient_type =1", orgID).
 		Find(&vms).
 		Error
 	if err != nil {
@@ -898,6 +900,7 @@ type SchTemplatePatient struct {
 	DialysisNo   string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
 	IsInfectious int64  `gorm:"column:is_infectious" json:"is_infectious"`
 	FirstLetter  string `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
+	PatientType  int64  `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
 }
 
 func (SchTemplatePatient) TableName() string {
@@ -905,8 +908,9 @@ func (SchTemplatePatient) TableName() string {
 }
 
 func GetSchTemplatePatientList(orgID int64) ([]*SchTemplatePatient, error) {
+
 	var patients []*SchTemplatePatient
-	err := readDb.Model(&SchTemplatePatient{}).Where("user_org_id = ? AND status = 1 AND lapseto = 1", orgID).Find(&patients).Error
+	err := readDb.Model(&SchTemplatePatient{}).Where("user_org_id = ? AND status = 1 AND lapseto = 1 and patient_type =1", orgID).Find(&patients).Error
 	return patients, err
 }
 

service/patient_service.go

@@ -1936,7 +1936,8 @@ func FindLastDryWeightAdjust(orgID int64, id int64) (weight models.SgjPatientDry
 }
 
 func GetSchedualPatientByKeyWord(orgID int64, keywords string, date int64) (patient []*models.Patients, err error) {
-	db := readDb.Model(&models.Patients{}).Where("user_org_id=? and status=1 and lapseto = 1 ", orgID)
+
+	db := readDb.Model(&models.Patients{}).Where("user_org_id=? and status=1 and lapseto = 1 and patient_type =1 ", orgID)
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
 		err = db.Where("(name LIKE ? OR dialysis_no LIKE ?) AND NOT EXISTS (Select * FROM `xt_dialysis_order` as d Where d.`dialysis_date` = ? AND d.`status` = 1 AND d.`patient_id` = xt_patients.id AND  d.user_org_id = xt_patients.user_org_id)", likekey, likekey, date).Find(&patient).Error
@@ -3332,10 +3333,15 @@ func GetDialysisInformationList(user_org_id int64, advice_date int64) (informati
 }
 
 func GetNewAllMonitorList(orgID int64, scheduleDate int64, pat_type int64) (monitor []*models.VMMonitoringRecord, err error) {
+
 	if pat_type == 0 || pat_type == 9 {
 		err = readDb.Model(&models.VMMonitoringRecord{}).Where("status = 1  AND user_org_id = ? AND  monitoring_date= ?", orgID, scheduleDate).Order("monitoring_date asc").Find(&monitor).Error
 	}
 
+	if pat_type == 13 {
+		err = readDb.Model(&models.VMMonitoringRecord{}).Where("status = 1  AND user_org_id = ? AND  monitoring_date= ? and ultrafiltration_volume>0", orgID, scheduleDate).Order("monitoring_date asc").Find(&monitor).Error
+	}
+
 	if pat_type == 10 {
 		err = readDb.Model(&models.VMMonitoringRecord{}).Where("status = 1  AND user_org_id = ? AND  monitoring_date= ? AND accumulated_blood_volume = 0", orgID, scheduleDate).Order("monitoring_date asc").Find(&monitor).Error
 	}
@@ -3617,10 +3623,10 @@ func GetDialysisOrderCountTenEight(patient_id int64, recordDate int64) (models.V
 	return order, err
 }
 
-func GetLastAcceptRecrods(patient_id int64) (models.ReceiveTreatmentAsses, error) {
+func GetLastAcceptRecrods(patient_id int64, user_org_id int64) (models.ReceiveTreatmentAsses, error) {
 
 	treatmentAsses := models.ReceiveTreatmentAsses{}
-	err := XTReadDB().Where("patient_id = ? and status= 1 and admission_number!=''", patient_id).Last(&treatmentAsses).Error
+	err := XTReadDB().Where("patient_id = ? and status= 1 and admission_number!='' and user_org_id =? ", patient_id, user_org_id).Last(&treatmentAsses).Error
 	return treatmentAsses, err
 }
 
@@ -5020,3 +5026,17 @@ func GetNewInspectionByProjectId(patient_id int64, project_id int64, inspect_dat
 
 	return inspection, err
 }
+
+func GetSelfDrugOutInfo(patient_id int64, sys_record_time int64, drug_id int64) (outInfo []*models.XtSelfDrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and sys_record_time = ? and drug_id = ? and status=1", patient_id, sys_record_time, drug_id).Find(&outInfo).Error
+
+	return outInfo, err
+}
+
+func ModifyExecutionAdvice(id int64, execution_staff int64, ExecutionTime int64) error {
+
+	err := XTWriteDB().Model(&models.DoctorAdvice{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"execution_staff": execution_staff, "execution_state": 1, "execution_time": ExecutionTime}).Error
+
+	return err
+}

service/patientmanage_service.go

@@ -585,7 +585,7 @@ func GetDryWeight(patientid int64, startime int64, endtime int64, limit int64, p
 	}
 	offset := (page - 1) * limit
 	err = db.Count(&total).Order("x.ctime desc").Offset(offset).Limit(limit).Group("x.id").
-		Select("x.id,x.dry_weight,x.creator,x.remakes,x.patient_id,x.ctime,x.adjusted_value,x.user_id,x.user_org_id,r.user_name").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.creator").Scan(&dryWeight).Error
+		Select("x.id,x.dry_weight,x.creator,x.remakes,x.patient_id,x.ctime,x.adjusted_value,x.user_id,x.user_org_id,r.user_name").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.creator and r.org_id = x.user_org_id").Scan(&dryWeight).Error
 	return dryWeight, total, err
 }
 
@@ -1183,6 +1183,12 @@ func GetAllBedNumberList(orgid int64) (number []*models.DeviceNumber, err error)
 	return number, err
 }
 
+func GetPatientScheduleDialyCount(patient_id int64, start_time int64, end_time int64, org_id int64) (schedule []*models.XtSchedule, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and schedule_date>=? and schedule_date<=? and user_org_id = ? and status=1", patient_id, start_time, end_time, org_id).Find(&schedule).Error
+	return schedule, err
+}
+
 func GetAllGroupOne(orgid int64) (group []*models.DeviceGroup, err error) {
 
 	err = XTReadDB().Model(&group).Where("org_id =?", orgid).Find(&group).Error

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -489,6 +489,12 @@ func GetBatchAssessmentBeforeDislysisVM(orgid int64, patient_id int64, assessmen
 	return AssessmentBeforeDislysisVM, err
 }
 
+func GetPatientScheduleDialyCount(patient_id int64, start_time int64, end_time int64, org_id int64) (schedule []*models.XtSchedule, err error) {
+
+	err = p_service.XTReadDB().Where("patient_id = ? and schedule_date>=? and schedule_date<=? and user_org_id = ? and status=1", patient_id, start_time, end_time, org_id).Find(&schedule).Error
+	return schedule, err
+}
+
 func GetBatchAssessmentAfterDislysisVM(orgid int64, patient_id int64, assessment_date int64) (AssessmentAfterDislysisVM, error) {
 
 	assessmentAfterDislysisVM := AssessmentAfterDislysisVM{}

service/schedule_service.go

@@ -46,7 +46,7 @@ func GetPatientWithScheduleAndSolution(orgID int64, keywords string, weekStart,
 		Preload("DialysisSolutions", "user_org_id=? and initiate_mode=1 and affirm_state=1 and parent_id=0 and status=1", orgID).
 		Preload("Schedules", "user_org_id=? and schedule_date>=? and schedule_date<= ? and status=1", orgID, weekStart, weekEnd).
 		Preload("Contagions", "status=1").
-		Where("p.user_org_id=? and p.lapseto=1 and p.status=1", orgID)
+		Where("p.user_org_id=? and p.lapseto=1 and p.status=1 and p.patient_type =1", orgID)
 	if len(keywords) > 0 {
 		likeKey := "%" + keywords + "%"
 		db = db.Where("p.name LIKE ? or p.first_letter LIKE ?", likeKey, likeKey)
@@ -1206,9 +1206,19 @@ func GetThreeWeekList(startime int64, endtime int64, orgid int64, scheduletype i
 	if startime > 0 {
 		db = db.Where("x.schedule_date >=?", startime)
 	}
+
+	if startime == 0 {
+		db = db.Where("x.schedule_date >=1739116800")
+	}
+
 	if endtime > 0 {
 		db = db.Where("x.schedule_date <=?", endtime)
 	}
+
+	if endtime == 0 {
+		db = db.Where("x.schedule_date <=1739635200")
+	}
+
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}

service/self_drug_service.go

@@ -3951,6 +3951,13 @@ func FindSelfBaseDrugLibRecord(org_id int64, id int64, tx *gorm.DB) (lib models.
 	return lib, err
 }
 
+func FindNewSelfBaseDrugLibRecord(org_id int64, id int64) (lib models.BaseDrugLib, err error) {
+
+	err = XTReadDB().Model(&models.BaseDrugLib{}).Where("id = ? AND org_id = ?  AND status = 1", id, org_id).First(&lib).Error
+
+	return lib, err
+}
+
 func GetSelfBaseDrugMedical(id int64, tx *gorm.DB) (models.XtBaseDrug, error) {
 	drug := models.XtBaseDrug{}
 	err := tx.Model(&drug).Where("id = ? and status = 1", id).Find(&drug).Error
@@ -5418,3 +5425,10 @@ func GetHisDocInfoList(drug_id int64, user_org_id int64) (info []*models.HisDoct
 
 	return info, err
 }
+
+func GetSelfDrugWarhouseInfoByPatient(drug_id int64, patient_id int64, user_org_id int64) (info []*models.XtSelfDrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and patient_id = ? and org_id = ? and status=1 and is_check=1", drug_id, patient_id, user_org_id).Order("ctime desc").Find(&info).Error
+
+	return info, err
+}

service/sign_service.go

@@ -6,11 +6,16 @@ import (
 	"crypto/sha1"
 	"encoding/base64"
 	"encoding/json"
+	"errors"
 	"fmt"
+	"strconv"
+	"strings"
 
 	"XT_New/models"
 	"XT_New/utils"
 	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
+
 	//"github.com/jung-kurt/gofpdf"
 	"io/ioutil"
 	"net/http"
@@ -2400,3 +2405,83 @@ func GetSelfDrugWarehouseOutInfo(patient_id int64, drug_id int64, advice_Date in
 
 	return outInfo, err
 }
+
+func GetHisPRrescriptionByUserOrgId(user_org_id int64) (prescription []*models.HisPrescriptionProject, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status = 1 and type =3 and record_date =1738598400", 10752).Find(&prescription).Error
+
+	return prescription, err
+}
+
+func GetHisDoctorAdviceByUserOrgId(user_org_id int64) (info []*models.HisDoctorAdviceInfo, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status =1 and advice_date = 1738512000", user_org_id).Find(&info).Error
+
+	return info, err
+}
+
+func BloodNewHisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdviceInfo, tx *gorm.DB) (err error) {
+
+	// 1.判断药品是否来自专用字典的药品库
+	// 2.判断当天当前机构有没有创建出库单，没有则创建
+	// 3.创建出库流程
+	// 3.1 实现先进先出逻辑 由于药品执行后，不可以修改和删除，所以不考虑出库后的退库和修改出库数量等
+
+	isHasWay := false
+	record_time := int64(0)
+	isHasWay = true
+	record_time = advice.RecordDate
+
+	if isHasWay {
+		//判断当天当前机构有没有创建出库单，没有则创建
+		out, err := FindNewDrugStockOutByIsSys(orgID, 1, record_time, tx)
+		houseConfig, _ := GetAllStoreHouseConfig(orgID)
+		if err == gorm.ErrRecordNotFound {
+			timeStr := "2025-02-03"
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := FindAllDrugWarehouseOut(orgID)
+			total = total + 1
+			warehousing_out_order := strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+			number = number + total
+			warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+
+			warehouseOut := models.DrugWarehouseOut{
+				WarehouseOutOrderNumber: warehousing_out_order,
+				OperationTime:           record_time,
+				OrgId:                   orgID,
+				Creater:                 creater,
+				Ctime:                   record_time,
+				Status:                  1,
+				WarehouseOutTime:        record_time,
+				Dealer:                  0,
+				Manufacturer:            0,
+				Type:                    1,
+				IsSys:                   1,
+				StorehouseId:            houseConfig.DrugStorehouseOut,
+				IsCheck:                 1,
+			}
+			err := AddNewSigleDrugWarehouseOut(&warehouseOut, tx)
+			if err != nil {
+				utils.TraceLog("创建出库单失败 err = %v", err)
+				return err
+			} else {
+				out = warehouseOut
+			}
+		}
+
+		//出库流程
+		//1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
+		drup, _ := FindNewBaseDrugLibRecord(orgID, advice.DrugId, tx)
+		if drup.ID > 0 {
+			prescribingNumber := advice.PrescribingNumber
+			HisStoryBloodHisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice, prescribingNumber, advice.PrescribingNumberUnit, tx)
+
+		} else {
+			return errors.New("药品信息不存在")
+		}
+
+	}
+
+	return
+}

service/smart_sch.go

@@ -9,7 +9,7 @@ import (
 
 func GetSmartSchPatientByKeyWord(orgID int64, keywords string) (patient []*models.SmartSchPatient, err error) {
 	if orgID != 10517 {
-		db := readDb.Model(&models.SmartSchPatient{}).Where("user_org_id=? and status=1 and  lapseto !=3", orgID)
+		db := readDb.Model(&models.SmartSchPatient{}).Where("user_org_id=? and status=1 and  lapseto !=3 and patient_type =1", orgID)
 		if len(keywords) > 0 {
 			likekey := "%" + keywords + "%"
 			err = db.Where("name LIKE ? OR dialysis_no LIKE ?", likekey, likekey).Find(&patient).Error
@@ -19,7 +19,7 @@ func GetSmartSchPatientByKeyWord(orgID int64, keywords string) (patient []*model
 	}
 
 	if orgID == 10517 {
-		db := readDb.Model(&models.SmartSchPatient{}).Where("user_org_id=? and status=1 and  lapseto =1", orgID)
+		db := readDb.Model(&models.SmartSchPatient{}).Where("user_org_id=? and status=1 and  lapseto =1 and patient_type =1", orgID)
 		if len(keywords) > 0 {
 			likekey := "%" + keywords + "%"
 			err = db.Where("name LIKE ? OR dialysis_no LIKE ?", likekey, likekey).Find(&patient).Error

service/statistics_service/index_evaluation_service.go

@@ -1,13 +1,14 @@
 package statistics_service
 
 import (
-	"XT_New/models"
-	"XT_New/service"
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"math"
 	"strconv"
 	"strings"
+
+	"XT_New/models"
+	"XT_New/service"
+	"github.com/jinzhu/gorm"
 )
 
 func GetOrgFirstPatientInfo(user_org_id int64) (patient *models.Patients, err error) {
@@ -1930,12 +1931,13 @@ func GetPatientInspectionBarChartData(user_org_id int64, start_time int64, end_t
 }
 
 type VMPatient 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"`
-	UserId    int64  `gorm:"column:user_id" json:"user_id" form:"user_id"`
-	Name      string `gorm:"column:name" json:"name" form:"name"`
-	Lapseto   int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
-	Status    int64  `gorm:"column:status" json:"status" form:"status"`
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	UserId      int64  `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	Name        string `gorm:"column:name" json:"name" form:"name"`
+	Lapseto     int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	Status      int64  `gorm:"column:status" json:"status" form:"status"`
+	PatientType int64  `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
 }
 
 func (VMPatient) TableName() string {
@@ -1945,7 +1947,7 @@ func (VMPatient) TableName() string {
 func GetOrgPatients(user_org_id int64) (patient *[]VMPatient, err error) {
 	db := service.XTReadDB()
 	var tempPatient []VMPatient
-	findErr := db.Model(&models.Patients{}).Where("user_org_id = ? AND status = 1 AND lapseto = 1", user_org_id).Find(&tempPatient).Error
+	findErr := db.Model(&models.Patients{}).Where("user_org_id = ? AND status = 1 AND lapseto = 1 and patient_type =1", user_org_id).Find(&tempPatient).Error
 	if findErr == gorm.ErrRecordNotFound {
 		return nil, nil
 	}

service/stock_service.go

@@ -1821,7 +1821,7 @@ func FindAllDrugWarehouseOut(org_id int64) (total int64, err error) {
 
 func FindAllSelfDrugWarehouseOut(org_id int64, tx *gorm.DB) (total int64, err error) {
 
-	err = tx.Model(&models.XtSelfDrugWarehouseOut{}).Where("org_id = ?", org_id).Count(&total).Error
+	err = tx.Model(&models.XtDrugWarehouseOut{}).Where("org_id = ?", org_id).Count(&total).Error
 	if err != gorm.ErrRecordNotFound {
 		if err != nil {
 			tx.Rollback()
@@ -6234,6 +6234,13 @@ func GetStockFlowList(limit int64, page int64, consumable_type int64, orgId int6
 	return flow, total, err
 }
 
+func GetHidsDoctorAdvice(good_id int64, user_org_id int64, patient_id int64, record_date int64) (models.HisPrescriptionProject, error) {
+
+	project := models.HisPrescriptionProject{}
+	err = XTReadDB().Where("project_id = ? and type =3 and user_org_id = ? and record_date =? and patient_id = ?", good_id, user_org_id, record_date, patient_id).Find(&project).Error
+	return project, err
+}
+
 func GetLastGoodListByPatientId(recordtime int64, patientid int64, goodid int64, goodtypeid int64) (models.AutomaticReduceDetail, error) {
 
 	detail := models.AutomaticReduceDetail{}
@@ -6371,6 +6378,14 @@ func GetDrugFlow(drugid int64, orgid int64, limit int64, page int64, startTime i
 	return drug_flow, total, err
 }
 
+func HisDoctorAdviceMap(patient_id int64, advice_date int64, drug_id int64, user_org_id int64) (models.HisDoctorAdviceInfo, error) {
+
+	advicelist := models.HisDoctorAdviceInfo{}
+	err = XTReadDB().Where("patient_id = ? and  drug_id = ? and user_org_id = ? and advice_date = ? and status=1", patient_id, drug_id, user_org_id, advice_date).Find(&advicelist).Error
+
+	return advicelist, err
+}
+
 func GetDrugWarehouseOutInfoIsExit(drug_id int64, patient_id int64, recordtime int64) (*models.DrugWarehouseOutInfo, error) {
 
 	outInfo := models.DrugWarehouseOutInfo{}
@@ -11093,11 +11108,18 @@ func GetNewPatientAdviceList(patient_id int64, start_time int64, end_time int64,
 	if user_org_id > 0 {
 		db = db.Where("user_org_id = ?", user_org_id)
 	}
-	err = db.Find(&advice).Error
+	err = db.Order("drug_id desc").Find(&advice).Error
 
 	return advice, err
 }
 
+func GetSelfDrugWarehouseInfoByPatientId(patient_id int64, user_org_id int64) (drugInfo []*models.XtSelfDrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and org_id = ? and status =1 and is_check =1", patient_id, user_org_id).Find(&drugInfo).Error
+	return drugInfo, err
+
+}
+
 func GetPatientAdviceListDetail(patient_id int64, start_time int64, end_time int64, user_org_id int64, advice_name string) (advice []*models.DoctorAdvice, err error) {
 
 	db := XTReadDB().Model(&advice).Where("status = 1")

service/user_service.go

@@ -101,7 +101,7 @@ func GetAllAdminUsersTwo(orgId int64) (list []*AdminUserList, err error) {
 	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=?  and ua.status=1", orgId).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&list).Error
 
 	if orgId == 10724 {
-		err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=?", orgId).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&list).Error
+		err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.org_id=?", orgId).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&list).Error
 	} else {
 		err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=?  and ua.status=1", orgId).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&list).Error
 	}

service/warhouse_service.go

@@ -11190,7 +11190,7 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 			over_count += its.StockMaxNumber + its.StockMinNumber
 		}
 
-		drugWareInfo, _ := GetLastNewWarehouseOutInfoById(advice.DrugId, tx)
+		//drugWareInfo, _ := GetLastNewWarehouseOutInfoById(advice.DrugId, tx)
 		drugflow := models.DrugFlow{
 			WarehouseOutId:          warehouseout.ID,
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
@@ -11212,7 +11212,7 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 			IsEdit:                  1,
 			Creator:                 0,
 			IsSys:                   0,
-			WarehouseOutDetailId:    drugWareInfo.ID,
+			WarehouseOutDetailId:    advice.ID,
 			AdviceId:                advice.ID,
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            advice.StorehouseId,
@@ -11237,7 +11237,7 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 		outInfoLog := models.XtDrugWarehouseOutInfoLog{
 			UserOrgId:          advice.OrgId,
 			DrugId:             advice.DrugId,
-			WarehouseOutInfoId: drugWareInfo.ID,
+			WarehouseOutInfoId: advice.ID,
 			RecordDate:         advice.SysRecordTime,
 			Status:             1,
 			Ctime:              time.Now().Unix(),
@@ -11275,7 +11275,7 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 			}
 			over_count += its.StockMaxNumber + its.StockMinNumber
 		}
-		drugWareInfo, _ := GetLastNewWarehouseOutInfoById(advice.DrugId, tx)
+		//drugWareInfo, _ := GetLastNewWarehouseOutInfoById(advice.DrugId, tx)
 		drugflow := models.DrugFlow{
 			WarehouseOutId:          warehouseout.ID,
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
@@ -11297,7 +11297,7 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 			IsEdit:                  1,
 			Creator:                 0,
 			IsSys:                   0,
-			WarehouseOutDetailId:    drugWareInfo.ID,
+			WarehouseOutDetailId:    advice.ID,
 			AdviceId:                advice.ID,
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            advice.StorehouseId,
@@ -11319,7 +11319,7 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 		outInfoLog := models.XtDrugWarehouseOutInfoLog{
 			UserOrgId:          advice.OrgId,
 			DrugId:             advice.DrugId,
-			WarehouseOutInfoId: drugWareInfo.ID,
+			WarehouseOutInfoId: advice.ID,
 			RecordDate:         advice.SysRecordTime,
 			Status:             1,
 			Ctime:              time.Now().Unix(),