历史排班

controllers/base_api_controller.go

@@ -82,7 +82,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10278 //机构id 10344
+		subscibe.OrgId = 10164 //机构id 10344
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -92,8 +92,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10278 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 3467  //4
+		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -327,7 +327,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10278 //机构id小英10344或4
+		subscibe.OrgId = 10164 //机构id小英10344或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -337,8 +337,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10278 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 3467  //4
+		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/dialysis_api_controller.go

@@ -1,17 +1,18 @@
 package controllers
 
 import (
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
 	"encoding/json"
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"math"
 	"reflect"
 	"strconv"
 	"strings"
 
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+	"github.com/jinzhu/gorm"
+
 	//"strings"
 	"time"
 
@@ -143,6 +144,8 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/patient/getdialysisgatherlist", &DialysisApiController{}, "Get:GetDialysisGatherList")
 
 	beego.Router("/api/getpatientdialysisrecordlist", &DialysisApiController{}, "Get:GetPatientDialysisRecordList")
+
+	beego.Router("/api/patient/getpatientrecordlist", &DialysisApiController{}, "Get:GetPatientRecordList")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -2152,6 +2155,7 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 	assessment.TransfusionVolume = data.TransfusionVolume
 	assessment.Condenser = data.Condenser
 	assessment.LastAfterWeight = data.LastAfterWeight
+	assessment.DisplaceLiquiValue = data.DisplaceLiquiValue
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
 	if assessment.ID > 0 {
@@ -7677,3 +7681,17 @@ func (this *DialysisApiController) GetPatientDialysisRecordList() {
 
 	return
 }
+
+func (this *DialysisApiController) GetPatientRecordList() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	beforList, _ := service.GetPatientBeforRecordList(patient_id, orgId)
+	afterList, _ := service.GetPatientAfterRecordList(patient_id, orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"beforList": beforList,
+		"afterList": afterList,
+	})
+
+}

controllers/his_api_controller.go

@@ -17,6 +17,7 @@ import (
 	"XT_New/utils"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
+	"github.com/mozillazg/go-pinyin"
 	"github.com/shopspring/decimal"
 )
 
@@ -3101,7 +3102,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -11529,6 +11530,26 @@ func (c *HisApiController) PostProjectInformation() {
 	errLogs, _ := service.FindPatientExportLog(c.GetAdminUserInfo().CurrentOrgId, export_time)
 	if len(projectList) > 0 {
 		for _, item := range projectList {
+
+			hans := item.ProjectName // 要转换的汉字字符串
+			// 创建一个拼音转换器
+			p := pinyin.NewArgs()
+
+			// 将汉字转为拼音
+			pinyinSlice := pinyin.Pinyin(hans, p)
+
+			// 输出拼音
+			fmt.Println("Pinyin:", pinyinSlice)
+
+			// 获取首字母
+			firstLetter := ""
+			for _, py := range pinyinSlice {
+				if len(py) > 0 {
+					firstLetter += string(py[0][0])
+				}
+			}
+
+			item.FirstLetter = firstLetter
 			project := models.HisProject{
 				ProjectName:                 item.ProjectName,
 				Price:                       item.Price,
@@ -11557,6 +11578,7 @@ func (c *HisApiController) PostProjectInformation() {
 				Remark:                      item.Remark,
 				SocialSecurityDirectoryCode: item.SocialSecurityDirectoryCode,
 				ExecutionFrequency:          item.ExecutionFrequency,
+				FirstLetter:                 item.FirstLetter,
 			}
 
 			_, errcodeproject := service.GetProjectByNameIsExsit(item.ProjectName, orgId)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1399,6 +1399,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	accumulated_blood_volume := c.GetString("accumulated_blood_volume")
 	transfusion_volume := c.GetString("transfusion_volume")
 	last_after_weight := c.GetString("last_after_weight")
+	displace_liqui_value := c.GetString("displace_liqui_value")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1508,6 +1509,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		AccumulatedBloodVolume:       accumulated_blood_volume,
 		TransfusionVolume:            transfusion_volume,
 		LastAfterWeight:              last_after_weight,
+		DisplaceLiquiValue:           displace_liqui_value,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
@@ -1642,8 +1644,10 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		assessmentAfterDislysis.ID = assessmentAfter.ID
 		recordDialysis, _ := service.GetSigleAssessmentAfterDislysisRecord(assessmentAfterDislysis.PatientId, assessmentAfter.AssessmentDate, assessmentAfter.UserOrgId)
 
-		if assessmentAfterDislysis.WeightAfter == 0 {
-			assessmentAfterDislysis.WeightAfter = recordDialysis.WeightAfter
+		if assessmentAfterDislysis.UserOrgId != 10340 {
+			if assessmentAfterDislysis.WeightAfter == 0 {
+				assessmentAfterDislysis.WeightAfter = recordDialysis.WeightAfter
+			}
 		}
 		err := service.UpdateAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
 
@@ -3381,9 +3385,9 @@ func (this *DialysisAPIController) StartDialysis() {
 		tempdispose = "引血" + strconv.FormatInt(blood_drawing, 10) + "ml/min"
 	}
 
-	if blood_drawing > 0 && adminUserInfo.Org.Id == 10629 {
-		tempdispose = "引血" + strconv.FormatInt(blood_drawing, 10) + "ml/min"
-	}
+	//if blood_drawing > 0 && adminUserInfo.Org.Id == 10629 {
+	//	tempdispose = "引血" + strconv.FormatInt(blood_drawing, 10) + "ml/min"
+	//}
 
 	var ultrafiltration_rate float64
 	_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, schedulestartTime, adminUserInfo.Org.Id)
@@ -3466,6 +3470,11 @@ func (this *DialysisAPIController) StartDialysis() {
 				ultrafiltration_rate = ultrafiltration_rate / 1000
 			}
 
+			if adminUserInfo.Org.Id == 10644 {
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
+				ultrafiltration_rate = ultrafiltration_rate / 1000
+			}
+
 		}
 	}
 
@@ -4495,7 +4504,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 			}
 
-			if adminInfo.Org.Id == 10460 {
+			if adminInfo.Org.Id == 10460 || adminInfo.Org.Id == 10644 {
 
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
@@ -4559,7 +4568,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		record.UltrafiltrationVolume = ultrafiltration_volume / 1000
 	}
 
-	if adminInfo.Org.Id == 10460 {
+	if adminInfo.Org.Id == 10460 || adminInfo.Org.Id == 10644 {
 
 		ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 
@@ -9670,7 +9679,7 @@ func (this *DialysisAPIController) ExectionMobileAdvice() {
 			}
 
 			creater := this.GetMobileAdminUserInfo().AdminUser.Id
-			fmt.Println("creater2332243244224242424", creater)
+
 			//执行医嘱
 			errs := service.ExectionBloodMobileAdvice(orgId, idSplit, theTime.Unix(), creater)
 			advices, _ := service.FindAllDoctorAdviceByIds(orgId, idSplit)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1665,23 +1665,25 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 				}
 
+				//fmt.Println("config+++++++++++", config.IsOpen)
+				//fmt.Println("config+++++++++++", item.UserOrgId)
 				//
-				if config.IsOpen == 1 && item.UserOrgId == 10188 {
-
-					service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-					//更新字典里面的库存
-					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-					var sum_count int64
-					for _, its := range stockInfo {
-						if its.MaxUnit == medical.MaxUnit {
-							its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
-						}
-						sum_count += its.StockMaxNumber + its.StockMinNumber
-					}
-					service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
-					//剩余库存
-					service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
-				}
+				//if config.IsOpen == 1 && item.UserOrgId == 10210 {
+				//
+				//	service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+				//	//更新字典里面的库存
+				//	stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+				//	var sum_count int64
+				//	for _, its := range stockInfo {
+				//		if its.MaxUnit == medical.MaxUnit {
+				//			its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+				//		}
+				//		sum_count += its.StockMaxNumber + its.StockMinNumber
+				//	}
+				//	service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+				//	//剩余库存
+				//	service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+				//}
 
 			}
 		}
@@ -3278,6 +3280,14 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 
 		}
 	}
+	//针对长沙南雅的问题
+	if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10164 {
+		if len(evaluation.SymptomBeforeDialysis) == 0 {
+			predialysisEvaluation, _ := service.GetPredialysisEvaluation(id, adminUserInfo.Org.Id)
+			evaluation.SymptomBeforeDialysis = predialysisEvaluation.SymptomBeforeDialysis
+		}
+
+	}
 
 	err = service.UpadatePredialysisEvaluation(&evaluation)
 

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -429,7 +429,7 @@ func (this *StaffScheduleApiController) GetAllZonePb() {
 	}
 
 	//查询排班里面的空透析器
-	if orgid == 10375 {
+	if orgid == 10375 || orgid == 10510 || orgid == 9538 {
 
 		schedulesFive, _ := service.GetMobileScheduleListByScheduleDateOne(orgid, startTime)
 
@@ -451,6 +451,23 @@ func (this *StaffScheduleApiController) GetAllZonePb() {
 				service.UpdateSchOne(item.ID, item.DialysisMachineName)
 			}
 
+			if item.ScheduleDate < timeNewDate.Unix() {
+				prescriptionList, _ := service.GetDialysisPrescriptionList(item.PatientId, item.UserOrgId, item.ScheduleDate)
+				var DialysisMachineName string
+				if len(prescriptionList.DialysisDialyszers) > 0 {
+					DialysisMachineName = prescriptionList.DialysisDialyszers
+				}
+				if len(prescriptionList.DialyzerPerfusionApparatus) > 0 {
+					DialysisMachineName = DialysisMachineName + "," + prescriptionList.DialyzerPerfusionApparatus
+				}
+
+				if len(prescriptionList.DialysisIrrigation) > 0 {
+					DialysisMachineName = DialysisMachineName + "," + prescriptionList.DialysisIrrigation
+				}
+				item.DialysisMachineName = DialysisMachineName
+				service.UpdateSchOne(item.ID, item.DialysisMachineName)
+			}
+
 		}
 
 	}

