11月9日库存管理

controllers/dialysis_api_controller.go

@@ -44,6 +44,8 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/dialysis/treatmentsummary", &DialysisApiController{}, "Post:PostTreatmentSummary")
 
 	beego.Router("/api/dialysis/advice_remind", &DialysisApiController{}, "Get:GetLongAdvice")
+	beego.Router("/api/dialysis/advice_remind/one", &DialysisApiController{}, "Get:GetLongAdviceOne")
+	beego.Router("/api/dialysis/advice_remind/two", &DialysisApiController{}, "Get:GetLongAdviceTwo")
 	beego.Router("/api/advice_remind/create", &DialysisApiController{}, "Post:CreateRemindDoctorAdvice")
 
 	beego.Router("/api/solution/get", &DialysisApiController{}, "Get:GetSolution")
@@ -66,6 +68,9 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/get/getrolelist", &DialysisApiController{}, "Get:GetRoleList")
 
 	beego.Router("/api/getinitprintdata", &DialysisApiController{}, "Get:GetInitPrintData")
+
+	beego.Router("/api/schedule/getorderdoctoradvice", &DialysisApiController{}, "Get:GetOrderDoctorAdvice")
+
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -2973,9 +2978,207 @@ func (c *DialysisApiController) GetLongAdvice() {
 		//开启推送提醒逻辑    提交长期处方的时候，弹起长期医嘱推送
 		var advice_three []*models.DoctorAdvice
 		//groupNo := service.GetMaxLongAdviceGroupID(adminUserInfo.Org.Id, patient_id)
-		advices, err := service.GetLastLongAdviceByGroupNo(adminUserInfo.CurrentOrgId, patient_id)
-		advices_two, err := service.GetLastLongAdviceByGroupNoThree(adminUserInfo.CurrentOrgId, patient_id)
+		recordDateStr := time.Now().Format("2006-01-02")
+		recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+
+		nowtime := recordDate.Unix()
+
+		advices, err := service.GetLastLongAdviceByGroupNo(adminUserInfo.CurrentOrgId, patient_id, nowtime)
+		advices_two, err := service.GetLastLongAdviceByGroupNoThree(adminUserInfo.CurrentOrgId, patient_id, nowtime)
+
+		for _, advice := range advices {
+			if advice.FrequencyType == 3 {
+				t := time.Now()
+				week := int(t.Weekday())
+
+				switch week {
+				case 1:
+					if strings.Index(advice.WeekDay, "周一") == -1 {
+						advice_three = append(advice_three, advice)
+					}
+
+					break
+				case 2:
+					if strings.Index(advice.WeekDay, "周二") == -1 {
+						advice_three = append(advice_three, advice)
+					}
+
+					break
+				case 3:
+					if strings.Index(advice.WeekDay, "周三") == -1 {
+						advice_three = append(advice_three, advice)
+					}
+
+					break
+				case 4:
+					if strings.Index(advice.WeekDay, "周四") == -1 {
+						advice_three = append(advice_three, advice)
+					}
+					break
+				case 5:
+					if strings.Index(advice.WeekDay, "周五") == -1 {
+						advice_three = append(advice_three, advice)
+					}
+					break
+				case 6:
+					if strings.Index(advice.WeekDay, "周六") == -1 {
+						advice_three = append(advice_three, advice)
+					}
+
+					break
+				case 0:
+					if strings.Index(advice.WeekDay, "周日") == -1 {
+						advice_three = append(advice_three, advice)
+					}
+					break
+				}
+			}
+		}
+
+		for _, advice := range advices_two {
+			p, _ := time.Parse("2006-01-02", time.Now().Format("2006-01-02"))
+			now := p.Unix()
+			dayStr := strconv.FormatInt(advice.DayCount, 10)
+			dayStr2 := "-" + dayStr
+			count, _ := strconv.ParseInt(dayStr2, 10, 64)
+			oldTime := time.Now().AddDate(0, 0, int(count)).Unix()
+			advices, _ := service.FindAllDoctorAdviceByTime(now, oldTime, patient_id, adminUserInfo.CurrentOrgId, advice.TemplateId)
+
+			for _, ad := range advices {
+				advice_three = append(advice_three, ad)
+			}
+		}
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status":         "2",
+				"advices":        advices,
+				"advices_two":    RemoveRepeatedElement(advice_three),
+				"is_open_remind": config.IsOpenRemind,
+			})
+		}
+	}
+
+}
+
+func (c *DialysisApiController) GetLongAdviceOne() {
+	patient_id, _ := c.GetInt64("patient_id")
+	schedule_date := c.GetString("schedule_date")
+	adminUserInfo := c.GetAdminUserInfo()
+	_, config := service.FindDoctorAdviceRecordByOrgId(adminUserInfo.CurrentOrgId)
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", schedule_date+" 00:00:00", loc)
+	//patient, _ := service.FindPatientIsOpenRemindById(patient_id, adminUserInfo.Org.Id)
+	if config.IsOpenRemind == 0 { //针对老用户，即没开启推送功能，也没有	不开启推送功能，不做任何处理
+		c.ServeSuccessJSON(map[string]interface{}{
+			"status": "1",
+		})
+		return
+	} else { //开启推送提醒
+		//开启推送提醒逻辑    提交长期处方的时候，弹起长期医嘱推送
+		var advice_three []*models.DoctorAdvice
+		//groupNo := service.GetMaxLongAdviceGroupID(adminUserInfo.Org.Id, patient_id)
+		//recordDateStr := time.Now().Format("2006-01-02")
+		//recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+		//
+		//nowtime := recordDate.Unix()
+
+		advices, err := service.GetLastLongAdviceByGroupNo(adminUserInfo.CurrentOrgId, patient_id, theTime.Unix())
+		advices_two, err := service.GetLastLongAdviceByGroupNoThree(adminUserInfo.CurrentOrgId, patient_id, theTime.Unix())
+		fmt.Println("advice23323232233232233223232332232323322323wodee", theTime.Unix())
+		for _, advice := range advices {
+			if advice.FrequencyType == 3 {
+				t := time.Now()
+				week := int(t.Weekday())
 
+				switch week {
+				case 1:
+					if strings.Index(advice.WeekDay, "周一") == -1 {
+						advice_three = append(advice_three, advice)
+					}
+
+					break
+				case 2:
+					if strings.Index(advice.WeekDay, "周二") == -1 {
+						advice_three = append(advice_three, advice)
+					}
+
+					break
+				case 3:
+					if strings.Index(advice.WeekDay, "周三") == -1 {
+						advice_three = append(advice_three, advice)
+					}
+
+					break
+				case 4:
+					if strings.Index(advice.WeekDay, "周四") == -1 {
+						advice_three = append(advice_three, advice)
+					}
+					break
+				case 5:
+					if strings.Index(advice.WeekDay, "周五") == -1 {
+						advice_three = append(advice_three, advice)
+					}
+					break
+				case 6:
+					if strings.Index(advice.WeekDay, "周六") == -1 {
+						advice_three = append(advice_three, advice)
+					}
+
+					break
+				case 0:
+					if strings.Index(advice.WeekDay, "周日") == -1 {
+						advice_three = append(advice_three, advice)
+					}
+					break
+				}
+			}
+		}
+
+		for _, advice := range advices_two {
+			p, _ := time.Parse("2006-01-02", time.Now().Format("2006-01-02"))
+			now := p.Unix()
+			dayStr := strconv.FormatInt(advice.DayCount, 10)
+			dayStr2 := "-" + dayStr
+			count, _ := strconv.ParseInt(dayStr2, 10, 64)
+			oldTime := time.Now().AddDate(0, 0, int(count)).Unix()
+			advices, _ := service.FindAllDoctorAdviceByTime(now, oldTime, patient_id, adminUserInfo.CurrentOrgId, advice.TemplateId)
+
+			for _, ad := range advices {
+				advice_three = append(advice_three, ad)
+			}
+		}
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status":         "2",
+				"advices":        advices,
+				"advices_two":    RemoveRepeatedElement(advice_three),
+				"is_open_remind": config.IsOpenRemind,
+			})
+		}
+	}
+
+}
+
+func (c *DialysisApiController) GetLongAdviceTwo() {
+	patient_id, _ := c.GetInt64("patient_id")
+	schedule_date, _ := c.GetInt64("schedule_date")
+	adminUserInfo := c.GetAdminUserInfo()
+	_, config := service.FindDoctorAdviceRecordByOrgId(adminUserInfo.CurrentOrgId)
+
+	//patient, _ := service.FindPatientIsOpenRemindById(patient_id, adminUserInfo.Org.Id)
+	if config.IsOpenRemind == 0 { //针对老用户，即没开启推送功能，也没有	不开启推送功能，不做任何处理
+		c.ServeSuccessJSON(map[string]interface{}{
+			"status": "1",
+		})
+		return
+	} else { //开启推送提醒
+		//开启推送提醒逻辑    提交长期处方的时候，弹起长期医嘱推送
+		var advice_three []*models.DoctorAdvice
+		//groupNo := service.GetMaxLongAdviceGroupID(adminUserInfo.Org.Id, patient_id)
+		advices, err := service.GetLastLongAdviceByGroupNo(adminUserInfo.CurrentOrgId, patient_id, schedule_date)
+		advices_two, err := service.GetLastLongAdviceByGroupNoThree(adminUserInfo.CurrentOrgId, patient_id, schedule_date)
+		fmt.Println("advice23323232233232233223232332232323322323wodee", schedule_date)
 		for _, advice := range advices {
 			if advice.FrequencyType == 3 {
 				t := time.Now()
@@ -3729,17 +3932,32 @@ func (this *DialysisApiController) GetFuncPurview() {
 	}
 }
 
+func (this *DialysisApiController) GetOrderDoctorAdvice() {
+	patient_id, _ := this.GetInt64("patient_id", 0)
+	advice_date, _ := this.GetInt64("advice_date")
+	adminUserInfo := this.GetAdminUserInfo()
+	doctorAdvice, _ := service.GetBloodDoctorAdvice(advice_date, adminUserInfo.CurrentOrgId, patient_id)
+	hisDoctorAdvice, _ := service.GetHisDoctorAdvice(advice_date, adminUserInfo.CurrentOrgId, patient_id)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+
+		"doctorAdvice":    doctorAdvice,
+		"hisDoctorAdvice": hisDoctorAdvice,
+	})
+
+}
+
 func (this *DialysisApiController) GetLastOrNextDoctorAdvice() {
 	change_type, _ := this.GetInt64("type", 0)
 	record_date := this.GetString("record_time")
 	patient_id, _ := this.GetInt64("patient_id", 0)
-
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theAdviceRecordTime, _ := time.ParseInLocation(timeLayout, record_date, loc)
 	record_time := theAdviceRecordTime.Unix()
 	adminUserInfo := this.GetAdminUserInfo()
 	advices, sch, err := service.GetDoctorAdviceByType(change_type, record_time, adminUserInfo.CurrentOrgId, patient_id)
+
 	if err == nil {
 		if len(advices) == 0 {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceEmpty)

controllers/his_api_controller.go

@@ -1001,7 +1001,7 @@ func (c *HisApiController) CreateHisPrescription() {
 				if id > 0 {
 					new_prescription, err := service.GetPrescriptionById(id, adminInfo.CurrentOrgId)
 					if err != nil {
-						if new_prescription.OrderStatus == 2 || new_prescription.OrderStatus == 4 {
+						if new_prescription.OrderStatus == 4 {
 							isCharge = true
 						}
 					}
@@ -1093,14 +1093,14 @@ func (c *HisApiController) CreateHisPrescription() {
 								advicelist, _ := service.GetHisAdviceListByDrugIdEight(drug_id, patient_id, recordDateTime, adviceId)
 
 								//查询最新批次库存
-								//info, _ := service.FindLastDrugWarehousingInfoByID(drug_id, storeConfig.DrugStorehouseOut)
-								//var batch_number_count int64
-								//batch_number_count = info.StockMaxNumber*drug.MinNumber + info.StockMinNumber
-								//batch_number_counts := strconv.FormatInt(batch_number_count, 10)
+								info, _ := service.FindLastDrugWarehousingInfoByID(drug_id, storeConfig.DrugStorehouseOut)
+								var batch_number_count int64
+								batch_number_count = info.StockMaxNumber*drug.MinNumber + info.StockMinNumber
+								batch_number_counts := strconv.FormatInt(batch_number_count, 10)
 								//新增处方
 								if advicelist.ID == 0 {
 									all_count, _ := strconv.ParseFloat(totals, 64)
-									//batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
+									batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
 									if prescribingNumberUnit == drug.MinUnit {
 
 										if drug.IsUse != 1 {
@@ -1109,10 +1109,12 @@ func (c *HisApiController) CreateHisPrescription() {
 												return
 											}
 
-											//if prescribing_number > batch_number_all_count {
-											//	c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
-											//	return
-											//}
+											if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+												if prescribing_number > batch_number_all_count {
+													c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
+													return
+												}
+											}
 
 										}
 
@@ -1124,11 +1126,13 @@ func (c *HisApiController) CreateHisPrescription() {
 												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 												return
 											}
+											if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+												if num > batch_number_all_count {
+													c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
+													return
+												}
+											}
 
-											//if num > batch_number_all_count {
-											//	c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
-											//	return
-											//}
 										}
 									}
 								}
@@ -1182,6 +1186,7 @@ func (c *HisApiController) CreateHisPrescription() {
 											var batch_number_count int64
 											batch_number_count = info.StockMaxNumber*drug.MinNumber + info.StockMinNumber
 											batch_number_counts := strconv.FormatInt(batch_number_count, 10)
+
 											all_count, _ := strconv.ParseFloat(totals, 64)
 											if prescribingNumberUnit == drug.MinUnit {
 												batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
@@ -1190,12 +1195,13 @@ func (c *HisApiController) CreateHisPrescription() {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														return
 													}
-													fmt.Println("prescribing_number2332323323323", prescribing_number)
-													fmt.Println("batch_number_all_count", batch_number_all_count)
-													//if prescribing_number > batch_number_all_count {
-													//	c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
-													//	return
-													//}
+													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+														if prescribing_number > batch_number_all_count {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
+															return
+														}
+													}
+
 												}
 
 											} else {
@@ -1207,12 +1213,13 @@ func (c *HisApiController) CreateHisPrescription() {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
 														}
-														fmt.Println("prescribing_number2332323323323", prescribing_number)
-														fmt.Println("batch_number_all_count", batch_number_all_count)
-														//if prescribing_number > batch_number_all_count {
-														//	c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
-														//	return
-														//}
+														if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+															if prescribing_number > batch_number_all_count {
+																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
+																return
+															}
+														}
+
 													}
 
 												}
@@ -1257,44 +1264,51 @@ func (c *HisApiController) CreateHisPrescription() {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														return
 													}
-													fmt.Println("number_count", number_count)
-													fmt.Println("device_number", device_number)
-													fmt.Println("batch_number_count", batch_number_count)
 
-													//if (number_count - device_number) > batch_number_count {
-													//	c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
-													//	return
-													//}
+													if (number_count - device_number) > batch_number_count {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
+														return
+													}
+													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+														// 查询该药品最后一次出库记录
+														outInfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(drug_id, patient_id, recordDateTime, adviceId)
 
-													// 查询该药品最后一次出库记录
-													//outInfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(drug_id, patient_id, recordDateTime, adviceId)
-													//var out_count int64
-													//var in_count int64
-													//var stock_max_number int64
-													//var stock_min_number int64
-													//for _, it := range outInfo {
-													//	if it.CountUnit == drug.MaxUnit {
-													//		it.Count = it.Count * drug.MinNumber
-													//	}
-													//	out_count += it.Count
-													//	warehouseInfoList, _ := service.GetDrugWarehouseInfoById(it.WarehouseInfoId)
-													//	fmt.Println("warehouseInfoList233323232332323232",warehouseInfoList)
-													//	stock_max_number = warehouseInfoList.StockMaxNumber
-													//	stock_min_number = warehouseInfoList.StockMinNumber
-													//	if warehouseInfoList.MaxUnit == drug.MaxUnit {
-													//		in_count = warehouseInfoList.WarehousingCount * drug.MinNumber
-													//	}
-													//	if warehouseInfoList.MaxUnit == drug.MinUnit {
-													//		in_count = warehouseInfoList.WarehousingCount
-													//	}
-													//}
-													//fmt.Println("out_count",out_count)
-													//fmt.Println("number_count - device_number",number_count - device_number)
-													//fmt.Println("in_countwowowowowowow",in_count)
-													//if (out_count + (number_count - device_number)) > in_count {
-													//	c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(stock_max_number, 10) + drug.MaxUnit + strconv.FormatInt(stock_min_number, 10) + drug.MinUnit)
-													//	return
-													//}
+														var out_count int64
+														var in_count int64
+														var stock_max_number int64
+														var stock_min_number int64
+														for _, it := range outInfo {
+															if it.CountUnit == drug.MaxUnit {
+																it.Count = it.Count * drug.MinNumber
+															}
+															out_count += it.Count
+															warehouseInfoList, _ := service.GetDrugWarehouseInfoById(it.WarehouseInfoId)
+
+															stock_max_number = warehouseInfoList.StockMaxNumber
+															stock_min_number = warehouseInfoList.StockMinNumber
+															in_count = warehouseInfoList.StockMaxNumber*drug.MinNumber + warehouseInfoList.StockMinNumber
+
+														}
+
+														if out_count > 0 {
+															if (number_count - device_number) > in_count {
+																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(stock_max_number, 10) + drug.MaxUnit + strconv.FormatInt(stock_min_number, 10) + drug.MinUnit)
+																return
+															}
+														}
+														// 未出库
+														if out_count == 0 {
+															var sum_in_count int64
+															warehouseInfo, _ := service.FindLastDrugWarehousingInfoByID(drug_id, storeConfig.DrugStorehouseOut)
+															sum_in_count = warehouseInfo.StockMaxNumber*drug.MinNumber + warehouseInfo.StockMinNumber
+															fmt.Println("sum_in_count", sum_in_count)
+															//如果修改的数量大于有库存的第一个批次
+															if number_count > sum_in_count {
+																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(warehouseInfo.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(warehouseInfo.StockMinNumber, 10) + drug.MinUnit)
+																return
+															}
+														}
+													}
 
 												}
 
