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

controllers/dialysis_api_controller.go

@@ -62,6 +62,8 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/goodstatistics/get", &DialysisApiController{}, "Get:GetDialysisGoodsStatistics")
 	beego.Router("/api/queue/get", &DialysisApiController{}, "Get:GetQueueCall")
 	beego.Router("/api/queue/update", &DialysisApiController{}, "Get:UpdateQueueCall")
+
+	beego.Router("/api/get/getrolelist", &DialysisApiController{}, "Get:GetRoleList")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -909,7 +911,7 @@ func (c *DialysisApiController) PostDouleCheck() {
 	vascular_access_desc := c.GetString("vascular_access_desc")
 	pipeline_connection_desc := c.GetString("pipeline_connection_desc")
 	collator, _ := c.GetInt64("collator", 0)
-
+	employee_number := c.GetString("employee_number")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -934,6 +936,15 @@ func (c *DialysisApiController) PostDouleCheck() {
 
 	var checkDate int64
 
+	if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10340 {
+		list, _ := service.GetRoleList(adminUserInfo.CurrentOrgId, modifier)
+
+		if employee_number != list.JobNumber {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorEmployeeNumber)
+			return
+		}
+	}
+
 	if len(checkTimeStr) == 0 {
 		//checkTimeStr = time.Now().Format("2006-01-02 15:04")
 		checkDate = 0
@@ -970,6 +981,7 @@ func (c *DialysisApiController) PostDouleCheck() {
 		CreatedTime:                time.Now().Unix(),
 		UpdatedTime:                time.Now().Unix(),
 		CheckDate:                  recordDate.Unix(),
+		EmployeeNumber:             employee_number,
 	}
 
 	_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId)
@@ -982,11 +994,11 @@ func (c *DialysisApiController) PostDouleCheck() {
 		err := service.AddSigleDoubleCheck(&doubleCheck)
 		redis := service.RedisClient()
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":double_check"
-		fmt.Println("key2333223233223232323", key)
+
 		//清空key 值
 		redis.Set(key, "", time.Second)
 		keyTwo := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
-		fmt.Println("keyTwo23332323223233223323232", keyTwo)
+
 		redis.Set(keyTwo, "", time.Second)
 		keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":prescriptions_list_all"
 		redis.Set(keyThree, "", time.Second)
@@ -1010,10 +1022,10 @@ func (c *DialysisApiController) PostDouleCheck() {
 		redis := service.RedisClient()
 		err := service.UpdateDoubleCheck(&doubleCheck)
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":double_check"
-		fmt.Println("key2333223233223232323", key)
+
 		keyTwo := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
 		redis.Set(keyTwo, "", time.Second)
-		fmt.Println("keyTwo23332323223233223323232", keyTwo)
+
 		//清空key 值
 		redis.Set(key, "", time.Second)
 		keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":prescriptions_list_all"
@@ -3844,3 +3856,20 @@ func (c *DialysisApiController) GetDialysisGoodsStatistics() {
 	}
 
 }
+
+func (c *DialysisApiController) GetRoleList() {
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	list, err := service.GetRoleList(orgId, admin_user_id)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"adminRole": list,
+		})
+		return
+
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}

controllers/dialysis_record_api_controller.go

@@ -1015,7 +1015,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 			if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 				totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-				fmt.Println("total23232323232322332", totalMin)
+				//fmt.Println("total23232323232322332", totalMin)
 				if (template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 36) && adminUserInfo.CurrentOrgId != 9671 {
 					ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				}
@@ -1046,7 +1046,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 
 					if evaluation.ID > 0 {
 						ultrafiltration_rate = math.Ceil(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
-						fmt.Println("ultrafiltration_rate", ultrafiltration_rate)
+
 					}
 				}
 
@@ -1055,7 +1055,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 
 					if evaluation.ID > 0 {
 						ultrafiltration_rate = math.Ceil(prescription.TargetUltrafiltration / float64(totalMin) * 60)
-						fmt.Println("hhhh2323323223322323323232", ultrafiltration_rate)
+
 					}
 				}
 			}
@@ -1138,6 +1138,10 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 	nurseID, _ := this.GetInt64("nurse")
 	end_time := this.GetString("end_time")
 
+	puncture_point_haematoma, _ := this.GetInt64("puncture_point_haematoma")
+	internal_fistula := this.GetString("internal_fistula")
+	catheter := this.GetString("catheter")
+	cruor := this.GetString("cruor")
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1343,6 +1347,72 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 
 	err := service.UpdateAssessmentAfterDislysisRecord(&tempassessmentAfterDislysis)
 
+	//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
@@ -1358,7 +1428,8 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 		http.PostForm(api, values)
 	}()
 
-	updateErr := service.ModifyDialysisRecord(dialysisRecord.ID, nurseID, endDate.Unix(), adminUserInfo.AdminUser.Id)
+	//执行下机
+	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()
@@ -1386,6 +1457,7 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 			"assessmentAfterDislysis": tempassessmentAfterDislysis,
 		})
 	}
+
 }
 
 func (this *DialysisRecordAPIController) ModifyStartDialysis() {
@@ -1619,7 +1691,10 @@ func (c *DialysisRecordAPIController) ModifyFinishDialysis() {
 	record_id, _ := c.GetInt64("id")
 	nurseID, _ := c.GetInt64("nurse")
 	end_time := c.GetString("end_time")
-
+	puncture_point_haematoma, _ := c.GetInt64("puncture_point_haematoma")
+	internal_fistula := c.GetString("internal_fistula")
+	catheter := c.GetString("catheter")
+	cruor := c.GetString("cruor")
 	if record_id <= 0 || nurseID <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1657,11 +1732,15 @@ func (c *DialysisRecordAPIController) ModifyFinishDialysis() {
 	//}
 
 	dialysisRecord := &models.DialysisOrder{
-		ID:             record_id,
-		UserOrgId:      adminUserInfo.CurrentOrgId,
-		EndTime:        endDate.Unix(),
-		FinishNurse:    nurseID,
-		FinishModifier: adminUserInfo.AdminUser.Id,
+		ID:                         record_id,
+		UserOrgId:                  adminUserInfo.CurrentOrgId,
+		EndTime:                    endDate.Unix(),
+		FinishNurse:                nurseID,
+		FinishModifier:             adminUserInfo.AdminUser.Id,
+		PuncturePointHaematoma:     puncture_point_haematoma,
+		BloodAccessInternalFistula: internal_fistula,
+		Catheter:                   catheter,
+		Cruor:                      cruor,
 	}
 
 	updateErr := service.ModifyFinishDialysisOrder(dialysisRecord)

controllers/drug_pharmacy_management_controller.go

@@ -2,10 +2,14 @@ package controllers
 
 import (
 	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
 	"fmt"
 	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
+	"math"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -16,9 +20,23 @@ type PharmacyApiController struct {
 
 func PharmacyApiControllersRegisterRouters() {
 
+	//获取设置为药房发药的药品数据
 	beego.Router("/api/advice/gettodayadvicelist", &PharmacyApiController{}, "Get:GetTodayAdviceList")
+	//获取今日未发药的数据
 	beego.Router("api/advice/getpharmacybasedrug", &PharmacyApiController{}, "Get:GetPharyMacyBaseDrug")
+	//发药
 	beego.Router("/api/advice/updatepharmacybasedrug", &PharmacyApiController{}, "Get:UpdatePharmacyBaseDrug")
+
+	//获取今日已发药的数据
+	beego.Router("/api/advice/getpharmacybasedruglist", &PharmacyApiController{}, "Get:GetPharmacyBaseDrugList")
+	//退药流程
+	beego.Router("/api/advice/getreturnpharmacybasedrug", &PharmacyApiController{}, "Get:GetReturnPharmacyBaseDrug")
+
+	//设置
+	beego.Router("/api/advice/savesetting", &PharmacyApiController{}, "Get:SaveSetting")
+
+	beego.Router("/api/advice/getpharmacyconfig", &PharmacyApiController{}, "Get:GetPharmacyConfig")
+
 }
 
 func (this *PharmacyApiController) GetTodayAdviceList() {
@@ -30,9 +48,12 @@ func (this *PharmacyApiController) GetTodayAdviceList() {
 	//获取药房发药药品库数据
 	houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
 	list, err := service.GetPharmacyDrugList(houseConfig.DrugStorehouseOut, orgId, keywords)
+	appId := this.GetAdminUserInfo().CurrentAppId
+	doctorlist, _ := service.GetAllDoctorSix(orgId, appId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list": list,
+			"list":       list,
+			"doctorlist": doctorlist,
 		})
 	} else {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -80,6 +101,7 @@ func (this *PharmacyApiController) UpdatePharmacyBaseDrug() {
 
 	hisStr := this.GetString("hisStr")
 
+	admin_user_id, _ := this.GetInt64("admin_user_id")
 	if len(bloodStr) == 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -105,139 +127,387 @@ func (this *PharmacyApiController) UpdatePharmacyBaseDrug() {
 	adviceList, _ := service.GetPharmacyAdviceList(idArray, orgId)
 
 	hisAdviceList, _ := service.GetPharmacyHisAdviceList(idArray, orgId)
-	fmt.Print(hisAdviceList)
+
 	//查询是否通过药房出库
 	pharmacyConfig, _ := service.FindPharmacyConfig(orgId)
-
-	medical, _ := service.GetBaseDrugMedical(orgId)
-	fmt.Print(medical)
 	if pharmacyConfig.IsOpen == 1 {
+		var total int64
+		var prescribing_number_total int64
+		//创建流水
+		timeStr := time.Now().Format("2006-01-02")
+		timeArr := strings.Split(timeStr, "-")
+		totals, _ := service.FindAllPharmacyDrugWarehouseOut(orgId)
+		totals = totals + 1
+		warehousing_out_order := strconv.FormatInt(orgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+		number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+		number = number + totals
+		warehousing_out_order = "FY" + strconv.FormatInt(number, 10)
 
+		//血透
 		for _, item := range adviceList {
-			fmt.Print(item)
-			//houseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
+
+			pharmacy := models.Pharmacy{
+				UserOrgId:      item.UserOrgId,
+				PatientId:      item.PatientId,
+				PrescriptionId: 0,
+				XtAdviceId:     item.ID,
+				HisOrXt:        1,
+				Ctime:          time.Now().Unix(),
+				Mtime:          0,
+				Status:         1,
+				HisAdviceId:    0,
+				DrugId:         item.DrugId,
+				RecordDate:     item.AdviceDate,
+				OrdreNumber:    warehousing_out_order,
+				Creater:        admin_user_id,
+			}
+
+			service.CreatePharmacy(pharmacy)
+
+			lastPharmacy, _ := service.GetLastPharmary(item.UserOrgId, item.ID, item.AdviceDate)
+
+			houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
 			////查询该药品是否有库存
-			//list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
+			list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
 			//
 			////查询改药品信息
-			//medical, _ := service.GetBaseDrugMedical(item.DrugId)
+			medical, _ := service.GetBaseDrugMedical(item.DrugId)
 			////判断单位是否相等
-			//if medical.MaxUnit == item.PrescribingNumberUnit {
-			//  prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-			//  count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-			//  //转化为最小单位
-			//  total = list.Count*medical.MinNumber + list.StockMinNumber
-			//  prescribing_number_total = count * medical.MinNumber
-			//}
-			//if medical.MinUnit == item.PrescribingNumberUnit {
-			//  prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-			//  count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-			//  total = list.Count*medical.MinNumber + list.StockMinNumber
-			//  prescribing_number_total = count
-			//}
-			//
-			//if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
-			//  c.ServeSuccessJSON(map[string]interface{}{
-			//    "msg":    "3",
-			//    "advice": advice,
-			//  })
-			//  return
-			//}
-			//if prescribing_number_total > total {
-			//  c.ServeSuccessJSON(map[string]interface{}{
-			//    "msg":    "2",
-			//    "advice": advice,
-			//  })
-			//  return
-			//}
-			//if prescribing_number_total <= total {
-			//
-			//  //查询是否门诊处方和临时医嘱同步到透析医嘱的开关是否开启
-			//
-			//  adviceSetting, _ := service.FindAdviceSettingById(item.UserOrgId)
-			//  if adviceSetting.IsAdviceOpen == 1 {
-			//
-			//    //查询是否出库按钮开启
-			//    prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
-			//    if prescriptionConfig.IsOpen == 1 {
-			//      if medical.IsUse == 2 {
-			//        service.DrugsDelivery(item.UserOrgId, 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
-			//        }
-			//        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 {
-			//        c.ServeSuccessJSON(map[string]interface{}{
-			//          "msg":    "1",
-			//          "advice": advice,
-			//        })
-			//        return
-			//      }
-			//    } else {
-			//      if medical.IsUse == 1 {
-			//        c.ServeSuccessJSON(map[string]interface{}{
-			//          "msg":    "1",
-			//          "advice": advice,
-			//        })
-			//        return
-			//      }
-			//    }
+			if medical.MaxUnit == item.PrescribingNumberUnit {
+				prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+				count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+				//转化为最小单位
+				total = list.Count*medical.MinNumber + list.StockMinNumber
+				prescribing_number_total = count * medical.MinNumber
+			}
+			if medical.MinUnit == item.PrescribingNumberUnit {
+				prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+				count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+				total = list.Count*medical.MinNumber + list.StockMinNumber
+				prescribing_number_total = count
+			}
+
+			if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+				this.ServeSuccessJSON(map[string]interface{}{
+					"msg":     "3",
+					"medical": medical,
+				})
+				return
+			}
+			if prescribing_number_total > total {
+				this.ServeSuccessJSON(map[string]interface{}{
+					"msg":     "2",
+					"medical": medical,
+				})
+				return
+			}
+
+			if prescribing_number_total <= total {
+
+				//查询是否门诊处方和临时医嘱同步到透析医嘱的开关是否开启
+				adviceSetting, _ := service.FindAdviceSettingById(item.UserOrgId)
+				if adviceSetting.IsAdviceOpen == 1 {
+					if medical.IsUse == 2 {
+						service.PharmacyDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item, lastPharmacy.ID)
+						//查询默认仓库
+						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
+						}
+						service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
+						break
+						this.ServeSuccessJSON(map[string]interface{}{
+							"msg":     "1",
+							"medical": medical,
+						})
+						return
+					}
+					if medical.IsUse == 1 {
+						this.ServeSuccessJSON(map[string]interface{}{
+							"msg": "1",
+						})
+						return
+					}
+
+				} else {
+					if medical.IsUse == 2 {
+						service.PharmacyDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item, lastPharmacy.ID)
+						//查询默认仓库
+						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
+						}
+						service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
+						this.ServeSuccessJSON(map[string]interface{}{
+							"msg":     "1",
+							"medical": medical,
+						})
+						return
+					}
+					if medical.IsUse == 1 {
+						this.ServeSuccessJSON(map[string]interface{}{
+							"msg":     "1",
+							"medical": medical,
+						})
+						return
+					}
+				}
+			}
+		}
+
+		//血透
+		for _, item := range hisAdviceList {
+
+			pharmacy := models.Pharmacy{
+				UserOrgId:      item.UserOrgId,
+				PatientId:      item.PatientId,
+				PrescriptionId: 0,
+				XtAdviceId:     0,
+				HisOrXt:        2,
+				Ctime:          time.Now().Unix(),
+				Mtime:          0,
+				Status:         1,
+				HisAdviceId:    item.ID,
+				DrugId:         item.DrugId,
+				RecordDate:     item.AdviceDate,
+				OrdreNumber:    warehousing_out_order,
+				Creater:        admin_user_id,
+			}
+
+			service.CreatePharmacy(pharmacy)
+
+			lastPharmary, _ := service.GetLastHisPharmary(item.UserOrgId, item.ID, item.AdviceDate)
+
+			houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+			////查询该药品是否有库存
+			list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
 			//
-			//  } else {
-			//    if medical.IsUse == 2 {
-			//      service.DrugsDelivery(item.UserOrgId, 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
-			//      }
-			//      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 {
-			//      c.ServeSuccessJSON(map[string]interface{}{
-			//        "msg":    "1",
-			//        "advice": advice,
-			//      })
-			//      return
-			//    }
-			//  }
-			//}
+			////查询改药品信息
+			medical, _ := service.GetBaseDrugMedical(item.DrugId)
+			////判断单位是否相等
+			if medical.MaxUnit == item.PrescribingNumberUnit {
+				prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+				count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+				//转化为最小单位
+				total = list.Count*medical.MinNumber + list.StockMinNumber
+				prescribing_number_total = count * medical.MinNumber
+			}
+			if medical.MinUnit == item.PrescribingNumberUnit {
+				prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+				count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+				total = list.Count*medical.MinNumber + list.StockMinNumber
+				prescribing_number_total = count
+			}
+
+			if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+				this.ServeSuccessJSON(map[string]interface{}{
+					"msg":     "3",
+					"medical": medical,
+				})
+				return
+			}
+			if prescribing_number_total > total {
+				this.ServeSuccessJSON(map[string]interface{}{
+					"msg":     "2",
+					"medical": medical,
+				})
+				return
+			}
+
+			if prescribing_number_total <= total {
+
+				//查询是否门诊处方和临时医嘱同步到透析医嘱的开关是否开启
+				adviceSetting, _ := service.FindAdviceSettingById(item.UserOrgId)
+				if adviceSetting.IsAdviceOpen == 1 {
+					if medical.IsUse == 2 {
+						service.PharmacyHisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item, lastPharmary.ID)
+						//查询默认仓库
+						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
+						}
+						service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
+						break
+						this.ServeSuccessJSON(map[string]interface{}{
+							"msg":     "1",
+							"medical": medical,
+						})
+						return
+					}
+					if medical.IsUse == 1 {
+						this.ServeSuccessJSON(map[string]interface{}{
+							"msg": "1",
+						})
+						return
+					}
+
+				} else {
+					if medical.IsUse == 2 {
+						service.PharmacyHisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item, lastPharmary.ID)
+						//查询默认仓库
+						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
+						}
+						service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
+						this.ServeSuccessJSON(map[string]interface{}{
+							"msg":     "1",
+							"medical": medical,
+						})
+						return
+					}
+					if medical.IsUse == 1 {
+						this.ServeSuccessJSON(map[string]interface{}{
+							"msg":     "1",
+							"medical": medical,
+						})
+						return
+					}
+				}
+			}
 		}
 	}
