no message

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 #

controllers/dialysis_api_controller.go

@@ -3107,7 +3107,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
-			if template.TemplateId == 6 && adminInfo.CurrentOrgId == 9671 {
+			if template.TemplateId == 6 && adminInfo.CurrentOrgId == 10121 {
 
 				dehydration, _ := strconv.ParseFloat(evaluation.Dehydration, 64)
 				ultrafiltration_rate = math.Floor((prescription.TargetUltrafiltration + dehydration) / float64(totalMin) * 60 * 1000)
@@ -3142,6 +3142,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 {
 		if ultrafiltration_rate > 0 && adminInfo.CurrentOrgId != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
+
 			record.UltrafiltrationVolume = ultrafiltration_volume
 		}
 

controllers/dialysis_record_api_controller.go

@@ -773,7 +773,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 				}
 
 				//针对福建医师汇
-				if template.TemplateId == 6 && adminUserInfo.CurrentOrgId == 9671 {
+				if template.TemplateId == 6 && adminUserInfo.CurrentOrgId == 10121 {
 					if evaluation.ID > 0 {
 						dehydration, _ := strconv.ParseFloat(evaluation.Dehydration, 64)
 						ultrafiltration_rate = math.Floor((prescription.TargetUltrafiltration + dehydration) / float64(totalMin) * 60 * 1000)

controllers/drug_stock_api_contorller.go

@@ -136,27 +136,25 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 
 				warehousing_count, _ := strconv.ParseInt(items["warehousing_count"].(string), 10, 64)
 
-				if items["price"] == nil || reflect.TypeOf(items["price"]).String() != "string" {
-					utils.ErrorLog("price")
+				if items["last_price"] == nil || reflect.TypeOf(items["last_price"]).String() != "string" {
+					utils.ErrorLog("last_price")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
-				price, _ := strconv.ParseFloat(items["price"].(string), 64)
-				total := float64(warehousing_count) * price
+				last_price, _ := strconv.ParseFloat(items["last_price"].(string), 64)
+				total := float64(warehousing_count) * last_price
 
-				if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
-					utils.ErrorLog("retail_price")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
-				retail_price, _ := strconv.ParseFloat(items["retail_price"].(string), 64)
-				retail_price_total := float64(warehousing_count) * retail_price
+				//if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
+				//	utils.ErrorLog("retail_price")
+				//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				//	return
+				//}
+				//retail_price, _ := strconv.ParseFloat(items["retail_price"].(string), 64)
+				retail_price_total := float64(warehousing_count) * last_price
 
 				var productDates int64
 				var expiryDates int64
 
-				fmt.Println()
-
 				if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "string" {
 					expiryDates = 0
 				} else {
@@ -207,7 +205,7 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 					ProductDate:      productDates,
 					ExpiryDate:       expiryDates,
 					WarehousingCount: warehousing_count,
-					Price:            price,
+					Price:            last_price,
 					TotalPrice:       total,
 					Status:           1,
 					Ctime:            ctime,
@@ -216,7 +214,7 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 					Type:             types,
 					Manufacturer:     manufacturer_id,
 					Dealer:           dealer_id,
-					RetailPrice:      retail_price,
+					//RetailPrice:      retail_price,
 					RetailTotalPrice: retail_price_total,
 				}
 				warehousingInfo = append(warehousingInfo, warehouseInfo)

controllers/manager_center_api_controller.go

@@ -78,6 +78,8 @@ func ManagerCenterRegistRouters() {
 	beego.Router("/api/diagnose/list", &ManagerCenterApiController{}, "get:GetDiagnoseList")
 	beego.Router("/api/diagnose/delete", &ManagerCenterApiController{}, "post:DeleteDiagnose")
 	beego.Router("/api/diagnose/get", &ManagerCenterApiController{}, "get:GetDiagnose")
+	beego.Router("/api/drug/getalldruglist", &ManagerCenterApiController{}, "get:GetAllDrugList")
+	beego.Router("/api/drug/postsearchdruglist", &ManagerCenterApiController{}, "get:GetSearchDrugList")
 
 }
 
@@ -134,6 +136,11 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	loc, _ := time.LoadLocation("Local")
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	drug_remark := c.GetString("drug_remark")
+	dosage := c.GetString("dosage")
+	unval := c.GetString("unval")
+	packing_unit := c.GetString("packing_unit")
+	packing_price, _ := c.GetFloat("packing_price")
+	drug_day := c.GetString("drug_day")
 	adminInfo := c.GetAdminUserInfo()
 
 	drugLib := &models.BaseDrugLib{
@@ -190,6 +197,11 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 		SocialSecurityDirectoryCode: social_security_directory_code,
 		RecordDate:                  theTime.Unix(),
 		DrugRemark:                  drug_remark,
+		Dosage:                      dosage,
+		Unval:                       unval,
+		PackingUnit:                 packing_unit,
+		PackingPrice:                packing_price,
+		DrugDay:                     drug_day,
 	}
 
 	total := service.FindAllDrugLibRecordTotal(adminInfo.CurrentOrgId)
@@ -197,7 +209,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	drug_code = "54000000" + drug_code
 	drugLib.DrugCode = drug_code
 
-	count := service.FindBaseDrugLibRecordCount(drugLib)
+	count := service.FindBaseDrugLibRecordCountOne(drugLib)
 
 	if count == 0 {
 		err := service.CreateBaseDrugLib(drugLib)
@@ -274,6 +286,11 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	loc, _ := time.LoadLocation("Local")
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	drug_remark := c.GetString("drug_remark")
+	dosage := c.GetString("dosage")
+	unval := c.GetString("unval")
+	packing_unit := c.GetString("packing_unit")
+	packing_price, _ := c.GetFloat("packing_price")
+	drug_day := c.GetString("drug_day")
 	adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
 
@@ -333,6 +350,11 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		SocialSecurityDirectoryCode: social_security_directory_code,
 		RecordDate:                  theTime.Unix(),
 		DrugRemark:                  drug_remark,
+		Dosage:                      dosage,
+		Unval:                       unval,
+		PackingPrice:                packing_price,
+		PackingUnit:                 packing_unit,
+		DrugDay:                     drug_day,
 	}
 
 	err := service.UpdateBaseDrugLib(drugLib)
@@ -355,7 +377,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	//查询是否存在
 	_, errTwo := service.GetStandNameIsExist(id, adminInfo.CurrentOrgId)
 	if errTwo == gorm.ErrRecordNotFound {
-		fmt.Println("进来了吗1")
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "修改成功",
 		})
@@ -2129,3 +2151,34 @@ func (c *ManagerCenterApiController) GetDiagnose() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 	}
 }
+
+func (c *ManagerCenterApiController) GetAllDrugList() {
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+
+	list, err := service.GetAllDrugList(orgId)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list":             list,
+			"manufacturerList": manufacturerList,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (c *ManagerCenterApiController) GetSearchDrugList() {
+	keyword := c.GetString("keyword")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	list, err := service.GetSearchDrugList(keyword, orgId)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list":             list,
+			"manufacturerList": manufacturerList,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2312,6 +2312,7 @@ func (this *DialysisAPIController) GetLastMonitorRecord() {
 }
 
 func (this *DialysisAPIController) GetLastMonitorRecordTody() {
+
 	thisTime := time.Now()
 	scheduleDateStart := thisTime.Format("2006-01-02") + " 00:00:00"
 	timeLayout := "2006-01-02 15:04:05"
@@ -2337,8 +2338,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if template.TemplateId == 6 && adminInfo.Org.Id != 9671 {
-
+			if template.TemplateId == 6 && adminInfo.Org.Id != 9538 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
@@ -2382,6 +2382,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume
+
 		}
 	}
 

controllers/schedule_api_controller.go

@@ -64,6 +64,8 @@ func ScheduleApiRegistRouters() {
 	beego.Router("/api/schedule/schedulesone", &ScheduleApiController{}, "Get:GetScheduleOne")
 	beego.Router("/api/schedule/postscheduletemplate", &ScheduleApiController{}, "Get:SaveScheduleTemplate")
 	beego.Router("/api/schedule/getscheduletemplate", &ScheduleApiController{}, "Get:GetScheduleTemplate")
+	beego.Router("/api/order/changefuncprint", &ScheduleApiController{}, "Get:ChangeFuncPrint")
+	beego.Router("/api/order/getdataprint", &ScheduleApiController{}, "Get:GetDataPrint")
 }
 
 func (c *ScheduleApiController) GetWeekPanels() {
@@ -2623,3 +2625,45 @@ func (c *ScheduleApiController) GetScheduleTemplate() {
 	})
 	return
 }
+
+func (c *ScheduleApiController) ChangeFuncPrint() {
+
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	is_open, _ := c.GetInt64("is_open")
+	dataPrint := models.XtDataPrint{
+		UserOrgId: orgId,
+		IsOpen:    is_open,
+		Status:    1,
+		Ctime:     time.Now().Unix(),
+	}
+
+	_, errcode := service.GetDataPrintByOrgId(orgId)
+	fmt.Println("errcode222234444555556t66", errcode)
+	if errcode == gorm.ErrRecordNotFound {
+		service.CreateDataPrint(&dataPrint)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"dataPrint": dataPrint,
+		})
+		return
+	} else if errcode == nil {
+		service.UpdteDataPrint(orgId, &dataPrint)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"dataPrint": dataPrint,
+		})
+		return
+	}
+
+}
+
+func (c *ScheduleApiController) GetDataPrint() {
+
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+
+	dataPrint, _ := service.GetDataPrint(orgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"dataPrint": dataPrint,
+	})
+	return
+}

