11月8日库存管理

controllers/dialysis_record_api_controller.go

@@ -1347,119 +1347,117 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 
 	err := service.UpdateAssessmentAfterDislysisRecord(&tempassessmentAfterDislysis)
 
-	if adminUserInfo.CurrentOrgId == 10101 || adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10215 || adminUserInfo.CurrentOrgId == 10233 || adminUserInfo.CurrentOrgId == 10223 || adminUserInfo.CurrentOrgId == 10243 || adminUserInfo.CurrentOrgId == 10340 {
-
-		//evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
-		//if evaluation.SystolicBloodPressure == 0 {
-		//	evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
-		//
-		//	pre := models.PredialysisEvaluation{
-		//		SystolicBloodPressure: evaluation.SystolicBloodPressure,
-		//	}
-		//	fmt.Println("prew", pre)
-		//	getNurseErr := service.UpdatePredialysisEvaluation(&pre, evaluation.ID)
-		//	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
-		//	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
-		//
-		//	redis := service.RedisClient()
-		//	redis.Set(key, "", time.Second)
-		//	redis.Set(keyOne, "", time.Second)
-		//	defer redis.Close()
-		//	fmt.Println(getNurseErr)
-		//}
-		//if evaluation.DiastolicBloodPressure == 0 {
-		//	evaluation.DiastolicBloodPressure = fmonitorRecords.DiastolicBloodPressure
-		//	pres := models.PredialysisEvaluation{
-		//		DiastolicBloodPressure: evaluation.DiastolicBloodPressure,
-		//	}
-		//	getNurseErr := service.UpdatePredialysisEvaluationTwo(&pres, evaluation.ID)
-		//	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
-		//
-		//	redis := service.RedisClient()
-		//	redis.Set(key, "", time.Second)
-		//
-		//	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
-		//	redis.Set(keyOne, "", time.Second)
-		//	defer redis.Close()
-		//	fmt.Println(getNurseErr)
-		//}
-		//if evaluation.PulseFrequency == 0 {
-		//	evaluation.PulseFrequency = fmonitorRecords.PulseFrequency
-		//	press := models.PredialysisEvaluation{
-		//		PulseFrequency: evaluation.PulseFrequency,
-		//	}
-		//	getNurseErr := service.UpdatePredialysisEvaluationThree(&press, evaluation.ID)
-		//	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
-		//
-		//	redis := service.RedisClient()
-		//	redis.Set(key, "", time.Second)
-		//	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
-		//	redis.Set(keyOne, "", time.Second)
-		//	defer redis.Close()
-		//	fmt.Println(getNurseErr)
-		//}
-		//
-		//if evaluation.Temperature == 0 {
-		//	evaluation.Temperature = fmonitorRecords.Temperature
-		//	press := models.PredialysisEvaluation{
-		//		Temperature: evaluation.Temperature,
-		//	}
-		//	getNurseErr := service.UpdatePredialysisEvaluationFour(&press, evaluation.ID)
-		//	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
-		//
-		//	redis := service.RedisClient()
-		//	redis.Set(key, "", time.Second)
-		//	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
-		//	redis.Set(keyOne, "", time.Second)
-		//	defer redis.Close()
-		//	fmt.Println(getNurseErr)
-		//}
-		//
-		if err != nil {
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
+	//evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
+	//if evaluation.SystolicBloodPressure == 0 {
+	//	evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
+	//
+	//	pre := models.PredialysisEvaluation{
+	//		SystolicBloodPressure: evaluation.SystolicBloodPressure,
+	//	}
+	//	fmt.Println("prew", pre)
+	//	getNurseErr := service.UpdatePredialysisEvaluation(&pre, evaluation.ID)
+	//	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+	//	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
+	//
+	//	redis := service.RedisClient()
+	//	redis.Set(key, "", time.Second)
+	//	redis.Set(keyOne, "", time.Second)
+	//	defer redis.Close()
+	//	fmt.Println(getNurseErr)
+	//}
+	//if evaluation.DiastolicBloodPressure == 0 {
+	//	evaluation.DiastolicBloodPressure = fmonitorRecords.DiastolicBloodPressure
+	//	pres := models.PredialysisEvaluation{
+	//		DiastolicBloodPressure: evaluation.DiastolicBloodPressure,
+	//	}
+	//	getNurseErr := service.UpdatePredialysisEvaluationTwo(&pres, evaluation.ID)
+	//	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+	//
+	//	redis := service.RedisClient()
+	//	redis.Set(key, "", time.Second)
+	//
+	//	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
+	//	redis.Set(keyOne, "", time.Second)
+	//	defer redis.Close()
+	//	fmt.Println(getNurseErr)
+	//}
+	//if evaluation.PulseFrequency == 0 {
+	//	evaluation.PulseFrequency = fmonitorRecords.PulseFrequency
+	//	press := models.PredialysisEvaluation{
+	//		PulseFrequency: evaluation.PulseFrequency,
+	//	}
+	//	getNurseErr := service.UpdatePredialysisEvaluationThree(&press, evaluation.ID)
+	//	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+	//
+	//	redis := service.RedisClient()
+	//	redis.Set(key, "", time.Second)
+	//	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
+	//	redis.Set(keyOne, "", time.Second)
+	//	defer redis.Close()
+	//	fmt.Println(getNurseErr)
+	//}
+	//
+	//if evaluation.Temperature == 0 {
+	//	evaluation.Temperature = fmonitorRecords.Temperature
+	//	press := models.PredialysisEvaluation{
+	//		Temperature: evaluation.Temperature,
+	//	}
+	//	getNurseErr := service.UpdatePredialysisEvaluationFour(&press, evaluation.ID)
+	//	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+	//
+	//	redis := service.RedisClient()
+	//	redis.Set(key, "", time.Second)
+	//	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
+	//	redis.Set(keyOne, "", time.Second)
+	//	defer redis.Close()
+	//	fmt.Println(getNurseErr)
+	//}
+	//
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
 
-		go func() {
-			ssoDomain := beego.AppConfig.String("call_domain")
-			api := ssoDomain + "/index/downpatient"
-			values := make(url.Values)
-			values.Set("org_id", strconv.FormatInt(adminUserInfo.CurrentOrgId, 10))
-			values.Set("admin_user_id", strconv.FormatInt(nurseID, 10))
-			values.Set("patient_id", strconv.FormatInt(patientID, 10))
-			http.PostForm(api, values)
-		}()
+	go func() {
+		ssoDomain := beego.AppConfig.String("call_domain")
+		api := ssoDomain + "/index/downpatient"
+		values := make(url.Values)
+		values.Set("org_id", strconv.FormatInt(adminUserInfo.CurrentOrgId, 10))
+		values.Set("admin_user_id", strconv.FormatInt(nurseID, 10))
+		values.Set("patient_id", strconv.FormatInt(patientID, 10))
+		http.PostForm(api, values)
+	}()
 
-		//执行下机
-		updateErr := service.ModifyDialysisRecord(dialysisRecord.ID, nurseID, endDate.Unix(), adminUserInfo.AdminUser.Id, puncture_point_haematoma, internal_fistula, catheter, cruor)
-		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_order"
-		redis := service.RedisClient()
-		defer redis.Close()
-		//清空key 值
-		redis.Set(key, "", time.Second)
+	//执行下机
+	updateErr := service.ModifyDialysisRecord(dialysisRecord.ID, nurseID, endDate.Unix(), adminUserInfo.AdminUser.Id, puncture_point_haematoma, internal_fistula, catheter, cruor)
+	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_order"
+	redis := service.RedisClient()
+	defer redis.Close()
+	//清空key 值
+	redis.Set(key, "", time.Second)
 
-		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_orders_list_all"
-		redis.Set(keyOne, "", time.Second)
+	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_orders_list_all"
+	redis.Set(keyOne, "", time.Second)
 
-		if updateErr != nil {
-			this.ErrorLog("下机失败:%v", updateErr)
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		} else {
-			dialysisRecord.Stage = 2
-			dialysisRecord.FinishNurse = nurseID
-			dialysisRecord.FinishCreator = adminUserInfo.AdminUser.Id
-			dialysisRecord.FinishModifier = adminUserInfo.AdminUser.Id
-			dialysisRecord.EndTime = endDate.Unix()
-			// 结束时候透析次数加1
-			service.UpdateSolutionByPatientId(patientID)
+	if updateErr != nil {
+		this.ErrorLog("下机失败:%v", updateErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	} else {
+		dialysisRecord.Stage = 2
+		dialysisRecord.FinishNurse = nurseID
+		dialysisRecord.FinishCreator = adminUserInfo.AdminUser.Id
+		dialysisRecord.FinishModifier = adminUserInfo.AdminUser.Id
+		dialysisRecord.EndTime = endDate.Unix()
+		// 结束时候透析次数加1
+		service.UpdateSolutionByPatientId(patientID)
 
-			this.ServeSuccessJSON(map[string]interface{}{
-				"dialysis_order":          dialysisRecord,
-				"assessmentAfterDislysis": tempassessmentAfterDislysis,
-			})
-		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"dialysis_order":          dialysisRecord,
+			"assessmentAfterDislysis": tempassessmentAfterDislysis,
+		})
 	}
+
 }
 
 func (this *DialysisRecordAPIController) ModifyStartDialysis() {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1160,23 +1160,27 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 					if prescribing_number_total <= total {
 						if medical.IsUse == 2 {
-							service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-							//查询默认仓库
-							houseConfig, _ := service.GetAllStoreHouseConfig(medical.OrgId)
-							//查询默认仓库剩余多少库存
-							list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, medical.OrgId, medical.ID)
-							var sum_count int64
-							var sum_in_count int64
-							for _, it := range list {
-								baseDrug, _ := service.GetBaseDrugMedical(medical.ID)
-								if it.MaxUnit == baseDrug.MaxUnit {
-									it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-									it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+							config, _ := service.GetDrugOpenConfig(adminInfo.Org.Id)
+							if config.IsOpen != 1 {
+								service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+								//查询默认仓库
+								houseConfig, _ := service.GetAllStoreHouseConfig(medical.OrgId)
+								//查询默认仓库剩余多少库存
+								list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, medical.OrgId, medical.ID)
+								var sum_count int64
+								var sum_in_count int64
+								for _, it := range list {
+									baseDrug, _ := service.GetBaseDrugMedical(medical.ID)
+									if it.MaxUnit == baseDrug.MaxUnit {
+										it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+										it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+									}
+									sum_count += it.StockMaxNumber + it.StockMinNumber
+									sum_in_count += it.WarehousingCount
 								}
-								sum_count += it.StockMaxNumber + it.StockMinNumber
-								sum_in_count += it.WarehousingCount
+								service.UpdateMedicalSumCount(medical.ID, sum_count, sum_in_count, medical.OrgId)
 							}
-							service.UpdateMedicalSumCount(medical.ID, sum_count, sum_in_count, medical.OrgId)
+
 						}
 					}
 				}

controllers/patient_api_controller.go

@@ -2124,30 +2124,33 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 				if prescribing_number_total <= total {
 					if medical.IsUse == 2 {
-						service.HisDrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
-
-						//查询默认仓库
-						houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
-						//查询默认仓库剩余多少库存
-						list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-						var sum_count int64
-						var sum_in_count int64
-						for _, it := range list {
-							baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-							if it.MaxUnit == baseDrug.MaxUnit {
-								it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-								it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+						config, _ := service.GetDrugOpenConfig(adminUserInfo.CurrentOrgId)
+						if config.IsOpen != 1 {
+							service.HisDrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
+
+							//查询默认仓库
+							houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+							//查询默认仓库剩余多少库存
+							list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+							var sum_count int64
+							var sum_in_count int64
+							for _, it := range list {
+								baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+								if it.MaxUnit == baseDrug.MaxUnit {
+									it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+									it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+								}
+								sum_count += it.StockMaxNumber + it.StockMinNumber
+								sum_in_count += it.WarehousingCount
 							}
-							sum_count += it.StockMaxNumber + it.StockMinNumber
-							sum_in_count += it.WarehousingCount
+							service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
+							break
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":    "1",
+								"advice": advice,
+							})
+							return
 						}
-						service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
-						break
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg":    "1",
-							"advice": advice,
-						})
-						return
 					}
 
 					if medical.IsUse == 1 {