+}
+
+func (this *PharmacyApiController) GetPharmacyBaseDrugList() {
+
+	start_time := this.GetString("start_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var theStartTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theStartTime = theTime.Unix()
+	}
+
+	drug_id, _ := this.GetInt64("drug_id")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	//获取血透医嘱
+	advicelist, _ := service.GetUseredBloodAdviceList(theStartTime, drug_id, orgId)
+
+	//获取医保医嘱
+	hisAdviceList, err := service.GetUseredHisAdviceList(theStartTime, drug_id, orgId)
+
+	patient, _ := service.GetAllPatientListSix(orgId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"advicelist":    advicelist,
+			"hisAdviceList": hisAdviceList,
+			"patient":       patient,
+		})
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (this *PharmacyApiController) GetReturnPharmacyBaseDrug() {
+
+	bloodStr := this.GetString("bloodStr")
+
+	hisStr := this.GetString("hisStr")
+
+	if len(bloodStr) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	idArray := strings.Split(bloodStr, ",")
+
+	if len(hisStr) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
 
+	idArrayOne := strings.Split(hisStr, ",")
+
+	fmt.Println("idArray23332233223", idArray)
+	fmt.Println("idArrayOne23332233223", idArrayOne)
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	service.UpdateReturnPharmacyAdviceBaseDrug(idArray, orgId)
+	service.UpdateReturnPharmacyHisAdviceBaseDrug(idArray, orgId)
+}
+
+func (this *PharmacyApiController) SaveSetting() {
+
+	is_open, _ := this.GetInt64("is_open")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	config := models.PharmacyConfig{
+		UserOrgId: orgId,
+		IsOpen:    is_open,
+		Status:    1,
+		Ctime:     time.Now().Unix(),
+	}
+
+	//查找是否存在
+	_, errcode := service.GetConfigSettingIsExsit(orgId)
+	if errcode == gorm.ErrRecordNotFound {
+		service.CreatePharmacyConfig(&config)
+	} else if errcode == nil {
+		service.UpdatePharmacyConfig(orgId, &config)
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"config": config,
+	})
+}
+
+func (this *PharmacyApiController) GetPharmacyConfig() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	config, err := service.GetPharmacyConfig(orgId)
+
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"config": config,
+		})
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
 }

controllers/drug_stock_api_contorller.go

@@ -71,6 +71,8 @@ func DrugStockManagerApiRegistRouters() {
 	beego.Router("/api/drug/getdrugwarehouseinfoprint", &StockDrugApiController{}, "get:GetDrugWarehouseInfoPrint")
 	beego.Router("/api/drug/getdrugoutorderprint", &StockDrugApiController{}, "get:GetDrugOutOrderPrint")
 
+	beego.Router("/api/drugstock/config/list", &StockDrugApiController{}, "get:GetConfigList")
+
 }
 
 func (c *StockDrugApiController) CreateDrugWarehouse() {
@@ -986,7 +988,10 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						fmt.Println(parseDateErr)
 					}
 				}
-				errs = service.UpDateDrugWarehousingInfoSix(item.ID, warehouseinfo)
+				if item.MaxUnit == warehouseInfo.MaxUnit {
+					errs = service.UpDateDrugWarehousingInfoSix(item.ID, warehouseinfo)
+				}
+
 				//查询默认仓库
 				houseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 				//查询默认仓库剩余多少库存
@@ -2281,7 +2286,8 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 
 				if item.CountUnit == medical.MaxUnit {
 					maxNumber = cha_number / medical.MinNumber
-					parseDateErr := service.UpdateWarehouseInfo(maxNumber, item.DrugId, item.OrgId)
+
+					parseDateErr := service.UpdateWarehouseInfo(maxNumber, item.DrugId, item.OrgId, outInfo.WarehouseInfoId)
 
 					if parseDateErr != nil {
 						utils.ErrorLog(errs.Error())
@@ -2302,7 +2308,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 					if minNumber < 0 {
 						minNumber = 0
 					}
-					parseDateErr = service.UpdateWarehouseInfoOne(minNumber, item.DrugId, item.OrgId)
+					parseDateErr = service.UpdateWarehouseInfoOne(minNumber, item.DrugId, item.OrgId, outInfo.WarehouseInfoId)
 
 					if parseDateErr != nil {
 						utils.ErrorLog(errs.Error())
@@ -2321,7 +2327,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 					})
 				}
 				if item.CountUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
-					parseDateErr := service.UpdateWarehouseInfoOne(cha_number, item.DrugId, item.OrgId)
+					parseDateErr := service.UpdateWarehouseInfoOne(cha_number, item.DrugId, item.OrgId, outInfo.WarehouseInfoId)
 
 					if parseDateErr != nil {
 						utils.ErrorLog(errs.Error())
@@ -2361,68 +2367,83 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						AdminUserId:  item.AdminUserId,
 					}
 					service.UpdateDrugFlowSix(item.WarehouseOutId, item.DrugId, item.WarehouseOutOrderNumber, flow)
-					if item.CountUnit == medical.MaxUnit {
-						maxNumber = cha_number / medical.MinNumber
-
-						parseDateErr := service.UpdateWarehouseInfoTwo(maxNumber, item.DrugId, item.OrgId)
-
-						fmt.Println("parseDateErr", parseDateErr)
-						if parseDateErr != nil {
-							utils.ErrorLog(errs.Error())
-							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
-							return
-						}
-
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg":        "2",
-							"drug_name":  "",
-							"dose":       "",
-							"dose_unit":  "",
-							"min_number": "",
-							"min_unit":   "",
-							"max_unit":   "",
-						})
-						minNumber = cha_number % medical.MinNumber
-						if minNumber < 0 {
-							minNumber = 0
-						}
-						parseDateErr = service.UpdateWarehouseInfoFour(minNumber, item.DrugId, item.OrgId)
 