controllers/stock_in_api_controller.go

@@ -2607,21 +2607,85 @@ func (this *StockManagerApiController) AddDrugInformation() {
 
 		drug.DrugName = drug_name
 
-		if goodNameM["drug_alias"] == nil || reflect.TypeOf(goodNameM["drug_alias"]).String() != "string" {
-			utils.ErrorLog("drug_alias")
+		if goodNameM["unval"] == nil || reflect.TypeOf(goodNameM["unval"]).String() != "string" {
+			utils.ErrorLog("unval")
 			return
 		}
 
-		drug_alias, _ := goodNameM["drug_alias"].(string)
+		unval, _ := goodNameM["unval"].(string)
+		if len(drug_name) == 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.DrugAlias = drug_alias
+		drug.Unval = unval
+
+		min_unit := goodNameM["min_unit"].(string)
+		if len(min_unit) == 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.MinUnit = min_unit
+
+		dosage, _ := goodNameM["dosage"].(string)
+		if len(dosage) == 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.Dosage = dosage
+
+		max_unit_id := goodNameM["max_unit"].(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_spec, _ := goodNameM["drug_spec"].(string)
-		if len(drug_spec) == 0 { //名字为空则生成一条导入错误日志
+		drug.MaxUnit = max_unit_id
+
+		packing_unit := goodNameM["packing_unit"].(string)
+		if len(packing_unit) == 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
 				LogType:    4,
 				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的药品规格不能为空",
+				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的包装单位不能为空",
 				Status:     1,
 				CreateTime: time.Now().Unix(),
 				UpdateTime: time.Now().Unix(),
@@ -2631,7 +2695,58 @@ func (this *StockManagerApiController) AddDrugInformation() {
 			continue
 		}
 
-		drug.DrugSpec = drug_spec
+		drug.PackingUnit = packing_unit
+
+		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
+		}
+
+		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
+		}
+
+		drug.ExecutionFrequency = execution_frequency
+
+		drug_day := goodNameM["drug_day"].(string)
+		if len(drug_day) == 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.DrugDay = drug_day
 
 		drug_type := goodNameM["drug_type"].(string)
 		if len(drug_type) == 0 { //名字为空则生成一条导入错误日志
@@ -2828,12 +2943,12 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		}
 		drug.MedicalInsuranceLevel = medical_insurance_level_id
 
-		max_unit_id := goodNameM["max_unit"].(string)
+		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) + "行" + "的最大不能为空",
+				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的单位换算不能为空",
 				Status:     1,
 				CreateTime: time.Now().Unix(),
 				UpdateTime: time.Now().Unix(),
@@ -2843,14 +2958,15 @@ func (this *StockManagerApiController) AddDrugInformation() {
 			continue
 		}
 
-		drug.MaxUnit = max_unit_id
+		drug.UnitMatrixing = unit_matrixing
+		retail_prices := goodNameM["retail_price"].(string)
+		retail_price, _ := strconv.ParseFloat(retail_prices, 64)
 
-		min_unit := goodNameM["min_unit"].(string)
-		if len(max_unit_id) == 0 { //名字为空则生成一条导入错误日志
+		if retail_price <= 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
 				LogType:    4,
 				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的最小单位不能为空",
+				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的拆零售价不能为空",
 				Status:     1,
 				CreateTime: time.Now().Unix(),
 				UpdateTime: time.Now().Unix(),
@@ -2860,32 +2976,16 @@ func (this *StockManagerApiController) AddDrugInformation() {
 			continue
 		}
 
-		drug.MinUnit = min_unit
-
-		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.RetailPrice = retail_price
 
-		drug.UnitMatrixing = unit_matrixing
-		retail_prices := goodNameM["retail_price"].(string)
-		retail_price, _ := strconv.ParseFloat(retail_prices, 64)
+		packing_prices := goodNameM["packing_price"].(string)
+		packing_price, _ := strconv.ParseFloat(packing_prices, 64)
 
-		if retail_price <= 0 { //名字为空则生成一条导入错误日志
+		if packing_price <= 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
 				LogType:    4,
 				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的零售价不能为空",
+				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的包装零售价不能为空",
 				Status:     1,
 				CreateTime: time.Now().Unix(),
 				UpdateTime: time.Now().Unix(),
@@ -2903,7 +3003,7 @@ func (this *StockManagerApiController) AddDrugInformation() {
 			err_log := models.ExportErrLog{
 				LogType:    4,
 				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的上次进价不能为空",
+				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的进货价不能为空",
 				Status:     1,
 				CreateTime: time.Now().Unix(),
 				UpdateTime: time.Now().Unix(),
@@ -2968,6 +3068,77 @@ func (this *StockManagerApiController) AddDrugInformation() {
 			}
 		}
 
+		drug_dose := goodNameM["drug_dose"].(string)
+
+		if len(drug_dose) == 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
+		}
+		drugDoses, _ := strconv.ParseFloat(drug_dose, 64)
+		drug.DrugDose = drugDoses
+
+		var units = "单位"
+		var unit_id int64
+		drugDoseUnit := goodNameM["drug_dose_unit"].(string)
+
+		if len(drugDoseUnit) == 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
+		}
+
+		dataConfig, _ := service.GetDataConfigIsExist(0, units)
+		if len(drugDoseUnit) != 0 {
+			_, errcodedataconfig := service.GetChildeConfigIsExist(dataConfig.ID, drugDoseUnit, orgId)
+			if errcodedataconfig == gorm.ErrRecordNotFound {
+				childConfig, _ := service.GetLastChildeConfig(dataConfig.ID, orgId)
+				dataconfig := models.Dataconfig{
+					ParentId:       dataConfig.ID,
+					Module:         "hemodialysis",
+					OrgId:          orgId,
+					Name:           drugDoseUnit,
+					FieldName:      "",
+					Value:          childConfig.Value + 1,
+					CreatedTime:    "",
+					UpdatedTime:    "",
+					CreateUserId:   adminUser.AdminUser.Id,
+					Status:         1,
+					Remark:         "",
+					DeleteIdSystem: 0,
+					Title:          "",
+					Content:        "",
+					Order:          0,
+					Code:           "",
+					FieldType:      0,
+				}
+				service.CreateDataConfig(&dataconfig)
+			}
+		}
+		list, _ := service.FindAllDataConfigList(orgId, dataConfig.ID)
+		for _, it := range list {
+			if drugDoseUnit == it.Name {
+				unit_id = int64(it.Value)
+			}
+		}
+		drug.DrugDoseUnit = unit_id
+
 		drug.DrugClassify = strconv.FormatInt(drug_classify_id, 10)
 
 		manufacturer := goodNameM["manufacturer"].(string)
@@ -3033,14 +3204,61 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		}
 		drug.Dealer = dealer_id
 
-		pinyin := goodNameM["pinyin"].(string)
+		lmt_used_flags := int64(goodNameM["lmt_used_flag"].(float64))
 
-		drug.Pinyin = pinyin
-		wubi := goodNameM["wubi"].(string)
-		drug.Wubi = wubi
+		drug.LmtUsedFlag = lmt_used_flags
+
+		if goodNameM["drug_alias"] == nil || reflect.TypeOf(goodNameM["drug_alias"]).String() != "string" {
+			utils.ErrorLog("drug_alias")
+			return
+		}
 
-		drug_alias_pinyin := goodNameM["drug_alias_pinyin"].(string)
-		drug.DrugAliasPinyin = drug_alias_pinyin
+		drug_alias, _ := goodNameM["drug_alias"].(string)
+
+		drug.DrugAlias = drug_alias
+
+		drug_category := goodNameM["drug_category"].(string)
+
+		var drugCategory = "药品类别"
+		var drug_category_id int64
+
+		drugCategoryConfig, _ := service.GetDrugDataConfig(0, drugCategory)
+
+		if len(drug_category) != 0 {
+			_, drugcategoryerrcodes := service.IsExistDicConfig(drugCategoryConfig.ID, drug_category, orgId)
+			if drugcategoryerrcodes == gorm.ErrRecordNotFound {
+				drugCategoryConfigSix, _ := service.GetLastDicConfig(drugCategoryConfig.ID, orgId)
+				dataconfig := models.DictDataconfig{
+					ParentId:       drugCategoryConfig.ID,
+					Module:         "system",
+					OrgId:          orgId,
+					Name:           drug_category,
+					FieldName:      "",
+					Value:          drugCategoryConfigSix.Value + 1,
+					CreatedTime:    "",
+					UpdatedTime:    "",
+					CreateUserId:   adminUser.AdminUser.Id,
+					Status:         1,
+					Remark:         "",
+					DeleteIdSystem: 0,
+					Title:          "",
+					Content:        "",
+					Order:          0,
+					Code:           "",
+				}
+				service.CreatedDicConfig(&dataconfig)
+			}
+		}
+
+		drugCategoryList, _ := service.GetParentDataConfig(drugCategoryConfig.ID, orgId)
+		fmt.Println("drugCategoryList", drugCategoryList)
+		for _, it := range drugCategoryList {
+			if drug_category == it.Name {
+				drug_category_id = int64(it.Value)
+			}
+		}
+
+		drug.DrugCategory = drug_category_id
 
 		statistics_category := goodNameM["statistics_category"].(string)
 
@@ -3153,9 +3371,6 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		limit_remark := goodNameM["limit_remark"].(string)
 		drug.LimitRemark = limit_remark
 
-		drug_alias_wubi := goodNameM["drug_alias_wubi"].(string)
-		drug.DrugAliasWubi = drug_alias_wubi
-
 		drug_control := goodNameM["drug_control"].(string)
 
 		var drugControl = "开药控制"
@@ -3196,123 +3411,6 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		}
 		drug.DrugControl = drug_control_id
 