@@ -1394,38 +1408,43 @@ func (c *HisApiController) CreateHisPrescription() {
 										//新增处方
 										if advicelist.ID == 0 {
 											//查询最新批次库存
-											//info, _ := service.FindLastDrugWarehousingInfoByID(drug_id, storeConfig.DrugStorehouseOut)
-											//var batch_number_count int64
-											//batch_number_count = info.StockMaxNumber*drug.MinNumber + info.StockMinNumber
-											//batch_number_counts := strconv.FormatInt(batch_number_count, 10)
+											info, _ := service.FindLastDrugWarehousingInfoByID(drug_id, storeConfig.DrugStorehouseOut)
+											var batch_number_count int64
+											batch_number_count = info.StockMaxNumber*drug.MinNumber + info.StockMinNumber
+											batch_number_counts := strconv.FormatInt(batch_number_count, 10)
 											all_count, _ := strconv.ParseFloat(totals, 64)
 											if prescribingNumberUnit == drug.MinUnit {
-												//batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
+												batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
 												if drug.IsUse != 1 {
 													if prescribing_number > all_count {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														return
 													}
-													//if prescribing_number > batch_number_all_count {
-													//	c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
-													//	return
-													//}
+													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+														if prescribing_number > batch_number_all_count {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
+															return
+														}
+													}
+
 												}
 
 											} else {
 												if prescribingNumberUnit == drug.MaxUnit {
-													//batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
+													batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
 													num := prescribing_number * float64(drug.MinNumber)
 													if drug.IsUse != 1 {
 														if num > all_count {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
 														}
+														if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+															if prescribing_number > batch_number_all_count {
+																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
+																return
+															}
+														}
 
-														//if prescribing_number > batch_number_all_count {
-														//	c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
-														//	return
-														//}
 													}
 
 												}
@@ -1468,43 +1487,53 @@ func (c *HisApiController) CreateHisPrescription() {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														return
 													}
-													fmt.Println("number_count", number_count)
-													fmt.Println("device_number", device_number)
-													fmt.Println("batch_number_count", batch_number_count)
-													//if (number_count - device_number) > batch_number_count {
-													//	c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
-													//	return
-													//}
-
-													//查询历史出库数据总批次
-													// 查询该药品最后一次出库记录
-													//outInfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(drug_id, patient_id, recordDateTime, adviceId)
-													//var out_count int64
-													//var in_count int64
-													//var stock_max_number int64
-													//var stock_min_number int64
-													//for _, it := range outInfo {
-													//	if it.CountUnit == drug.MaxUnit {
-													//		it.Count = it.Count * drug.MinNumber
-													//	}
-													//	out_count += it.Count
-													//	warehouseInfoList, _ := service.GetDrugWarehouseInfoById(it.WarehouseInfoId)
-													//	stock_max_number = warehouseInfoList.StockMaxNumber
-													//	stock_min_number = warehouseInfoList.StockMinNumber
-													//	if warehouseInfoList.MaxUnit == drug.MaxUnit {
-													//		in_count = warehouseInfoList.WarehousingCount * drug.MinNumber
-													//	}
-													//	if warehouseInfoList.MaxUnit == drug.MinUnit {
-													//		in_count = warehouseInfoList.WarehousingCount
-													//	}
-													//}
-													//fmt.Println("out_count",out_count)
-													//fmt.Println("number_count - device_number",number_count - device_number)
-													//fmt.Println("in_count",in_count)
-													//if (out_count + (number_count - device_number)) > in_count {
-													//	c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(stock_max_number, 10) + drug.MaxUnit + strconv.FormatInt(stock_min_number, 10) + drug.MinUnit)
-													//	return
-													//}
+													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+														if (number_count - device_number) > batch_number_count {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
+															return
+														}
+													}
+
+													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+														//查询历史出库数据总批次
+														// 查询该药品最后一次出库记录
+														outInfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(drug_id, patient_id, recordDateTime, adviceId)
+														var out_count int64
+														var in_count int64
+														var stock_max_number int64
+														var stock_min_number int64
+														for _, it := range outInfo {
+															if it.CountUnit == drug.MaxUnit {
+																it.Count = it.Count * drug.MinNumber
+															}
+															out_count += it.Count
+															warehouseInfoList, _ := service.GetDrugWarehouseInfoById(it.WarehouseInfoId)
+															stock_max_number = warehouseInfoList.StockMaxNumber
+															stock_min_number = warehouseInfoList.StockMinNumber
+															in_count = warehouseInfoList.StockMaxNumber*drug.MinNumber + warehouseInfoList.StockMinNumber
+
+														}
+
+														if out_count > 0 {
+															if (number_count - device_number) > in_count {
+																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(stock_max_number, 10) + drug.MaxUnit + strconv.FormatInt(stock_min_number, 10) + drug.MinUnit)
+																return
+															}
+														}
+
+														// 未出库
+														if out_count == 0 {
+															var sum_in_count int64
+															warehouseInfo, _ := service.FindLastDrugWarehousingInfoByID(drug_id, storeConfig.DrugStorehouseOut)
+															sum_in_count = warehouseInfo.StockMaxNumber*drug.MinNumber + warehouseInfo.StockMinNumber
+
+															//如果修改的数量大于有库存的第一个批次
+															if number_count > sum_in_count {
+																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(warehouseInfo.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(warehouseInfo.StockMinNumber, 10) + drug.MinUnit)
+																return
+															}
+														}
+													}
 
 												}
 											}
