11月8日库存管理

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

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

@@ -7,6 +7,7 @@ import (
 	"XT_New/utils"
 	"fmt"
 	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
 	"math"
 	"strconv"
 	"strings"
@@ -27,10 +28,15 @@ func PharmacyApiControllersRegisterRouters() {
 	beego.Router("/api/advice/updatepharmacybasedrug", &PharmacyApiController{}, "Get:UpdatePharmacyBaseDrug")
 
 	//获取今日已发药的数据
-	beego.Router("api/advice/getpharmacybasedruglist", &PharmacyApiController{}, "Get:GetPharmacyBaseDrugList")
+	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() {
@@ -42,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)
@@ -92,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
@@ -120,7 +130,6 @@ func (this *PharmacyApiController) UpdatePharmacyBaseDrug() {
 
 	//查询是否通过药房出库
 	pharmacyConfig, _ := service.FindPharmacyConfig(orgId)
-	creater := this.GetAdminUserInfo().AdminUser.Id
 	if pharmacyConfig.IsOpen == 1 {
 		var total int64
 		var prescribing_number_total int64
@@ -150,7 +159,7 @@ func (this *PharmacyApiController) UpdatePharmacyBaseDrug() {
 				DrugId:            item.DrugId,
 				RecordDate:        item.AdviceDate,
 				OrdreNumber:       warehousing_out_order,
-				Creater:           creater,
+				Creater:           admin_user_id,
 			}
 
 			service.CreatePharmacy(pharmacy)
@@ -282,7 +291,7 @@ func (this *PharmacyApiController) UpdatePharmacyBaseDrug() {
 				DrugId:            item.DrugId,
 				RecordDate:        item.AdviceDate,
 				OrdreNumber:       warehousing_out_order,
-				Creater:           creater,
+				Creater:           admin_user_id,
 			}
 
 			service.CreatePharmacy(pharmacy)
@@ -462,3 +471,43 @@ func (this *PharmacyApiController) GetReturnPharmacyBaseDrug() {
 	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

@@ -2286,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())
@@ -2307,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())
@@ -2326,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())
@@ -2366,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 {

controllers/gobal_config_api_controller.go

@@ -2239,11 +2239,13 @@ func (c *GobalConfigApiController) GetDrugOutOrderPrint() {
 
 	warehousing, _ := service.GetExportOutOrderDrugListOne(ids)
 
-	//drug_warhouse_out, _ := service.GetDrugWarehouseOut(ids)
+	drug_warhouse_out, _ := service.GetDrugWarehouseOutTenty(ids)
+
 	c.ServeSuccessJSON(map[string]interface{}{
-		"info":             info,
-		"warehousing":      warehousing,
-		"manufacturerList": manufacturerList,
+		"info":              info,
+		"warehousing":       warehousing,
+		"manufacturerList":  manufacturerList,
+		"drug_warhouse_out": drug_warhouse_out,
 	})
 }
 

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/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")
+
 }

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_stock.go

@@ -421,3 +421,49 @@ type DrugFlow struct {
 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"
+}

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 {

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/drug_pharmacy_management_service.go

@@ -1597,3 +1597,37 @@ func GetLastHisPharmary(orgid int64, advice_id int64, record_date int64) (models
 
 	return pharmacy, err
 }
+
+func GetConfigSettingIsExsit(orgid int64) (*models.PharmacyConfig, error) {
+
+	var pharmacy models.PharmacyConfig
+	var err error
+	err = readDb.Model(&models.PharmacyConfig{}).Where("user_org_id=? and status = 1", orgid).First(&pharmacy).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, nil
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &pharmacy, nil
+}
+
+func CreatePharmacyConfig(config *models.PharmacyConfig) error {
+
+	err := XTWriteDB().Create(&config).Error
+	return err
+}
+
+func UpdatePharmacyConfig(orgid int64, config *models.PharmacyConfig) error {
+
+	err := XTWriteDB().Model(&models.PharmacyConfig{}).Where("user_org_id = ? and status = 1", orgid).Update(map[string]interface{}{"is_open": config.IsOpen}).Error
+	return err
+}
+
+func GetPharmacyConfig(orgid int64) (models.PharmacyConfig, error) {
+
+	config := models.PharmacyConfig{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&config).Error
+
+	return config, 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"
@@ -4687,6 +4688,12 @@ func GetDrugWarehouseOut(warehouse_out_id []string) (out []*models.StDrugWarehou
 	return out, err
 }
 
+func GetDrugWarehouseOutTenty(warehouse_out_id []string) (out []*models.DrugWarehouseOutInfoTenty, err error) {
+
+	err = XTReadDB().Where("warehouse_out_id in(?)", warehouse_out_id).Preload("BaseDrugLib", "status = 1").Find(&out).Error
+	return out, err
+}
+
 func GetLastGoodInformationByGoodId(goodid int64, warehouse_info_id int64, orgid_id int64) (models.WarehouseOutInfo, error) {
 
 	info := models.WarehouseOutInfo{}
@@ -5213,9 +5220,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 +5234,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
 }
 
@@ -5712,7 +5719,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
 }
 
@@ -6630,3 +6636,161 @@ 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
+}