-		drug_category := goodNameM["drug_category"].(string)
-
-		var drugCategory = "药品类别"
-		var drug_category_id int64
-
-		drugCategoryConfig, _ := service.GetDrugDataConfig(0, drugCategory)
-
-		if len(drug_category) != 0 {
-			_, drugcategoryerrcodes := service.IsExistDicConfig(drugCategoryConfig.ID, drug_category, orgId)
-			if drugcategoryerrcodes == gorm.ErrRecordNotFound {
-				drugCategoryConfigSix, _ := service.GetLastDicConfig(drugCategoryConfig.ID, orgId)
-				dataconfig := models.DictDataconfig{
-					ParentId:       drugCategoryConfig.ID,
-					Module:         "system",
-					OrgId:          orgId,
-					Name:           drug_category,
-					FieldName:      "",
-					Value:          drugCategoryConfigSix.Value + 1,
-					CreatedTime:    "",
-					UpdatedTime:    "",
-					CreateUserId:   adminUser.AdminUser.Id,
-					Status:         1,
-					Remark:         "",
-					DeleteIdSystem: 0,
-					Title:          "",
-					Content:        "",
-					Order:          0,
-					Code:           "",
-				}
-				service.CreatedDicConfig(&dataconfig)
-			}
-		}
-
-		drugCategoryList, _ := service.GetParentDataConfig(drugCategoryConfig.ID, orgId)
-		fmt.Println("drugCategoryList", drugCategoryList)
-		for _, it := range drugCategoryList {
-			if drug_category == it.Name {
-				drug_category_id = int64(it.Value)
-			}
-		}
-
-		drug.DrugCategory = drug_category_id
-
-		drug_dose := goodNameM["drug_dose"].(string)
-
-		if len(drug_dose) == 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
-		}
-		drugDoses, _ := strconv.ParseFloat(drug_dose, 64)
-		drug.DrugDose = drugDoses
-
-		var units = "单位"
-		var unit_id int64
-		drugDoseUnit := goodNameM["drug_dose_unit"].(string)
-
-		if len(drugDoseUnit) == 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
-		}
-
-		dataConfig, _ := service.GetDataConfigIsExist(0, units)
-		if len(drugDoseUnit) != 0 {
-			_, errcodedataconfig := service.GetChildeConfigIsExist(dataConfig.ID, drugDoseUnit, orgId)
-			if errcodedataconfig == gorm.ErrRecordNotFound {
-				childConfig, _ := service.GetLastChildeConfig(dataConfig.ID, orgId)
-				dataconfig := models.Dataconfig{
-					ParentId:       dataConfig.ID,
-					Module:         "hemodialysis",
-					OrgId:          orgId,
-					Name:           drugDoseUnit,
-					FieldName:      "",
-					Value:          childConfig.Value + 1,
-					CreatedTime:    "",
-					UpdatedTime:    "",
-					CreateUserId:   adminUser.AdminUser.Id,
-					Status:         1,
-					Remark:         "",
-					DeleteIdSystem: 0,
-					Title:          "",
-					Content:        "",
-					Order:          0,
-					Code:           "",
-					FieldType:      0,
-				}
-				service.CreateDataConfig(&dataconfig)
-			}
-		}
-		list, _ := service.FindAllDataConfigList(orgId, dataConfig.ID)
-		for _, it := range list {
-			if drugDoseUnit == it.Name {
-				unit_id = int64(it.Value)
-			}
-		}
-		drug.DrugDoseUnit = unit_id
-
-		lmt_used_flags := int64(goodNameM["lmt_used_flag"].(float64))
-
-		drug.LmtUsedFlag = lmt_used_flags
 		drugList = append(drugList, &drug)
 	}
 