@@ -2386,7 +2415,7 @@ func (c *HisApiController) DeletePrescription() {
 	}
 
 	for _, item := range new_prescriptions {
-		if item.OrderStatus == 2 || item.OrderStatus == 4 {
+		if item.OrderStatus == 4 {
 			isCharge = true
 		}
 	}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3314,10 +3314,126 @@ func (c *DialysisAPIController) GetLongAdvice() {
 	} else { //开启推送提醒
 		//开启推送提醒逻辑    提交长期处方的时候，弹起长期医嘱推送
 		var advice_three []*models.DoctorAdvice
+		recordDateStr := time.Now().Format("2006-01-02")
+		recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+
+		nowtime := recordDate.Unix()
+		//advices, err := service.GetLastLongAdviceByGroupNoOne(adminUserInfo.Org.Id, patient_id,nowtime)
+		//fmt.Println("advices232333232323323233232333223233232322332",advices)
+		//advices_two, err := service.GetLastLongAdviceByGroupNoFour(adminUserInfo.Org.Id, patient_id,nowtime)
+		advices, err := service.GetLastLongAdviceByGroupNo(adminUserInfo.Org.Id, patient_id, nowtime)
+		advices_two, err := service.GetLastLongAdviceByGroupNoThree(adminUserInfo.Org.Id, patient_id, nowtime)
+		for _, advice := range advices {
+			if advice.FrequencyType == 3 {
+				t := time.Now()
+				week := int(t.Weekday())
+				fmt.Println(t.Weekday())
+
+				fmt.Println(week)
 
-		advices, err := service.GetLastLongAdviceByGroupNoOne(adminUserInfo.Org.Id, patient_id)
-		advices_two, err := service.GetLastLongAdviceByGroupNoFour(adminUserInfo.Org.Id, patient_id)
+				switch week {
+				case 1:
+					if strings.Index(advice.WeekDay, "周一") == -1 {
+						advice_three = append(advice_three, advice)
+					}
+					break
+				case 2:
+					if strings.Index(advice.WeekDay, "周二") == -1 {
+						advice_three = append(advice_three, advice)
+					}
+					break
+				case 3:
+					if strings.Index(advice.WeekDay, "周三") == -1 {
+						advice_three = append(advice_three, advice)
+					}
+					break
+				case 4:
+					if strings.Index(advice.WeekDay, "周四") == -1 {
+						advice_three = append(advice_three, advice)
+					}
+					break
+				case 5:
+					if strings.Index(advice.WeekDay, "周五") == -1 {
+						advice_three = append(advice_three, advice)
+					}
+					break
+				case 6:
+					if strings.Index(advice.WeekDay, "周六") == -1 {
+						advice_three = append(advice_three, advice)
+					}
+					break
+				case 0:
+					if strings.Index(advice.WeekDay, "周日") == -1 {
+						advice_three = append(advice_three, advice)
+					}
+					break
+				}
+			}
+		}
 
+		for _, advice := range advices_two {
+			p, _ := time.Parse("2006-01-02", time.Now().Format("2006-01-02"))
+			now := p.Unix()
+			dayStr := strconv.FormatInt(advice.DayCount, 10)
+			dayStr2 := "-" + dayStr
+			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)
+
+			for _, ad := range advices {
+				advice_three = append(advice_three, ad)
+			}
+		}
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status":            "2",
+				"advices":           advices,
+				"advices_two":       RemoveRepeatedElement(advice_three),
+				"is_open_remind":    config.IsOpenRemind,
+				"his_config_open":   hisConfig.IsOpen,
+				"is_advice_open":    is_advice_open.IsAdviceOpen,
+				"prescription_open": prescription_open.IsOpen,
+			})
+		}
+	}
+
+}
+
+func (c *DialysisAPIController) GetLongAdviceOne() {
+	patient_id, _ := c.GetInt64("id")
+	startTime := c.GetString("schedule_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	var theStartTime int64
+	if len(startTime) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", startTime+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		theStartTime = theTime.Unix()
+	}
+	adminUserInfo := c.GetMobileAdminUserInfo()
+	_, config := service.FindDoctorAdviceRecordByOrgId(adminUserInfo.Org.Id)
+	_, hisConfig := service.FindXTHisRecordByOrgId(adminUserInfo.Org.Id)
+	is_advice_open, _ := service.FindAdviceSettingById(adminUserInfo.Org.Id)
+
+	prescription_open, _ := service.FindPrescriptionConfigById(adminUserInfo.Org.Id)
+	//patient, _ := service.FindPatientIsOpenRemindById(patient_id, adminUserInfo.Org.Id)
+	if config.IsOpenRemind == 0 { //针对老用户，即没开启推送功能，也没有	不开启推送功能，不做任何处理
+		c.ServeSuccessJSON(map[string]interface{}{
+			"status": "1",
+		})
+		return
+	} else { //开启推送提醒
+		//开启推送提醒逻辑    提交长期处方的时候，弹起长期医嘱推送
+		var advice_three []*models.DoctorAdvice
+
+		fmt.Println("theStartTime23434343433434433443434343434334", theStartTime)
+		advices, err := service.GetLastLongAdviceByGroupNo(adminUserInfo.Org.Id, patient_id, theStartTime)
+		advices_two, err := service.GetLastLongAdviceByGroupNoThree(adminUserInfo.Org.Id, patient_id, theStartTime)
 		for _, advice := range advices {
 			if advice.FrequencyType == 3 {
 				t := time.Now()
@@ -3393,6 +3509,7 @@ func (c *DialysisAPIController) GetLongAdvice() {
 	}
 
 }
+
 func RemoveRepeatedElement(arr []*models.DoctorAdvice) (newArr []*models.DoctorAdvice) {
 	newArr = make([]*models.DoctorAdvice, 0)
 	for i := 0; i < len(arr); i++ {

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -111,6 +111,7 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/warehouse/query", &StockApiController{}, "get:GetWarehouse")
 
 	beego.Router("/m/api/dialysis/advice_remind", &DialysisAPIController{}, "Get:GetLongAdvice")
+	beego.Router("/m/api/dialysis/advice_remind/one", &DialysisAPIController{}, "Get:GetLongAdviceOne")
 	beego.Router("/m/api/advice_remind/create", &DialysisAPIController{}, "Post:CreateRemindDoctorAdvice")
 	beego.Router("/m/api/dryweight/commit", &DialysisAPIController{}, "Post:UploadDryWeight")
 

controllers/role_controller.go

@@ -221,7 +221,8 @@ func (this *RoleAPIController) EditPurviewInitData() {
 	purviews_func, _ := service.GetAllGeneralFuncPurviewVMsProcessed()
 
 	//门诊
-	outpatientRegistration, _, _ := service.GetOtherAllGeneralPurviewVMsProcessed("/outpatientRegistration/manage")
+	_, _, outpatientRegistration := service.GetOtherAllGeneralPurviewVMsProcessed("/outpatientRegistration/manage")
+	fmt.Println(outpatientRegistration)
 	//电子病历
 	_, _, originEle := service.GetOtherAllGeneralPurviewVMsProcessed("/patinets/ele")
 	//透析管理
@@ -232,12 +233,14 @@ func (this *RoleAPIController) EditPurviewInitData() {
 	//_, _, orginConfig := service.GetOtherAllGeneralPurviewVMsProcessed("/config/manage")
 
 	//门诊管理
+	_, _, YajinPurview := service.GetOtherAllGeneralPurviewVMsProcessed("DepositManagement")
+	//_, _, YaofangPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/api/pharmacy")
+	_, _, DengjiPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/hospitalRecord/index")
+	_, _, GongjuPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/hisTool")
+	_, _, ShoufeiPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/hospitalCharges")
 	_, _, outpatientRegistrationPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/outpatientRegistration/index")
-
 	_, _, outpatientRegistrationPurviewTwo := service.GetOtherAllGeneralPurviewVMsProcessed("/outpatientDoctorStation")
-
 	_, _, outpatientRegistrationPurviewThree := service.GetOtherAllGeneralPurviewVMsProcessed("/outpatientCharges")
-
 	_, _, outpatientRegistrationPurviewFour := service.GetOtherAllGeneralPurviewVMsProcessed("/hospitalStation")
 
 	//透析管理
@@ -266,13 +269,66 @@ func (this *RoleAPIController) EditPurviewInitData() {
 
 	//门诊管理
 
+	subYajinPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
 	subPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
-
 	subPurviewTreeViewModelTwo := []*service.PurviewTreeViewModel{}
 	subPurviewTreeViewModelThree := []*service.PurviewTreeViewModel{}
+	//subYaoFangPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	subDengjiPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
 	subPurviewTreeViewModelFour := []*service.PurviewTreeViewModel{}
-
 	subPurviewTreeViewModelFive := []*service.PurviewTreeViewModel{}
+	subGongJuPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	subShouFeiPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+
+	for _, item := range YajinPurview {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subYajinPurviewTreeViewModel = append(subYajinPurviewTreeViewModel, temp)
+	}
+
+	//for _, item := range YaofangPurview {
+	//	temp := &service.PurviewTreeViewModel{
+	//		ID:     item.Id,
+	//		PID:    item.Parentid,
+	//		Name:   item.Name,
+	//		Number: 1,
+	//	}
+	//	subYaoFangPurviewTreeViewModel = append(subYaoFangPurviewTreeViewModel, temp)
+	//}
+
+	for _, item := range DengjiPurview {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subDengjiPurviewTreeViewModel = append(subDengjiPurviewTreeViewModel, temp)
+	}
+
+	for _, item := range GongjuPurview {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subGongJuPurviewTreeViewModel = append(subGongJuPurviewTreeViewModel, temp)
+	}
+
+	for _, item := range ShoufeiPurview {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subShouFeiPurviewTreeViewModel = append(subShouFeiPurviewTreeViewModel, temp)
+	}
 
 	for _, item := range outpatientRegistrationPurview {
 		temp := &service.PurviewTreeViewModel{
@@ -325,7 +381,23 @@ func (this *RoleAPIController) EditPurviewInitData() {
 		subPurviewTreeViewModelFive = append(subPurviewTreeViewModelFive, temp)
 	}
 
+	//透析管理
+	subOutpatientPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
 	for _, item := range outpatientRegistration {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subOutpatientPurviewTreeViewModel = append(subOutpatientPurviewTreeViewModel, temp)
+	}
+
+	for _, item := range subOutpatientPurviewTreeViewModel {
+		if item.Name == "押金管理" {
+			item.Childs = append(item.Childs, subYajinPurviewTreeViewModel...)
+		}
+
 		if item.Name == "门诊挂号" {
 			item.Childs = append(item.Childs, subPurviewTreeViewModel...)
 		}
@@ -335,12 +407,30 @@ func (this *RoleAPIController) EditPurviewInitData() {
 		}
 
 		if item.Name == "门诊收费" {
+
 			item.Childs = append(item.Childs, subPurviewTreeViewModelThree...)
 		}
+		//if item.Name == "药房管理" {
+		//	item.Childs = append(item.Childs, subYaoFangPurviewTreeViewModel...)
+		//}
+
+		if item.Name == "住院登记" {
+			item.Childs = append(item.Childs, subDengjiPurviewTreeViewModel...)
+		}
 
 		if item.Name == "住院工作站" {
+
 			item.Childs = append(item.Childs, subPurviewTreeViewModelFour...)
 		}
+
+		if item.Name == "住院收费" {
+			item.Childs = append(item.Childs, subShouFeiPurviewTreeViewModel...)
+		}
+
+		if item.Name == "HIS工具" {
+
+			item.Childs = append(item.Childs, subGongJuPurviewTreeViewModel...)
+		}
 	}
 
 	//电子病历
@@ -643,7 +733,7 @@ func (this *RoleAPIController) EditPurviewInitData() {
 		PID:    0,
 		Name:   "门诊管理",
 		Number: 3,
-		Childs: outpatientRegistration,
+		Childs: subOutpatientPurviewTreeViewModel,
 	}
 	purviews = append(purviews, menzhen)
 

controllers/self_drug_api_congtroller.go

@@ -85,6 +85,20 @@ func SelfDrugRouters() {
 	beego.Router("/api/drug/getdamagebydrugid", &SelfDrugApiController{}, "Get:GetDamageByDrugId")
 
 	beego.Router("/api/drug/getinventorymodelist", &SelfDrugApiController{}, "Get:GetInventoryModeList")
+
+	//耗材库存优化接口
+	beego.Router("/api/drug/getstorehouselist", &SelfDrugApiController{}, "Get:GetStorehouseList")
+	beego.Router("/api/drug/getgoodnewquery", &SelfDrugApiController{}, "Get:GetGoodNewQuery")
+	beego.Router("/api/drug/getgoodwarehouseoutinfobyid", &SelfDrugApiController{}, "Get:GetGoodWarehouseOutInfoByIdList")
+	beego.Router("/api/good/getgoodpatientlist", &SelfDrugApiController{}, "Get:GetGoodPatientList")
+	beego.Router("/api/good/getwarehouseoutdetailbypatientid", &SelfDrugApiController{}, "Get:GetWarehouseOutDetailByPatientId")
+	beego.Router("/api/good/getgoodexpirydatequery", &SelfDrugApiController{}, "Get:GetGoodExpiryDateQuery")
+	beego.Router("/api/good/getpurchasestockquery", &SelfDrugApiController{}, "Get:GetGoodPurchaseStockQuery")
+
+	//药品库存优化接口
+	beego.Router("/api/good/getdrugwarehouseoutdetailbypatientid", &SelfDrugApiController{}, "Get:GetDrugWarehouseOutDetailByPatientId")
+	beego.Router("/api/drug/getdrugexpirydatequery", &SelfDrugApiController{}, "Get:GetDrugExpiryDateQuery")
+
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -2683,3 +2697,382 @@ func (this *SelfDrugApiController) GetInventoryModeList() {
 		"manufacturerList": manufacturerList,
 	})
 }
+
+//库存优化接口
+func (this *SelfDrugApiController) GetStorehouseList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, err := service.GetAllStoreHouseList(orgId)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	goodType, _ := service.GetAllGoodType(orgId)
+	patientList, _ := service.GetAllpatient(orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取仓库失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+		"goodTypeList":     goodType,
+		"patientList":      patientList,
+	})
+}
+
+func (this *SelfDrugApiController) GetGoodNewQuery() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	storehouse_id, _ := this.GetInt64("storehouse_id")
+	good_type, _ := this.GetInt64("good_type")
+	keyword := this.GetString("keyword")
+	page, _ := this.GetInt64("page")
+	limit, _ := this.GetInt64("limit")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	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()
+	}
+	var ids []int64
+	var goodIds []int64
+	manufacturerList, _ := service.GetManufacturerListByKeyword(orgId, keyword)
+	infoList, _ := service.GetGoodWarehouseInfoByOrgId(orgId)
+	for _, it := range manufacturerList {
+		ids = append(ids, it.ID)
+	}
+	for _, it := range infoList {
+		goodIds = append(goodIds, it.GoodId)
+	}
+	list, total, err := service.GetGoodNewQuery(orgId, storehouse_id, good_type, keyword, page, limit, ids, goodIds, startTime, endTime)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取查询信息失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"total": total,
+		"list":  list,
+	})
+}
+
+func (this *SelfDrugApiController) GetGoodWarehouseOutInfoByIdList() {
+
+	good_id, _ := this.GetInt64("good_id")
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	start_time := this.GetString("start_first_time")
+	end_time := this.GetString("end_first_time")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	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()
+	}
+	list, total, err := service.GetGoodWarehouseOutInfoByIdList(good_id, limit, page, orgId, startTime, endTime)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取查寻出库信息失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"total": total,
+		"list":  list,
+	})
+}
+
+func (this *SelfDrugApiController) GetGoodPatientList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	keyword := this.GetString("keyword")
+	list, err := service.GetGoodPatientList(orgId, keyword)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取患者信息失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *SelfDrugApiController) GetWarehouseOutDetailByPatientId() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	start_time := this.GetString("start_first_time")
+	end_time := this.GetString("end_first_time")
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	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()
+	}
+	list, total, err := service.GetWarehouseOutDetailByPatientId(orgId, patient_id, startTime, endTime, limit, page)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取患者信息失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+		"total":            total,
+	})
+}
+
+func (this *SelfDrugApiController) GetGoodExpiryDateQuery() {
+
+	storehouse_id, _ := this.GetInt64("storehouse_id")
+	expiry_type, _ := this.GetInt64("expiry_type")
+	keyword := this.GetString("keyword")
+	page, _ := this.GetInt64("page")
+	limit, _ := this.GetInt64("limit")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	start_time := this.GetString("start_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var endTime 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
+		}
+		endTime = theTime.Unix()
+	}
+	recordDateStr := time.Now().Format("2006-01-02")
+	recordDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+	fmt.Scan("parseDateErr", parseDateErr)
+	nowtime := recordDate.Unix()
+
+	var ids []int64
+	var goodIds []int64
+
+	manufacturers, _ := service.GetManufacturerListByKeyword(orgId, keyword)
+	for _, it := range manufacturers {
+		ids = append(ids, it.ID)
+	}
+	goodList, _ := service.GetGoodNameByword(orgId, keyword)
+	for _, it := range goodList {
+		goodIds = append(goodIds, it.ID)
+	}
+	list, total, err := service.GetGoodExpiryDateQuery(storehouse_id, expiry_type, keyword, page, limit, orgId, ids, goodIds, nowtime, endTime)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取患者信息失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+		"total":            total,
+		"nowtime":          nowtime,
+	})
+}
+
+func (this *SelfDrugApiController) GetGoodPurchaseStockQuery() {
+
+	good_type, _ := this.GetInt64("good_type")
+
+	keyword := this.GetString("keyword")
+
+	page, _ := this.GetInt64("page")
+
+	limit, _ := this.GetInt64("limit")
+
+	start_time := this.GetString("start_first_time")
+	end_time := this.GetString("end_first_time")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	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()
+	}
+	var ids []int64
+	var infoIds []int64
+
+	manufacturers, _ := service.GetManufacturerListByKeyword(orgId, keyword)
+	for _, it := range manufacturers {
+		ids = append(ids, it.ID)
+	}
+	infoList, _ := service.GetGoodWarehouseInfoByOrgId(orgId)
+	for _, it := range infoList {
+		infoIds = append(infoIds, it.GoodId)
+	}
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	list, total, err := service.GetGoodPurchaseStockQuery(good_type, keyword, page, limit, orgId, startTime, endTime, ids, infoIds)
+	fmt.Println("list233323233233232332233232", list)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取患者信息失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+		"total":            total,
+	})
+}
+
+func (this *SelfDrugApiController) GetDrugWarehouseOutDetailByPatientId() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	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()
+	}
+
+	list, total, _ := service.GetDrugWarehouseOutDetailByPatientId(patient_id, orgId, startTime, endTime, page, limit)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"total":            total,
+		"manufacturerList": manufacturerList,
+	})
+}
+
+func (this *SelfDrugApiController) GetDrugExpiryDateQuery() {
+	storehouse_id, _ := this.GetInt64("storehouse_id")
+	expiry_type, _ := this.GetInt64("expiry_type")
+	keyword := this.GetString("keyword")
+	page, _ := this.GetInt64("page")
+	limit, _ := this.GetInt64("limit")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	start_time := this.GetString("start_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var endTime 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
+		}
+		endTime = theTime.Unix()
+	}
+	recordDateStr := time.Now().Format("2006-01-02")
+	recordDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+	fmt.Scan("parseDateErr", parseDateErr)
+	nowtime := recordDate.Unix()
+
+	var ids []int64
+	var goodIds []int64
+
+	manufacturers, _ := service.GetManufacturerListByKeyword(orgId, keyword)
+	for _, it := range manufacturers {
+		ids = append(ids, it.ID)
+	}
+	drugList, _ := service.GetDrugNameByword(orgId, keyword)
+	for _, it := range drugList {
+		goodIds = append(goodIds, it.ID)
+	}
+	list, total, err := service.GetDrugExpiryDateQuery(storehouse_id, expiry_type, keyword, page, limit, orgId, ids, goodIds, nowtime, endTime)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	var drugType = "药品类型"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取患者信息失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+		"total":            total,
+		"nowtime":          nowtime,
+		"drugTypeList":     drugTypeList,
+	})
+}