-						if parseDateErr != nil {
-							utils.ErrorLog(errs.Error())
-							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
-							return
-						}
-
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg":        "2",
-							"drug_name":  "",
-							"dose":       "",
-							"dose_unit":  "",
-							"min_number": "",
-							"min_unit":   "",
-							"max_unit":   "",
-						})
-					}
-					if item.CountUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
-						parseDateErr := service.UpdateWarehouseInfoFour(cha_number, item.DrugId, item.OrgId)
-
-						if parseDateErr != nil {
-							utils.ErrorLog(errs.Error())
-							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
-							return
-						}
-
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg":        "2",
-							"drug_name":  "",
-							"dose":       "",
-							"dose_unit":  "",
-							"min_number": "",
-							"min_unit":   "",
-							"max_unit":   "",
-						})
-					}
+					service.UpdateWarehouseInfoTwentyFive(cha_number, item.DrugId, item.OrgId, storehouse_id, &medical)
+
+					//if item.CountUnit == medical.MaxUnit {
+					//	maxNumber = cha_number / medical.MinNumber
+					//
+					//  service.UpdateWarehouseInfoTwentyFive(maxNumber,item.DrugId,item.OrgId,storehouse_id)
+					//
+					//  ////如果库存大于差
+					//  //if(warehouse.StockMaxNumber > maxNumber){
+					//  // service.UpdateWarehouseInfoTwenty(maxNumber,warehouse.ID)
+					//  //}
+					//  ////如果库存小于差
+					//  //if(warehouse.StockMaxNumber < maxNumber){
+					//  //
+					//  //   //先出库完上一个批次的
+					//  //  service.UpdateWarehouseInfoTwentyOne(warehouse.ID)
+					//  //}
+					//
+					//	parseDateErr := service.UpdateWarehouseInfoTwo(maxNumber, item.DrugId, item.OrgId)
+					//	fmt.Println("parseDateErr", parseDateErr)
+					//	if parseDateErr != nil {
+					//		utils.ErrorLog(errs.Error())
+					//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+					//		return
+					//	}
+					//
+					//	c.ServeSuccessJSON(map[string]interface{}{
+					//		"msg":        "2",
+					//		"drug_name":  "",
+					//		"dose":       "",
+					//		"dose_unit":  "",
+					//		"min_number": "",
+					//		"min_unit":   "",
+					//		"max_unit":   "",
+					//	})
+					//	minNumber = cha_number % medical.MinNumber
+					//	if minNumber < 0 {
+					//		minNumber = 0
+					//	}
+					//	parseDateErr = service.UpdateWarehouseInfoFour(minNumber, item.DrugId, item.OrgId)
+					//
+					//	if parseDateErr != nil {
+					//		utils.ErrorLog(errs.Error())
+					//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+					//		return
+					//	}
+					//
+					//	c.ServeSuccessJSON(map[string]interface{}{
+					//		"msg":        "2",
+					//		"drug_name":  "",
+					//		"dose":       "",
+					//		"dose_unit":  "",
+					//		"min_number": "",
+					//		"min_unit":   "",
+					//		"max_unit":   "",
+					//	})
+					//}
+					//if item.CountUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+					//	parseDateErr := service.UpdateWarehouseInfoFour(cha_number, item.DrugId, item.OrgId)
+					//
+					//	if parseDateErr != nil {
+					//		utils.ErrorLog(errs.Error())
+					//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+					//		return
+					//	}
+					//
+					//	c.ServeSuccessJSON(map[string]interface{}{
+					//		"msg":        "2",
+					//		"drug_name":  "",
+					//		"dose":       "",
+					//		"dose_unit":  "",
+					//		"min_number": "",
+					//		"min_unit":   "",
+					//		"max_unit":   "",
+					//	})
+					//}
 				}
 
 				if all_number == cha_number {
@@ -3854,8 +3875,7 @@ func (c *StockDrugApiController) GetDrugOutOrderPrint() {
 	adminUserInfo := c.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	if order_type == 2 {
-		//list, err := service.GetDrugOutOrderInfoPrintList(startTime, endTime, orgId)
-		list, err := service.GetDrugOutOrderPrintList(startTime, endTime, orgId)
+		list, err := service.GetDrugOutOrderInfoPrintList(startTime, endTime, orgId)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"list": list,
@@ -3865,3 +3885,22 @@ func (c *StockDrugApiController) GetDrugOutOrderPrint() {
 	}
 
 }
+
+func (c *StockDrugApiController) GetConfigList() {
+	adminUserInfo := c.GetAdminUserInfo()
+	manufacturer, _ := service.FindAllManufacturer(adminUserInfo.CurrentOrgId)
+	dealer, _ := service.FindAllDealer(adminUserInfo.CurrentOrgId)
+	stockIns, _ := service.FindStockInNumber(adminUserInfo.CurrentOrgId)
+	list, _ := service.GetAllStoreHouseListThree(adminUserInfo.CurrentOrgId)
+	configlist, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
+	appId := c.GetAdminUserInfo().CurrentAppId
+	doctorList, _ := service.GetAllDoctorListSix(adminUserInfo.CurrentOrgId, appId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"manufacturer": manufacturer,
+		"dealer":       dealer,
+		"numbers":      stockIns,
+		"list":         list,
+		"configlist":   configlist,
+		"doctorList":   doctorList,
+	})
+}

controllers/gobal_config_api_controller.go

@@ -118,6 +118,8 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/changeadviceconfig", &GobalConfigApiController{}, "Get:ChangeAdviceConfig")
 
 	beego.Router("/api/changeprescriptionconfig", &GobalConfigApiController{}, "Get:ChangePrescriptionConfig")
+
+	beego.Router("/api/changedrugopenconfig", &GobalConfigApiController{}, "Get:ChangeDrugOpenConfig")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -1567,12 +1569,15 @@ func (c *GobalConfigApiController) GetAllIsOpenConfig() {
 	adviceSetting, _ := service.FindAdviceSettingById(adminUserInfo.CurrentOrgId)
 
 	prescriptionConfig, _ := service.FindPrescriptionConfigById(adminUserInfo.CurrentOrgId)
+
+	drugOutConfig, _ := service.FindDrugOutConfigById(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"is_open_xt_his":         config.IsOpen,
 		"is_open_xt_his_project": project_config.IsOpen,
 		"is_open_stock":          stockSetting.IsType,
 		"is_open_advice":         adviceSetting.IsAdviceOpen,
 		"is_prescription_advice": prescriptionConfig.IsOpen,
+		"is_open":                drugOutConfig.IsOpen,
 	})
 
 }
@@ -2239,11 +2244,13 @@ func (c *GobalConfigApiController) GetDrugOutOrderPrint() {
 
 	warehousing, _ := service.GetExportOutOrderDrugListOne(ids)
 
-	//drug_warhouse_out, _ := service.GetDrugWarehouseOut(ids)
+	drug_warhouse_out, _ := service.GetDrugWarehouseOutTenty(ids, admin.CurrentOrgId)
+
 	c.ServeSuccessJSON(map[string]interface{}{
-		"info":             info,
-		"warehousing":      warehousing,
-		"manufacturerList": manufacturerList,
+		"info":              info,
+		"warehousing":       warehousing,
+		"manufacturerList":  manufacturerList,
+		"drug_warhouse_out": drug_warhouse_out,
 	})
 }
 
@@ -2435,3 +2442,27 @@ func (c *GobalConfigApiController) ChangePrescriptionConfig() {
 	}
 
 }
+
+func (c *GobalConfigApiController) ChangeDrugOpenConfig() {
+
+	drug_out_open, _ := c.GetInt64("drug_out_open")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	_, errcode := service.GetDrugOpenConfig(orgId)
+	if errcode == gorm.ErrRecordNotFound {
+		config := models.DrugOutConfig{
+			UserOrgId: orgId,
+			IsOpen:    drug_out_open,
+			Status:    1,
+			Ctime:     time.Now().Unix(),
+		}
+		service.CreateDrugOutConfig(config)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": 1,
+		})
+	} else if errcode == nil {
+		service.UpdateDrugOutConfig(orgId, drug_out_open)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": 1,
+		})
+	}
+}

controllers/his_api_controller.go

@@ -832,46 +832,90 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 	advices, _ := service.FindAllHisAdviceTemplate(adminInfo.CurrentOrgId)
 
 	houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