@@ -3365,10 +3463,17 @@ func (this *StockManagerApiController) AddDrugInformation() {
 				DrugDose:                    item.DrugDose,
 				DrugDoseUnit:                item.DrugDoseUnit,
 				LmtUsedFlag:                 item.LmtUsedFlag,
+				Dosage:                      item.Dosage,
+				Unval:                       item.Unval,
+				PackingUnit:                 item.PackingUnit,
+				PackingPrice:                item.PackingPrice,
+				DrugDay:                     item.DrugDay,
+				DeliveryWay:                 item.DeliveryWay,
+				ExecutionFrequency:          item.ExecutionFrequency,
 			}
 
 			//查询同种药品同种规格是否存在
-			_, drugerror := service.IsExistDrugByName(item.DrugName, item.DrugSpec, orgId)
+			_, drugerror := service.IsExistDrugByNameOne(item.DrugName, item.Dosage, item.MaxUnit, item.Unval, item.MinUnit, item.PackingUnit, orgId)
 
 			if drugerror == gorm.ErrRecordNotFound {
 				service.CreateDrugsInfomation(&goodInfo)

models/drug.go

@@ -65,6 +65,11 @@ type BaseDrugLib struct {
 	HospApprFlag                int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	LmtUsedFlag                 int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
+	Dosage       string  `gorm:"column:dosage" json:"dosage" form:"dosage"`
+	Unval        string  `gorm:"column:unval" json:"unval" form:"unval"`
+	PackingUnit  string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	PackingPrice float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	DrugDay      string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
 }
 
 func (BaseDrugLib) TableName() string {

models/schedule_models.go

@@ -22,6 +22,7 @@ type VmSchedules struct {
 	DoctorAdvice         []*DoctorAdvice        `json:"doctoradvice" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
 	DialysisPrescription DialysisPrescription   `json:"prescription" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
 	HisDoctorAdviceInfo  []*HisDoctorAdviceInfo `json:"hisdoctoradviceinfo" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	DialysisSolution     []*DialysisSolution    `json:"dialysissolution" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
 }
 
 func (VmSchedules) TableName() string {
@@ -137,6 +138,7 @@ type WeekSchedule struct {
 	DialysisPrescription DialysisSolution       `json:"prescription" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
 	DoctorAdvice         []*DoctorAdvice        `json:"doctoradvice" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
 	HisDoctorAdviceInfo  []*HisDoctorAdviceInfo `json:"hisdoctoradviceinfo" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	DialysisSolution     []*DialysisSolution    `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
 }
 
 func (WeekSchedule) TableName() string {
@@ -155,3 +157,16 @@ type ScheduleTemplate struct {
 func (ScheduleTemplate) TableName() string {
 	return "xt_schedule_template"
 }
+
+type XtDataPrint struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtDataPrint) TableName() string {
+	return "xt_data_print"
+}

service/manage_center_service.go

@@ -158,6 +158,11 @@ func FindBaseDrugLibRecordCount(lib *models.BaseDrugLib) (count int64) {
 	return
 }
 
+func FindBaseDrugLibRecordCountOne(lib *models.BaseDrugLib) (count int64) {
+	readDb.Model(&models.BaseDrugLib{}).Where("org_id = ? and drug_name = ? and dosage = ? and max_unit = ? and unval = ? and min_unit = ? and packing_unit = ? and manufacturer = ? and status = 1", lib.OrgId, lib.DrugName, lib.Dosage, lib.MaxUnit, lib.Unval, lib.MinUnit, lib.PackingUnit, lib.Manufacturer).Count(&count)
+	return
+}
+
 func FindAllDrugLibRecordTotal(org_id int64) (count int64) {
 	readDb.Model(&models.BaseDrugLib{}).Where("org_id = ? AND status = 1", org_id).Count(&count)
 	return
@@ -357,3 +362,9 @@ func GetDoseCode(dose_id int64, user_org_id int64) (error, string) {
 	err := readDb.Model(&models.DictDataconfig{}).Where(" (user_org_id = ? Or user_org_id = 0) AND parent_id = 4 AND module = 'system' AND status = 1 AND value = ?", user_org_id, dose_id).First(&data).Error
 	return err, data.Code
 }
+
+func GetAllDrugList(orgid int64) (drug []*models.BaseDrugLib, err error) {
+
+	err = XTReadDB().Model(&drug).Where("org_id = ? and status = 1", orgid).Find(&drug).Error
+	return drug, err
+}

service/patientmanage_service.go

@@ -865,7 +865,7 @@ func GetDialysisrecord(patientID int64, start int64, end int64, limit int64, pag
 			return readUserDb.Where("org_id=? and status = 1", orgID)
 		}).
 		Joins("JOIN xt_schedule as s ON s.patient_id=? and FROM_UNIXTIME(s.schedule_date, '%Y-%m-%d')=FROM_UNIXTIME(do.dialysis_date, '%Y-%m-%d')", patientID).
-		Joins("JOIN xt_device_zone as dz ON dz.org_id = ? and dz.id=s.partition_id", orgID).
+		Joins("JOIN xt_device_zone as dz ON dz.org_id = ? and dz.id=s.partition_id and s.status = 1", orgID).
 		Where("do.patient_id=? and do.user_org_id=? and do.stage = 2 and do.status=1", patientID, orgID).Group("s.schedule_date")
 
 	if start > 0 {

service/schedule_service.go

@@ -579,7 +579,7 @@ func GetWeekDayScheduleById(orgid int64, scheduleDate int64, scheduleType int64)
 
 	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
-	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Find(&list).Error
+	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Preload("DialysisSolution", "status = 1 and user_org_id = ?", orgid).Find(&list).Error
 
 	return list, err
 }
@@ -602,7 +602,7 @@ func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int
 
 	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
-	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Find(&list).Error
+	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Preload("DialysisSolution", "user_org_id =? and status = 1", orgid).Find(&list).Error
 
 	return list, err
 }
@@ -777,7 +777,9 @@ func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endt
 		Preload("DeviceNumber", "status = 1 ").
 		Preload("DialysisPrescription", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Order("id asc")
-		}).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
+		}).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1").Order("id asc")
+	}).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1").Joins("JOIN xt_patients as p ON p.id = s.patient_id").
 		Select("s.id,s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time, p.name as patient").