controllers/stock_in_api_controller.go

@@ -152,7 +152,6 @@ func StockManagerApiRegistRouters() {
 func (c *StockManagerApiController) CreateWarehouse() {
 
 	warehousing_time := c.GetString("warehousing_time")
-	fmt.Println("warehousing_time我的", warehousing_time)
 	types, _ := c.GetInt64("type", 0)
 	storehouse_id, _ := c.GetInt64("storehouse_id")
 	warehousing_info_id, _ := c.GetInt64("warehousing_info_id")
@@ -7016,10 +7015,13 @@ func (this *StockManagerApiController) ReturnCheckWarehouseOut() {
 func (this *StockManagerApiController) CheckWarehouseInfo() {
 
 	warehousing_info_id, _ := this.GetInt64("warehousing_info_id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	//查询默认仓库
+	storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
 	//更改审核状态
 	err := service.UpdateCheckWarehouseInfo(warehousing_info_id)
 	if err == nil {
-		orgId := this.GetAdminUserInfo().CurrentOrgId
+
 		list, _ := service.GetWarehouseInfoList(warehousing_info_id, orgId)
 		Creator := this.GetAdminUserInfo().AdminUser.Id
 		for _, item := range list {
@@ -7059,20 +7061,19 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 				AdminUserId:             0,
 				BuyPrice:                item.Price,
 				StockCount:              "",
+				BatchNumberCount:        item.WarehousingCount,
 			}
 			//创建出库流水
 			service.CreateStockFlowOne(stockFlow)
-
 			orgId := this.GetAdminUserInfo().CurrentOrgId
-			//查询默认仓库
-			storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+			//查询该耗材剩余库存库
 			stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, orgId)
 			var total_count int64
 			for _, it := range stockList {
 				total_count += it.StockCount
 			}
 			//基础库插入数据
-			service.UpdateGoodInfoSumCount(item.GoodId, total_count, orgId)
+			service.UpdateGoodInfoAddSumCount(item.GoodId, total_count, orgId)
 		}
 	}
 
@@ -7090,11 +7091,6 @@ func (this *StockManagerApiController) ReturnCheckWarehouseInfo() {
 	//查询入库数据
 	list, _ := service.GetWarehouseInfoList(warehousing_info_id, orgId)
 	for _, item := range list {
-		//nightInfo, _ := service.GetWarehouseInfoByIdNight(item.ID)
-		//if nightInfo.WarehousingCount != nightInfo.StockCount {
-		//   this.ServeFailJSONWithSGJErrorCode(enums.ErrorCheckGoodParamWrong)
-		//   return
-		//}
 		//查询该耗材 是否有出库数据
 		outlist, _ := service.GetWarehouseOutByWarehouseInfoId(item.ID, item.GoodId, item.OrgId)
 
@@ -7112,14 +7108,13 @@ func (this *StockManagerApiController) ReturnCheckWarehouseInfo() {
 
 		//查询默认仓库
 		storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+		//查询该耗材剩余多少库存
 		stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, orgId)
 		var sum_count int64
-		var sum_in_count int64
 		for _, it := range stockList {
 			sum_count += it.StockCount
-			sum_in_count += it.WarehousingCount
 		}
-		service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, orgId)
+		service.UpdateGoodInfoAddSumCount(item.GoodId, sum_count, orgId)
 	}
 	err := service.ReturnCheckWarehouseInfo(warehousing_info_id)
 	if err == nil {

main.go

@@ -11,7 +11,7 @@ func init() {
 }
 
 func main() {
-	//service.BeginAutoCreateWeekSchedulesJob()
+	service.BeginAutoCreateWeekSchedulesJob()
 	//service.BeginAutoCreateWeekDisinfectionJob()
 	//service.BeginAutoCreatePlanJob()
 	//service.AutoClearSchedules()

models/dialysis.go

@@ -397,6 +397,7 @@ type DoctorAdvices struct {
 	AnticoagulantZongliang     float64         `gorm:"column:anticoagulant_zongliang" json:"anticoagulant_zongliang" form:"anticoagulant_zongliang"`
 	DialysisDialyszers         string          `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
 	DialysisIrrigation         string          `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	PushStartTime              int64           `gorm:"column:push_start_time" json:"push_start_time" form:"push_start_time"`
 }
 
 type DoctorAdvice struct {
@@ -449,7 +450,8 @@ type DoctorAdvice struct {
 	Way                   int64           `gorm:"column:way" json:"way" form:"way"`
 	DrugId                int64           `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 	DrugNameId            int64           `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
-	IsMedicine			  int64			  `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	IsMedicine            int64           `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	PushStartTime         int64           `gorm:"column:push_start_time" json:"push_start_time" form:"push_start_time"`
 }
 
 func (DoctorAdvice) TableName() string {

models/good_models.go

@@ -90,6 +90,7 @@ type GoodInfo struct {
 	BatchRetaiPrice             float64              `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
 	SumInCount                  int64                `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
 	WarehousingInfo             []*WarehousingInfo   `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"warehouse_info"`
+	WarehouseOutInfo            []*WarehouseOutInfo  `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"warehouse_out_info"`
 }
 
 func (GoodInfo) TableName() string {

models/patient_models.go

@@ -191,6 +191,7 @@ type Patients struct {
 	ContagionIds             []int64 `gorm:"-"`
 	DryWeight                float64 `gorm:"-"`
 	ZbPatientId              string  `gorm:"column:zb_patient_id" json:"zb_patient_id" form:"zb_patient_id"`
+	TreatmentPlan            string  `gorm:"column:treatment_plan" json:"treatment_plan" form:"treatment_plan"`
 }
 
 func (Patients) TableName() string {
@@ -746,6 +747,7 @@ type XtPatientsNew struct {
 	OutReason                    string  `gorm:"column:out_reason" json:"out_reason" form:"out_reason"`
 	DeathTime                    int64   `gorm:"column:death_time" json:"death_time" form:"death_time"`
 	TrobleShoot                  int64   `gorm:"column:troble_shoot" json:"troble_shoot" form:"troble_shoot"`
+	TreatmentPlan                string  `gorm:"column:treatment_plan" json:"treatment_plan" form:"treatment_plan"`
 }
 
 func (XtPatientsNew) TableName() string {

models/self_drug_models.go

@@ -980,3 +980,77 @@ type PatientDrugWarehouseInfo struct {
 	Manufacturer   int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
 	Dealer         int64  `gorm:"column:dealer" json:"dealer" form:"dealer"`
 }
+
+type NewGoodInformation struct {
+	ID                          int64               `gorm:"column:id" json:"id" form:"id"`
+	GoodCode                    string              `gorm:"column:good_code" json:"good_code" form:"good_code"`
+	SpecificationName           string              `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodTypeId                  int64               `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	GoodUnit                    int64               `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
+	BuyPrice                    float64             `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	SellPrice                   float64             `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
+	Remark                      string              `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime                       int64               `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                       int64               `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Manufacturer                int64               `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                      int64               `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	ExpiryDateWarnDayCount      int64               `gorm:"column:expiry_date_warn_day_count" json:"expiry_date_warn_day_count" form:"expiry_date_warn_day_count"`
+	StockWarnCount              int64               `gorm:"column:stock_warn_count" json:"stock_warn_count" form:"stock_warn_count"`
+	IsReuse                     int64               `gorm:"column:is_reuse" json:"is_reuse" form:"is_reuse"`
+	Status                      int64               `gorm:"column:status" json:"status" form:"status"`
+	FilmArea                    string              `gorm:"column:film_area" json:"film_area" form:"film_area"`
+	IsUse                       int64               `gorm:"column:is_use" json:"is_use" form:"is_use"`
+	FilmMaterialQuality         string              `gorm:"column:film_material_quality" json:"film_material_quality" form:"film_material_quality"`
+	OrgId                       int64               `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Modifier                    int64               `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Creater                     int64               `gorm:"column:creater" json:"creater" form:"creater"`
+	GoodName                    string              `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	Pinyin                      string              `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string              `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	GoodKind                    int64               `gorm:"column:good_kind" json:"good_kind" form:"good_kind"`
+	MedicalInsuranceLevel       int64               `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	RetailPrice                 float64             `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MedicalInsuranceNumber      string              `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	IsSpecialDiseases           int64               `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
+	IsRecord                    int64               `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	StatisticsCategory          int64               `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
+	GoodStatus                  string              `gorm:"column:good_status" json:"good_status" form:"good_status"`
+	DefaultCount                int64               `gorm:"column:default_count" json:"default_count" form:"default_count"`
+	IsDefault                   int64               `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsChargeUse                 int64               `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	IsChargePredict             int64               `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
+	IsStatisticsWork            int64               `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
+	Sign                        int64               `gorm:"column:sign" json:"sign" form:"sign"`
+	Sort                        int64               `gorm:"column:sort" json:"sort" form:"sort"`
+	IsDoctorUse                 int64               `gorm:"column:is_doctor_use" json:"is_doctor_use" form:"is_doctor_use"`
+	Agent                       string              `gorm:"column:agent" json:"agent" form:"agent"`
+	GoodNumber                  string              `gorm:"column:good_number" json:"good_number" form:"good_number"`
+	CommdityCode                string              `gorm:"column:commdity_code" json:"commdity_code" form:"commdity_code"`
+	SocialSecurityDirectoryCode string              `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	ProductionType              string              `gorm:"column:production_type" json:"production_type" form:"production_type"`
+	SpecialMedical              string              `gorm:"column:special_medical" json:"special_medical" form:"special_medical"`
+	IsMark                      int64               `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	Total                       float64             `gorm:"column:total" json:"total" form:"total"`
+	MinNumber                   int64               `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	PackingUnit                 string              `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	PackingPrice                float64             `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	DefaultCountUnit            string              `gorm:"column:default_count_unit" json:"default_count_unit" form:"default_count_unit"`
+	MinUnit                     string              `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	RegisterNumber              string              `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	ProvincesCode               string              `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
+	IsUser                      int64               `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	Number                      string              `gorm:"column:number" json:"number" form:"number"`
+	IsWarehouse                 string              `gorm:"column:is_warehouse" json:"is_warehouse" form:"is_warehouse"`
+	BatchRetaiPrice             float64             `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
+	SumCount                    int64               `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	SumInCount                  int64               `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
+	ManufacturerName            string              `gorm:"column:manufacturer_name" json:"manufacturer_name" form:"manufacturer_name"`
+	StWarehousingInfo           []*WarehousingInfo  `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"xt_warehouse_info"`
+	CancelStockInfo             []*CancelStockInfo  `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"cancel_stock_info"`
+	WarehousingInfo             []*WarehousingInfo  `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"warehouse_info"`
+	WarehouseOutInfo            []*WarehouseOutInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"warehouse_out_info"`
+}
+
+func (NewGoodInformation) TableName() string {
+	return "xt_good_information"
+}

models/stock_models.go

@@ -193,6 +193,7 @@ type VmWarehousingInfo struct {
 	PackingPrice      float64     `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
 	StorehouseId      int64       `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	IsCheck           int64       `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	BatchNumberCount  int64       `gorm:"column:batch_number_count" json:"batch_number_count" form:"batch_number_count"`
 }
 
 type WarehouseOut struct {
@@ -633,6 +634,7 @@ type VmStockFlow struct {
 	BuyPrice                  float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
 	StockCount                string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
 	RegisterNumber            string  `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	BatchNumberCount          int64   `gorm:"column:batch_number_count" json:"batch_number_count" form:"batch_number_count"`
 }
 
 func (VmStockFlow) TableName() string {

service/auto_create_week_schedules_service.go

@@ -19,6 +19,7 @@ func init() {
 	utils.InfoLog("开启自动排班定时任务")
 	createWeekSchedulesCronJob = cron.New()
 	spec := "0 0 0 ? * MON" // 每周一凌晨0点生成排班
+	//spec := "0 */1 * * * ?"
 	createWeekSchedulesCronJob.AddFunc(spec, func() {
 		AutoCreateWeekSchedules()
 	})
@@ -129,6 +130,7 @@ func AutoCreateWeekSchedules() {
 func _refreshWeekSchedulesWithTemplateItems(tx *gorm.DB, orgID int64, week time.Time, templateItems []*models.PatientScheduleTemplateItem, deviceNumberMap map[int64]*DeviceNumberViewModel) error {
 	if deviceNumberMap == nil {
 		deviceNumbers, getDeviceNumbersErr := GetAllValidDeviceNumbers(orgID)
+		//fmt.Println("getDeviceNumbersErr3232322332323232323323223232323",getDeviceNumbersErr)
 		if getDeviceNumbersErr != nil {
 			return getDeviceNumbersErr
 		}
@@ -141,6 +143,7 @@ func _refreshWeekSchedulesWithTemplateItems(tx *gorm.DB, orgID int64, week time.
 	now := time.Now()
 	monday, sunday := utils.GetMondayAndSundayOfWeekDate(&week)
 	disableErr := tx.Model(&models.Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date >= ? AND schedule_date <= ?", orgID, monday.Unix(), sunday.Unix()).Updates(map[string]interface{}{"status": 0, "mtime": now.Unix()}).Error
+	//fmt.Println("disableErr323232332323232233222332232332",disableErr)
 	if disableErr != nil {
 		return disableErr
 	}
@@ -173,6 +176,7 @@ func _refreshWeekSchedulesWithTemplateItems(tx *gorm.DB, orgID int64, week time.
 
 		sql := fmt.Sprintf("INSERT INTO xt_schedule (user_org_id, partition_id, bed_id, patient_id, schedule_date, schedule_week, schedule_type, mode_id, status, created_time, updated_time) VALUES %v;", strings.Join(valueStrs, ", "))
 		if insertErr := tx.Exec(sql, values...).Error; insertErr != nil {
+			//fmt.Println("insertErr232332233223332232323222222www",insertErr)
 			return insertErr
 		}
 	}

service/dialysis_service.go

@@ -350,16 +350,38 @@ func ExceDoctorAdviceById(m *models.DoctorAdvice, id int64, patientId int64) err
 	return err
 }
 
+func ExecBatchDoctorAdvice(patient_id int64, orgid int64, ids []string, creater int64) error {
+
+	err := writeDb.Model(&models.DoctorAdvice{}).Where("patient_id = ? AND   user_org_id = ? and id in(?) AND status = 1 ", patient_id, orgid, ids).Updates(map[string]interface{}{"execution_time": time.Now().Unix(), "execution_staff": creater, "execution_state": 1}).Error
+	return err
+}
+
 func ExceHidDoctorAdviceById(m *models.HisDoctorAdviceInfo, id int64, patientId int64) error {
 	err := writeDb.Model(&models.HisDoctorAdviceInfo{}).Where("patient_id = ? AND (id = ? Or parent_id=?)  AND status = 1 ", patientId, id, id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
 	return err
 }
 
+func ExceHisBatchDotorAdvice(patientid int64, orgid int64, ids []string, creater int64) error {
+
+	err := writeDb.Model(&models.HisDoctorAdviceInfo{}).Where("patient_id = ? AND user_org_id = ? and id in(?) AND status = 1 ", patientid, orgid, ids).Updates(map[string]interface{}{"execution_time": time.Now().Unix(), "execution_staff": creater, "execution_state": 1}).Error
+	return err
+}
+
 func CheckDoctorAdviceById(m *models.DoctorAdvice, id int64, patientId int64) error {
 	err := writeDb.Model(&models.DoctorAdvice{}).Where("patient_id = ? AND (id = ? Or parent_id=?) AND status = 1 ", patientId, id, id).Updates(map[string]interface{}{"check_time": m.CheckTime, "checker": m.Checker, "check_state": 1}).Error
 	return err
 }
 
+func CheckHisBathDoctorAdviceById(patientId int64, orgid int64, creater int64, ids []string) error {
+	err := writeDb.Model(&models.HisDoctorAdvice{}).Where("patient_id = ? and user_org_id = ? and id in(?)", patientId, orgid, ids).Updates(map[string]interface{}{"check_time": time.Now().Unix(), "checker": creater, "check_state": 1}).Error
+	return err
+}
+
+func CheckBatchDoctorAdviceById(patientId int64, ids []string, orgid int64, creater int64) error {
+	err := writeDb.Model(&models.DoctorAdvice{}).Where("patient_id = ? and user_org_id = ? and id in(?)", patientId, orgid, ids).Updates(map[string]interface{}{"check_time": time.Now().Unix(), "checker": creater, "check_state": 1}).Error
+	return err
+}
+
 func CheckHisDoctorAdviceById(m *models.HisDoctorAdviceInfo, id int64, patientId int64) error {
 	err := writeDb.Model(&models.HisDoctorAdviceInfo{}).Where("patient_id = ? AND (id = ? Or parent_id=?) AND status = 1 ", patientId, id, id).Updates(map[string]interface{}{"check_time": m.CheckTime, "checker": m.Checker, "check_state": 1}).Error
 	return err
@@ -721,7 +743,7 @@ func GetDialysisWatch(orgID int64, schedulDate int64, schedulType int64, partiti
 			}).
 			Preload("DialysisOrder", "status = 1 AND user_org_id = ? and dialysis_date>=? and dialysis_date<=?", orgID, start, end).
 			Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)
-		db = db.Where("xt_schedule.status = 1 AND user_org_id = ?", orgID)
+		db = db.Where("xt_schedule.status = 1")
 	}
 	if schedulDate > 0 {
 		db = db.Preload("DeviceNumber", "org_id = ?", orgID).
@@ -734,7 +756,7 @@ func GetDialysisWatch(orgID int64, schedulDate int64, schedulType int64, partiti
 			}).
 			Preload("DialysisOrder", "status = 1 AND user_org_id = ? and dialysis_date>=? and dialysis_date<=?", orgID, schedulDate, schedulDate).
 			Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)
-		db = db.Where("xt_schedule.status = 1 AND user_org_id = ?", orgID)
+		db = db.Where("xt_schedule.status = 1")
 		db = db.Where("schedule_date = ?", schedulDate)
 	}
 	if schedulType > 0 {
@@ -746,6 +768,9 @@ func GetDialysisWatch(orgID int64, schedulDate int64, schedulType int64, partiti
 	if end > 0 {
 		db = db.Where("schedule_date <= ?", end)
 	}
+	if orgID > 0 {
+		db = db.Where("user_org_id = ?", orgID)
+	}
 	if partitionType > 0 {
 		db = db.Joins("inner join xt_device_number on xt_device_number.id = xt_schedule.bed_id and xt_device_number.zone_id = ?", partitionType)
 		// db = db.Where("partition_id = ?", partitionType)
@@ -1171,12 +1196,12 @@ func GetMaxLongAdviceGroupID(orgId int64, patient_id int64) (group int64) {
 	return
 }
 
-func GetLastLongAdviceByGroupNo(orgId int64, patient_id int64) (advice []*models.DoctorAdvice, err error) {
-	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND advice_type = 1  AND stop_state = 2 AND parent_id = 0 AND frequency_type <> 0", orgId, patient_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
+func GetLastLongAdviceByGroupNo(orgId int64, patient_id int64, advice_date int64) (advice []*models.DoctorAdvice, err error) {
+	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND advice_type = 1  AND stop_state = 2 AND parent_id = 0 AND frequency_type <> 0 and (push_start_time >=? or push_start_time = 0) ", orgId, patient_id, advice_date).Preload("ChildDoctorAdvice", "status = 1 and (push_start_time >=? or push_start_time = 0)", advice_date).Find(&advice).Error
 	return
 }
 
-func GetLastLongAdviceByGroupNoOne(orgId int64, patient_id int64) (advice []*models.DoctorAdvice, err error) {
+func GetLastLongAdviceByGroupNoOne(orgId int64, patient_id int64, advice_date int64) (advice []*models.DoctorAdvice, err error) {
 
 	redis := RedisClient()
 	defer redis.Close()
@@ -1184,7 +1209,7 @@ func GetLastLongAdviceByGroupNoOne(orgId int64, patient_id int64) (advice []*mod
 	long_advice_str, _ := redis.Get(key).Result()
 
 	if len(long_advice_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND advice_type = 1  AND stop_state = 2 AND parent_id = 0 AND frequency_type <> 0", orgId, patient_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
+		err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND advice_type = 1  AND stop_state = 2 AND parent_id = 0 AND frequency_type <> 0 and (push_start_time >=? or push_start_time = 0) ", orgId, patient_id, advice_date).Preload("ChildDoctorAdvice", "status = 1 and (push_start_time >=? or push_start_time = 0) ", advice_date).Find(&advice).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				return nil, nil
@@ -1213,16 +1238,16 @@ func GetLastLongAdviceByGroupNoOne(orgId int64, patient_id int64) (advice []*mod
 			return advice, nil
 		}
 	}
-	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND advice_type = 1  AND stop_state = 2 AND parent_id = 0 AND frequency_type <> 0", orgId, patient_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
+	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND advice_type = 1  AND stop_state = 2 AND parent_id = 0 AND frequency_type <> 0 and (push_start_time >=? or push_start_time = 0) ", orgId, patient_id, advice_date).Preload("ChildDoctorAdvice", "status = 1 and (push_start_time >=? or push_start_time = 0) ", advice_date).Find(&advice).Error
 	return
 }
 
-func GetLastLongAdviceByGroupNoThree(orgId int64, patient_id int64) (advice []*models.DoctorAdvice, err error) {
-	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ?  AND  advice_type = 1 AND frequency_type = 2 AND stop_state = 2 AND parent_id = 0 ", orgId, patient_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
+func GetLastLongAdviceByGroupNoThree(orgId int64, patient_id int64, advice_date int64) (advice []*models.DoctorAdvice, err error) {
+	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ?  AND  advice_type = 1 AND frequency_type = 2 AND stop_state = 2 AND parent_id = 0 and (push_start_time>=? or push_start_time = 0) ", orgId, patient_id, advice_date).Preload("ChildDoctorAdvice", "status = 1 and (push_start_time>=? or push_start_time = 0) ", advice_date).Find(&advice).Error
 	return
 }
 
-func GetLastLongAdviceByGroupNoFour(orgId int64, patient_id int64) (advice []*models.DoctorAdvice, err error) {
+func GetLastLongAdviceByGroupNoFour(orgId int64, patient_id int64, advice_date int64) (advice []*models.DoctorAdvice, err error) {
 	//err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ?  AND  advice_type = 1 AND frequency_type = 2 AND stop_state = 2 AND parent_id = 0 ", orgId, patient_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
 	//return
 
@@ -1232,7 +1257,7 @@ func GetLastLongAdviceByGroupNoFour(orgId int64, patient_id int64) (advice []*mo
 	long_advice_str, _ := redis.Get(key).Result()
 
 	if len(long_advice_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ?  AND  advice_type = 1 AND frequency_type = 2 AND stop_state = 2 AND parent_id = 0 ", orgId, patient_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
+		err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ?  AND  advice_type = 1 AND frequency_type = 2 AND stop_state = 2 AND parent_id = 0 and  (push_start_time >=? or push_start_time = 0)", orgId, patient_id, advice_date).Preload("ChildDoctorAdvice", "status = 1  and  (push_start_time >=? or push_start_time = 0)", advice_date).Find(&advice).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				return nil, nil
@@ -1261,7 +1286,7 @@ func GetLastLongAdviceByGroupNoFour(orgId int64, patient_id int64) (advice []*mo
 			return advice, nil
 		}
 	}
-	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND advice_type = 1  AND stop_state = 2 AND parent_id = 0 AND frequency_type <> 0", orgId, patient_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
+	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND advice_type = 1  AND stop_state = 2 AND parent_id = 0 AND frequency_type <> 0  and  (push_start_time >=? or push_start_time = 0)", orgId, patient_id, advice_date).Preload("ChildDoctorAdvice", "status = 1  and  (push_start_time >=? or push_start_time = 0)", advice_date).Find(&advice).Error
 	return
 }
 

service/doctor_advice_service.go

@@ -480,3 +480,14 @@ func GetDict(orgid int64) (drugways []*models.DrugwayDic, total int64, err error
 	err = readDb.Model(&models.DrugwayDic{}).Where("(org_id =? or org_id = 0) and status=1", orgid).Count(&total).Order("id desc").Find(&drugways).Error
 	return
 }
+
+func GetBloodDoctorAdvice(record_time int64, org_id int64, patient_id int64) (advice []*DoctorAdvice, err error) {
+
+	err = XTReadDB().Where("advice_date = ? and user_org_id = ? and patient_id = ? and status = 1", record_time, org_id, patient_id).Order("created_time asc").Find(&advice).Error
+	return advice, err
+}
+
+func GetHisDoctorAdvice(record_time int64, org_id int64, patient_id int64) (advice []*models.HisDoctorAdvice, err error) {
+	err = XTReadDB().Where("advice_date = ? and user_org_id = ? and patient_id = ? and status = 1", record_time, org_id, patient_id).Order("created_time asc").Find(&advice).Error
+	return advice, err
+}

service/his_hospital_service.go

@@ -342,7 +342,7 @@ func GetHisHospitalUnUploadPrescriptionDetailPatientList(org_id int64, record_da
 	db = db.Joins("join xt_schedule as sch ON sch.patient_id = his_hospital_check_record.patient_id AND sch.status = 1 AND sch.user_org_id = ? AND sch.schedule_date = ?", org_id, record_date)
 
 	if sch_type > 0 {
-		db = db.Joins("join xt_schedule as sch ON sch.patient_id = his_hospital_check_record.patient_id AND sch.status = 1 AND sch.user_org_id = ? AND sch.schedule_date = ? AND sch.schedule_type = ? ", org_id, record_date, sch_type)
+		db = db.Joins("join xt_schedule as schs ON schs.patient_id = his_hospital_check_record.patient_id AND schs.status = 1 AND schs.user_org_id = ? AND schs.schedule_date = ? AND schs.schedule_type = ? ", org_id, record_date, sch_type)
 	}
 	db = db.Where("his_hospital_check_record.user_org_id = ? AND his_hospital_check_record.status = 1 AND his_hospital_check_record.in_hospital_status = 1 AND his_hospital_check_record.out_hospital_status = 0", org_id)
 	err = db.Group("number").Find(&patients).Error

service/his_service.go

@@ -1489,7 +1489,7 @@ func GetCallHisPrescriptions(start_time int64, end_time int64, org_id int64, pat
 				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 					return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status = 1")
 				})
-		}).Find(&advice).Error
+		}).Order("record_date desc").Find(&advice).Error
 
 	return
 }

service/mobile_dialysis_service.go

@@ -814,7 +814,7 @@ func MobileGetSchedualDialysisRecord(orgID int64, patientID int64, recordDate in
 	defer redis.Close()
 
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":dialysis_order"
-
+	redis.Set(key, "", time.Second)
 	dialysis_order_str, _ := redis.Get(key).Result()
 	if len(dialysis_order_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err := readDb.Model(&models.DialysisOrder{}).Preload("DeviceNumber", "org_id = ? AND  status = 1", orgID).Where("user_org_id = ? AND patient_id = ? AND  dialysis_date = ?", orgID, patientID, recordDate).First(&record).Error
@@ -2742,10 +2742,10 @@ func MobileGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 		Preload("DialysisBeforePrepare", func(db *gorm.DB) *gorm.DB {
-			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ?", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0) ", orgID).Where("status = 1 AND user_org_id = ? AND record_date = ?  AND count > 0 ", orgID, scheduleDate)
+			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ? and find_in_set('停用',good_status) = 0", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0) ", orgID).Where("status = 1 AND user_org_id = ? AND record_date = ?  AND count > 0 ", orgID, scheduleDate)
 		}).
 		Preload("AutomaticReduceDetail", func(db *gorm.DB) *gorm.DB {
-			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ?", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Where("status = 1 AND org_id = ? AND count > 0 AND record_time >= ? AND record_time <= ?  ", orgID, scheduleDate, end_time).Group("patient_id,good_id")
+			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ? and find_in_set('停用',good_status) = 0", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Where("status = 1 AND org_id = ? AND count > 0 AND record_time >= ? AND record_time <= ?  ", orgID, scheduleDate, end_time).Group("patient_id,good_id")
 		}).Where("sch.status = 1 AND sch.user_org_id = ?", orgID)
 	if scheduleDate != 0 {
 		db = db.Where("schedule_date = ?", scheduleDate)
@@ -2775,7 +2775,7 @@ func GetLastDialysisGoods(patient_id int64, orgID int64, record_time int64) (goo
 	err = readDb.Model(&AutomaticReduceDetail{}).Where("patient_id = ? AND org_id = ? AND status=1 AND record_time < ? AND count > 0", patient_id, orgID, record_time).Select("record_time").Group("record_time").Order("record_time asc").Scan(&Id).Error
 	if len(Id) > 0 {
 
-		err = readDb.Model(&AutomaticReduceDetail{}).Where("patient_id = ? AND org_id = ? AND status=1 AND record_time = ? AND count > 0", patient_id, orgID, Id[len(Id)-1].RecordTime).Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Find(&goodUser).Error
+		err = readDb.Model(&AutomaticReduceDetail{}).Where("patient_id = ? AND org_id = ? AND status=1 AND record_time = ? AND count > 0", patient_id, orgID, Id[len(Id)-1].RecordTime).Preload("VMGoodInfo", "status = 1 AND org_id = ? and find_in_set('停用',good_status) = 0", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Find(&goodUser).Error
 	}
 	return
 }
@@ -2784,7 +2784,7 @@ func GetLastDialysisBeforePrepare(patient_id int64, orgID int64, record_time int
 	var Id []*DialysisGoodsDate
 	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date < ? AND count > 0", patient_id, orgID, record_time).Select("record_date").Group("record_date").Order("record_date asc").Scan(&Id).Error
 	if len(Id) > 0 {
-		err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date = ? AND count > 0", patient_id, orgID, Id[len(Id)-1].RecordDate).Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0) ", orgID).Find(&goodUser).Error
+		err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date = ? AND count > 0", patient_id, orgID, Id[len(Id)-1].RecordDate).Preload("VMGoodInfo", "status = 1 AND org_id = ? and find_in_set('停用',good_status) = 0", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0) ", orgID).Find(&goodUser).Error
 	}
 	return
 }

service/patient_service.go

@@ -1118,11 +1118,31 @@ func FindDoctorAdvice(orgID, id int64) (advice models.DoctorAdvice, err error) {
 	return
 }
 
+func FindDoctorAdviceOne(orgID, patient_id int64) (advice models.DoctorAdvice, err error) {
+	err = readDb.Model(&models.DoctorAdvice{}).Where("patient_id = ? and user_org_id=? and status = 1", patient_id, orgID).First(&advice).Error
+	return
+}
+
+func FindDoctorAdviceTwo(ids []string, orgID int64) (advice []*models.DoctorAdvice, err error) {
+	err = readDb.Model(&models.DoctorAdvice{}).Where("id in(?) and user_org_id=? and status = 1", ids, orgID).First(&advice).Error
+	return
+}
+
 func FindHisDoctorAdvice(orgID, id int64) (advice models.HisDoctorAdviceInfo, err error) {
 	err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("id = ? and user_org_id=? and status = 1", id, orgID).First(&advice).Error
 	return
 }
 
+func FindHisDoctorAdviceTwo(ids []string, orgID int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+	err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("id in(?) and user_org_id=? and status = 1", ids, orgID).First(&advice).Error
+	return
+}
+
+func FindHisDoctorAdviceOne(orgID, patient_id int64) (advice models.HisDoctorAdviceInfo, err error) {
+	err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("patient_id = ? and user_org_id=? and status = 1", patient_id, orgID).First(&advice).Error
+	return
+}
+
 func FindDoctorAdviceByGroupNo(orgID, groupNo int64) (advice models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).Where("groupno = ? and user_org_id=? and status = 1", groupNo, orgID).First(&advice).Error
 	return
@@ -1202,7 +1222,7 @@ func GetDoctorAdviceListOne(orgID, patientID, advice_type, stop, start, end int6
 		db = db.Where("x.advice_name LIKE ?", likeKey)
 	}
 	offset := (page - 1) * limit
-	err = db.Group("x.id").Count(&total).Offset(offset).Limit(limit).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Order("start_time desc, groupno desc, advice_order desc, id asc").Scan(&advices).Error
+	err = db.Group("x.id").Count(&total).Offset(offset).Limit(limit).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,x.push_start_time,r.user_name, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Order("start_time desc, groupno desc, advice_order desc, id asc").Scan(&advices).Error
 	fmt.Print("err", err)
 	return
 }
@@ -1245,7 +1265,7 @@ func GetDoctorAdviceListTwo(orgID int64, patientID int64, advice_type int64, sto
 		db = db.Where("x.advice_name LIKE ?", likeKey)
 	}
 	offset := (page - 1) * limit
-	err = db.Order("x.start_time desc").Group("x.start_time").Count(&total).Offset(offset).Limit(limit).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Scan(&advices).Error
+	err = db.Order("x.start_time desc").Group("x.start_time").Count(&total).Offset(offset).Limit(limit).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,x.push_start_time,r.user_name, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Scan(&advices).Error
 	fmt.Print("错误是什么", err)
 	return
 

service/schedule_service.go

@@ -674,7 +674,7 @@ func GetWeekDayScheduleById(orgid int64, scheduleDate int64, scheduleType int64,
 
 func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType int64, zone []string) (list []*models.VmSchedulesRemind, err error) {
 
-	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
+	db := readDb2.Table("xt_schedule as x").Where("x.status = 1")
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
@@ -701,7 +701,7 @@ func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType in
 
 func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int64, startDate int64, zone []string) (list []*models.VmSchedulesRemind, err error) {
 
-	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
+	db := readDb2.Table("xt_schedule as x").Where("x.status = 1")
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
@@ -880,7 +880,7 @@ func UpdateNewScheduleTemplateStatus(id int64, org_id int64) (err error) {
 
 func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endtime int64, orgID int64, zone []string, record_date int64) (schedules []*models.WeekScheduleSix, err error) {
 
-	db := readDb.Table("xt_schedule as s ").Where("s.status =1")
+	db := readDb2.Table("xt_schedule as s ").Where("s.status =1")
 	if orgID > 0 {
 		db = db.Where("s.user_org_id = ?", orgID)
 	}
@@ -1168,17 +1168,13 @@ func GetInitPrintData(patient_id int64, scheduleDate int64, orgid int64) (list [
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
 	if patient_id > 0 {
-		db = db.Where("patient_id = ?", patient_id)
+		db = db.Where("x.patient_id = ?", patient_id)
 	}
 	if scheduleDate > 0 {
 		db = db.Where("x.schedule_date >=? and x.schedule_date<=?", scheduleDate, scheduleDate)
 	}
-	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1 and dialysis_date =?", scheduleDate).Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date =?", scheduleDate).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1 and patient_id = ?", patient_id)
-	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ? and patient_id = ?", scheduleDate, patient_id).Preload("DialysisPrescription", "status = 1 and record_date = ? and patient_id = ?", scheduleDate, patient_id).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date =? and patient_id = ?", scheduleDate, patient_id).Preload("DialysisPrescription", "status = 1 and record_date = ? and patient_id = ?", scheduleDate, patient_id).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and patient_id = ?", patient_id).Order("id asc")
-	}).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
-		return db.Where("user_org_id = ? and status = 1 and assessment_date < ? and patient_id = ?", orgid, scheduleDate, patient_id)
 	}).Find(&list).Error
 
 	return list, err

service/self_drug_service.go

@@ -1195,3 +1195,280 @@ func GetInventoryModeList(orgid int64) (info []*models.PatientDrugWarehouseInfo,
 	err = db.Select("x.drug_id,x.number,x.product_date,x.expiry_date,x.stock_max_number,x.stock_min_number,x.batch_number,t.drug_name,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,x.manufacturer,x.dealer").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id,x.batch_number").Scan(&info).Error
 	return info, err
 }
+
+func GetManufacturerListByKeyword(orgid int64, keyword string) (list []*models.Manufacturer, err error) {
+
+	likeKey := "%" + keyword + "%"
+	db := XTReadDB().Model(&list).Where("status = 1")
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	if len(keyword) > 0 {
+		db = db.Where("manufacturer_name like ?", likeKey)
+	}
+	err = db.Find(&list).Error
+	return list, err
+}
+
+func GetGoodNameByword(orgid int64, keyword string) (list []*models.GoodInfo, err error) {
+	likeKey := "%" + keyword + "%"
+	db := XTReadDB().Model(&list).Where("status = 1")
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	if len(keyword) > 0 {
+		db = db.Where("good_name like ?", likeKey)
+	}
+	err = db.Find(&list).Error
+	return list, err
+}
+
+func GetDrugNameByword(orgid int64, keyword string) (list []*models.XtBaseDrug, err error) {
+	likeKey := "%" + keyword + "%"
+	db := XTReadDB().Model(&list).Where("status = 1")
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	if len(keyword) > 0 {
+		db = db.Where("drug_name like ?", likeKey)
+	}
+	err = db.Find(&list).Error
+	return list, err
+}
+
+func GetGoodWarehouseInfoByOrgId(orgid int64) (info []*models.WarehousingInfo, err error) {
+
+	err = XTReadDB().Where("org_id = ? and is_check =1 and status =1", orgid).Group("good_id").Find(&info).Error
+	return info, err
+}
+
+func GetGoodNewQuery(orgId int64, storehouse_id int64, good_type int64, keyword string, page int64, limit int64, ids []int64, goodIds []int64, startime int64, endtime int64) (good []*models.NewGoodInformation, total int64, err error) {
+
+	offset := (page - 1) * limit
+	likeKey := "%" + keyword + "%"
+	db := XTReadDB().Table("xt_good_information as x").Where("x.status = 1 and id in(?)", goodIds)
+
+	if storehouse_id > 0 {
+		db = db.Preload("StWarehousingInfo", "org_id = ? and status = 1 and storehouse_id = ? and is_check = 1", orgId, storehouse_id)
+
+	} else {
+		db = db.Preload("StWarehousingInfo", "org_id = ? and status = 1 and is_check = 1", orgId)
+	}
+
+	if len(keyword) > 0 {
+		db = db.Where("good_name like ? or manufacturer in(?)", likeKey, ids)
+	}
+
+	if orgId > 0 {
+		db = db.Where("x.org_id = ?", orgId)
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Preload("WarehousingInfo", func(db *gorm.DB) *gorm.DB {
+		if startime > 0 {
+			db = db.Where("ctime>=?", startime)
+		}
+		if endtime > 0 {
+			db = db.Where("ctime<=?", endtime)
+		}
+		if storehouse_id > 0 {
+			db = db.Where("storehouse_id = ?", storehouse_id)
+		}
+		return db.Where("status = 1").Group("good_id,storehouse_id")
+	}).Preload("CancelStockInfo", func(db *gorm.DB) *gorm.DB {
+		if startime > 0 {
+			db = db.Where("ctime>=?", startime)
+		}
+		if endtime > 0 {
+			db = db.Where("ctime<=?", endtime)
+		}
+		return db.Where("status = 1")
+	}).Preload("WarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
+		if startime > 0 {
+			db = db.Where("ctime>=?", startime)
+		}
+		if endtime > 0 {
+			db = db.Where("ctime<=?", endtime)
+		}
+		return db.Where("status = 1")
+	}).Find(&good).Error
+
+	return good, total, err
+}
+
+func GetGoodWarehouseOutInfoByIdList(good_id int64, limit int64, page int64, orgid int64, startime int64, endtime int64) (info []*models.WarehouseOutInfo, total int64, err error) {
+
+	db := XTReadDB().Model(&info).Where("status = 1")
+	offset := (page - 1) * limit
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+	if orgid > 0 {
+		db = db.Where("org_id =?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("ctime<=?", endtime)
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Find(&info).Error
+	return info, total, err
+}
+
+func GetGoodPatientList(orgid int64, keyword string) (patient []*models.XtPatients, err error) {
+
+	likeKey := "%" + keyword + "%"
+	if len(keyword) > 0 {
+		err = XTReadDB().Where("user_org_id = ? and status = 1 and name like ?", orgid, likeKey).Find(&patient).Error
+	} else {
+		err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&patient).Error
+	}
+	return patient, err
+}
+
+func GetWarehouseOutDetailByPatientId(orgid int64, patient_id int64, startime int64, endtime int64, limit int64, page int64) (info []*models.WarehouseOutInfo, total int64, err error) {
+
+	db := XTReadDB().Model(&info).Where("status = 1 and is_sys = 1")
+	offset := (page - 1) * limit
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if startime > 0 {
+		db = db.Where("ctime>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("ctime<=?", endtime)
+	}
+	err = db.Preload("GoodInfo", "org_id = ? and status = 1", orgid).Count(&total).Offset(offset).Limit(limit).Find(&info).Error
+	return info, total, err
+}
+
+func GetGoodExpiryDateQuery(storehouse_id int64, expiry_type int64, keyword string, page int64, limit int64, orgid int64, ids []int64, goodIds []int64, startime int64, endtime int64) (info []*models.WarehousingInfo, total int64, err error) {
+
+	offset := (page - 1) * limit
+	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1 and x.is_check = 1")
+
+	if storehouse_id > 0 {
+		db = db.Where("x.storehouse_id = ?", storehouse_id)
+	}
+	//已过期
+	if expiry_type == 1 {
+		db = db.Where("x.expiry_date < ?", startime)
+	}
+
+	if expiry_type > 1 {
+		db = db.Where("x.expiry_date > ? and x.expiry_date<=?", startime, endtime)
+	}
+
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+
+	if len(keyword) > 0 {
+		db = db.Where("x.manufacturer in(?) or x.good_id in(?)", ids, goodIds)
+	}
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Preload("GoodInfo", "org_id = ? and status = 1", orgid).Find(&info).Error
+	return info, total, err
+}
+
+func GetGoodPurchaseStockQuery(good_type int64, keyword string, page int64, limit int64, orgid int64, startime int64, endtime int64, ids []int64, infos []int64) (goodinfo []*models.GoodInfo, total int64, err error) {
+
+	db := XTReadDB().Model(&goodinfo).Where("status = 1")
+	offset := (page - 1) * limit
+	likeKey := "%" + keyword + "%"
+	if good_type > 0 {
+		db = db.Where("good_type_id = ?", good_type)
+	}
+
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+
+	if len(keyword) > 0 {
+		db = db.Where("good_name like ? or manufacturer in(?)", likeKey, ids)
+	}
+	if len(infos) > 0 {
+		db = db.Where("id in(?)", infos)
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Preload("WarehousingInfo", func(db *gorm.DB) *gorm.DB {
+		if startime > 0 {
+			db = db.Where("ctime>=?", startime)
+		}
+		if endtime > 0 {
+			db = db.Where("ctime<=?", endtime)
+		}
+		return db.Where("status = 1").Group("good_id,storehouse_id")
+	}).Preload("CancelStockInfo", func(db *gorm.DB) *gorm.DB {
+		if startime > 0 {
+			db = db.Where("ctime>=?", startime)
+		}
+		if endtime > 0 {
+			db = db.Where("ctime<=?", endtime)
+		}
+		return db.Where("status = 1")
+	}).Preload("WarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
+		if startime > 0 {
+			db = db.Where("ctime>=?", startime)
+		}
+		if endtime > 0 {
+			db = db.Where("ctime<=?", endtime)
+		}
+		return db.Where("status = 1")
+	}).Find(&goodinfo).Error
+
+	return goodinfo, total, err
+}
+
+func GetDrugWarehouseOutDetailByPatientId(patient_id int64, orgid int64, startime int64, endtime int64, page int64, limit int64) (info []*models.DrugWarehouseOutInfo, total int64, err error) {
+	fmt.Println("startime232233232332322222wo", startime)
+	fmt.Println("endtime232233232332322222wo", endtime)
+	db := XTReadDB().Model(&info).Where("status = 1")
+	offset := (page - 1) * limit
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("sys_record_time >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("sys_record_time <= ?", endtime)
+	}
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Preload("BaseDrugLib", "status = 1 and org_id = ?", orgid).Find(&info).Error
+	return
+}
+
+func GetDrugExpiryDateQuery(storehouse_id int64, expiry_type int64, keyword string, page int64, limit int64, orgid int64, ids []int64, goodIds []int64, startime int64, endtime int64) (info []*models.XtDrugWarehouseInfo, total int64, err error) {
+
+	offset := (page - 1) * limit
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1 and x.is_check = 1")
+
+	if storehouse_id > 0 {
+		db = db.Where("x.storehouse_id = ?", storehouse_id)
+	}
+	//已过期
+	if expiry_type == 1 {
+		db = db.Where("x.expiry_date < ?", startime)
+	}
+
+	if expiry_type > 1 {
+		db = db.Where("x.expiry_date > ? and x.expiry_date<=?", startime, endtime)
+	}
+
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+
+	if len(keyword) > 0 {
+		db = db.Where("x.manufacturer in(?) or x.drug_id in(?)", ids, goodIds)
+	}
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Preload("XtBaseDrug", "org_id = ? and status = 1", orgid).Find(&info).Error
+	return info, total, err
+}

service/stock_service.go

@@ -386,7 +386,7 @@ func FindAllGoodTypeOne(org_id int64) (goodType []*models.GoodsType, err error)
 }
 
 func FindAllGoodInfo(org_id int64) (goodInfo []*models.GoodInfo, err error) {
-	err = XTReadDB().Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1 and is_warehouse = 1", org_id).Find(&goodInfo).Error
+	err = XTReadDB().Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1 and is_warehouse = 1  and find_in_set('停用',good_status) = 0", org_id).Find(&goodInfo).Error
 	return goodInfo, err
 }
 
@@ -4069,7 +4069,8 @@ func GetStockListById(good_id int64, orgid int64, limit int64, page int64, start
 	offset := (page - 1) * limit
 	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status= 1 and x.is_check = 1")
 	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
-	fmt.Println(table)
+	tables := XTReadDB().Table("xt_stock_flow as f").Where("f.status = 1 and f.consumable_type = 1 and f.user_org_id = ?", orgid)
+	fmt.Println(table, tables)
 	if startime > 0 {
 		db = db.Where("x.ctime>=?", startime)
 	}
@@ -4083,7 +4084,7 @@ func GetStockListById(good_id int64, orgid int64, limit int64, page int64, start
 	if good_id > 0 {
 		db = db.Where("x.good_id = ?", good_id)
 	}
-	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehousing_unit,x.stock_count,x.price,x.total_price,x.dealer,x.packing_price,t.manufacturer,x.remark,x.ctime,x.is_return,x.warehousing_order,x.type,x.storehouse_id,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.min_unit,t.buy_price").Joins("left join xt_good_information as t on t.id = x.good_id").Count(&total).Offset(offset).Limit(limit).Order("x.id desc").Scan(&info).Error
+	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehousing_unit,x.stock_count,x.price,x.total_price,x.dealer,x.packing_price,t.manufacturer,x.remark,x.ctime,x.is_return,x.warehousing_order,x.type,x.storehouse_id,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.min_unit,t.buy_price,f.batch_number_count").Joins("left join xt_good_information as t on t.id = x.good_id").Joins("left join xt_stock_flow as f on f.warehousing_detail_id = x.id").Count(&total).Offset(offset).Limit(limit).Order("x.id desc").Scan(&info).Error
 	return info, total, err
 
 }
@@ -7316,6 +7317,12 @@ func UpdateGoodInfoReduceSumCount(goodid int64, sum_count int64, orgid int64) er
 	return err
 }
 
+func UpdateGoodInfoAddSumCount(goodid int64, sum_count int64, orgid int64) error {
+
+	err := XTReadDB().Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", goodid, orgid).Update(map[string]interface{}{"sum_count": sum_count}).Error
+	return err
+}
+
 func GetCancelStockInfo(id int64, orgid int64) (stock []*models.CancelStockInfo, err error) {
 
 	err = XTReadDB().Where("cancel_stock_id  = ? and org_id = ? and status  = 1", id, orgid).Preload("GoodInfo", "status = 1 and org_id = ?", orgid).Preload("WarehousingInfo", "status = 1 and org_id = ?", orgid).Find(&stock).Error

service/warhouse_service.go

@@ -5054,6 +5054,7 @@ func ConsumablesDeliveryThirty(orgID int64, record_time int64, goods *models.War
 			AdminUserId:             goods.AdminUserId,
 			BuyPrice:                warehouse.Price,
 			StockCount:              goods.StockCount,
+			BatchNumberCount:        warehouse.StockCount - goods.Count,
 		}
 		//创建出库流水
 		CreateStockFlowOne(stockFlow)
@@ -5133,6 +5134,7 @@ func ConsumablesDeliveryThirty(orgID int64, record_time int64, goods *models.War
 			AdminUserId:             goods.AdminUserId,
 			BuyPrice:                warehouse.Price,
 			StockCount:              goods.StockCount,
+			BatchNumberCount:        0,
 		}
 		//创建出库流水
 		CreateStockFlowOne(stockFlow)
@@ -5140,16 +5142,16 @@ func ConsumablesDeliveryThirty(orgID int64, record_time int64, goods *models.War
 	}
 
 	//查询该机构默认仓库
-	storeConfig, _ := GetAllStoreHouseConfig(goods.OrgId)
-	//查询剩余库存
-	goodList, _ := GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, goods.GoodId, goods.OrgId)
-	var sum_count int64
-	var sum_in_count int64
-	for _, item := range goodList {
-		sum_count += item.StockCount
-		sum_in_count += item.WarehousingCount
-	}
-	UpdateGoodByGoodId(goods.GoodId, sum_count, sum_in_count, goods.OrgId)
+	//storeConfig, _ := GetAllStoreHouseConfig(goods.OrgId)
+	////查询剩余库存
+	//goodList, _ := GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, goods.GoodId, goods.OrgId)
+	//var sum_count int64
+	//var sum_in_count int64
+	//for _, item := range goodList {
+	//	sum_count += item.StockCount
+	//	sum_in_count += item.WarehousingCount
+	//}
+	//UpdateGoodByGoodId(goods.GoodId, sum_count, sum_in_count, goods.OrgId)
 	// 出库完成后，要将该批次库存清零
 	warehouse.StockCount = 0
 	warehouse.Mtime = time.Now().Unix()