-	//获取所有基础药
-	drugs, _ := service.GetAllDrugLibListSix(adminInfo.CurrentOrgId, houseConfig.DrugStorehouseOut)
-
-	_, config := service.FindHisStockPriceRecordByOrgId(adminInfo.CurrentOrgId)
-	if config.ID > 0 && config.IsOpen == 1 {
-		for _, item := range drugs {
-			var index = 0
-			for _, subItem := range item.OtherDrugWarehouseInfo {
-				if index == 0 {
-					index = index + 1
-					if subItem.RetailPrice > 0 {
-						item.MinPrice = subItem.RetailPrice
+	if adminInfo.CurrentOrgId == 9675 || adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10215 {
+		//获取所有基础药
+		drugs, _ := service.GetAllDrugLibListSeven(adminInfo.CurrentOrgId, houseConfig.DrugStorehouseOut)
+		_, config := service.FindHisStockPriceRecordByOrgId(adminInfo.CurrentOrgId)
+		if config.ID > 0 && config.IsOpen == 1 {
+			for _, item := range drugs {
+				var index = 0
+				for _, subItem := range item.OtherDrugWarehouseInfo {
+					if index == 0 {
+						index = index + 1
+						if subItem.RetailPrice > 0 {
+							item.MinPrice = subItem.RetailPrice
+						}
 					}
 				}
 			}
 		}
+
+		manufacturers, _ := service.GetAllManufacturerList(adminInfo.CurrentOrgId)
+		drugways, _, _ := service.GetDrugWayDics(adminInfo.CurrentOrgId)
+		efs, _, _ := service.GetExecutionFrequencyDics(adminInfo.CurrentOrgId)
+		doctors, _ := service.GetHisAdminUserDoctors(adminInfo.CurrentOrgId)
+		//获取所有科室信息
+		department, _ := service.GetAllDepartMent(adminInfo.CurrentOrgId)
+		//获取诊断信息
+		sick, _ := service.FindAllSick(adminInfo.CurrentOrgId)
+		diagnose, _ := service.FindAllDiagnose(adminInfo.CurrentOrgId)
+		additions, _ := service.FindAllAddition(adminInfo.CurrentOrgId)
+
+		c.ServeSuccessJSON(map[string]interface{}{
+			"drugs":            drugs,
+			"advices_template": advices,
+			"drugways":         drugways,
+			"efs":              efs,
+			"doctors":          doctors,
+			"department":       department,
+			"sick":             sick,
+			"additions":        additions,
+			"diagnose":         diagnose,
+			"manufacturers":    manufacturers,
+		})
 	}
-	manufacturers, _ := service.GetAllManufacturerList(adminInfo.CurrentOrgId)
-	drugways, _, _ := service.GetDrugWayDics(adminInfo.CurrentOrgId)
-	efs, _, _ := service.GetExecutionFrequencyDics(adminInfo.CurrentOrgId)
-	doctors, _ := service.GetHisAdminUserDoctors(adminInfo.CurrentOrgId)
-	//获取所有科室信息
-	department, _ := service.GetAllDepartMent(adminInfo.CurrentOrgId)
-	//获取诊断信息
-	sick, _ := service.FindAllSick(adminInfo.CurrentOrgId)
-	diagnose, _ := service.FindAllDiagnose(adminInfo.CurrentOrgId)
-	additions, _ := service.FindAllAddition(adminInfo.CurrentOrgId)
+	if adminInfo.CurrentOrgId != 9675 && adminInfo.CurrentOrgId != 9671 && adminInfo.CurrentOrgId != 10215 {
+		//获取所有基础药
+		drugs, _ := service.GetAllDrugLibListSix(adminInfo.CurrentOrgId, houseConfig.DrugStorehouseOut)
+		_, config := service.FindHisStockPriceRecordByOrgId(adminInfo.CurrentOrgId)
+		if config.ID > 0 && config.IsOpen == 1 {
+			for _, item := range drugs {
+				var index = 0
+				for _, subItem := range item.OtherDrugWarehouseInfo {
+					if index == 0 {
+						index = index + 1
+						if subItem.RetailPrice > 0 {
+							item.MinPrice = subItem.RetailPrice
+						}
+					}
+				}
+			}
+		}
 
-	c.ServeSuccessJSON(map[string]interface{}{
-		"drugs":            drugs,
-		"advices_template": advices,
-		"drugways":         drugways,
-		"efs":              efs,
-		"doctors":          doctors,
-		"department":       department,
-		"sick":             sick,
-		"additions":        additions,
-		"diagnose":         diagnose,
-		"manufacturers":    manufacturers,
-	})
+		manufacturers, _ := service.GetAllManufacturerList(adminInfo.CurrentOrgId)
+		drugways, _, _ := service.GetDrugWayDics(adminInfo.CurrentOrgId)
+		efs, _, _ := service.GetExecutionFrequencyDics(adminInfo.CurrentOrgId)
+		doctors, _ := service.GetHisAdminUserDoctors(adminInfo.CurrentOrgId)
+		//获取所有科室信息
+		department, _ := service.GetAllDepartMent(adminInfo.CurrentOrgId)
+		//获取诊断信息
+		sick, _ := service.FindAllSick(adminInfo.CurrentOrgId)
+		diagnose, _ := service.FindAllDiagnose(adminInfo.CurrentOrgId)
+		additions, _ := service.FindAllAddition(adminInfo.CurrentOrgId)
+
+		c.ServeSuccessJSON(map[string]interface{}{
+			"drugs":            drugs,
+			"advices_template": advices,
+			"drugways":         drugways,
+			"efs":              efs,
+			"doctors":          doctors,
+			"department":       department,
+			"sick":             sick,
+			"additions":        additions,
+			"diagnose":         diagnose,
+			"manufacturers":    manufacturers,
+		})
+	}
 }
 
 func (c *HisApiController) CreateHisPrescription() {

controllers/his_project_api_controller.go

@@ -827,28 +827,55 @@ func (this *HisProjectApiController) DeleteProject() {
 func (this *HisProjectApiController) GetHisProject() {
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
-	project, err := service.GetHisProject(orgId)
+
 	houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
-	good_info, err := service.GetGoodInfoMationSix(orgId, houseConfig.StorehouseOutInfo)
-	_, config := service.FindHisStockPriceRecordByOrgId(orgId)
-	if config.ID > 0 && config.IsOpen == 1 {
-		//处理耗材不同批号价格问题
-		for _, item := range good_info {
-			if len(item.GoodSotckInfo) > 0 {
-				if item.GoodSotckInfo[0].Price > 0 {
-					item.PackingPrice = item.GoodSotckInfo[0].Price
+	if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10215 {
+		project, err := service.GetHisProject(orgId)
+		good_info, err := service.GetGoodInfoMationSeven(orgId, houseConfig.StorehouseOutInfo)
+		_, config := service.FindHisStockPriceRecordByOrgId(orgId)
+		if config.ID > 0 && config.IsOpen == 1 {
+			//处理耗材不同批号价格问题
+			for _, item := range good_info {
+				if len(item.GoodSotckInfo) > 0 {
+					if item.GoodSotckInfo[0].Price > 0 {
+						item.PackingPrice = item.GoodSotckInfo[0].Price
+					}
 				}
 			}
 		}
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"project":   project,
+			"good_info": good_info,
+		})
 	}
-	if err != nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
-		return
+
+	if adminUserInfo.CurrentOrgId != 9671 && adminUserInfo.CurrentOrgId != 9675 && adminUserInfo.CurrentOrgId != 10215 {
+		project, err := service.GetHisProject(orgId)
+		good_info, err := service.GetGoodInfoMationSix(orgId, houseConfig.StorehouseOutInfo)
+		_, config := service.FindHisStockPriceRecordByOrgId(orgId)
+		if config.ID > 0 && config.IsOpen == 1 {
+			//处理耗材不同批号价格问题
+			for _, item := range good_info {
+				if len(item.GoodSotckInfo) > 0 {
+					if item.GoodSotckInfo[0].Price > 0 {
+						item.PackingPrice = item.GoodSotckInfo[0].Price
+					}
+				}
+			}
+		}
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"project":   project,
+			"good_info": good_info,
+		})
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"project":   project,
-		"good_info": good_info,
-	})
 }
 
 func (this *HisProjectApiController) GetProjectTeam() {

controllers/manager_center_api_controller.go

@@ -2285,8 +2285,9 @@ func (c *ManagerCenterApiController) GetAllDrugList() {
 func (c *ManagerCenterApiController) GetSearchDrugList() {
 	keyword := c.GetString("keyword")
 	orgId := c.GetAdminUserInfo().CurrentOrgId
-	config, _ := service.GetAllStoreHouseConfig(orgId)
-	list, err := service.GetSearchDrugListSix(keyword, orgId, config.DrugStorehouseOut)
+	storehouse_id, _ := c.GetInt64("storehouse_id")
+	list, err := service.GetSearchDrugListSix(keyword, orgId, storehouse_id)
+
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	dealerList, _ := service.GetAllDealerList(orgId)
 	if err == nil {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -738,6 +738,7 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 	vascular_access_desc := c.GetString("vascular_access_desc")
 	pipeline_connection_desc := c.GetString("pipeline_connection_desc")
 	collator, _ := c.GetInt64("collator", 0)
+	employee_number := c.GetString("employee_number")
 
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -751,6 +752,15 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		return
 	}
 
+	if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10340 {
+
+		list, _ := service.GetRoleList(adminUserInfo.Org.Id, modifier)
+		if employee_number != list.JobNumber {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorEmployeeNumber)
+			return
+		}
+	}
+
 	if len(recordDateStr) == 0 {
 		recordDateStr = time.Now().Format("2006-01-02")
 	}
@@ -800,6 +810,7 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		CreatedTime:                time.Now().Unix(),
 		CheckDate:                  recordDate.Unix(),
 		UpdatedTime:                time.Now().Unix(),
+		EmployeeNumber:             employee_number,
 	}
 
 	_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -829,9 +840,9 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		doubleCheck.Modifier = modifier
 		doubleCheck.CreatedTime = check.CreatedTime
 		doubleCheck.ID = check.ID
+		doubleCheck.EmployeeNumber = employee_number
 		err := service.UpdateDoubleCheck(&doubleCheck)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":double_check"
-		fmt.Println("key233232232323232323", key)
 		redis := service.RedisClient()
 		defer redis.Close()
 		//清空key 值
@@ -1646,7 +1657,10 @@ func (c *DialysisAPIController) Finish() {
 	recordDateStr := c.GetString("record_date")
 	nurseID, _ := c.GetInt64("nurse")
 	end_time := c.GetString("end_time")
-
+	puncture_point_haematoma, _ := c.GetInt64("puncture_point_haematoma")
+	internal_fistula := c.GetString("blood_access_internal_fistula")
+	catheter := c.GetString("catheter")
+	cruor := c.GetString("cruor")
 	if id <= 0 || nurseID <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1766,7 +1780,7 @@ func (c *DialysisAPIController) Finish() {
 
 	}
 
-	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 4 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 {
+	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 {
 		evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.Org.Id, id, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
 			evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
@@ -1784,6 +1798,7 @@ func (c *DialysisAPIController) Finish() {
 			defer redis.Close()
 			fmt.Println(getNurseErr)
 		}
+
 		if evaluation.DiastolicBloodPressure == 0 {
 			evaluation.DiastolicBloodPressure = fmonitorRecords.DiastolicBloodPressure
 			pres := models.PredialysisEvaluation{
@@ -1815,6 +1830,22 @@ func (c *DialysisAPIController) Finish() {
 			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.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+
+			redis := service.RedisClient()
+			redis.Set(key, "", time.Second)
+			keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
+			redis.Set(keyOne, "", time.Second)
+			defer redis.Close()
+			fmt.Println(getNurseErr)
+		}
 	}
 
 	if adminUserInfo.Org.Id == 9583 {
@@ -1933,7 +1964,7 @@ func (c *DialysisAPIController) Finish() {
 		return
 	}
 	if dialysisOrder.Stage == 1 {
-		err := service.ModifyDialysisRecord(dialysisOrder.ID, nurseID, endDate.Unix(), adminUserInfo.AdminUser.Id)
+		err := service.ModifyDialysisRecord(dialysisOrder.ID, nurseID, endDate.Unix(), adminUserInfo.AdminUser.Id, puncture_point_haematoma, internal_fistula, catheter, cruor)
 
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_order"
 		redis := service.RedisClient()
@@ -3153,6 +3184,10 @@ func (c *DialysisAPIController) ModifyFinishDialysisOrder() {
 	nurseID, _ := c.GetInt64("nurse")
 	end_time := c.GetString("end_time")
 
+	puncture_point_haematoma, _ := c.GetInt64("puncture_point_haematoma")
+	blood_access_internal_fistula := c.GetString("blood_access_internal_fistula")
+	catheter := c.GetString("catheter")
+	cruor := c.GetString("cruor")
 	if record_id <= 0 || nurseID <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -3190,11 +3225,15 @@ func (c *DialysisAPIController) ModifyFinishDialysisOrder() {
 	//}
 
 	dialysisRecord := &models.DialysisOrder{
-		ID:             record_id,
-		UserOrgId:      adminUserInfo.Org.Id,
-		EndTime:        endDate.Unix(),
-		FinishNurse:    nurseID,
-		FinishModifier: adminUserInfo.AdminUser.Id,
+		ID:                         record_id,
+		UserOrgId:                  adminUserInfo.Org.Id,
+		EndTime:                    endDate.Unix(),
+		FinishNurse:                nurseID,
+		FinishModifier:             adminUserInfo.AdminUser.Id,
+		PuncturePointHaematoma:     puncture_point_haematoma,
+		BloodAccessInternalFistula: blood_access_internal_fistula,
+		Catheter:                   catheter,
+		Cruor:                      cruor,
 	}
 
 	updateErr := service.ModifyFinishDialysisOrder(dialysisRecord)
@@ -5672,3 +5711,15 @@ func RemoveRepeatedCheckRecod(arr []*models.HisPrescriptionProject) (newArr []*m
 	}
 	return
 }
+
+func (this *DialysisAPIController) GetRoleList() {
+
+	admin_user_id, _ := this.GetInt64("admin_user_id")
+	orgid := this.GetMobileAdminUserInfo().Org.Id
+	list, err := service.GetRoleList(orgid, admin_user_id)
+	fmt.Println(err)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+	return
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -165,4 +165,6 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/getmobileschedulelist", &DialysisAPIController{}, "Get:GetMobileScheduleList")
 
+	beego.Router("/m/api/getrolelist", &DialysisAPIController{}, "Get:GetRoleList")
+
 }

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 {

controllers/stock_in_api_controller.go

@@ -4382,36 +4382,36 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		drug.Dealer = dealer_id
 
 		delivery_way := goodNameM["delivery_way"].(string)
-		if len(delivery_way) == 0 { //名字为空则生成一条导入错误日志
-			err_log := models.ExportErrLog{
-				LogType:    4,
-				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认给药途径不能为空",
-				Status:     1,
-				CreateTime: time.Now().Unix(),
-				UpdateTime: time.Now().Unix(),
-				ExportTime: time.Now().Unix(),
-			}
-			service.CreateExportErrLog(&err_log)
-			continue
-		}
+		//if len(delivery_way) == 0 { //名字为空则生成一条导入错误日志
+		//	err_log := models.ExportErrLog{
+		//		LogType:    4,
+		//		UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
+		//		ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认给药途径不能为空",
+		//		Status:     1,
+		//		CreateTime: time.Now().Unix(),
+		//		UpdateTime: time.Now().Unix(),
+		//		ExportTime: time.Now().Unix(),
+		//	}
+		//	service.CreateExportErrLog(&err_log)
+		//	continue
+		//}
 
 		drug.DeliveryWay = delivery_way
 
 		execution_frequency := goodNameM["execution_frequency"].(string)
-		if len(execution_frequency) == 0 { //名字为空则生成一条导入错误日志
-			err_log := models.ExportErrLog{
-				LogType:    4,
-				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认执行频率不能为空",
-				Status:     1,
-				CreateTime: time.Now().Unix(),
-				UpdateTime: time.Now().Unix(),
-				ExportTime: time.Now().Unix(),
-			}
-			service.CreateExportErrLog(&err_log)
-			continue
-		}
+		//if len(execution_frequency) == 0 { //名字为空则生成一条导入错误日志
+		//	err_log := models.ExportErrLog{
+		//		LogType:    4,
+		//		UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
+		//		ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认执行频率不能为空",
+		//		Status:     1,
+		//		CreateTime: time.Now().Unix(),
+		//		UpdateTime: time.Now().Unix(),
+		//		ExportTime: time.Now().Unix(),
+		//	}
+		//	service.CreateExportErrLog(&err_log)
+		//	continue
+		//}
 
 		drug.ExecutionFrequency = execution_frequency
 
@@ -4419,74 +4419,6 @@ func (this *StockManagerApiController) AddDrugInformation() {
 
 		drug.LmtUsedFlag = lmt_used_flags
 
-		//medical_insurance_level := goodNameM["medical_insurance_level"].(string)
-		//var medical_insurance_level_id int64
-		//if len(medical_insurance_level) == 0 { //名字为空则生成一条导入错误日志
-		//  err_log := models.ExportErrLog{
-		//    LogType:    4,
-		//    UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-		//    ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的医保等级不能为空",
-		//    Status:     1,
-		//    CreateTime: time.Now().Unix(),
-		//    UpdateTime: time.Now().Unix(),
-		//    ExportTime: time.Now().Unix(),
-		//  }
-		//  service.CreateExportErrLog(&err_log)
-		//  continue
-		//}
-		//var medicalInsuranceName = "医保等级"
-		//medicalInsuranceConfig, _ := service.GetDrugDataConfig(0, medicalInsuranceName)
-		//if len(medical_insurance_level) != 0 {
-		//  _, errcodemedical := service.IsExistDicConfig(medicalInsuranceConfig.ID, medical_insurance_level, orgId)
-		//  if errcodemedical == gorm.ErrRecordNotFound {
-		//    medConfig, _ := service.GetLastDicConfig(medicalInsuranceConfig.ID, orgId)
-		//    dataconfig := models.DictDataconfig{
-		//      ParentId:       medicalInsuranceConfig.ID,
-		//      Module:         "system",
-		//      OrgId:          orgId,
-		//      Name:           medical_insurance_level,
-		//      FieldName:      "",
-		//      Value:          medConfig.Value + 1,
-		//      CreatedTime:    "",
-		//      UpdatedTime:    "",
-		//      CreateUserId:   adminUser.AdminUser.Id,
-		//      Status:         1,
-		//      Remark:         "",
-		//      DeleteIdSystem: 0,
-		//      Title:          "",
-		//      Content:        "",
-		//      Order:          0,
-		//      Code:           "",
-		//    }
-		//    service.CreatedDicConfig(&dataconfig)
-		//  }
-		//}
-
-		//medicalInsuranceList, _ := service.GetParentDataConfig(medicalInsuranceConfig.ID, orgId)
-		//for _, it := range medicalInsuranceList {
-		//  if medical_insurance_level == it.Name {
-		//    medical_insurance_level_id = int64(it.Value)
-		//  }
-		//}
-		//drug.MedicalInsuranceLevel = medical_insurance_level_id
-
-		//unit_matrixing := goodNameM["unit_matrixing"].(string)
-		//if len(max_unit_id) == 0 { //名字为空则生成一条导入错误日志
-		//  err_log := models.ExportErrLog{
-		//    LogType:    4,
-		//    UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-		//    ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的单位换算不能为空",
-		//    Status:     1,
-		//    CreateTime: time.Now().Unix(),
-		//    UpdateTime: time.Now().Unix(),
-		//    ExportTime: time.Now().Unix(),
-		//  }
-		//  service.CreateExportErrLog(&err_log)
-		//  continue
-		//}
-		//
-		//drug.UnitMatrixing = unit_matrixing
-
 		dataConfig, _ := service.GetDataConfigIsExist(0, units)
 		if len(drugDoseUnit) != 0 {
 			_, errcodedataconfig := service.GetChildeConfigIsExist(dataConfig.ID, drugDoseUnit, orgId)
@@ -5045,36 +4977,36 @@ func (this *StockManagerApiController) AddDrugInformation() {
 			drug.Dealer = dealer_id
 
 			delivery_way := goodNameM["delivery_way"].(string)
-			if len(delivery_way) == 0 { //名字为空则生成一条导入错误日志
-				err_log := models.ExportErrLog{
-					LogType:    4,
-					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认给药途径不能为空",
-					Status:     1,
-					CreateTime: time.Now().Unix(),
-					UpdateTime: time.Now().Unix(),
-					ExportTime: time.Now().Unix(),
-				}
-				service.CreateExportErrLog(&err_log)
-				continue
-			}
+			//if len(delivery_way) == 0 { //名字为空则生成一条导入错误日志
+			//	err_log := models.ExportErrLog{
+			//		LogType:    4,
+			//		UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
+			//		ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认给药途径不能为空",
+			//		Status:     1,
+			//		CreateTime: time.Now().Unix(),
+			//		UpdateTime: time.Now().Unix(),
+			//		ExportTime: time.Now().Unix(),
+			//	}
+			//	service.CreateExportErrLog(&err_log)
+			//	continue
+			//}
 
 			drug.DeliveryWay = delivery_way
 
 			execution_frequency := goodNameM["execution_frequency"].(string)
-			if len(execution_frequency) == 0 { //名字为空则生成一条导入错误日志
-				err_log := models.ExportErrLog{
-					LogType:    4,
-					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认执行频率不能为空",
-					Status:     1,
-					CreateTime: time.Now().Unix(),
-					UpdateTime: time.Now().Unix(),
-					ExportTime: time.Now().Unix(),
-				}
-				service.CreateExportErrLog(&err_log)
-				continue
-			}
+			//if len(execution_frequency) == 0 { //名字为空则生成一条导入错误日志
+			//	err_log := models.ExportErrLog{
+			//		LogType:    4,
+			//		UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
+			//		ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认执行频率不能为空",
+			//		Status:     1,
+			//		CreateTime: time.Now().Unix(),
+			//		UpdateTime: time.Now().Unix(),
+			//		ExportTime: time.Now().Unix(),
+			//	}
+			//	service.CreateExportErrLog(&err_log)
+			//	continue
+			//}
 
 			drug.ExecutionFrequency = execution_frequency
 
@@ -5379,6 +5311,7 @@ func (this *StockManagerApiController) AddDrugInformation() {
 					DoseUnit:                    item.DoseUnit,
 					Dose:                        item.Dose,
 					MinNumber:                   item.MinNumber,
+					IsUse:                       2,
 				}
 
 				//查询同种药品同种规格是否存在
@@ -5510,8 +5443,8 @@ func (this *StockManagerApiController) PostSearchGoodList() {
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 
-	config, _ := service.GetAllStoreHouseConfig(orgId)
-	list, _ := service.GetSearchGoodListSix(keyword, orgId, config.StorehouseOutInfo)
+	storehouse_id, _ := this.GetInt64("storehouse_id")
+	list, _ := service.GetSearchGoodListSix(keyword, orgId, storehouse_id)
 
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	dealerList, _ := service.GetAllDealerList(orgId)

enums/error_code.go

@@ -247,6 +247,8 @@ const ( // ErrorCode
 	ErrorCodeRecordFailedException = 300011
 
 	ErrorPsnNoEmpty = 310000
+
+	ErrorEmployeeNumber = 320000
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -483,7 +485,8 @@ var ErrCodeMsgs = map[int]string{
 
 	ErrorCodeStockExced: "请先出库,执行失败",
 
-	ErrorPsnNoEmpty: "人员编码不能为空",
+	ErrorPsnNoEmpty:     "人员编码不能为空",
+	ErrorEmployeeNumber: "请输入正确的工号",
 }
 
 type SGJError struct {

models/dialysis.go

@@ -538,6 +538,7 @@ type DoubleCheck struct {
 	Modifier                   int64  `gorm:"column:modifier" json:"modifier"`
 	CheckTime                  int64  `gorm:"column:check_time" json:"check_time"`
 	FirstCheckTime             int64  `gorm:"column:first_check_time" json:"first_check_time"`
+	EmployeeNumber             string `gorm:"column:employee_number" json:"employee_number" form:"employee_number"`
 }
 
 func (DoubleCheck) TableName() string {
@@ -794,34 +795,38 @@ func (VmDialysisOrder) TableName() string {
 }
 
 type DialysisOrder struct {
-	ID                     int64         `gorm:"column:id" json:"id"`
-	DialysisDate           int64         `gorm:"column:dialysis_date" json:"dialysis_date"`
-	UserOrgId              int64         `gorm:"column:user_org_id" json:"user_org_id"`
-	PatientId              int64         `gorm:"column:patient_id" json:"patient_id"`
-	PrescriptionId         int64         `gorm:"column:prescription_id" json:"prescription_id"`
-	Stage                  int64         `gorm:"column:stage" json:"stage"`
-	Remark                 string        `gorm:"column:remark" json:"remark"`
-	BedID                  int64         `gorm:"column:bed_id" json:"bed_id"`
-	StartNurse             int64         `gorm:"column:start_nurse" json:"start_nurse"`
-	FinishNurse            int64         `gorm:"column:finish_nurse" json:"finish_nurse"`
-	Status                 int64         `gorm:"column:status" json:"status"`
-	CreatedTime            int64         `gorm:"column:created_time" json:"created_time"`
-	UpdatedTime            int64         `gorm:"column:updated_time" json:"updated_time"`
-	DeviceNumber           DeviceNumber  `gorm:"ForeignKey:BedID"`
-	StartTime              int64         `gorm:"column:start_time" json:"start_time"`
-	EndTime                int64         `gorm:"column:end_time" json:"end_time"`
-	PunctureNurse          int64         `gorm:"column:puncture_nurse" json:"puncture_nurse"`
-	Creator                int64         `gorm:"column:creator" json:"creator"`
-	Modifier               int64         `gorm:"column:modifier" json:"modifier"`
-	FinishCreator          int64         `gorm:"column:finish_creator" json:"finish_creator"`
-	FinishModifier         int64         `gorm:"column:finish_modifier" json:"finish_modifier"`
-	SchedualType           int64         `gorm:"column:schedual_type" json:"schedual_type"`
-	UserAdminRole          UserAdminRole `json:"role" gorm:"foreignkey:AdminUserId;AssociationForeignKey:StartNurse;"`
-	WashpipeNurse          int64         `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
-	ChangeNurse            int64         `gorm:"column:change_nurse" json:"change_nurse" form:"change_nurse"`
-	DifficultPunctureNurse int64         `gorm:"column:difficult_puncture_nurse" json:"difficult_puncture_nurse" form:"difficult_puncture_nurse"`
-	NewFistulaNurse        int64         `gorm:"column:new_fistula_nurse" json:"new_fistula_nurse" form:"new_fistula_nurse"`
-	ZoneId                 int64         `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
+	ID                         int64         `gorm:"column:id" json:"id"`
+	DialysisDate               int64         `gorm:"column:dialysis_date" json:"dialysis_date"`
+	UserOrgId                  int64         `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId                  int64         `gorm:"column:patient_id" json:"patient_id"`
+	PrescriptionId             int64         `gorm:"column:prescription_id" json:"prescription_id"`
+	Stage                      int64         `gorm:"column:stage" json:"stage"`
+	Remark                     string        `gorm:"column:remark" json:"remark"`
+	BedID                      int64         `gorm:"column:bed_id" json:"bed_id"`
+	StartNurse                 int64         `gorm:"column:start_nurse" json:"start_nurse"`
+	FinishNurse                int64         `gorm:"column:finish_nurse" json:"finish_nurse"`
+	Status                     int64         `gorm:"column:status" json:"status"`
+	CreatedTime                int64         `gorm:"column:created_time" json:"created_time"`
+	UpdatedTime                int64         `gorm:"column:updated_time" json:"updated_time"`
+	DeviceNumber               DeviceNumber  `gorm:"ForeignKey:BedID"`
+	StartTime                  int64         `gorm:"column:start_time" json:"start_time"`
+	EndTime                    int64         `gorm:"column:end_time" json:"end_time"`
+	PunctureNurse              int64         `gorm:"column:puncture_nurse" json:"puncture_nurse"`
+	Creator                    int64         `gorm:"column:creator" json:"creator"`
+	Modifier                   int64         `gorm:"column:modifier" json:"modifier"`
+	FinishCreator              int64         `gorm:"column:finish_creator" json:"finish_creator"`
+	FinishModifier             int64         `gorm:"column:finish_modifier" json:"finish_modifier"`
+	SchedualType               int64         `gorm:"column:schedual_type" json:"schedual_type"`
+	UserAdminRole              UserAdminRole `json:"role" gorm:"foreignkey:AdminUserId;AssociationForeignKey:StartNurse;"`
+	WashpipeNurse              int64         `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
+	ChangeNurse                int64         `gorm:"column:change_nurse" json:"change_nurse" form:"change_nurse"`
+	DifficultPunctureNurse     int64         `gorm:"column:difficult_puncture_nurse" json:"difficult_puncture_nurse" form:"difficult_puncture_nurse"`
+	NewFistulaNurse            int64         `gorm:"column:new_fistula_nurse" json:"new_fistula_nurse" form:"new_fistula_nurse"`
+	ZoneId                     int64         `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
+	PuncturePointHaematoma     int64         `gorm:"column:puncture_point_haematoma" json:"puncture_point_haematoma" form:"puncture_point_haematoma"`
+	BloodAccessInternalFistula string        `gorm:"column:blood_access_internal_fistula" json:"blood_access_internal_fistula" form:"blood_access_internal_fistula"`
+	Catheter                   string        `gorm:"column:catheter" json:"catheter" form:"catheter"`
+	Cruor                      string        `gorm:"column:cruor" json:"cruor" form:"cruor"`
 }
 
 func (DialysisOrder) TableName() string {
@@ -982,6 +987,7 @@ type SgjUserAdminRole struct {
 	OrgName       string `gorm:"column:org_name" json:"org_name" form:"org_name"`
 	OrgLogo       string `gorm:"column:org_logo" json:"org_logo" form:"org_logo"`
 	Creator       int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	JobNumber     string `gorm:"column:job_number" json:"job_number" form:"job_number"`
 }
 
 func (SgjUserAdminRole) TableName() string {

models/drug_pharmacy_management_models.go

@@ -213,3 +213,25 @@ type PharmacyConfig struct {
 func (PharmacyConfig) TableName() string {
 	return "xt_pharmacy_config"
 }
+
+type Pharmacy struct {
+	ID              int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId       int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId       int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisAdviceInfoId int64  `gorm:"column:his_advice_info_id" json:"his_advice_info_id" form:"his_advice_info_id"`
+	XtAdviceId      int64  `gorm:"column:xt_advice_id" json:"xt_advice_id" form:"xt_advice_id"`
+	HisOrXt         int64  `gorm:"column:his_or_xt" json:"his_or_xt" form:"his_or_xt"`
+	Ctime           int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime           int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status          int64  `gorm:"column:status" json:"status" form:"status"`
+	HisAdviceId     int64  `gorm:"column:his_advice_id" json:"his_advice_id" form:"his_advice_id"`
+	DrugId          int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	RecordDate      int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	OrdreNumber     string `gorm:"column:ordre_number" json:"ordre_number" form:"ordre_number"`
+	Creater         int64  `gorm:"column:creater" json:"creater" form:"creater"`
+	PrescriptionId  int64  `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+}
+
+func (Pharmacy) TableName() string {
+	return "xt_pharmacy"
+}

models/drug_stock.go

@@ -167,6 +167,7 @@ type DrugWarehouseOutInfo struct {
 	AdminUserId             int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 	LastPrice               float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
 	StockCount              string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PharmacyId              int64   `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
 }
 
 func (DrugWarehouseOutInfo) TableName() string {
@@ -414,8 +415,82 @@ type DrugFlow struct {
 	AdminUserId               int64                `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 	LastPrice                 float64              `gorm:"column:last_price" json:"last_price" form:"last_price"`
 	StockCount                string               `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PharmacyId                int64                `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
 }
 
 func (DrugFlow) TableName() string {
 	return "xt_drug_flow"
 }
+
+type DrugWarehouseOutInfoTenty struct {
+	ID                      int64       `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64       `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	DrugId                  int64       `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingOutTarget    int64       `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
+	Count                   int64       `gorm:"column:count" json:"count" form:"count"`
+	CountUnit               string      `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
+	Price                   float64     `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice              float64     `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	ProductDate             int64       `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate              int64       `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Mtime                   int64       `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Ctime                   int64       `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status                  int64       `gorm:"column:status" json:"status" form:"status"`
+	OrgId                   int64       `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Remark                  string      `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCancel                int64       `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
+	WarehouseOutOrderNumber string      `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	Type                    int64       `gorm:"column:type" json:"type" form:"type"`
+	Dealer                  int64       `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64       `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	IsSys                   int64       `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SysRecordTime           int64       `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
+	RetailPrice             float64     `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice        float64     `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	Number                  string      `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber             string      `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PatientId               int64       `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	WarehouseInfoId         int64       `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	AdviceId                int64       `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	SupplyCancelOutId       int64       `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseId       int64       `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	IsSource                int64       `gorm:"column:is_source" json:"is_source" form:"is_source"`
+	StorehouseId            int64       `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId   int64       `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	AdminUserId             int64       `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	LastPrice               float64     `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	StockCount              string      `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PharmacyId              int64       `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
+	BaseDrugLib             BaseDrugLib `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
+}
+
+func (DrugWarehouseOutInfoTenty) TableName() string {
+	return "xt_drug_warehouse_out_info"
+}
+
+type DrugWarehouseOutTwenty struct {
+	ID                        int64                     `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutOrderNumber   string                    `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	OperationTime             int64                     `gorm:"column:operation_time" json:"operation_time" form:"operation_time"`
+	Creater                   int64                     `gorm:"column:creater" json:"creater" form:"creater"`
+	OrgId                     int64                     `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Modifier                  int64                     `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	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"`
+	Status                    int64                     `gorm:"column:status" json:"status" form:"status"`
+	WarehouseOutTime          int64                     `gorm:"column:warehouse_out_time" json:"warehouse_out_time" form:"warehouse_out_time"`
+	Dealer                    int64                     `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer              int64                     `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Type                      int64                     `gorm:"column:type" json:"type" form:"type"`
+	IsSys                     int64                     `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SupplyCancelOutId         int64                     `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseId         int64                     `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	StorehouseId              int64                     `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseId         int64                     `gorm:"column:second_warehouse_id" json:"second_warehouse_id" form:"second_warehouse_id"`
+	DrugWarehouseOutInfoTenty DrugWarehouseOutInfoTenty `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseOutId"json:"xt_drug_warehouse_out_info" `
+}
+
+func (DrugWarehouseOutTwenty) TableName() string {
+	return "xt_drug_warehouse_out"
+}

models/self_drug_models.go

@@ -645,6 +645,7 @@ type StDrugWarehouseInfo struct {
 	LastPrice        string  `json:"last_price"`
 	PackingUnit      string  `json:"packing_unit"`
 	Dosage           int64   `json:"dosage"`
+	LimaxUnit        string  `json:"limax_unit"`
 }
 
 type VmDrugWarehouseOutInfo struct {

models/stock_models.go

@@ -1007,6 +1007,7 @@ type VmStockAdjustPrice struct {
 	UserName          string  `gorm:"column:user_name" json:"user_name" form:"user_name"`
 	Number            string  `gorm:"column:number" json:"number" form:"number"`
 	Total             int64   `gorm:"column:total" json:"total" form:"total"`
+	StorehouseId      int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 type XtStockReportPrice struct {
@@ -1377,3 +1378,16 @@ type XtPrescriptionConfig struct {
 func (XtPrescriptionConfig) TableName() string {
 	return "xt_prescription_config"
 }
+
+type DrugOutConfig struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (DrugOutConfig) TableName() string {
+	return "xt_drug_out_config"
+}

service/device_service.go

@@ -254,7 +254,7 @@ func GetDeviceCountForDeviceNumberID(orgID int64, deviceNumberID int64) (int, er
 
 func GetAllValidDeviceZones(orgID int64) ([]*models.DeviceZone, error) {
 	var zones []*models.DeviceZone
-	err := readDb.Model(&models.DeviceZone{}).Where("org_id = ? AND status = 1", orgID).Find(&zones).Error
+	err := readDb.Model(&models.DeviceZone{}).Where("org_id = ?", orgID).Find(&zones).Error
 	if err != nil {
 		return nil, err
 	}

service/dialysis_service.go

@@ -264,7 +264,7 @@ func AddSigleAssessmentBeforeDislysisRecord(assessmentBeforeDislysis *models.Pre
 
 func AddSigleDoubleCheck(check *models.DoubleCheck) (err error) {
 	tx := writeDb.Begin()
-	errors := tx.Model(&models.PredialysisEvaluation{}).Create(&check).Error
+	errors := tx.Model(&models.DoubleCheck{}).Create(&check).Error
 	if err != nil {
 		tx.Rollback()
 	}
@@ -324,6 +324,12 @@ func UpdatePredialysisEvaluationThree(predialysisevaluation *models.PredialysisE
 	return err
 }
 
+func UpdatePredialysisEvaluationFour(predialysisevaluation *models.PredialysisEvaluation, id int64) error {
+
+	err := writeDb.Model(&predialysisevaluation).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"temperature": predialysisevaluation.Temperature}).Error
+	return err
+}
+
 //修改
 func UpdateSummeRecord(treatmentSummary *models.TreatmentSummary) error {
 	err := writeDb.Save(&treatmentSummary).Error
@@ -525,12 +531,18 @@ func CreateDialysisRecord(id int64, orgId int64, record *models.DialysisOrder) e
 	return nil
 }
 
-func ModifyDialysisRecord(id int64, finishNurse int64, end_time int64, admin_user_id int64) error {
-	err := writeDb.Model(&models.DialysisOrder{}).Where("id = ? AND status = 1 ", id).Updates(map[string]interface{}{"updated_time": time.Now().Unix(), "stage": 2, "finish_nurse": finishNurse, "end_time": end_time, "finish_creator": admin_user_id, "finish_modifier": admin_user_id}).Error
+func ModifyDialysisRecord(id int64, finishNurse int64, end_time int64, admin_user_id int64, puncture_point_haematoma int64, internal_fistula string, catheter string, cruor string) error {
+	err := writeDb.Model(&models.DialysisOrder{}).Where("id = ? AND status = 1 ", id).Updates(map[string]interface{}{"updated_time": time.Now().Unix(), "stage": 2, "finish_nurse": finishNurse, "end_time": end_time, "finish_creator": admin_user_id, "finish_modifier": admin_user_id, "puncture_point_haematoma": puncture_point_haematoma, "blood_access_internal_fistula": internal_fistula, "catheter": catheter, "cruor": cruor}).Error
 	return err
 
 }
 
+//func ModifyDialysisRecord(id int64, finishNurse int64, end_time int64, admin_user_id int64) error {
+//  err := writeDb.Model(&models.DialysisOrder{}).Where("id = ? AND status = 1 ", id).Updates(map[string]interface{}{"updated_time": time.Now().Unix(), "stage": 2, "finish_nurse": finishNurse, "end_time": end_time, "finish_creator": admin_user_id, "finish_modifier": admin_user_id}).Error
+//  return err
+//
+//}
+
 func UpdateSolutionByPatientId(id int64) error {
 	err := writeDb.Model(&models.Patients{}).Where("id = ? AND status = 1 ", id).UpdateColumn("total_dialysis", gorm.Expr("total_dialysis + ?", 1)).Error
 	return err
@@ -673,8 +685,8 @@ func GetDialysisSchedualsOne(orgID int64, scheduleDate int64) ([]*MDialysisSched
 	var vms []*MDialysisScheduleVM
 	db := readDb.
 		Table("xt_schedule").
-		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+		Preload("DeviceNumber", "org_id = ?", orgID).
+		Preload("DeviceNumber.Zone", "org_id = ?", orgID).
 		//Preload("DialysisOrder", "status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).
 		//Preload("AssessmentBeforeDislysis", "status = 1 AND user_org_id = ? AND  assessment_date = ?", orgID, scheduleDate).
 		//Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
@@ -699,7 +711,7 @@ func GetLastAcceptsAssessment(patient int64, orgId int64) (error, models.Receive
 func GetDialysisWatch(orgID int64, schedulDate int64, schedulType int64, partitionType int64, page int64, limit int64, start int64, end int64) (schedule []*models.DialysisSchedule, err error, total int64) {
 	db := readDb.Model(&models.MonitorDialysisSchedule{})
 	if start > 0 && end > 0 {
-		db = db.Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		db = db.Preload("DeviceNumber", "org_id = ?", orgID).
 			Preload("TreatmentMode", "status = 1").
 			Preload("Prescription", "status = 1 AND user_org_id = ? and record_date>=? and record_date <=?", orgID, start, end).
 			Preload("AssessmentBeforeDislysis", "status = 1 AND  user_org_id = ? and assessment_date >=? and assessment_date <=?", orgID, start, end).
@@ -712,7 +724,7 @@ func GetDialysisWatch(orgID int64, schedulDate int64, schedulType int64, partiti
 		db = db.Where("xt_schedule.status = 1 AND user_org_id = ?", orgID)
 	}
 	if schedulDate > 0 {
-		db = db.Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		db = db.Preload("DeviceNumber", "org_id = ?", orgID).
 			Preload("TreatmentMode", "status = 1").
 			Preload("Prescription", "status = 1 AND user_org_id = ? and record_date>=? and record_date <=?", orgID, schedulDate, schedulDate).
 			Preload("AssessmentBeforeDislysis", "status = 1 AND  user_org_id = ? and assessment_date >=? and assessment_date <=?", orgID, schedulDate, schedulDate).
@@ -735,7 +747,7 @@ func GetDialysisWatch(orgID int64, schedulDate int64, schedulType int64, partiti
 		db = db.Where("schedule_date <= ?", end)
 	}
 	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 = ? and xt_device_number.status = 1", partitionType)
+		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)
 	}
 	offset := (page - 1) * limit
@@ -803,7 +815,7 @@ func GetDialysisWatchByKeyword(orgID int64, keyword string, schedulType int64, p
 		db = db.Where("schedule_date<=?", end)
 	}
 	if partitionType > 0 {
-		db = db.Joins("inner join xt_device_number as d_n on d_n.id = xt_schedule.bed_id and d_n.zone_id = ? and d_n.status = 1", partitionType)
+		db = db.Joins("inner join xt_device_number as d_n on d_n.id = xt_schedule.bed_id and d_n.zone_id = ?", partitionType)
 		// db = db.Where("partition_id = ?", partitionType)
 	}
 	var schedules []*models.DialysisSchedule
@@ -1385,7 +1397,14 @@ func GetGoodInfoMation(orgid int64) (goodinfo []*models.GoodInfo, err error) {
 func GetGoodInfoMationSix(orgid int64, storehouse_id int64) (goodinfo []*models.GoodInfo, err error) {
 
 	err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Preload("GoodSotckInfo", "stock_count > 0 and status = 1 and storehouse_id = ?", storehouse_id).Find(&goodinfo).Error
-	//err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Find(&goodinfo).Error
+
+	return goodinfo, err
+}
+
+func GetGoodInfoMationSeven(orgid int64, storehouse_id int64) (goodinfo []*models.GoodInfo, err error) {
+
+	err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Preload("GoodSotckInfo", "status = 1 and storehouse_id = ?", storehouse_id).Find(&goodinfo).Error
+
 	return goodinfo, err
 }
 

service/his_service.go

@@ -802,7 +802,14 @@ func GetAllDrugLibListSix(org_id int64, storehouse_id int64) (list []*BaseDrugLi
 		return db.Where("(status = 1 and stock_max_number > 0 and  storehouse_id = ? )  or  (status = 1  AND stock_min_number >0 and  storehouse_id = ?)", storehouse_id, storehouse_id)
 	}).Find(&list).Error
 
-	//err = readDb.Model(&BaseDrugLib{}).Where("org_id = ?  AND status = 1 AND  find_in_set('停用',drug_status) = 0", org_id).Find(&list).Error
+	return
+}
+
+func GetAllDrugLibListSeven(org_id int64, storehouse_id int64) (list []*BaseDrugLib, err error) {
+	err = readDb.Model(&BaseDrugLib{}).Where("org_id = ?  AND status = 1 AND  find_in_set('停用',drug_status) = 0", org_id).Preload("OtherDrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("(status = 1  and  storehouse_id = ? )  or  (status = 1 and  storehouse_id = ?)", storehouse_id, storehouse_id)
+	}).Find(&list).Error
+
 	return
 }
 

service/mobile_dialysis_service.go

@@ -2018,7 +2018,7 @@ func ModifyStartDialysisOrder(order *models.DialysisOrder) error {
 func ModifyFinishDialysisOrder(order *models.DialysisOrder) error {
 	tx := writeDb.Begin()
 	updateTime := time.Now().Unix()
-	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"finish_nurse": order.FinishNurse, "updated_time": updateTime, "end_time": order.EndTime, "finish_modifier": order.FinishModifier}).Error
+	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"finish_nurse": order.FinishNurse, "updated_time": updateTime, "end_time": order.EndTime, "finish_modifier": order.FinishModifier, "puncture_point_haematoma": order.PuncturePointHaematoma, "blood_access_internal_fistula": order.BloodAccessInternalFistula, "catheter": order.Catheter, "cruor": order.Cruor}).Error
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -3619,3 +3619,9 @@ func GetMobileAutoReduce(orgID int64, scheduleDate int64) (auto []*models.Automa
 	err = readDb.Where("org_id = ? and status = 1 and record_time = ?", orgID, scheduleDate).Find(&auto).Error
 	return auto, err
 }
+
+func GetRoleList(orgid int64, admin_user_id int64) (models.SgjUserAdminRole, error) {
+	role := models.SgjUserAdminRole{}
+	err = readUserDb.Where("org_id = ? and admin_user_id = ? and status =1 ", orgid, admin_user_id).Find(&role).Error
+	return role, err
+}

service/self_drug_service.go

@@ -1116,7 +1116,6 @@ func GetDrugInventoryDetailList(keyword string, page int64, limit int64, orgid i
 		db = db.Where("x.storehouse_id = ?", storehouse_id)
 	}
 	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,x.expiry_date,x.product_date,x.min_count,x.storehouse_id,t.dose,t.dose_unit,t.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.last_stock_max_number,x.last_stock_min_number,x.inventory_type").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
-	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,x.expiry_date,x.product_date,x.min_count,t.dose,t.dose_unit,t.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.last_stock_max_number,x.last_stock_min_number,x.inventory_type").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Order("x.ctime desc").Offset(offset).Limit(limit).Scan(&list).Error
 	return list, total, err
 }
 

service/stock_service.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"XT_New/models"
+	"errors"
 	"fmt"
 	"github.com/jinzhu/gorm"
 	"strconv"
@@ -727,6 +728,11 @@ func CreateDrugFlowOne(flow models.DrugFlow) error {
 	return err
 }
 
+//func CreateDrugFlowOneTX(flow models.DrugFlow,tx *gorm.DB) error {
+//	err := tx.Create(&flow).Error
+//	return err
+//}
+
 func UpdateDrugFlowSeven(patientid int64, recorddate int64, drugid int64, advice_id int64) (models.DrugAutomaticReduceDetail, error) {
 
 	detail := models.DrugAutomaticReduceDetail{}
@@ -1149,7 +1155,7 @@ func FindDrugWarehousingInfoByIdOne(id []string, org_id int64) (list []*models.S
 	if org_id > 0 {
 		db = db.Where("x.org_id = ?", org_id)
 	}
-	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.price,x.remark,x.batch_number,x.batch_number,x.manufacturer,x.dealer,t.drug_name,t.last_price,t.dose_unit,t.dose,t.min_number,t.min_unit,t.max_unit,t.drug_type").Joins("left join xt_base_drug as t on t.id = x.drug_id").Scan(&list).Error
+	err = db.Select("x.id,x.max_unit as limax_unit,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.price,x.remark,x.batch_number,x.batch_number,x.manufacturer,x.dealer,t.drug_name,t.last_price,t.dose_unit,t.dose,t.min_number,t.min_unit,t.max_unit,t.drug_type").Joins("left join xt_base_drug as t on t.id = x.drug_id").Scan(&list).Error
 	return list, err
 }
 
@@ -1291,9 +1297,13 @@ func FindAllCancelStockTotal(org_id int64) (total int64, err error) {
 func FindAllDrugCancelStockTotal(org_id int64) (total int64, err error) {
 	err = readDb.Model(&models.DrugCancelStock{}).Where("org_id = ?", org_id).Count(&total).Error
 	return total, err
-
 }
 
+//func FindAllDrugCancelStockTotalTX(org_id int64,tx *gorm.DB) (total int64, err error) {
+//	err = tx.Model(&models.DrugCancelStock{}).Where("org_id = ?", org_id).Count(&total).Error
+//	return total, err
+//}
+
 func FindAllReturnList(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string) (list []*models.SalesReturn, total int64, err error) {
 	db := readDb.Model(&models.SalesReturn{})
 	db = db.Where("xt_sales_return.org_id = ? AND xt_sales_return.status = 1 AND xt_sales_return.type = ?", orgId, types)
@@ -1805,6 +1815,12 @@ func GetLastDrugCancelStockById(orgid int64) (models.DrugCancelStock, error) {
 	return stock, err
 }
 
+//func GetLastDrugCancelStockByIdTX(orgid int64,tx *gorm.DB) (models.DrugCancelStock, error) {
+//	stock := models.DrugCancelStock{}
+//	err := tx.Where("org_id = ? and status = 1", orgid).Last(&stock).Error
+//	return stock, err
+//}
+
 func GetManufactureById(id int64) (models.Manufacturer, error) {
 	manufacturer := models.Manufacturer{}
 	err := XTReadDB().Model(&manufacturer).Where("id = ? and status = 1", id).Find(&manufacturer).Error
@@ -1820,9 +1836,13 @@ func GetDealerById(id int64) (models.Dealer, error) {
 func AddSigleDrugCancelStock(cancelStock *models.DrugCancelStock) error {
 	err := writeDb.Create(&cancelStock).Error
 	return err
-
 }
 
+//func AddSigleDrugCancelStockTX(cancelStock *models.DrugCancelStock,tx *gorm.DB) error {
+//	err := tx.Create(&cancelStock).Error
+//	return err
+//}
+
 func CreateCancelStockInfo(cancelStockInfo []*models.CancelStockInfo) (err error) {
 	if len(cancelStockInfo) > 0 {
 		utx := writeDb.Begin()
@@ -1872,6 +1892,11 @@ func CreateCancelStockInfoTwo(info *models.DrugCancelStockInfo) error {
 	return err
 }
 
+//func CreateCancelStockInfoTwoTX(info *models.DrugCancelStockInfo,tx *gorm.DB) error {
+//	err := tx.Create(&info).Error
+//	return err
+//}
+
 func GetLastStockInfoThree(drugid int64) (models.DrugCancelStockInfo, error) {
 
 	info := models.DrugCancelStockInfo{}
@@ -1880,6 +1905,12 @@ func GetLastStockInfoThree(drugid int64) (models.DrugCancelStockInfo, error) {
 	return info, err
 }
 
+//func GetLastStockInfoThreeTX(drugid int64,tx *gorm.DB) (models.DrugCancelStockInfo, error) {
+//	info := models.DrugCancelStockInfo{}
+//	err := tx.Model(&info).Where("drug_id = ? and status = 1", drugid).Find(&info).Error
+//	return info, err
+//}
+
 func CreateCancelStockInfoOne(info *models.CancelStockInfo) error {
 
 	err := XTWriteDB().Create(&info).Error
@@ -3488,11 +3519,22 @@ func GetAllManufacturerList(orgid int64) (list []*models.Manufacturer, err error
 	return list, err
 }
 
+//func GetAllManufacturerListTX(orgid int64,tx *gorm.DB) (list []*models.Manufacturer, err error) {
+//
+//	err = tx.Where("org_id = ? and status = 1", orgid).Find(&list).Error
+//	return list, err
+//}
+
 func GetAllDealerList(orgid int64) (list []*models.Dealer, err error) {
 
 	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&list).Error
 	return list, err
 }
+
+//func GetAllDealerListTX(orgid int64,tx *gorm.DB) (list []*models.Dealer, err error) {
+//	err = tx.Where("org_id = ? and status = 1", orgid).Find(&list).Error
+//	return list, err
+//}
 func GetDealerByName(orgid int64, name string) (*models.Dealer, error) {
 	var dealer models.Dealer
 	var err error
@@ -4687,6 +4729,16 @@ func GetDrugWarehouseOut(warehouse_out_id []string) (out []*models.StDrugWarehou
 	return out, err
 }
 
+func GetDrugWarehouseOutTenty(warehouse_out_id []string, orgid int64) (out []*models.DrugWarehouseOutTwenty, err error) {
+
+	err = XTReadDB().Where("id in(?)", warehouse_out_id).
+		Preload("DrugWarehouseOutInfoTenty", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Where("org_id=? and status = 1", orgid).Preload("BaseDrugLib", "status = 1 and org_id = ?", orgid)
+		}).Find(&out).Error
+
+	return out, err
+}
+
 func GetLastGoodInformationByGoodId(goodid int64, warehouse_info_id int64, orgid_id int64) (models.WarehouseOutInfo, error) {
 
 	info := models.WarehouseOutInfo{}
@@ -5090,6 +5142,16 @@ func GetDrugWarehouseInfo(id int64) (models.XtDrugWarehouseInfo, error) {
 	return info, err
 }
 
+//func GetDrugWarehouseInfoTX(id int64,tx *gorm.DB) (models.XtDrugWarehouseInfo, error) {
+//	info := models.XtDrugWarehouseInfo{}
+//	db := tx.Model(&info).Where("status = 1")
+//	if id > 0 {
+//		db = db.Where("id = ?", id)
+//	}
+//	err := db.Select("drug_id,warehousing_count,stock_max_number,stock_min_number").Find(&info).Error
+//	return info, err
+//}
+
 func GetDrugWarehouseInfoPrescription(drugid int64, orgid int64) (info []*models.DrugWarehouseInfo, err error) {
 
 	err = XTReadDB().Where("drug_id = ? and org_id =? and status = 1", drugid, orgid).Find(&info).Error
@@ -5170,6 +5232,11 @@ func UpdateDrugWarehouseInfo(info *models.XtDrugWarehouseInfo, id int64) error {
 	return err
 }
 
+//func UpdateDrugWarehouseInfoTX(info *models.XtDrugWarehouseInfo, id int64,tx *gorm.DB) error {
+//	err = tx.Model(&models.XtDrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", info.StockMaxNumber)).Error
+//	return err
+//}
+
 func UpdateDrugWarehouseInfoOne(info *models.XtDrugWarehouseInfo, id int64) error {
 
 	//err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_min_number": info.StockMaxNumber}).Error
@@ -5179,6 +5246,11 @@ func UpdateDrugWarehouseInfoOne(info *models.XtDrugWarehouseInfo, id int64) erro
 	return err
 }
 
+//func UpdateDrugWarehouseInfoOneTX(info *models.XtDrugWarehouseInfo, id int64,tx *gorm.DB) error {
+//	err = tx.Model(&models.XtDrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", info.StockMinNumber)).Error
+//	return err
+//}
+
 func GetLastCancelStockInfo(id int64) (models.DrugCancelStockInfo, error) {
 
 	info := models.DrugCancelStockInfo{}
@@ -5213,9 +5285,9 @@ func UpdatedDrugInfoOne(id int64, count int64) (err error) {
 	return err
 }
 
-func UpdateWarehouseInfo(count int64, drugid int64, orgid int64) error {
+func UpdateWarehouseInfo(count int64, drugid int64, orgid int64, warehouse_info_id int64) error {
 
-	err := writeDb.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ?  and org_id = ? and status = 1", drugid, orgid).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
+	err := writeDb.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ?  and org_id = ? and status = 1 and id = ?", drugid, orgid, warehouse_info_id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
 
 	return err
 }
@@ -5227,9 +5299,9 @@ func UpdateWarehouseInfoTwo(count int64, drugid int64, orgid int64) error {
 	return err
 }
 
-func UpdateWarehouseInfoOne(count int64, drugid int64, orgid int64) error {
+func UpdateWarehouseInfoOne(count int64, drugid int64, orgid int64, warehouse_info_id int64) error {
 
-	err := writeDb.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ?  and org_id = ? and status = 1", drugid, orgid).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
+	err := writeDb.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ?  and org_id = ? and status = 1 and id = ?", drugid, orgid, warehouse_info_id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
 	return err
 }
 
@@ -5347,6 +5419,12 @@ func UpdateDrugCancel(id int64) (models.DrugCancelStock, error) {
 	return stock, err
 }
 
+//func UpdateDrugCancelTX(id int64,tx *gorm.DB) (models.DrugCancelStock, error) {
+//	stock := models.DrugCancelStock{}
+//	err := tx.Model(&stock).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+//	return stock, err
+//}
+
 func GetDrugWarehouseOutInfo(warehouse_info_id int64, drug_id int64) (info []*models.DrugWarehouseOutInfo, err error) {
 
 	db := XTReadDB().Model(&info)
@@ -5361,12 +5439,29 @@ func GetDrugWarehouseOutInfo(warehouse_info_id int64, drug_id int64) (info []*mo
 	return info, err
 }
 
+//func GetDrugWarehouseOutInfoTX(warehouse_info_id int64, drug_id int64,tx *gorm.DB) (info []*models.DrugWarehouseOutInfo, err error) {
+//	db := tx.Model(&info)
+//	if warehouse_info_id > 0 {
+//		db = db.Where("warehouse_info_id = ?", warehouse_info_id)
+//	}
+//	if drug_id > 0 {
+//		db = db.Where("drug_id = ? and status =1", drug_id)
+//	}
+//	err = db.Find(&info).Error
+//	return info, err
+//}
+
 func GetCancelDrugStockOutInfo(warehouse_info_id int64, drug_id int64) (info []*models.DrugCancelStockInfo, err error) {
 
 	err = XTReadDB().Model(&info).Where("batch_number_id =? and drug_id = ? and status = 1", warehouse_info_id, drug_id).Find(&info).Error
 	return info, err
 }
 
+//func GetCancelDrugStockOutInfoTX(warehouse_info_id int64, drug_id int64,tx *gorm.DB) (info []*models.DrugCancelStockInfo, err error) {
+//	err = tx.Model(&info).Where("batch_number_id =? and drug_id = ? and status = 1", warehouse_info_id, drug_id).Find(&info).Error
+//	return info, err
+//}
+
 func GetTemplateSummary(orgid int64) (config []*models.Dataconfig, err error) {
 
 	err = XTReadDB().Model(&config).Where("module='template_summary' and parent_id=? and org_id in (?)", 0, orgid).Find(&config).Error
@@ -5712,7 +5807,6 @@ func GetInventoryDetailList(keyword string, limit int64, page int64, orgid int64
 		db = db.Where("x.storehouse_id = ?", storehouse_id)
 	}
 	err = db.Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.number,x.expire_date,x.product_date,t.packing_unit,x.last_stock_count,x.type,x.inventory_type,x.stock_count,x.storehouse_id").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
-	err = db.Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.number,x.expire_date,x.product_date,t.packing_unit,x.last_stock_count,x.type,x.inventory_type,x.stock_count,x.ctime").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Order("x.ctime desc").Offset(offset).Limit(limit).Scan(&list).Error
 	return list, total, err
 }
 
@@ -6408,6 +6502,11 @@ func UpdateMedicalSumCount(drug_id int64, sum_count int64, sum_in_count int64, o
 	return err
 }
 
+//func UpdateMedicalSumCountTX(drug_id int64, sum_count int64, sum_in_count int64, orgid int64,tx *gorm.DB) error {
+//	err := tx.Model(&models.BaseDrugLib{}).Where("id = ? and org_id = ? and status = 1", drug_id, orgid).Update(map[string]interface{}{"sum_count": sum_count, "sum_in_count": sum_in_count}).Error
+//	return err
+//}
+
 func UpdateGoodByGoodId(good_id int64, sum_count int64, sum_in_count int64, orgid int64) error {
 	err := XTWriteDB().Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", good_id, orgid).Update(map[string]interface{}{"sum_count": sum_count, "sum_in_count": sum_in_count}).Error
 	return err
@@ -6630,3 +6729,193 @@ func FindPrescriptionConfigById(orgid int64) (models.XtPrescriptionConfig, error
 
 	return config, err
 }
+
+func UpdateWarehouseInfoTwentyFive(maxNumber int64, drugid int64, orgID int64, storehouse_id int64, drup *models.XtBaseDrug) (err error) {
+
+	var deliver_number int64 = 0
+	var stock_number int64 = 0
+
+	deliver_number = maxNumber
+	// 根据先进先出原则，查询最先入库的批次，进行出库
+	// 如果没有对应的库存，则报错
+	//开启事物
+
+	warehouse, err := FindLastDrugWarehousingInfoByID(drugid, storehouse_id)
+
+	if err != nil {
+		return err
+	}
+
+	// 将该批次的剩余库存数量转换为拆零数量
+	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+
+	// 当库存数量大于或等于出库数量的话，则正常出库该批次
+	if stock_number >= deliver_number {
+
+		var maxNumber int64 = 0
+		var minNumber int64 = 0
+		var stock_max_number int64 = 0
+		stock_max_number = warehouse.StockMaxNumber
+
+		maxNumber = deliver_number / drup.MinNumber
+		minNumber = deliver_number % drup.MinNumber
+
+		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
+			minNumber = maxNumber
+		}
+
+		if drup.MaxUnit != drup.MinUnit {
+			if warehouse.StockMaxNumber < maxNumber && warehouse.StockMinNumber < minNumber {
+				return errors.New("库存数量不足")
+			}
+		}
+
+		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+
+		if warehouse.StockMaxNumber < 0 {
+			warehouse.StockMaxNumber = 0
+		}
+		if warehouse.StockMinNumber < 0 {
+			warehouse.StockMinNumber = 0
+		}
+
+		warehouse.Mtime = time.Now().Unix()
+
+		if warehouse.StockMinNumber < minNumber {
+
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+		} else {
+			if minNumber > 0 {
+				if minNumber == 1 && maxNumber == 1 && drup.MaxUnit != drup.MinUnit {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				} else {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+				}
+			}
+
+			if minNumber == 0 && maxNumber != 1 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+			}
+
+		}
+
+		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
+			warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+			if warehouse.StockMinNumber == 0 {
+				warehouse.StockMaxNumber = stock_max_number
+			}
+		}
+
+		if drup.MaxUnit != drup.MinUnit {
+			if warehouse.StockMaxNumber < 0 && warehouse.StockMinNumber < 0 {
+				return errors.New("库存数量不足")
+			}
+		}
+		if warehouse.StockMinNumber <= 0 {
+			warehouse.StockMinNumber = 0
+		}
+
+		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
+		fmt.Println(errThree)
+
+		//查询默认仓库
+		houseConfig, _ := GetAllStoreHouseConfig(orgID)
+		//查询默认仓库剩余多少库存
+		list, _ := GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, orgID, warehouse.DrugId)
+		var sum_count int64
+		var sum_in_count int64
+		for _, it := range list {
+			baseDrug, _ := 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
+			}
+		}
+		UpdateMedicalSumCount(warehouse.DrugId, sum_count, sum_in_count, orgID)
+
+		return nil
+
+	} else {
+
+		warehouse.StockMaxNumber = 0
+		warehouse.StockMinNumber = 0
+		warehouse.Mtime = time.Now().Unix()
+
+		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
+		fmt.Println(errThree)
+
+		//查询默认仓库
+		houseConfig, _ := GetAllStoreHouseConfig(orgID)
+		//查询默认仓库剩余多少库存
+		list, _ := GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, orgID, warehouse.DrugId)
+		var sum_count int64
+		var sum_in_count int64
+		for _, it := range list {
+			baseDrug, _ := 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
+			}
+		}
+		UpdateMedicalSumCount(warehouse.DrugId, sum_count, sum_in_count, orgID)
+		if errThree != nil {
+			return errThree
+		}
+		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
+		prescribingNumber_two_temp := deliver_number - stock_number
+
+		UpdateWarehouseInfoTwentyFive(prescribingNumber_two_temp, drugid, orgID, storehouse_id, drup)
+	}
+	return
+}
+
+func UpdateWarehouseInfoTentyFour(count int64, id int64) error {
+
+	err := writeDb.Model(&models.XtDrugWarehouseInfo{}).Where("id = ? status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number - ?", count)).Error
+
+	return err
+}
+
+func UpdateWarehouseInfoTentyThree(count int64, id int64) error {
+
+	err := writeDb.Model(&models.XtDrugWarehouseInfo{}).Where("id = ? status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number - ?", count)).Error
+
+	return err
+}
+
+func GetDrugOpenConfig(orgid int64) (*models.DrugOutConfig, error) {
+
+	config := models.DrugOutConfig{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&config).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &config, nil
+}
+
+func CreateDrugOutConfig(config models.DrugOutConfig) error {
+
+	err := XTWriteDB().Create(&config).Error
+	return err
+}
+
+func UpdateDrugOutConfig(orgid int64, drug_out_open int64) error {
+
+	err := XTWriteDB().Model(&models.DrugOutConfig{}).Where("user_org_id = ? and status = 1", orgid).Update(map[string]interface{}{"is_open": drug_out_open}).Error
+	return err
+}
+
+func FindDrugOutConfigById(orgid int64) (models.DrugOutConfig, error) {
+
+	config := models.DrugOutConfig{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&config).Error
+	return config, err
+}