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

controllers/his_api_controller.go

@@ -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,10 @@ 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 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
+											//}
 
 										}
 
@@ -1125,10 +1125,10 @@ func (c *HisApiController) CreateHisPrescription() {
 												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
-											}
+											//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
+											//}
 										}
 									}
 								}
@@ -1190,10 +1190,12 @@ func (c *HisApiController) CreateHisPrescription() {
 														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
-													}
+													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
+													//}
 												}
 
 											} else {
@@ -1205,11 +1207,12 @@ func (c *HisApiController) CreateHisPrescription() {
 															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
-														}
+														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
+														//}
 													}
 
 												}
@@ -1254,37 +1257,44 @@ 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
+													//}
 
 													// 查询该药品最后一次出库记录
-													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
-														}
-													}
-													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
-													}
+													//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
+													//}
 
 												}
 
@@ -1384,27 +1394,27 @@ 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 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 {
@@ -1412,10 +1422,10 @@ 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 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
+														//}
 													}
 
 												}
@@ -1458,38 +1468,43 @@ func (c *HisApiController) CreateHisPrescription() {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														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
-													}
+													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
-														}
-													}
-
-													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
-													}
+													//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
+													//}
 
 												}
 											}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -562,12 +562,14 @@ func (this *DialysisAPIController) DialysisRecord() {
 
 	prescribeOne, _ = service.MobileGetDialysisPrescribeByModeIdOne(adminInfo.Org.Id, patientID, date.Unix())
 	var his_advices []*models.HisDoctorAdviceInfo
+	fmt.Println("w233232322332233223", is_open_config.IsOpen)
 	if is_open_config.IsOpen == 1 {
 		// 先走redis，没有走数据库
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.Org.Id, patientID, date.Unix())
 	}
 
 	is_advice_open, _ := service.FindAdviceSettingById(adminInfo.Org.Id)
+	fmt.Println("t233232322332233223", is_advice_open.IsAdviceOpen)
 	if is_advice_open.IsAdviceOpen == 1 {
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.Org.Id, patientID, date.Unix())
 	}

service/mobile_dialysis_service.go

@@ -2906,7 +2906,7 @@ func GetAllHisDoctorAdvice(orgid int64, patientid int64, recorddate int64) (his
 	defer redis.Close()
 	key := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patientid, 10) + ":" + strconv.FormatInt(recorddate, 10) + ":his_doctor_advice"
 	his_doctor_advice_str, _ := redis.Get(key).Result()
-
+	redis.Set(key, "", time.Second)
 	if len(his_doctor_advice_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date = ?", patientid, orgid, recorddate).Find(&his).Error
 		if err != nil {

service/patient_service.go

@@ -572,7 +572,7 @@ func FindPatientWithDeviceByNo(orgID int64, no string, time int64) (patient mode
 		return db.Preload("DeviceNumber", "org_id = ?", orgID).
 			Preload("DeviceZone", "org_id = ?", orgID).
 			Where("user_org_id = ? AND schedule_date = ? ", orgID, time)
-	}).Preload("InfectiousDiseases", "status = 1").Where("user_org_id=? and dialysis_no = ? and status=1", orgID, no).First(&patient).Error
+	}).Preload("InfectiousDiseases", "status = 1").Where("user_org_id=? and dialysis_no = ? and status=1 and lapseto =1", orgID, no).First(&patient).Error
 	return
 }