@@ -908,3 +910,36 @@ func GetScheduleTemplate(orgid int64) (models.ScheduleTemplate, error) {
 	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&template).Error
 	return template, err
 }
+
+func GetDataPrintByOrgId(orgid int64) (*models.XtDataPrint, error) {
+
+	dataPrint := models.XtDataPrint{}
+
+	err := XTReadDB().Model(&dataPrint).Where("user_org_id = ? and status = 1", orgid).Find(&dataPrint).Error
+
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &dataPrint, nil
+}
+
+func CreateDataPrint(dataPrint *models.XtDataPrint) error {
+
+	err := XTWriteDB().Create(&dataPrint).Error
+	return err
+}
+
+func UpdteDataPrint(orgid int64, dataPrint *models.XtDataPrint) error {
+
+	err := XTWriteDB().Model(&dataPrint).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"is_open": dataPrint.IsOpen}).Error
+	return err
+}
+
+func GetDataPrint(orgid int64) (models.XtDataPrint, error) {
+	dataPrint := models.XtDataPrint{}
+	err := XTReadDB().Model(&dataPrint).Where("user_org_id = ? and status = 1", orgid).Find(&dataPrint).Error
+	return dataPrint, err
+}

service/stock_service.go

@@ -551,19 +551,24 @@ func (VMDrugWarehouseInfo) TableName() string {
 }
 
 type Drug struct {
-	ID              int64  `gorm:"column:id" json:"id" form:"id"`
-	DrugName        string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	DrugSpec        string `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugType        int64  `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
-	DrugStockLimit  string `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
-	DrugOriginPlace string `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
-	DrugDosageForm  int64  `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
-	Manufacturer    int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	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"`
-	OrgId           int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	DrugCode        string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	ID              int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName        string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugSpec        string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType        int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit  string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugOriginPlace string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	DrugDosageForm  int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
+	Manufacturer    int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	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"`
+	OrgId           int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode        string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	Dosage          string  `gorm:"column:dosage" json:"dosage" form:"dosage"`
+	Unval           string  `gorm:"column:unval" json:"unval" form:"unval"`
+	PackingUnit     string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	PackingPrice    float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	DrugDay         string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
 }
 
 func (Drug) TableName() string {
@@ -2327,6 +2332,19 @@ func IsExistDrugByName(drugname string, drugdesc string, orgid int64) (*models.B
 	return &drug, nil
 }
 
+func IsExistDrugByNameOne(drugname string, dosage string, maxunit string, unival string, minunit string, packtunit string, orgid int64) (*models.BaseDrugLib, error) {
+	var drug models.BaseDrugLib
+	var err error
+	err = XTReadDB().Model(&drug).Where("drug_name = ? and dosage = ?  and max_unit = ? and unval = ? and min_unit=? and packing_unit = ? and status =1 and org_id = ?", drugname, dosage, maxunit, unival, minunit, packtunit, orgid).Find(&drug).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &drug, nil
+}
+
 func CreateDrugsInfomation(info *models.BaseDrugLib) error {
 	err := XTWriteDB().Create(&info).Error
 	return err
@@ -2334,7 +2352,7 @@ func CreateDrugsInfomation(info *models.BaseDrugLib) error {
 
 func UpdateDrugsInformation(drug *models.BaseDrugLib, drugName string, drugSpec string, orgid int64) error {
 
-	err := XTWriteDB().Model(&drug).Where("drug_name = ? and drug_spec = ? and org_id = ? and status = 1", drugName, drugSpec, orgid).Updates(map[string]interface{}{"drug_name": drug.DrugName, "drug_alias": drug.DrugAlias, "drug_spec": drug.DrugSpec, "drug_type": drug.DrugType, "drug_stock_limit": drug.DrugStockLimit, "drug_origin_place": drug.DrugOriginPlace, "drug_dosage_form": drug.DrugDosageForm, "medical_insurance_level": drug.MedicalInsuranceLevel, "max_unit": drug.MaxUnit, "min_unit": drug.MinUnit, "unit_matrixing": drug.UnitMatrixing, "retail_price": drug.RetailPrice, "last_price": drug.LastPrice, "drug_classify": drug.DrugClassify, "manufacturer": drug.Manufacturer, "dealer": drug.Dealer, "pinyin": drug.Pinyin, "wubi": drug.Wubi, "drug_alias_pinyin": drug.DrugAliasPinyin, "drug_alias_wubi": drug.DrugAliasWubi, "drug_category": drug.DrugCategory, "drug_control": drug.DrugControl, "number": drug.Number, "hosp_appr_flag": drug.HospApprFlag, "medical_insurance_number": drug.MedicalInsuranceNumber, "pharmacology_category": drug.PharmacologyCategory, "statistics_category": drug.StatisticsCategory, "code": drug.Code, "is_special_diseases": drug.IsSpecialDiseases, "is_record": drug.IsRecord, "prescription_mark": drug.PrescriptionMark, "social_security_directory_code": drug.SocialSecurityDirectoryCode, "record_date": drug.RecordDate, "drug_remark": drug.DrugRemark, "drug_status": drug.DrugStatus, "limit_remark": drug.LimitRemark, "drug_dose": drug.DrugDose, "drug_dose_unit": drug.DrugDoseUnit, "lmt_used_flag": drug.LmtUsedFlag}).Error
+	err := XTWriteDB().Model(&drug).Where("drug_name = ? and drug_spec = ? and org_id = ? and status = 1", drugName, drugSpec, orgid).Updates(map[string]interface{}{"drug_name": drug.DrugName, "drug_alias": drug.DrugAlias, "drug_spec": drug.DrugSpec, "drug_type": drug.DrugType, "drug_stock_limit": drug.DrugStockLimit, "drug_origin_place": drug.DrugOriginPlace, "drug_dosage_form": drug.DrugDosageForm, "medical_insurance_level": drug.MedicalInsuranceLevel, "max_unit": drug.MaxUnit, "min_unit": drug.MinUnit, "unit_matrixing": drug.UnitMatrixing, "retail_price": drug.RetailPrice, "last_price": drug.LastPrice, "drug_classify": drug.DrugClassify, "manufacturer": drug.Manufacturer, "dealer": drug.Dealer, "pinyin": drug.Pinyin, "wubi": drug.Wubi, "drug_alias_pinyin": drug.DrugAliasPinyin, "drug_alias_wubi": drug.DrugAliasWubi, "drug_category": drug.DrugCategory, "drug_control": drug.DrugControl, "number": drug.Number, "hosp_appr_flag": drug.HospApprFlag, "medical_insurance_number": drug.MedicalInsuranceNumber, "pharmacology_category": drug.PharmacologyCategory, "statistics_category": drug.StatisticsCategory, "code": drug.Code, "is_special_diseases": drug.IsSpecialDiseases, "is_record": drug.IsRecord, "prescription_mark": drug.PrescriptionMark, "social_security_directory_code": drug.SocialSecurityDirectoryCode, "record_date": drug.RecordDate, "drug_remark": drug.DrugRemark, "drug_status": drug.DrugStatus, "limit_remark": drug.LimitRemark, "drug_dose": drug.DrugDose, "drug_dose_unit": drug.DrugDoseUnit, "lmt_used_flag": drug.LmtUsedFlag, "delivery_way": drug.DeliveryWay, "execution_frequency": drug.ExecutionFrequency, "dosage": drug.Dosage, "unval": drug.Unval, "packing_unit": drug.PackingUnit, "packing_price": drug.PackingPrice, "drug_day": drug.DrugDay}).Error
 	return err
 }
 
@@ -2539,3 +2557,15 @@ func GetWarehouseOrderInfoList(orgid int64) (list []*models.WarehousingInfo, err
 	err = XTReadDB().Model(&list).Where("org_id = ? and status = 1", orgid).Order("id asc").Group("good_id").Find(&list).Error
 	return list, err
 }
+
+func GetSearchDrugList(keywords string, orgid int64) (drug []*models.BaseDrugLib, err error) {
+
+	db := XTReadDB().Model(&drug).Where("org_id=? and status=1 ", orgid)
+	if len(keywords) > 0 {
+		likekey := "%" + keywords + "%"
+		err = db.Where("(drug_name LIKE ?)", likekey).Find(&drug).Error
+	} else {
+		err = db.Find(&drug).Error
+	}
+	return
+}

service/warhouse_service.go

@@ -2,14 +2,14 @@ package service
 
 import (
 	"XT_New/models"
-	_"fmt"
-	"strings"
-	"time"
-	"math"
 	"XT_New/utils"
-	"strconv"
 	"errors"
+	_ "fmt"
 	"github.com/jinzhu/gorm"
+	"math"
+	"strconv"
+	"strings"
+	"time"
 )
 
 // 药品出库
@@ -58,24 +58,25 @@ func DrugsDelivery(orgID int64, advice *models.DoctorAdvice) (err error) {
 			} else {
 				out = warehouseOut
 			}
-		} 
+		}
 
 		// 出库流程
 		// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
-		drup,_ := FindBaseDrugLibRecord(orgID,advice.DrugId)
+		drup, _ := FindBaseDrugLibRecord(orgID, advice.DrugId)
 		if drup.ID > 0 {
 			prescribingNumber := advice.PrescribingNumber
-			DrugDeliverInfo(orgID ,prescribingNumber ,&out ,&drup ,advice)
+			DrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice)
 		} else {
 			return errors.New("药品信息不存在")
 		}