controllers/patient_api_controller.go

@@ -372,9 +372,6 @@ func (c *PatientApiController) CreatePatient() {
 	// 将汉字转为拼音
 	pinyinSlice := pinyin.Pinyin(hans, p)
 
-	// 输出拼音
-	fmt.Println("Pinyin:", pinyinSlice)
-
 	// 获取首字母
 	firstLetter := ""
 	for _, py := range pinyinSlice {
@@ -495,6 +492,7 @@ func (c *PatientApiController) CreatePatient() {
 		InfectiousRemark:             patient.InfectiousRemark,
 		AllergicHistory:              patient.AllergicHistory,
 		PatientAddress:               patient.PatientAddress,
+		PrintDate:                    patient.PrintDate,
 	}
 	patientsNew.FirstLetter = firstLetter
 
@@ -735,6 +733,7 @@ func (c *PatientApiController) EditPatient() {
 		InfectiousRemark:          patient.InfectiousRemark,
 		AllergicHistory:           patient.AllergicHistory,
 		PatientAddress:            patient.PatientAddress,
+		PrintDate:                 patient.PrintDate,
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
@@ -5366,6 +5365,14 @@ func patientFormData(patient *models.Patients, data []byte, method string) (cont
 		patient.PatientAddress = patient_address
 	}
 
+	if patientBody["print_date"] != nil && reflect.TypeOf(patientBody["print_date"]).String() == "string" {
+		print_date := patientBody["print_date"].(string)
+		printDateTime, err := time.ParseInLocation(timeLayout, print_date, loc)
+		if err == nil {
+			patient.PrintDate = printDateTime.Unix()
+		}
+	}
+
 	return
 
 }
@@ -5891,6 +5898,26 @@ func (c *PatientApiController) ExportPatients() {
 
 	if len(patients) > 0 {
 		for _, item := range patients {
+
+			hans := item.Name // 要转换的汉字字符串
+			// 创建一个拼音转换器
+			p := pinyin.NewArgs()
+
+			// 将汉字转为拼音
+			pinyinSlice := pinyin.Pinyin(hans, p)
+
+			// 输出拼音
+			fmt.Println("Pinyin:", pinyinSlice)
+
+			// 获取首字母
+			firstLetter := ""
+			for _, py := range pinyinSlice {
+				if len(py) > 0 {
+					firstLetter += string(py[0][0])
+				}
+			}
+
+			item.FirstLetter = firstLetter
 			service.CreateExportPatient(item, item.ContagionIds, org.Creator)
 		}
 

controllers/pharmacy_controller.go

@@ -1,15 +1,16 @@
 package controllers
 
 import (
+	"fmt"
+	"math"
+	"strconv"
+	"time"
+
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
-	"fmt"
 	"github.com/astaxie/beego"
-	"math"
-	"strconv"
-	"time"
 )
 
 type PharmacyController struct {
@@ -146,6 +147,7 @@ func (this *PharmacyController) IssuedDrug() {
 		}
 	}()
 	keyword := this.GetString("keyword", "")
+	fmt.Println(keyword)
 	times := this.GetString("time", "")
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	shift, err := this.GetInt64("shift", 0) //班次
@@ -169,50 +171,47 @@ func (this *PharmacyController) IssuedDrug() {
 		etime = stime + 86399
 	}
 
-	if orgid == 10164 || orgid == 3877 || orgid == 10188 || orgid == 10217 || orgid == 9671 || orgid == 10387 || orgid == 10375 || orgid == 10480 || orgid == 10344 {
-
-		//获取排班班次
-		schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
+	//获取排班班次
+	schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
 
-		var ids []int64
-		for _, item := range schedule {
-			ids = append(ids, item.PatientId)
-		}
+	var ids []int64
+	for _, item := range schedule {
+		ids = append(ids, item.PatientId)
+	}
 
-		list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 1, ids)
+	list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 1, ids)
 
-		var flist []models.TmpPatientOne
-		if len(list) > 0 {
-			for _, item := range list {
-				patientlist, _ := service.GetPatientByAdviceId(item.PatientId)
-				flist = append(flist, patientlist)
-			}
+	var flist []models.TmpPatientOne
+	if len(list) > 0 {
+		for _, item := range list {
+			patientlist, _ := service.GetPatientByAdviceId(item.PatientId)
+			flist = append(flist, patientlist)
 		}
-		this.ServeSuccessJSON(map[string]interface{}{
-			"list": flist,
-		})
 	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": flist,
+	})
 
-	if orgid != 10164 && orgid == 3877 && orgid != 10188 && orgid != 10217 && orgid != 9671 && orgid != 10387 && orgid != 10375 && orgid != 10480 && orgid == 10344 {
-		//查询表里当天的数据
-		var flist []*models.TmpPatient
-		flist, err = service.GetTodayDrug(stime, etime, orgid, 1, keyword)
-		if err != nil {
-			utils.ErrorLog(err.Error())
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-			return
-		}
-		listt, err := service.PartitionAndLayout(stime, etime, orgid, shift, partition, flist)
-		if err != nil {
-			utils.ErrorLog(err.Error())
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-			return
-		}
-		this.ServeSuccessJSON(map[string]interface{}{
-			"list": listt,
-		})
-		return
-	}
+	//if orgid != 10164 && orgid == 3877 && orgid != 10188 && orgid != 10217 && orgid != 9671 && orgid != 10387 && orgid != 10375 && orgid != 10480 && orgid == 10344 {
+	//	//查询表里当天的数据
+	//	var flist []*models.TmpPatient
+	//	flist, err = service.GetTodayDrug(stime, etime, orgid, 1, keyword)
+	//	if err != nil {
+	//		utils.ErrorLog(err.Error())
+	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//		return
+	//	}
+	//	listt, err := service.PartitionAndLayout(stime, etime, orgid, shift, partition, flist)
+	//	if err != nil {
+	//		utils.ErrorLog(err.Error())
+	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//		return
+	//	}
+	//	this.ServeSuccessJSON(map[string]interface{}{
+	//		"list": listt,
+	//	})
+	//	return
+	//}
 
 }
 func (this *PharmacyController) WaitingDrug() {

controllers/schedule_api_controller.go

@@ -3986,7 +3986,11 @@ func (this *ScheduleApiController) GetNextWeekDayScheduleOne() {
 	loc, _ := time.LoadLocation("Local")
 	//theTimeStart, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	//theTimeEnd, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
-
+	ids := this.GetString("ids")
+	var idStr []string
+	if len(ids) > 0 {
+		idStr = strings.Split(ids, ",")
+	}
 	adminUserInfo := this.GetAdminUserInfo()
 	var theStartTIme int64
 	if len(record_date) > 0 {
@@ -3997,19 +4001,15 @@ func (this *ScheduleApiController) GetNextWeekDayScheduleOne() {
 		theStartTIme = theTime.Unix()
 	}
 
-	schedule, err := service.GetNextWeekDayScheduleSix(week_type, week_time, start_time, end_time, adminUserInfo.CurrentOrgId, zone, theStartTIme)
-	fmt.Println("schedule------------------------------------------------", len(schedule))
+	schedule, err := service.GetNextWeekDayScheduleSix(week_type, week_time, start_time, end_time, adminUserInfo.CurrentOrgId, zone, theStartTIme, idStr)
+
 	for _, item := range schedule {
 		order, _ := service.GetLastDialysisOrder(adminUserInfo.CurrentOrgId, item.PatientId, theStartTIme)
 		item.XtDialysisOrderSix = order
 		solutionLastWeek, _ := service.GetDialysisSolutionLastWeek(adminUserInfo.CurrentOrgId, item.PatientId, item.ModeId)
 		item.DialysisSolution = solutionLastWeek
-		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10340 {
-
-			dialysisprescription, _ := service.GetLastDialysisSolution(adminUserInfo.CurrentOrgId, item.PatientId, item.ModeId, item.ScheduleDate)
-			item.DialysisPrescription = dialysisprescription
-
-		}
+		prescription, _ := service.GetLastDialysisPrescriptionTwo(adminUserInfo.CurrentOrgId, item.PatientId, item.ModeId, item.ScheduleDate)
+		item.DialysisPrescription = prescription
 
 	}
 	if err != nil {
@@ -4036,7 +4036,11 @@ func (this *ScheduleApiController) GetNextWeekDaySchedule() {
 	loc, _ := time.LoadLocation("Local")
 	theTimeStart, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	theTimeEnd, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
-
+	ids := this.GetString("ids")
+	var idStr []string
+	if len(ids) > 0 {
+		idStr = strings.Split(ids, ",")
+	}
 	adminUserInfo := this.GetAdminUserInfo()
 	var theStartTIme int64
 	if len(record_date) > 0 {
@@ -4047,7 +4051,7 @@ func (this *ScheduleApiController) GetNextWeekDaySchedule() {
 		theStartTIme = theTime.Unix()
 	}
 
-	schedule, err := service.GetNextWeekDaySchedule(week_type, week_time, theTimeStart.Unix(), theTimeEnd.Unix(), adminUserInfo.CurrentOrgId, zone, theStartTIme)
+	schedule, err := service.GetNextWeekDaySchedule(week_type, week_time, theTimeStart.Unix(), theTimeEnd.Unix(), adminUserInfo.CurrentOrgId, zone, theStartTIme, idStr)
 
 	for _, item := range schedule {
 		AssessmentBefor, _ := service.GetAssessmentBeforListLastWeek(item.ScheduleDate, item.PatientId, item.UserOrgId)
@@ -4425,6 +4429,13 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 	week_time, _ := this.GetInt64("week_time")
 	zones := this.GetString("zone")
 	zone := strings.Split(zones, ",")
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	ids := this.GetString("ids")
+	var idStr []string
+	if len(ids) > 0 {
+		idStr = strings.Split(ids, ",")
+	}
 	thisTime := time.Now()
 	weekDay := int(thisTime.Weekday())
 	if weekDay == 0 {
@@ -4442,7 +4453,6 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 		weekTitle = append(weekTitle, indexWeek)
 		days = append(days, theDay.Format("2006-01-02"))
 	}
-	fmt.Println(days)
 
 	var targetDayStr string
 	var startTime string
@@ -4488,19 +4498,25 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 
-	fmt.Println("week_type-------------------------", week_type)
 	if week_type > 0 {
-		list, err := service.GetWeekDayScheduleByIdThee(orgId, targetDay.Unix(), week_time, zone)
+
+		list, total, err := service.GetWeekDayScheduleByIdThee(orgId, targetDay.Unix(), week_time, zone, limit, page, idStr)
+
 		for _, item := range list {
 			order, _ := service.GetLastDialysisOrder(orgId, item.PatientId, targetDay.Unix())
-			adviceList, _ := service.GetHisDoctorAdviceList(orgId, item.PatientId, targetDay.Unix())
-			item.HisDoctorAdviceInfo = adviceList
 			item.XtDialysisOrderSix = order
-			if orgId == 10340 {
-
-				solution, _ := service.GetLastDialysisSolution(orgId, item.PatientId, item.ModeId, item.ScheduleDate)
-				item.DialysisPrescription = solution
-			}
+			advicehisList, _ := service.GetHisDoctorAdviceList(orgId, item.PatientId, targetDay.Unix())
+			item.HisDoctorAdviceInfo = advicehisList
+			advices, _ := service.GetDoctorAdviceListSchedule(orgId, item.PatientId)
+			item.DoctorAdvice = advices
+			prescription, _ := service.GetLastDialysisPrescriptionTwo(orgId, item.PatientId, item.ModeId, item.ScheduleDate)
+			item.DialysisPrescription = prescription
+			dialysisSolution, _ := service.GetLastDialysisSolution(orgId, item.PatientId, item.ModeId)
+			item.DialysisSolution = dialysisSolution
+			lastDialysisAfter, _ := service.GetLastDialysisAfter(orgId, item.PatientId, item.ScheduleDate)
+			item.LastAfterWeight = lastDialysisAfter
+			assessmentBeforFourty, _ := service.GetAssessmentBeforFourty(orgId, item.PatientId, item.ScheduleDate)
+			item.XtAssessmentBeforeDislysis = assessmentBeforFourty
 
 		}
 		if err != nil {
@@ -4509,23 +4525,33 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 		}
 
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list": list,
-			"day":  targetDayStr,
+			"list":  list,
+			"day":   targetDayStr,
+			"total": total,
 		})
 	}
 
 	if week_type == 0 {
 		startDate, _ := utils.ParseTimeStringToTime("2006-01-02", startTime)
-		list, err := service.GetWeekDayScheduleByIdTwo(orgId, targetDay.Unix(), week_time, startDate.Unix(), zone)
+		list, total, err := service.GetWeekDayScheduleByIdTwo(orgId, targetDay.Unix(), week_time, startDate.Unix(), zone, limit, page, idStr)
 		for _, item := range list {
 
 			order, _ := service.GetLastDialysisOrder(orgId, item.PatientId, targetDay.Unix())
 			item.XtDialysisOrderSix = order
-			if orgId == 9671 || orgId == 9675 || orgId == 10340 {
+			advicehisList, _ := service.GetHisDoctorAdviceList(orgId, item.PatientId, targetDay.Unix())
+			item.HisDoctorAdviceInfo = advicehisList
+			advices, _ := service.GetDoctorAdviceListSchedule(orgId, item.PatientId)
+			item.DoctorAdvice = advices
+			prescription, _ := service.GetLastDialysisPrescriptionTwo(orgId, item.PatientId, item.ModeId, item.ScheduleDate)
+			item.DialysisPrescription = prescription
+			dialysisSolution, _ := service.GetLastDialysisSolution(orgId, item.PatientId, item.ModeId)
+			item.DialysisSolution = dialysisSolution
 
-				solution, _ := service.GetLastDialysisSolution(orgId, item.PatientId, item.ModeId, item.ScheduleDate)
-				item.DialysisPrescription = solution
-			}
+			lastDialysisAfter, _ := service.GetLastDialysisAfter(orgId, item.PatientId, item.ScheduleDate)
+			item.LastAfterWeight = lastDialysisAfter
+
+			assessmentBeforFourty, _ := service.GetAssessmentBeforFourty(orgId, item.PatientId, item.ScheduleDate)
+			item.XtAssessmentBeforeDislysis = assessmentBeforFourty
 
 		}
 		if err != nil {
@@ -4534,8 +4560,9 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 		}
 
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list": list,
-			"day":  targetDayStr,
+			"list":  list,
+			"day":   targetDayStr,
+			"total": total,
 		})
 	}
 
@@ -4759,7 +4786,7 @@ func (c *ScheduleApiController) GetScheduleOne() {
 	}
 
 	//查询排班里面的空透析器
-	if adminInfo.CurrentOrgId == 10375 {
+	if adminInfo.CurrentOrgId == 10375 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 9538 {
 
 		schedulesFive, _ := service.GetWeekScheduleFive(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
 
@@ -4780,6 +4807,22 @@ func (c *ScheduleApiController) GetScheduleOne() {
 				item.DialysisMachineName = DialysisMachineName
 				service.UpdateSchOne(item.ID, item.DialysisMachineName)
 			}
+			if item.ScheduleDate < timeNewDate.Unix() {
+				prescriptionList, _ := service.GetDialysisPrescriptionList(item.PatientId, item.UserOrgId, item.ScheduleDate)
+				var DialysisMachineName string
+				if len(prescriptionList.DialysisDialyszers) > 0 {
+					DialysisMachineName = prescriptionList.DialysisDialyszers
+				}
+				if len(prescriptionList.DialyzerPerfusionApparatus) > 0 {
+					DialysisMachineName = DialysisMachineName + "," + prescriptionList.DialyzerPerfusionApparatus
+				}
+
+				if len(prescriptionList.DialysisIrrigation) > 0 {
+					DialysisMachineName = DialysisMachineName + "," + prescriptionList.DialysisIrrigation
+				}
+				item.DialysisMachineName = DialysisMachineName
+				service.UpdateSchOne(item.ID, item.DialysisMachineName)
+			}
 
 		}
 

controllers/self_drug_api_congtroller.go

@@ -123,6 +123,12 @@ func SelfDrugRouters() {
 	beego.Router("/api/stock/getpurchaseDrugQueryList", &SelfDrugApiController{}, "Get:GetPurchaseDrugQueryList")
 
 	beego.Router("/api/stock/getpurchasestockquerylist", &SelfDrugApiController{}, "Get:GetPurchaseStockQueryList")
+
+	beego.Router("/api/drug/getcheckdrugbatchlist", &SelfDrugApiController{}, "Get:GetCheckDrugBatchList")
+
+	beego.Router("/api/good/getcheckgoodbatchlist", &SelfDrugApiController{}, "Get:GetCheckGoodBatchList")
+
+	beego.Router("/api/drug/getdrugpatientname", &SelfDrugApiController{}, "Get:GetDrugPatientName")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -2761,43 +2767,25 @@ func (this *SelfDrugApiController) GetGoodNewQuery() {
 	limit, _ := this.GetInt64("limit")
 
 	// 查询该机构所有耗材入库信息
-	goodList, _ := service.GetAllGoodListSeven(orgId)
-
-	for _, it := range goodList {
-		var sum_total int64
-		//查询该耗材入库信息
-		warehouseinfo, _ := service.GetGoodInformationWarehouseInfo(it.ID, orgId)
-		for _, item := range warehouseinfo {
-			sum_total += item.StockCount
-		}
-		service.UpdateGoodInformation(it.ID, orgId, sum_total)
-
-		//stockListTwo, _ := service.GetGoodStockCountList(orgId, it.ID)
-		//if len(stockListTwo) > 0 {
-		//	for _, item := range stockListTwo {
-		//		var over_count int64
-		//		over_count = item.StockInCount - item.FlushCount
-		//		service.UpdateGoodListCount(item.UserOrgId, over_count, item.GoodId, item.StorehouseId)
-		//
-		//	}
-		//}
-		//
-		//stockListOne, _ := service.GetGoodStockCountList(orgId, it.ID)
-		//if len(stockListOne) > 0 {
-		//	for _, item := range stockListOne {
-		//		var over_count int64
-		//		over_count = item.StockOutCount + item.StockCancelCount
-		//		service.UpdateGoodListCountOne(item.UserOrgId, over_count, item.GoodId, item.StorehouseId)
-		//	}
-		//}
-
-	}
+	//goodList, _ := service.GetAllGoodListSeven(orgId)
+	//
+	//for _, it := range goodList {
+	//	var sum_total int64
+	//	//查询该耗材入库信息
+	//	warehouseinfo, _ := service.GetGoodInformationWarehouseInfo(it.ID, orgId)
+	//	for _, item := range warehouseinfo {
+	//		sum_total += item.StockCount
+	//	}
+	//	service.UpdateGoodInformation(it.ID, orgId, sum_total)
+	//}
 
 	var ids []int64
 
-	manufacturerList, _ := service.GetManufacturerListByKeyword(orgId, keyword)
-	for _, it := range manufacturerList {
-		ids = append(ids, it.ID)
+	if len(keyword) > 0 {
+		manufacturerList, _ := service.GetManufacturerListByKeyword(orgId, keyword)
+		for _, it := range manufacturerList {
+			ids = append(ids, it.ID)
+		}
 	}
 
 	stockList, total, err := service.GetGoodStockList(orgId, storehouse_id, good_type, keyword, page, limit, ids)
@@ -3432,48 +3420,34 @@ func (this *SelfDrugApiController) GetDrugNewQuery() {
 	}
 	var ids []int64
 	var goodIds []int64
-	manufacturerList, _ := service.GetManufacturerListByKeyword(orgId, keyword)
 
+	if len(keyword) > 0 {
+		manufacturerList, _ := service.GetManufacturerListByKeyword(orgId, keyword)
+		for _, it := range manufacturerList {
+			ids = append(ids, it.ID)
+		}
+	}
 	//查询药品库信息
-	drug, _ := service.GetBaseDrugName(orgId)
-
-	for _, it := range drug {
-		var sum_count int64
-		var limit_count int64
-		drugInfo, _ := service.GetDrugWarehouseInfoName(it.ID, orgId)
-		for _, item := range drugInfo {
+	//drug, _ := service.GetBaseDrugName(orgId)
+	//
+	//for _, it := range drug {
+	//	var sum_count int64
+	//	var limit_count int64
+	//	drugInfo, _ := service.GetDrugWarehouseInfoName(it.ID, orgId)
+	//	for _, item := range drugInfo {
+	//
+	//		sum_count += item.StockMaxNumber*it.MinNumber + item.StockMinNumber
+	//	}
+	//	stockInt, _ := strconv.ParseInt(it.DrugStockLimit, 10, 64)
+	//	limit_count = stockInt * it.MinNumber
+	//	service.UpdateDrugById(it.ID, orgId, limit_count, sum_count)
+	//}
 
-			sum_count += item.StockMaxNumber*it.MinNumber + item.StockMinNumber
+	if storehouse_id > 0 {
+		infoList, _ := service.GetDrugWarehouseInfoByOrgId(orgId, storehouse_id)
+		for _, it := range infoList {
+			goodIds = append(goodIds, it.DrugId)
 		}
-		stockInt, _ := strconv.ParseInt(it.DrugStockLimit, 10, 64)
-		limit_count = stockInt * it.MinNumber
-		service.UpdateDrugById(it.ID, orgId, limit_count, sum_count)
-
-		//druglist, _ := service.GetDrugCountMapList(it.ID, orgId)
-		//if len(druglist) > 0 {
-		//	for _, item := range druglist {
-		//		var over_count int64
-		//		over_count = item.SumInCount - item.FlushCount
-		//		service.UpdateDrugStockInCount(item.DrugId, item.StorehouseId, over_count, item.UserOrgId)
-		//	}
-		//}
-
-		//druglistOne, _ := service.GetDrugCountMapList(it.ID, orgId)
-		//if len(druglistOne) > 0 {
-		//	for _, item := range druglistOne {
-		//		var over_count int64
-		//		over_count = item.SumOutCount + item.SumCancelCount
-		//		service.UpdateDrugStockInCountOne(item.DrugId, item.StorehouseId, over_count, item.UserOrgId)
-		//	}
-		//}
-	}
-
-	for _, it := range manufacturerList {
-		ids = append(ids, it.ID)
-	}
-	infoList, _ := service.GetDrugWarehouseInfoByOrgId(orgId, storehouse_id)
-	for _, it := range infoList {
-		goodIds = append(goodIds, it.DrugId)
 	}
 
 	countList, total, err := service.GetDrugStockCountList(orgId, storehouse_id, good_type, keyword, page, limit, ids, goodIds, startTime, endTime)
@@ -4387,3 +4361,63 @@ func (this *SelfDrugApiController) GetPurchaseStockQueryList() {
 	})
 
 }
+
+func (this *SelfDrugApiController) GetCheckDrugBatchList() {
+
+	drug_id, _ := this.GetInt64("drug_id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	advicelist, _ := service.GetHisAdviceGroupList(drug_id, orgId)
+
+	outInfo, _ := service.GetDrugWarehousOutInfo(drug_id, orgId)
+
+	outInfoOne, _ := service.GetDrugWarehousOutInfoOne(drug_id, orgId)
+
+	baseDrugList, _ := service.GetDrugByGoodId(drug_id)
+
+	drugflow, _ := service.GetCheckDrugFlow(drug_id, orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"advicelist":   advicelist,
+		"outInfo":      outInfo,
+		"outInfoOne":   outInfoOne,
+		"baseDrugList": baseDrugList,
+		"drugflow":     drugflow,
+	})
+}
+
+func (this *SelfDrugApiController) GetCheckGoodBatchList() {
+
+	id, _ := this.GetInt64("id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	projectList, _ := service.GetCheckGoodBatchList(id, orgId)
+
+	warehouseList, _ := service.GetCheckGoodWarehouseList(id, orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"projectList":   projectList,
+		"warehouseList": warehouseList,
+	})
+}
+
+func (this *SelfDrugApiController) GetDrugPatientName() {
+
+	drug_id, _ := this.GetInt64("drug_id")
+
+	sys_record_time, _ := this.GetInt64("sys_record_time")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	advicelist, _ := service.GetHisAdviceListBySysRrecordTime(drug_id, sys_record_time, orgId)
+
+	outInfor, _ := service.GetDrugWarehouseOutInfoBySysRecordTime(drug_id, sys_record_time, orgId)
+
+	patients, _ := service.GetAllpatient(orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"advicelist": advicelist,
+		"outInfor":   outInfor,
+		"patients":   patients,
+	})
+
+}

controllers/stock_in_api_controller.go

@@ -1,18 +1,20 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
 	"encoding/json"
 	"fmt"
-	"github.com/astaxie/beego"
-	"github.com/jinzhu/gorm"
 	"reflect"
 	"strconv"
 	"strings"
 	"time"
+
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
+	"github.com/mozillazg/go-pinyin"
 )
 
 type StockManagerApiController struct {
@@ -159,6 +161,8 @@ func StockManagerApiRegistRouters() {
 
 	beego.Router("/api/stock/getstockfloworderlist", &StockManagerApiController{}, "Get:GetStockFlowOrderList")
 
+	beego.Router("/api/stock/getgoodpatientname", &StockManagerApiController{}, "Get:GetGoodPatientName")
+
 }
 func (c *StockManagerApiController) HandleRefundStock() {
 	order_id, _ := c.GetInt64("order_id", 0)
@@ -3574,6 +3578,40 @@ func (this *StockManagerApiController) AddGoodInformation() {
 
 		good.GoodUnit = unit_id
 
+		default_count := int64(goodNameM["default_count"].(float64))
+		if default_count == 0 { //名字为空则生成一条导入错误日志
+			err_log := models.ExportErrLog{
+				LogType:    5,
+				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
+		}
+
+		good.DefaultCount = default_count
+
+		default_count_unit := goodNameM["default_count_unit"].(string)
+		if len(default_count_unit) == 0 { //名字为空则生成一条导入错误日志
+			err_log := models.ExportErrLog{
+				LogType:    5,
+				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
+		}
+
+		good.DefaultCountUnit = default_count_unit
+
 		retail_prices := goodNameM["retail_price"].(string)
 		retail_price, _ := strconv.ParseFloat(retail_prices, 64)
 
@@ -3593,6 +3631,25 @@ func (this *StockManagerApiController) AddGoodInformation() {
 
 		good.RetailPrice = retail_price
 
+		buy_prices := goodNameM["buy_price"].(string)
+		buy_price, _ := strconv.ParseFloat(buy_prices, 64)
+
+		if buy_price <= 0 { //名字为空则生成一条导入错误日志
+			err_log := models.ExportErrLog{
+				LogType:    5,
+				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
+		}
+
+		good.BuyPrice = buy_price
+
 		if goodNameM["stock_warn_count"] == nil || reflect.TypeOf(goodNameM["stock_warn_count"]).String() != "float64" {
 			utils.ErrorLog("stock_warn_count")
 			return
@@ -3658,10 +3715,6 @@ func (this *StockManagerApiController) AddGoodInformation() {
 
 		good.Wubi = wubi
 
-		buy_prices := goodNameM["buy_price"].(string)
-		buy_price, _ := strconv.ParseFloat(buy_prices, 64)
-		good.BuyPrice = buy_price
-
 		if goodNameM["social_security_directory_code"] == nil || reflect.TypeOf(goodNameM["social_security_directory_code"]).String() != "string" {
 			utils.ErrorLog("social_security_directory_code")
 			return
@@ -3772,7 +3825,25 @@ func (this *StockManagerApiController) AddGoodInformation() {
 	if len(goods) > 0 {
 
 		for _, item := range goods {
+			hans := item.GoodName // 要转换的汉字字符串
+			// 创建一个拼音转换器
+			p := pinyin.NewArgs()
+
+			// 将汉字转为拼音
+			pinyinSlice := pinyin.Pinyin(hans, p)
 
+			// 输出拼音
+			fmt.Println("Pinyin:", pinyinSlice)
+
+			// 获取首字母
+			firstLetter := ""
+			for _, py := range pinyinSlice {
+				if len(py) > 0 {
+					firstLetter += string(py[0][0])
+				}
+			}
+
+			item.FirstLetter = firstLetter
 			goodInfo := models.GoodInfo{
 				GoodName:                    item.GoodName,
 				SpecificationName:           item.SpecificationName,
@@ -3804,6 +3875,9 @@ func (this *StockManagerApiController) AddGoodInformation() {
 				PackingUnit:                 item.PackingUnit,
 				PackingPrice:                item.RetailPrice,
 				IsWarehouse:                 1,
+				DefaultCount:                item.DefaultCount,
+				DefaultCountUnit:            item.DefaultCountUnit,
+				FirstLetter:                 item.FirstLetter,
 			}
 
 			//查询同种耗材名称同种类型同种规格的耗材是否存在
@@ -4231,6 +4305,7 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		var unit_id int64
 
 		drugDoseUnit := goodNameM["drug_dose_unit"].(string)
+
 		if len(drugDoseUnit) == 0 {
 			err_log := models.ExportErrLog{
 				LogType:    4,
@@ -4245,6 +4320,41 @@ func (this *StockManagerApiController) AddDrugInformation() {
 			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
+
 		manufacturer := goodNameM["manufacturer"].(string)
 		if len(manufacturer) == 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
@@ -4310,51 +4420,96 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		drug.Dealer = dealer_id
 
 		delivery_way := goodNameM["delivery_way"].(string)
+		if len(delivery_way) == 0 {
+			err_log := models.ExportErrLog{
+				LogType:    4,
+				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
+				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认给药途径不能为空",
+				Status:     1,
+				CreateTime: time.Now().Unix(),
+				UpdateTime: time.Now().Unix(),
+				ExportTime: time.Now().Unix(),
+			}
+			service.CreateExportErrLog(&err_log)
+			continue
+		}
 
 		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
 
-		lmt_used_flags := int64(goodNameM["lmt_used_flag"].(float64))
+		prescribing_number := goodNameM["prescribing_number"].(float64)
 
-		drug.LmtUsedFlag = lmt_used_flags
+		if prescribing_number == 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.PrescribingNumber = prescribing_number
 
-		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)
+		prescribing_number_unit := goodNameM["prescribing_number_unit"].(string)
+
+		if len(prescribing_number_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
 		}
-		list, _ := service.FindAllDataConfigList(orgId, dataConfig.ID)
-		for _, it := range list {
-			if drugDoseUnit == it.Name {
-				unit_id = int64(it.Value)
+
+		drug.PrescribingNumberUnit = prescribing_number_unit
+
+		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.DrugDoseUnit = unit_id
+
+		drug.DrugDay = drug_day
+
+		lmt_used_flags := int64(goodNameM["lmt_used_flag"].(float64))
+
+		drug.LmtUsedFlag = lmt_used_flags
 
 		if goodNameM["drug_alias"] == nil || reflect.TypeOf(goodNameM["drug_alias"]).String() != "string" {
 			utils.ErrorLog("drug_alias")
@@ -4399,7 +4554,6 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		}
 
 		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)
@@ -4557,6 +4711,26 @@ func (this *StockManagerApiController) AddDrugInformation() {
 
 	if len(drugList) > 0 {
 		for _, item := range drugList {
+			hans := item.DrugName // 要转换的汉字字符串
+			// 创建一个拼音转换器
+			p := pinyin.NewArgs()
+
+			// 将汉字转为拼音
+			pinyinSlice := pinyin.Pinyin(hans, p)
+
+			// 输出拼音
+			fmt.Println("Pinyin:", pinyinSlice)
+
+			// 获取首字母
+			firstLetter := ""
+			for _, py := range pinyinSlice {
+				if len(py) > 0 {
+					firstLetter += string(py[0][0])
+				}
+			}
+
+			item.FirstLetter = firstLetter
+			item.Pinyin = firstLetter
 			goodInfo := models.BaseDrugLib{
 				DrugName:                    item.DrugName,
 				DrugAlias:                   item.DrugAlias,
@@ -4608,6 +4782,9 @@ func (this *StockManagerApiController) AddDrugInformation() {
 				MinNumber:                   item.MinNumber,
 				IsUse:                       2,
 				MinPrice:                    item.MinPrice,
+				PrescribingNumber:           item.PrescribingNumber,
+				PrescribingNumberUnit:       item.PrescribingNumberUnit,
+				FirstLetter:                 item.FirstLetter,
 			}
 
 			//查询同种药品同种规格是否存在
@@ -7998,3 +8175,21 @@ func (this *StockManagerApiController) GetStockFlowOrderList() {
 
 	}
 }
+
+func (this *StockManagerApiController) GetGoodPatientName() {
+
+	good_id, _ := this.GetInt64("good_id")
+
+	sys_record_time, _ := this.GetInt64("sys_record_time")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	projectList, _ := service.GetGoodProjectList(good_id, sys_record_time, orgId)
+
+	outList, _ := service.GetWarehouseOutListBySysrecordTime(good_id, sys_record_time, orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"projectList": projectList,
+		"outList":     outList,
+	})
+}

models/dialysis.go

@@ -658,6 +658,7 @@ type AssessmentAfterDislysis struct {
 	TransfusionVolume               string  `gorm:"column:transfusion_volume" json:"transfusion_volume" form:"transfusion_volume"`
 	Condenser                       string  `gorm:"column:condenser" json:"condenser" form:"condenser"`
 	LastAfterWeight                 string  `gorm:"column:last_after_weight" json:"last_after_weight" form:"last_after_weight"`
+	DisplaceLiquiValue              string  `gorm:"column:displace_liqui_value" json:"displace_liqui_value" form:"displace_liqui_value"`
 }
 
 func (AssessmentAfterDislysis) TableName() string {

models/new_stock_models.go

@@ -172,6 +172,7 @@ type NewBaseDrugOne struct {
 	Manufacturer           int64                  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
 	Dealer                 int64                  `gorm:"column:dealer" json:"dealer" form:"dealer"`
 	MedicalInsuranceNumber string                 `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	DrugType               int64                  `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
 }
 
 func (NewBaseDrugOne) TableName() string {

models/patient_models.go

@@ -231,6 +231,7 @@ type Patients struct {
 	AllergicHistory          string  `gorm:"column:allergic_history" json:"allergic_history" form:"allergic_history"`
 	PatientAddress           string  `gorm:"column:patient_address" json:"patient_address" form:"patient_address"`
 	FirstLetter              string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
+	PrintDate                int64   `gorm:"column:print_date" json:"print_date" form:"print_date"`
 }
 
 func (Patients) TableName() string {
@@ -857,6 +858,7 @@ type XtPatientsNew struct {
 	AllergicHistory              string  `gorm:"column:allergic_history" json:"allergic_history" form:"allergic_history"`
 	PatientAddress               string  `gorm:"column:patient_address" json:"patient_address" form:"patient_address"`
 	FirstLetter                  string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
+	PrintDate                    int64   `gorm:"column:print_date" json:"print_date" form:"print_date"`
 }
 
 func (XtPatientsNew) TableName() string {

models/smart_sch.go

@@ -14,11 +14,11 @@ func (SmartSchPatient) TableName() string {
 }
 
 type SmartSchTemplatePatient struct {
-	ID         int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Name       string `gorm:"column:name" json:"name" form:"name"`
-	DialysisNo string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
-
+	ID                          int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Name                        string `gorm:"column:name" json:"name" form:"name"`
+	DialysisNo                  string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	Lapseto                     int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
 	XtPatientScheduleTemplateId []*XtPatientScheduleTemplateId
 }
 

models/user_models.go

@@ -199,6 +199,9 @@ type XtDialysisPrescription struct {
 	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
 	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 	BloodAccessPartId          string  `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
+	DialysisStrainer           string  `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
+	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
 }
 
 func (XtDialysisPrescription) TableName() string {

service/dialysis_service.go

@@ -1,13 +1,14 @@
 package service
 
 import (
-	"XT_New/models"
 	"encoding/json"
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"strconv"
 	"strings"
 	"time"
+
+	"XT_New/models"
+	"github.com/jinzhu/gorm"
 )
 
 // GetPatientList 返回患者的列表
@@ -303,6 +304,14 @@ func UpadateReceiveTreatmentAsses(receiveTreatmentAsses *models.ReceiveTreatment
 	return err
 }
 
+func GetPredialysisEvaluation(patient_id int64, org_id int64) (models.PredialysisEvaluation, error) {
+
+	evaluation := models.PredialysisEvaluation{}
+
+	err := XTReadDB().Where("patient_id = ? and user_org_id = ? and status =1 and symptom_before_dialysis!=''", patient_id, org_id).Last(&evaluation).Error
+	return evaluation, err
+}
+
 // 修改透前评估
 func UpadatePredialysisEvaluation(predialysisEvaluation *models.PredialysisEvaluation) error {
 	err := writeDb.Save(&predialysisEvaluation).Error

service/mobile_dialysis_service.go

@@ -1,12 +1,13 @@
 package service
 
 import (
-	"XT_New/models"
 	"encoding/json"
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"strconv"
 	"time"
+
+	"XT_New/models"
+	"github.com/jinzhu/gorm"
 )
 
 // func GetSchedualPatients(orgID int64) ([]*MDialysisScheduleVM, error) {
@@ -1139,6 +1140,7 @@ func MobileGetLastTimeAssessmentAfterDislysis(orgID int64, patientID int64, maxD
 
 	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(maxDate, 10) + ":assessment_after_dislysis_last"
+	redis.Set(key, "", time.Second)
 	assessment_after_dislysis_last_str, _ := redis.Get(key).Result()
 
 	if len(assessment_after_dislysis_last_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
@@ -2348,11 +2350,10 @@ func MobileGetDialysisSolutionByModeId(orgID int64, patientID int64, mode_id int
 
 	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_solution"
-
 	dialysis_solution_str, _ := redis.Get(key).Result()
 
 	if len(dialysis_solution_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err := readDb.Model(&models.DialysisSolution{}).Where("patient_id = ? and user_org_id = ? and status = 1 AND mode_id = ?", patientID, orgID, mode_id).Last(&record).Error
+		err := readDb.Model(&models.DialysisSolution{}).Where("patient_id = ? and user_org_id = ? and status = 1 AND mode_id = ? and solution_status=1", patientID, orgID, mode_id).Last(&record).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				if record.ID <= 0 {
@@ -3170,6 +3171,15 @@ func GetAssessmentBeforThrity(orgid int64, patientid int64, recorddate int64) (m
 	return evaluation, err
 }
 
+func GetAssessmentBeforFourty(orgid int64, patientid int64, recorddate int64) (models.XtAssessmentBeforeDislysis, error) {
+
+	evaluation := models.XtAssessmentBeforeDislysis{}
+
+	err := XTReadDB().Model(&evaluation).Where("user_org_id = ? and patient_id = ? and assessment_date = ? and status = 1", orgid, patientid, recorddate).Find(&evaluation).Error
+
+	return evaluation, err
+}
+
 func GetAllHisDoctorAdvice(orgid int64, patientid int64, recorddate int64) (his []*models.HisDoctorAdviceInfo, err error) {
 	redis := RedisClient()
 	defer redis.Close()

service/new_warehouse_service.go

@@ -1,15 +1,16 @@
 package service
 
 import (
-	"XT_New/models"
-	"XT_New/utils"
 	"errors"
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"math"
 	"strconv"
 	"strings"
 	"time"
+
+	"XT_New/models"
+	"XT_New/utils"
+	"github.com/jinzhu/gorm"
 )
 
 // 耗材出库
@@ -2631,13 +2632,13 @@ func FindNewDrugAutoReduceRecordInfo(patient_id int64, advice_date int64, orgid
 
 func UpdateDrugAutoReduceRecordInfo(patient_id int64, record_date int64, drug_id int64, detail *models.DrugAutomaticReduceDetail) error {
 
-	err := XTWriteDB().Model(&models.DrugAutomaticReduceDetail{}).Where("patient_id = ? and record_date = ? and drug_id = ?", patient_id, record_date, drug_id).Update(map[string]interface{}{"patient_id": detail.PatientId, "record_time": detail.RecordTime, "drug_id": detail.DrugId, "count": detail.Count, "count_unit": detail.CountUnit, "warehouse_info_id": detail.WarehouseInfoId, "advice_id": detail.AdviceId, "storehouse_id": detail.StorehouseId}).Error
+	err := XTWriteDB().Model(&models.DrugAutomaticReduceDetail{}).Where("patient_id = ? and record_time = ? and drug_id = ?", patient_id, record_date, drug_id).Update(map[string]interface{}{"patient_id": detail.PatientId, "record_time": detail.RecordTime, "drug_id": detail.DrugId, "count": detail.Count, "count_unit": detail.CountUnit, "warehouse_info_id": detail.WarehouseInfoId, "advice_id": detail.AdviceId, "storehouse_id": detail.StorehouseId}).Error
 	return err
 }
 
 func UpdateNewDrugAutoReduceRecordInfo(patient_id int64, record_date int64, drug_id int64, detail *models.DrugAutomaticReduceDetail, tx *gorm.DB) error {
 
-	err := tx.Model(&models.DrugAutomaticReduceDetail{}).Where("patient_id = ? and record_date = ? and drug_id = ?", patient_id, record_date, drug_id).Update(map[string]interface{}{"patient_id": detail.PatientId, "record_time": detail.RecordTime, "drug_id": detail.DrugId, "count": detail.Count, "count_unit": detail.CountUnit, "warehouse_info_id": detail.WarehouseInfoId, "advice_id": detail.AdviceId, "storehouse_id": detail.StorehouseId}).Error
+	err := tx.Model(&models.DrugAutomaticReduceDetail{}).Where("patient_id = ? and record_time = ? and drug_id = ?", patient_id, record_date, drug_id).Update(map[string]interface{}{"patient_id": detail.PatientId, "record_time": detail.RecordTime, "drug_id": detail.DrugId, "count": detail.Count, "count_unit": detail.CountUnit, "warehouse_info_id": detail.WarehouseInfoId, "advice_id": detail.AdviceId, "storehouse_id": detail.StorehouseId}).Error
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -3910,6 +3911,8 @@ func NewBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehous
 			lastDrugOutInfo, _ := GetNewNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID, tx)
 
 			if lastDrugOutInfo.ID == 0 {
+				//删除在新增
+				UpdateNewDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID, tx)
 				AddNewSigleDrugWarehouseOutInfo(warehouseOutInfo, tx)
 			}
 			if lastDrugOutInfo.ID > 0 {

service/patient_service.go

@@ -1,14 +1,15 @@
 package service
 
 import (
-	"XT_New/models"
-	"XT_New/utils"
 	"encoding/json"
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
 
+	"XT_New/models"
+	"XT_New/utils"
+
 	"github.com/jinzhu/gorm"
 )
 
@@ -901,7 +902,7 @@ func UpdatePatientLapseto(patientid int64, lapseto models.PatientLapseto) error
 func UpdatepatientTwo(patientsNew *models.XtPatientsNew, id int64) error {
 
 	err := XTWriteDB().Model(&patientsNew).Where("blood_id = ?", id).Update(map[string]interface{}{"user_org_id": patientsNew.UserOrgId, "user_id": patientsNew.UserId, "avatar": patientsNew.Avatar, "patient_type": patientsNew.Avatar, "dialysis_no": patientsNew.DialysisNo, "admission_number": patientsNew.AdmissionNumber, "source": patientsNew.Source, "lapseto": patientsNew.Lapseto, "partition_id": patientsNew.PartitionId, "bed_id": patientsNew.BedId, "name": patientsNew.Name, "alias": patientsNew.Alias, "gender": patientsNew.Gender, "marital_status": patientsNew.MaritalStatus, "id_card_no": patientsNew.IdCardNo, "birthday": patientsNew.Birthday, "reimbursement_way_id": patientsNew.ReimbursementWayId, "health_care_type": patientsNew.HealthCareType, "health_care_no": patientsNew.HealthCareType, "health_care_due_date": patientsNew.HealthCareType, "height": patientsNew.Height, "blood_type": patientsNew.BloodType, "rh": patientsNew.Rh, "health_care_due_alert_date": patientsNew.HealthCareDueAlertDate, "education_level": patientsNew.EducationLevel, "profession": patientsNew.Profession, "phone": patientsNew.Phone, "home_telephone": patientsNew.HomeTelephone, "relative_phone": patientsNew.RelativePhone, "relative_relations": patientsNew.RelativeRelations, "home_address": patientsNew.HomeAddress, "work_unit": patientsNew.WorkUnit, "unit_address": patientsNew.UnitAddress, "children": patientsNew.Children, "receiving_date": patientsNew.ReceivingDate, "is_hospital_first_dialysis": patientsNew.IsHospitalFirstDialysis, "first_dialysis_date": patientsNew.FirstDialysisDate, "first_dialysis_hospital": patientsNew.FirstDialysisHospital, "predialysis_condition": patientsNew.PredialysisCondition, "pre_hospital_dialysis_frequency": patientsNew.PreHospitalDialysisFrequency, "pre_hospital_dialysis_times": patientsNew.PreHospitalDialysisFrequency, "hospital_first_dialysis_date": patientsNew.HospitalFirstDialysisDate, "induction_period": patientsNew.InductionPeriod, "initial_dialysis": patientsNew.InitialDialysis, "total_dialysis": patientsNew.TotalDialysis, "attending_doctor_id": patientsNew.AttendingDoctorId, "head_nurse_id": patientsNew.HeadNurseId, "evaluate": patientsNew.Evaluate, "diagnose": patientsNew.Diagnose, "remark": patientsNew.Remark, "registrars_id": patientsNew.RegistrarsId, "registrars": patientsNew.Registrars, "qr_code": patientsNew.QrCode, "binding_state": patientsNew.BindingState, "patient_complains": patientsNew.PatientComplains, "present_history": patientsNew.PresentHistory, "past_history": patientsNew.PastHistory, "temperature": patientsNew.Temperature,
-		"pulse": patientsNew.Pulse, "respiratory": patientsNew.Respiratory, "sbp": patientsNew.Sbp, "dbp": patientsNew.Dbp, "nation": patientsNew.Nation, "native_place": patientsNew.NativePlace, "age": patientsNew.Age, "infectious_next_record_time": patientsNew.InfectiousNextRecordTime, "is_infectious": patientsNew.IsInfectious, "remind_cycle": patientsNew.RemindCycle, "response_result": patientsNew.ResponseResult, "is_open_remind": patientsNew.IsOpenRemind, "first_treatment_date": patientsNew.FirstTreatmentDate, "dialysis_age": patientsNew.DialysisAge, "expense_kind": patientsNew.ExpenseKind, "tell_phone": patientsNew.ExpenseKind, "contact_name": patientsNew.ContactName, "blood_patients": patientsNew.BloodPatients, "slow_patients": patientsNew.SlowPatients, "member_patients": patientsNew.MemberPatients, "ecommer_patients": patientsNew.EcommerPatients, "troble_shoot": patientsNew.TrobleShoot, "sch_remark": patientsNew.SchRemark, "treatment_plan": patientsNew.TreatmentPlan, "record_number": patientsNew.RecordNumber, "patient_start_time": patientsNew.PatientStartTime, "patient_end_time": patientsNew.PatientEndTime, "infectious_remark": patientsNew.InfectiousRemark, "allergic_history": patientsNew.AllergicHistory, "patient_address": patientsNew.PatientAddress}).Error
+		"pulse": patientsNew.Pulse, "respiratory": patientsNew.Respiratory, "sbp": patientsNew.Sbp, "dbp": patientsNew.Dbp, "nation": patientsNew.Nation, "native_place": patientsNew.NativePlace, "age": patientsNew.Age, "infectious_next_record_time": patientsNew.InfectiousNextRecordTime, "is_infectious": patientsNew.IsInfectious, "remind_cycle": patientsNew.RemindCycle, "response_result": patientsNew.ResponseResult, "is_open_remind": patientsNew.IsOpenRemind, "first_treatment_date": patientsNew.FirstTreatmentDate, "dialysis_age": patientsNew.DialysisAge, "expense_kind": patientsNew.ExpenseKind, "tell_phone": patientsNew.ExpenseKind, "contact_name": patientsNew.ContactName, "blood_patients": patientsNew.BloodPatients, "slow_patients": patientsNew.SlowPatients, "member_patients": patientsNew.MemberPatients, "ecommer_patients": patientsNew.EcommerPatients, "troble_shoot": patientsNew.TrobleShoot, "sch_remark": patientsNew.SchRemark, "treatment_plan": patientsNew.TreatmentPlan, "record_number": patientsNew.RecordNumber, "patient_start_time": patientsNew.PatientStartTime, "patient_end_time": patientsNew.PatientEndTime, "infectious_remark": patientsNew.InfectiousRemark, "allergic_history": patientsNew.AllergicHistory, "patient_address": patientsNew.PatientAddress, "print_date": patientsNew.PrintDate}).Error
 	return err
 }
 
@@ -4024,3 +4025,17 @@ func DeleteSolutionById(id int64) (models.DialysisSolution, error) {
 
 	return solution, err
 }
+
+func GetPatientBeforRecordList(patient_id int64, user_org_id int64) (befor []*models.XtAssessmentBeforeDislysis, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and user_org_id =? and status=1", patient_id, user_org_id).Order("id desc").Limit(5).Find(&befor).Error
+
+	return befor, err
+}
+
+func GetPatientAfterRecordList(patient_id int64, user_org_id int64) (after []*models.XtAssessmentAfterDislysis, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and user_org_id =? and status=1", patient_id, user_org_id).Order("id desc").Limit(5).Find(&after).Error
+
+	return after, err
+}

service/schedule_service.go

@@ -956,9 +956,10 @@ func GetWeekDayScheduleById(orgid int64, scheduleDate int64, scheduleType int64,
 	return list, err
 }
 
-func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType int64, zone []string) (list []*models.VmSchedulesRemind, err error) {
+func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType int64, zone []string, limit int64, page int64, ids []string) (list []*models.VmSchedulesRemind, total int64, err error) {
 
 	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
+	offset := (page - 1) * limit
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
@@ -972,20 +973,20 @@ func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType in
 		db = db.Where("x.partition_id in (?)", zone)
 	}
 
-	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 and dialysis_date = ?", scheduleDate).Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date =?", scheduleDate).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1")
-	}).Preload("DialysisPrescription", "status = 1 and record_date =? and user_org_id = ?", scheduleDate, orgid).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1 and solution_status = 1").Order("id asc")
-	}).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
-		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, scheduleDate).Limit(1)
-	}).Find(&list).Error
+	if len(ids) > 0 {
+		db = db.Where("x.patient_id in(?)", ids)
+	}
 
-	return list, err
+	err = db.Offset(offset).Limit(limit).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").Count(&total).Find(&list).Error
+
+	return list, total, err
 }
 
-func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int64, startDate int64, zone []string) (list []*models.VmSchedulesRemind, err error) {
+func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int64, startDate int64, zone []string, limit int64, page int64, ids []string) (list []*models.VmSchedulesRemind, total int64, err error) {
 
 	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
+	offset := (page - 1) * limit
+
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
@@ -998,16 +999,13 @@ func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int
 	if len(zone) > 0 {
 		db = db.Where("x.partition_id in (?)", zone)
 	}
+	if len(ids) > 0 {
+		db = db.Where("x.patient_id in(?)", ids)
+	}
 
-	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,x.mode_id").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1 and dialysis_date =?", scheduleDate).Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date =?", scheduleDate).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1")
-	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ?", scheduleDate).Preload("DialysisPrescription", "status = 1 and record_date = ?", scheduleDate).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1 and solution_status =1").Order("id asc")
-	}).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
-		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, scheduleDate).Limit(1)
-	}).Find(&list).Error
+	err = db.Offset(offset).Limit(limit).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,x.mode_id").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Count(&total).Find(&list).Error
 
-	return list, err
+	return list, total, err
 }
 
 func RemoveRepeatedElement(arr []*models.DoctorAdvice) (newArr []*models.DoctorAdvice) {
@@ -1167,7 +1165,7 @@ func UpdateNewScheduleTemplateStatus(id int64, org_id int64) (err error) {
 	return
 }
 
-func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endtime int64, orgID int64, zone []string, record_date int64) (schedules []*models.WeekScheduleSix, err error) {
+func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endtime int64, orgID int64, zone []string, record_date int64, ids []string) (schedules []*models.WeekScheduleSix, err error) {
 
 	db := XTReadDB().Table("xt_schedule as s ").Where("s.status =1")
 	if orgID > 0 {
@@ -1197,6 +1195,9 @@ func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endt
 	if len(zone) > 0 {
 		db = db.Where("s.partition_id in (?)", zone)
 	}
+	if len(ids) > 0 {
+		db = db.Where("s.patient_id in (?)", ids)
+	}
 	err = db.
 		Preload("DeviceZone", "status = 1 ").
 		Preload("DeviceNumber", "status = 1 ").Joins("JOIN xt_patients as p ON p.id = s.patient_id").
@@ -1365,7 +1366,7 @@ func GetDataPrint(orgid int64) (models.XtDataPrint, error) {
 func GetNextWeekPanels(startime int64, endtime int64, orgid int64) (schedule []*models.XtSchedule, err error) {
 
 	err = XTReadDB().Model(&schedule).Where("schedule_date >=? and schedule_date<=? and status = 1 and user_org_id = ?", startime, endtime, orgid).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
-		return db.Where("user_org_id = ? and status = 1 and  assessment_date>=1672502400  and assessment_date < ?", orgid, endtime)
+		return db.Where("user_org_id = ? and status = 1 and  assessment_date>=1704038400  and assessment_date < ?", orgid, endtime)
 	}).Find(&schedule).Error
 	return schedule, err
 }
@@ -1514,14 +1515,33 @@ func GetHisDoctorAdviceList(org_id int64, patient_id int64, dialysis_date int64)
 	return adviceInfo, err
 }
 
-func GetLastDialysisSolution(org_id int64, patient_id int64, mode_id int64, schedule_date int64) (models.NewDialysisPrescription, error) {
+func GetDoctorAdviceListSchedule(org_id int64, patient_id int64) (advices []*models.DoctorAdvice, err error) {
+
+	err = XTReadDB().Where("patient_id=? and user_org_id = ?  and status=1 and parent_id=0 and advice_type =1", patient_id, org_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advices).Error
+	return advices, err
+}
+
+func GetLastDialysisPrescriptionTwo(org_id int64, patient_id int64, mode_id int64, schedule_date int64) (models.NewDialysisPrescription, error) {
 
 	dialysisprescription := models.NewDialysisPrescription{}
-	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and mode_id = ? and status = 1 and record_date>=1672502400 and record_date<?", org_id, patient_id, mode_id, schedule_date).Order("id desc").First(&dialysisprescription).Error
+	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and mode_id = ? and status = 1 and record_date>=1704038400 and record_date<?", org_id, patient_id, mode_id, schedule_date).Order("id desc").First(&dialysisprescription).Error
 	return dialysisprescription, err
 
 }
 
+func GetLastDialysisSolution(org_id int64, patient_id int64, mode_id int64) (models.DialysisSolution, error) {
+	dialysisSolution := models.DialysisSolution{}
+	err := XTReadDB().Where("user_org_id =? and patient_id = ? and mode_id = ? and status=1 and solution_status=1", org_id, patient_id, mode_id).Find(&dialysisSolution).Error
+	return dialysisSolution, err
+}
+
+func GetLastDialysisAfter(org_id int64, patient_id int64, schedule_date int64) (models.AssessmentAfterDislysis, error) {
+
+	dislysis := models.AssessmentAfterDislysis{}
+	err := XTReadDB().Where("user_org_id = ? and patient_id =? and assessment_date <= ? and status=1", org_id, patient_id, schedule_date).Order("id desc").Last(&dislysis).Error
+	return dislysis, err
+}
+
 func GetDoctorAdviceLastWeek(org_id int64, patient_id int64, schedule_date int64) (advice []*models.DoctorAdvice, err error) {
 
 	err = XTReadDB().Where("user_org_id = ? and patient_id = ? and status= 1 and parent_id = 0 and advice_date = ?", org_id, patient_id, schedule_date).Preload("ChildDoctorAdvice", "status = 1 and advice_date = ?", schedule_date).Find(&advice).Error
@@ -1543,7 +1563,7 @@ func GetDialysisSolutionLastWeek(user_org_id int64, patient_id int64, mode_id in
 	return solution, err
 }
 
-func GetNextWeekDayScheduleSix(weektype int64, weektime int64, startime int64, endtime int64, orgID int64, zone []string, record_date int64) (schedules []*models.WeekScheduleSeven, err error) {
+func GetNextWeekDayScheduleSix(weektype int64, weektime int64, startime int64, endtime int64, orgID int64, zone []string, record_date int64, ids []string) (schedules []*models.WeekScheduleSeven, err error) {
 
 	db := XTReadDB().Table("xt_schedule as s ").Where("s.status =1")
 	if orgID > 0 {
@@ -1574,6 +1594,9 @@ func GetNextWeekDayScheduleSix(weektype int64, weektime int64, startime int64, e
 	if len(zone) > 0 {
 		db = db.Where("s.partition_id in (?)", zone)
 	}
+	if len(ids) > 0 {
+		db = db.Where("s.patient_id in(?)", ids)
+	}
 	err = db.
 		Preload("DeviceZone", "status = 1 ").
 		Preload("DeviceNumber", "status = 1 ").

service/self_drug_service.go

@@ -3214,3 +3214,75 @@ func GetNewDrugFlowNoPofitWarehouseInfo(drug_id int64, user_org_id int64, start_
 	err = db.Find(&list).Error
 	return list, err
 }
+
+func GetHisAdviceGroupList(drug_id int64, user_org_id int64) (advicelist []*models.HisDoctorAdviceInfo, err error) {
+
+	if user_org_id == 10265 {
+		err = XTReadDB().Where("drug_id = ? and user_org_id = ? and status=1 and execution_state =1", drug_id, user_org_id).Order("advice_date asc").Find(&advicelist).Error
+
+		return advicelist, err
+	} else {
+		err = XTReadDB().Where("drug_id = ? and user_org_id = ? and status=1", drug_id, user_org_id).Order("advice_date asc").Find(&advicelist).Error
+
+		return advicelist, err
+	}
+
+}
+
+func GetDrugWarehousOutInfo(drug_id int64, org_id int64) (out []*models.XtDrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and status=1 and org_id=? and is_sys=1", drug_id, org_id).Order("sys_record_time asc").Find(&out).Error
+	return out, err
+}
+
+func GetDrugWarehousOutInfoOne(drug_id int64, org_id int64) (out []*models.XtDrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and status=1 and org_id=? and is_sys=0", drug_id, org_id).Order("sys_record_time asc").Find(&out).Error
+	return out, err
+}
+
+func GetCheckDrugFlow(drug_id int64, user_org_id int64) (drugflow []*models.DrugFlow, err error) {
+
+	err = XTReadDB().Where("drug_id =? and status=1 and (consumable_type =10 or consumable_type =11) and user_org_id = ?", drug_id, user_org_id).Order("system_time asc").Find(&drugflow).Error
+	return drugflow, err
+}
+
+func GetCheckGoodBatchList(good_id int64, user_org_id int64) (project []*models.HisPrescriptionProject, err error) {
+
+	err = XTReadDB().Where("project_id = ? and user_org_id = ? and status =1 and type =3", good_id, user_org_id).Order("record_date asc").Find(&project).Error
+
+	return project, err
+}
+
+func GetCheckGoodWarehouseList(good_id int64, org_id int64) (info []*models.WarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("good_id = ? and org_id = ? and status=1 and is_sys=0", good_id, org_id).Order("sys_record_time").Find(&info).Error
+	return info, err
+}
+
+func GetHisAdviceListBySysRrecordTime(drug_id int64, sys_record_time int64, user_org_id int64) (info []*models.HisDoctorAdviceInfo, err error) {
+
+	err = XTReadDB().Where("drug_id=? and advice_date = ? and user_org_id = ? and status =1", drug_id, sys_record_time, user_org_id).Find(&info).Error
+
+	return info, err
+}
+
+func GetDrugWarehouseOutInfoBySysRecordTime(drug_id int64, sys_record_time int64, user_org_id int64) (info []*models.DrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("drug_id=? and sys_record_time =? and org_id = ? and status =1", drug_id, sys_record_time, user_org_id).Find(&info).Error
+
+	return info, err
+}
+
+func GetGoodProjectList(good_id int64, sys_record_time int64, user_org_id int64) (project []*models.HisPrescriptionProject, err error) {
+
+	err = XTReadDB().Where("project_id = ? and status =1 and record_date = ? and user_org_id=? and type =3", good_id, sys_record_time, user_org_id).Find(&project).Error
+
+	return project, err
+}
+
+func GetWarehouseOutListBySysrecordTime(good_id int64, sys_record_time int64, user_org_id int64) (out []*models.WarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("good_id = ? and sys_record_time =? and org_id = ? and status=1 and is_sys=1", good_id, sys_record_time, user_org_id).Find(&out).Error
+	return out, err
+}

service/smart_sch.go

@@ -1,9 +1,10 @@
 package service
 
 import (
+	"time"
+
 	"XT_New/models"
 	"github.com/jinzhu/gorm"
-	"time"
 )
 
 func GetSmartSchPatientByKeyWord(orgID int64, keywords string) (patient []*models.SmartSchPatient, err error) {
@@ -56,7 +57,7 @@ func GetSmartSchPatientByPatientID(orgID int64, id int64) (sch []*models.SmartSc
 }
 
 func GetSmartSchTemplatePatientByKeyWord(orgID int64, keywords string) (patient []*models.SmartSchTemplatePatient, err error) {
-	db := readDb.Model(&models.SmartSchTemplatePatient{}).Where("user_org_id=? and status=1", orgID)
+	db := readDb.Model(&models.SmartSchTemplatePatient{}).Where("user_org_id=? and status=1 and lapseto=1", orgID)
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
 		err = db.Where("name LIKE ? OR dialysis_no LIKE ? ", likekey, likekey).Find(&patient).Error

service/stock_service.go

@@ -878,10 +878,13 @@ func FindLastDrugWarehousingInfoByID(drug_id int64, storehouse_id int64) (info m
 
 func FindNewLastDrugWarehousingInfoByID(drug_id int64, storehouse_id int64, tx *gorm.DB) (info models.XtDrugWarehouseInfo, err error) {
 	err = tx.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ? AND status = 1 AND (stock_max_number > 0 or stock_min_number > 0) and storehouse_id = ? and is_check = 1", drug_id, storehouse_id).Order("ctime").First(&info).Error
-	if err != nil {
-		tx.Rollback()
-		return info, err
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return info, err
+		}
 	}
+
 	return info, err
 }
 
@@ -2023,10 +2026,13 @@ func GetManufactureById(id int64) (models.Manufacturer, error) {
 func GetNewManufactureById(id int64, tx *gorm.DB) (models.Manufacturer, error) {
 	manufacturer := models.Manufacturer{}
 	err := tx.Model(&manufacturer).Where("id = ? and status = 1", id).Find(&manufacturer).Error
-	if err != nil {
-		tx.Rollback()
-		return manufacturer, err
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return manufacturer, err
+		}
 	}
+
 	return manufacturer, err
 }
 
@@ -2740,6 +2746,7 @@ func UpDateDrugWarehouseInfoByStock(info *models.XtDrugWarehouseInfo) (err error
 
 func UpDateNewDrugWarehouseInfoByStock(info *models.XtDrugWarehouseInfo, tx *gorm.DB) (err error) {
 	err = tx.Save(&info).Error
+
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -8912,6 +8919,7 @@ func GetNewWarehouseOutInfoIsExistTen(good_id int64, patient_id int64, record_ti
 	err := tx.Where("good_id = ? and sys_record_time = ? and status = 1 and patient_id = ? and project_id = ? and warehouse_info_id = ?", good_id, record_time, patient_id, project_id, warehouse_info_id).Find(&info).Error
 	if err != gorm.ErrRecordNotFound {
 		if err != nil {
+			tx.Rollback()
 			return info, err
 		}
 	}

service/warhouse_service.go

@@ -1,16 +1,17 @@
 package service
 
 import (
-	"XT_New/models"
-	"XT_New/utils"
 	"errors"
 	"fmt"
 	_ "fmt"
-	"github.com/jinzhu/gorm"
 	"math"
 	"strconv"
 	"strings"
 	"time"
+
+	"XT_New/models"
+	"XT_New/utils"
+	"github.com/jinzhu/gorm"
 )
 
 // 药品出库
@@ -6022,7 +6023,7 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 		CreateDrugFlowOne(drugflow)
 
 		//更新出库id
-		UpdateDrugWarehouseOutInfo(advice.ID, warehouse.ID, advice.OrgId, over_count)
+		UpdateDrugWarehouseOutInfo(advice.ID, warehouse.ID, advice.OrgId, over_count, drug_price)
 
 		return nil
 
@@ -6089,7 +6090,7 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 
 		CreateDrugFlowOne(drugflow)
 		//更新出库id
-		UpdateDrugWarehouseOutInfo(advice.ID, warehouse.ID, advice.OrgId, over_count)
+		UpdateDrugWarehouseOutInfo(advice.ID, warehouse.ID, advice.OrgId, over_count, drug_price)
 		// 出库完成后，要将该批次库存清零
 
 		prescribingNumber_two_temp := deliver_number - stock_number
@@ -6102,9 +6103,9 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 	return
 }
 
-func UpdateDrugWarehouseOutInfo(id int64, warehouse_info_id int64, org_id int64, over_count int64) error {
+func UpdateDrugWarehouseOutInfo(id int64, warehouse_info_id int64, org_id int64, over_count int64, drug_price float64) error {
 	ut := XTWriteDB().Begin()
-	err = ut.Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and org_id = ? and status = 1", id, org_id).Update(map[string]interface{}{"warehouse_info_id": warehouse_info_id, "over_count": over_count}).Error
+	err = ut.Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and org_id = ? and status = 1", id, org_id).Update(map[string]interface{}{"warehouse_info_id": warehouse_info_id, "over_count": over_count, "price": drug_price, "retail_price": drug_price}).Error
 	if err != nil {
 		ut.Rollback()
 		return err
@@ -6194,6 +6195,7 @@ func FindLastDrugWarehouseOutInfo(orgid int64) (models.DrugWarehouseOutInfo, err
 func FindNewLastDrugWarehouseOutInfo(orgid int64, tx *gorm.DB) (models.DrugWarehouseOutInfo, error) {
 	info := models.DrugWarehouseOutInfo{}
 	err := tx.Where("org_id = ? and status = 1", orgid).Last(&info).Error
+
 	if err != gorm.ErrRecordNotFound {
 		if err != nil {
 			tx.Rollback()