-			
+
 	}
 
 	return
-} 
+}
+
 // 药品出库 递归方式
-func DrugDeliverInfo(orgID int64,prescribingNumber float64,warehouseout *models.DrugWarehouseOut,drup *models.BaseDrugLib,advice *models.DoctorAdvice) (err error) {
+func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DoctorAdvice) (err error) {
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
@@ -90,13 +91,13 @@ func DrugDeliverInfo(orgID int64,prescribingNumber float64,warehouseout *models.
 
 	// 根据先进先出原则，查询最先入库的批次，进行出库
 	// 如果没有对应的库存，则报错
-	warehouse,err := FindLastWarehousingInfoByID(advice.DrugId)
+	warehouse, err := FindLastWarehousingInfoByID(advice.DrugId)
 	if err != nil {
 		return err
 	}
 
 	// 将该批次的剩余库存数量转换为拆零数量
-	stock_number = warehouse.StockMaxNumber * drup.MinNumber + warehouse.StockMinNumber
+	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 		warehouseOutInfo := &models.DrugWarehouseOutInfo{
@@ -132,7 +133,7 @@ func DrugDeliverInfo(orgID int64,prescribingNumber float64,warehouseout *models.
 				OrgId:                   orgID,
 				DrugId:                  advice.DrugId,
 				Count:                   deliver_number,
-				CountUnit:				 drup.MinUnit,
+				CountUnit:               drup.MinUnit,
 			}
 			errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 			if errTwo != nil {
@@ -172,7 +173,7 @@ func DrugDeliverInfo(orgID int64,prescribingNumber float64,warehouseout *models.
 		}
 
 		return nil
-	}  else {
+	} else {
 		// 当改批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
 		warehouseOutInfo := &models.DrugWarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
@@ -192,7 +193,7 @@ func DrugDeliverInfo(orgID int64,prescribingNumber float64,warehouseout *models.
 		// count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
 		warehouseOutInfo.Count = stock_number
 		warehouseOutInfo.CountUnit = drup.MinUnit
-		
+
 		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 		if errOne != nil {
 			return errOne
@@ -208,7 +209,7 @@ func DrugDeliverInfo(orgID int64,prescribingNumber float64,warehouseout *models.
 				OrgId:                   orgID,
 				DrugId:                  advice.DrugId,
 				Count:                   stock_number,
-				CountUnit:				 drup.MinUnit,
+				CountUnit:               drup.MinUnit,
 			}
 			errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 			if errTwo != nil {
@@ -227,9 +228,9 @@ func DrugDeliverInfo(orgID int64,prescribingNumber float64,warehouseout *models.
 		prescribingNumber_two_temp := deliver_number - stock_number
 		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
 		advice.PrescribingNumberUnit = drup.MinUnit
-		DrugDeliverInfo(orgID ,prescribingNumber,warehouseout,drup ,advice )
+		DrugDeliverInfo(orgID, prescribingNumber, warehouseout, drup, advice)
 	}
-	return nil
+	return
 }
 
 // 耗材出库
@@ -522,9 +523,7 @@ func ConsumablesDeliveryDelete(orgID int64,patient_id int64,record_time int64,go
 		}
 
 		// 删除出库完成后，要增加对应批次的库存数量
-			
-		warehouse.StockNumber = warehouse.StockMaxNumber - maxNumber
-		warehouse.Mtime = time.Now().Unix()
+	
 		
 
 		errThree := UpDateWarehouseInfoByStockDelete(ware.WarehouseInfoId,delete_count)
@@ -533,11 +532,12 @@ func ConsumablesDeliveryDelete(orgID int64,patient_id int64,record_time int64,go
 		}
 
 		// 增加了对应的库存后，看看还有多少需要退库的
-		good_yc.Count = goods_yc - delete_count 
+		good_yc.Count = goods_yc.Count - delete_count 
 		if good_yc.Count == 0 {
 			return nil
 		}
 	}
+	
 	if good_yd.Count == 0 {
 		return nil 
 	}  else {