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

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10489 //机构id
+		subscibe.OrgId = 10666 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,8 +93,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10489 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 14655 //4
+		adminUserInfo.CurrentOrgId = 10666 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 17876 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10489 //机构id小英9675或4
+		subscibe.OrgId = 10666 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,8 +339,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10489 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 14655 //4
+		adminUserInfo.CurrentOrgId = 10666 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 17876 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/dialysis_api_controller.go

@@ -4421,6 +4421,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	//获取上次的透后体重
 	//	assessmentAfterDislysis, _ := service.MobileGetLastTimeAssessmentAfterDislysis(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	assessmentAfterDislysis, _ := service.MobileGetLast(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+
 	//获取透析次数
 	_, total, err := service.GetTotalDialysisCout(adminUserInfo.CurrentOrgId, patientInfo.ID)
 
@@ -4470,9 +4471,9 @@ func (c *DialysisApiController) GetDialysisOrder() {
 
 	//相关操作对应的操作人
 	//operators, _ := service.GetAdminUserES(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, operatorIDs)
-	operators, err := service.GetAdminUserEsOne(adminUserInfo.CurrentOrgId)
+	operators, err := service.GetAdminUserEsTwo(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
 
-	fmt.Println("operators", operators)
+	//fmt.Println("operators------------------------------------", operators)
 	templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
 	//获取当前日期月份的第一天
@@ -4481,14 +4482,62 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	//获取当前月份的病人透析次数
 	dialysiscount, err := service.GetDialysisCountByPatientId(firstMonthDate, xttime, patientInfo.ID, adminUserInfo.CurrentOrgId)
 
+	var hisAdvice []*models.HisDoctorAdviceInfo
+
+	var his_advices_one []*models.HisDoctorAdviceInfo
 	//获取his数据
-	hisAdvice, err := service.GetHisDoctorPatientById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+	hisAdvice, _ = service.GetHisDoctorPatientById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+
+	//针对茂名舒和
+	if adminUserInfo.CurrentOrgId == 10666 || adminUserInfo.CurrentOrgId == 10644 {
+		if len(hisAdvice) > 0 {
+			for _, item := range hisAdvice {
+				drug, _ := service.GetDrugIsShow(item.DrugId, adminUserInfo.CurrentOrgId)
+				if drug.IsShow == 1 {
+					his_advices_one = append(his_advices_one, item)
+				}
+			}
+		}
+	} else {
+		if len(hisAdvice) > 0 {
+			for _, item := range hisAdvice {
+				his_advices_one = append(his_advices_one, item)
+			}
+		}
+	}
 
 	//hisAdvice, err := service.GetHisDoctorPatientById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 	config, _ := service.GetHisDoctorConfig(adminUserInfo.CurrentOrgId)
 
 	project_config, _ := service.GetHisProjectConfig(adminUserInfo.CurrentOrgId)
-	projects, _ := service.FindAllHisProjectById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+
+	var projects []*models.HisPrescriptionProject
+	projects, _ = service.FindAllHisProjectById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+
+	var projectsOne []*models.HisPrescriptionProject
+
+	//针对茂名舒和
+	if adminUserInfo.CurrentOrgId == 10666 || adminUserInfo.CurrentOrgId == 10644 {
+		if len(projects) > 0 {
+			for _, item := range projects {
+				if item.Type == 2 {
+					if item.HisProject.IsShow == 1 {
+						projectsOne = append(projectsOne, item)
+					}
+				}
+
+				if item.Type == 3 {
+					if item.GoodInfo.IsShow == 1 {
+						projectsOne = append(projectsOne, item)
+					}
+				}
+			}
+		}
+	} else {
+		for _, item := range projects {
+			projectsOne = append(projectsOne, item)
+		}
+	}
 
 	//获取诊断
 	prescriptionInfo, _ := service.GetPrescriptionInfo(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
@@ -4525,7 +4574,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 			"PredialysisEvaluation":     PredialysisEvaluation,
 			"AssessmentAfterDislysis":   AssessmentAfterDislysis,
 			"dialysisPrescription":      dialysisPrescription,
-			"advices":                   hisAdvice,
+			"advices":                   his_advices_one,
 			"monitors":                  Record,
 			"summary":                   TreatmentSummary,
 			"receiverTreatmentAccess":   receiverTreatmentAccess,
@@ -4550,7 +4599,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 			"dialysiscount":             dialysiscount,
 			"last_order":                lastOrder,
 			"project_config":            project_config,
-			"projects":                  projects,
+			"projects":                  projectsOne,
 			"prescriptionInfo":          prescriptionInfo,
 			"patientDiagnose":           patientDiagnose,
 			"lastSchedule":              lastSchedule,

controllers/dialysis_record_api_controller.go

@@ -584,6 +584,8 @@ type EditMonitorParamObject struct {
 	ReplacementSpeed            float64 `gorm:"column:replacement_speed" json:"replacement_speed" form:"replacement_speed"`
 	Dicarbonate                 float64 `gorm:"column:dicarbonate" json:"dicarbonate" form:"dicarbonate"`
 	IsPressure                  string  `gorm:"column:is_pressure" json:"is_pressure" form:"is_pressure"`
+	UltrafiltrationRateOne      string  `gorm:"column:ultrafiltration_rate_one" json:"ultrafiltration_rate_one" form:"ultrafiltration_rate_one"`
+	HeparinOne                  string  `gorm:"column:heparin_one" json:"heparin_one" form:"heparin_one"`
 }
 
 // /api/dislysis/monitor/edit [post]
@@ -733,6 +735,8 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 			ReplacementSpeed:            monitorParam.ReplacementSpeed,
 			Dicarbonate:                 monitorParam.Dicarbonate,
 			IsPressure:                  monitorParam.IsPressure,
+			UltrafiltrationRateOne:      monitorParam.UltrafiltrationRateOne,
+			HeparinOne:                  monitorParam.HeparinOne,
 		}
 		createErr := service.CreateMonitor(&monitor)
 
@@ -853,6 +857,8 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 		monitor.ReplacementSpeed = monitorParam.ReplacementSpeed
 		monitor.Dicarbonate = monitorParam.Dicarbonate
 		monitor.IsPressure = monitorParam.IsPressure
+		monitor.UltrafiltrationRateOne = monitorParam.UltrafiltrationRateOne
+		monitor.HeparinOne = monitorParam.HeparinOne
 		updateErr := service.UpdateMonitor(monitor)
 		//记录日志
 		byterequest, _ := json.Marshal(monitor)
@@ -916,6 +922,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 	order_remark := this.GetString("order_remark")
 	catheter_operation := this.GetString("catheter_operation")
 	blood_flow_volume := this.GetString("blood_flow_volume")
+	dialysis_strainer := this.GetString("dialysis_strainer")
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1162,6 +1169,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		CatheterOperation:      catheter_operation,
 		BloodFlowVolume:        blood_flow_volume,
 		BloodDrawing:           blood_drawing,
+		DialysisStrainer:       dialysis_strainer,
 	}
 
 	createErr := service.MobileCreateDialysisOrder(adminUserInfo.CurrentOrgId, patientID, dialysisRecord)
@@ -1884,6 +1892,7 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 	catheter_operation := this.GetString("catheter_operation")
 	blood_flow_volume := this.GetString("blood_flow_volume")
 	blood_drawing, _ := this.GetInt64("blood_drawing")
+	dialysis_strainer := this.GetString("dialysis_strainer")
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1968,7 +1977,6 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 
 	schedule, err := service.GetDayScheduleByBedid(adminUserInfo.CurrentOrgId, schedulestartTime, bedID, schedual_type)
 
-	fmt.Println("schedule-----------------------------", schedule)
 	daySchedule, _ := service.GetDaySchedule(adminUserInfo.CurrentOrgId, schedulestartTime, scheduleendTime, tempDialysisRecord.PatientId)
 
 	if daySchedule.BedId != bedID || daySchedule.ScheduleType != schedual_type {
@@ -2058,6 +2066,7 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 		CatheterOperation:      catheter_operation,
 		BloodFlowVolume:        blood_flow_volume,
 		BloodDrawing:           blood_drawing,
+		DialysisStrainer:       dialysis_strainer,
 	}
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)

controllers/drug_stock_api_contorller.go

@@ -1275,6 +1275,8 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 
 				id := int64(items["id"].(float64))
 
+				class_type, _ := items["class_type"].(string)
+
 				warehouseOutInfo := &models.DrugWarehouseOutInfo{
 					ID:                      id,
 					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -1306,6 +1308,7 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 					IsCheck:                 2,
 					SysRecordTime:           warehousingOutDate.Unix(),
 					PatientId:               patient_id,
+					ClassType:               class_type,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1685,6 +1688,8 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 
 				stock_count, _ := items["stock_count"].(string)
 
+				class_type, _ := items["class_type"].(string)
+
 				if id == 0 {
 					warehouseOutInfo := &models.DrugWarehouseOutInfo{
 						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -1715,6 +1720,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						AdminUserId:             admin_user_id,
 						StockCount:              stock_count,
 						PatientId:               patient_id,
+						ClassType:               class_type,
 					}
 					warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1794,6 +1800,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						AdminUserId:             admin_user_id,
 						StockCount:              stock_count,
 						PatientId:               patient_id,
+						ClassType:               class_type,
 					}
 					upDateWarehouseOutInfos = append(upDateWarehouseOutInfos, warehouseOutInfo)
 

controllers/gobal_config_api_controller.go

@@ -1,14 +1,9 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"io/ioutil"
 	"log"
 	"os"
@@ -20,6 +15,12 @@ import (
 	"strings"
 	"time"
 
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+	"github.com/jinzhu/gorm"
+
 	"github.com/astaxie/beego"
 )
 
@@ -2316,6 +2317,7 @@ func (c *GobalConfigApiController) GetSingleOrderDetail() {
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 
 	list, err := service.GetSingleOrderDetail(id, orgId)
+	fmt.Println("HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH", list)
 	drugoutlist, _ := service.GetDrugWarehouseOutDetailNighty(id, orgId)
 	dealerList, err := service.GetAllDealerList(orgId)
 	manufacturerList, err := service.GetAllManufacturerList(orgId)

controllers/his_api_controller.go

@@ -2998,7 +2998,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 											}
 
-											//service.DeleteAutoWarehouse(patient_id, recordDateTime)
+											service.DeleteAutoWarehouse(patient_id, recordDateTime)
 
 										}
 
@@ -3051,7 +3051,7 @@ func (c *HisApiController) CreateHisPrescription() {
 													service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, item.OrgId)
 												}
 
-												//service.DeleteAutoWarehouse(patient_id, recordDateTime)
+												service.DeleteAutoWarehouse(patient_id, recordDateTime)
 
 											}
 
@@ -3181,7 +3181,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10666 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10666 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 9675 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -4442,7 +4442,11 @@ func (c *HisApiController) CreateHisPrescription() {
 										s.Price = lastWarehouse.RetailPrice
 									}
 									if s.Price == 0 {
-										s.Price = lastWarehouse.RetailPrice
+										if lastWarehouse.ID == 0 {
+											lastWarehouseTwo, _ := service.FindLastDrugWarehousingInfoByIDTwo(s.DrugId, storeConfig.DrugStorehouseOut)
+											s.Price = lastWarehouseTwo.RetailPrice
+										}
+
 									}
 								}
 
@@ -4529,6 +4533,11 @@ func (c *HisApiController) CreateHisPrescription() {
 										if p.Price != lastWarehouse.PackingPrice {
 											p.Price = lastWarehouse.PackingPrice
 										}
+										if p.Price == 0 {
+											lastWarehouseTwo, _ := service.FindFirstWarehousingInfoByStockFour(p.ProjectId, storeConfig.DrugStorehouseOut)
+											p.Price = lastWarehouseTwo.PackingPrice
+										}
+
 										if p.Unit == "" {
 											goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
 											p.Unit = goodInfoOne.PackingUnit

controllers/manage_api_controller.go

@@ -1,17 +1,18 @@
 package controllers
 
 import (
+	"encoding/json"
+	"fmt"
+	"strconv"
+	"time"
+	"unsafe"
+
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
-	"encoding/json"
-	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
-	"strconv"
-	"time"
-	"unsafe"
 )
 
 type MachineApiController struct {
@@ -5400,9 +5401,9 @@ func (this *MachineApiController) GetObjectDisInfectionLongTime() {
 
 func (this *MachineApiController) GetInformationmanalist() {
 
-	//获取2022年8月1日到10月16日的上机患者
+	//获取2022年8月1日到12日的上机患者
 
-	list, _ := service.GetDialysisOrderPatient(10101)
+	list, _ := service.GetDialysisOrderPatient(9538)
 
 	for _, dialysisOrder := range list {
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -505,6 +505,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 	go func() {
 		// 先走redis，没有走数据库
 		projects, _ = service.GetHisPrescriptionProjects(adminInfo.Org.Id, patientID, date.Unix())
+
 		ch <- struct{}{}
 	}()
 
@@ -561,6 +562,23 @@ func (this *DialysisAPIController) DialysisRecord() {
 
 	projects, _ = service.GetHisPrescriptionProjects(adminInfo.Org.Id, patientID, date.Unix())
 
+	temp_team_projects, _ := service.GetHisPrescriptionTeamProjects(adminInfo.Org.Id, patientID, date.Unix())
+
+	prescriptionConfig, _ := service.FindPrescriptionConfigById(adminInfo.Org.Id)
+
+	var team_projects []*models.HisPrescriptionProject
+	//var index int64 = 0
+	for _, item := range temp_team_projects {
+		//组套里面非检验项目的
+		if item.HisProject.CostClassify != 3 {
+			projects = append(projects, item)
+		}
+		//组套里面检验项目的
+		if item.HisProject.CostClassify == 3 {
+			team_projects = append(team_projects, item)
+		}
+	}
+
 	//针对茂名舒和
 	if adminInfo.Org.Id == 10666 || adminInfo.Org.Id == 10644 {
 		if len(projects) > 0 {
@@ -584,25 +602,6 @@ func (this *DialysisAPIController) DialysisRecord() {
 		}
 	}
 
-	fmt.Print("projectOne------------------------", projectsOne)
-
-	temp_team_projects, _ := service.GetHisPrescriptionTeamProjects(adminInfo.Org.Id, patientID, date.Unix())
-
-	prescriptionConfig, _ := service.FindPrescriptionConfigById(adminInfo.Org.Id)
-
-	var team_projects []*models.HisPrescriptionProject
-	//var index int64 = 0
-	for _, item := range temp_team_projects {
-		//组套里面非检验项目的
-		if item.HisProject.CostClassify != 3 {
-			projects = append(projects, item)
-		}
-		//组套里面检验项目的
-		if item.HisProject.CostClassify == 3 {
-			team_projects = append(team_projects, item)
-		}
-	}
-
 	team_projects = RemoveRepeatedCheckRecod(team_projects)
 
 	stockType, _ = service.GetStockType(adminInfo.Org.Id)
@@ -3169,6 +3168,7 @@ func (this *DialysisAPIController) StartDialysis() {
 	order_remark := this.GetString("order_remark")
 	catheter_operation := this.GetString("catheter_operation")
 	blood_flow_volume := this.GetString("blood_flow_volume")
+	dialysis_strainer := this.GetString("dialysis_strainer")
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -3390,6 +3390,7 @@ func (this *DialysisAPIController) StartDialysis() {
 		CatheterOperation:      catheter_operation,
 		BloodFlowVolume:        blood_flow_volume,
 		BloodDrawing:           blood_drawing,
+		DialysisStrainer:       dialysis_strainer,
 	}
 	//查询该床位是否有人用了
 	_, errorscode := service.GetDialysisOrderByBedId(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
@@ -3461,6 +3462,8 @@ func (this *DialysisAPIController) StartDialysis() {
 	//}
 
 	var ultrafiltration_rate float64
+
+	var ultrafiltration_rate_one string
 	_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, schedulestartTime, adminUserInfo.Org.Id)
 	//后期预增脱水量
 	_, evaluation := service.FindPredialysisEvaluationByReordDate(patientID, schedulestartTime, adminUserInfo.Org.Id)
@@ -3558,10 +3561,12 @@ func (this *DialysisAPIController) StartDialysis() {
 			if adminUserInfo.Org.Id == 10693 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				ultrafiltration_rate = ultrafiltration_rate
+				ultrafiltration_rate_one = strconv.FormatFloat(ultrafiltration_rate, 'f', -1, 64)
+
 			}
 
 			if adminUserInfo.Org.Id == 10694 || adminUserInfo.Org.Id == 10697 {
-				fmt.Println("hahahahhahahahahah")
+
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				ultrafiltration_rate = ultrafiltration_rate / 1000
 			}
@@ -3576,13 +3581,14 @@ func (this *DialysisAPIController) StartDialysis() {
 		MonitoringDate:  schedulestartTime,
 		OperateTime:     startDate.Unix(),
 		// MonitoringTime:            recordTime,
-		MonitoringNurse:       nurseID,
-		Dispose:               tempdispose,
-		UltrafiltrationRate:   ultrafiltration_rate,
-		UltrafiltrationVolume: 0,
-		Status:                1,
-		CreatedTime:           time.Now().Unix(),
-		UpdatedTime:           time.Now().Unix(),
+		MonitoringNurse:        nurseID,
+		Dispose:                tempdispose,
+		UltrafiltrationRate:    ultrafiltration_rate,
+		UltrafiltrationVolume:  0,
+		Status:                 1,
+		CreatedTime:            time.Now().Unix(),
+		UpdatedTime:            time.Now().Unix(),
+		UltrafiltrationRateOne: ultrafiltration_rate_one,
 	}
 
 	//只针对广慈医院
@@ -4737,6 +4743,7 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 	catheter_operation := this.GetString("catheter_operation")
 	blood_flow_volume := this.GetString("blood_flow_volume")
 	blood_drawing, _ := this.GetInt64("blood_drawing")
+	dialysis_strainer := this.GetString("dialysis_strainer")
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -4904,6 +4911,7 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 		CatheterOperation:      catheter_operation,
 		BloodFlowVolume:        blood_flow_volume,
 		BloodDrawing:           blood_drawing,
+		DialysisStrainer:       dialysis_strainer,
 	}
 
 	//修改床位号需要重新消毒
@@ -6242,6 +6250,7 @@ func (c *DialysisAPIController) CreateConsumables() {
 						service.CreateGoodErrcode(goodErrcode)
 						utils.TraceLog("创建出库单失败 err = %v", err)
 					}
+					service.ModfiyAddDialysisAuto(item.PatientId, item.RecordDate, item.Count, item.GoodId, tx)
 				}
 
 				if item.Count < his_count {
@@ -6259,11 +6268,14 @@ func (c *DialysisAPIController) CreateConsumables() {
 						Mtime:      time.Now().Unix(),
 						PatientId:  item.PatientId,
 						RecordDate: record_time,
+						Count:      strconv.FormatInt(item.Count, 10),
 					}
 
-					service.NewHisGoodCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, cha_count, goodObj, tx)
+					service.NewMobileHisGoodCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, cha_count, goodObj, tx)
 
-					service.NewHisGoodAutoCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, cha_count, goodObj, tx)
+					service.NewMobileHisGoodAutoCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, cha_count, goodObj, tx)
+
+					service.ModfiyReduceDialysisAuto(item.PatientId, item.RecordDate, item.Count, item.GoodId, tx)
 				}
 
 				if item.Count == his_count {
@@ -6290,6 +6302,7 @@ func (c *DialysisAPIController) CreateConsumables() {
 						}
 						//出库
 						service.ConsumableNewHisPrescriptionDelivery(adminInfo.Org.Id, patient_id, record_time, &dialyPrepareOne, &lastOut, creater, tx)
+						service.ModfiyAddDialysisAuto(item.PatientId, item.RecordDate, item.Count, item.GoodId, tx)
 					}
 				}
 
@@ -6424,6 +6437,7 @@ func (c *DialysisAPIController) CreateConsumables() {
 						service.CreateGoodErrcode(goodErrcode)
 						utils.TraceLog("创建出库单失败 err = %v", err)
 					}
+					service.ModfiyAddDialysisAuto(item.PatientId, item.RecordDate, item.Count, item.GoodId, tx)
 				}
 
 				if item.Count < his_count {
@@ -6441,11 +6455,14 @@ func (c *DialysisAPIController) CreateConsumables() {
 						Mtime:      time.Now().Unix(),
 						PatientId:  item.PatientId,
 						RecordDate: record_time,
+						Count:      strconv.FormatInt(item.Count, 10),
 					}
 
-					service.NewHisGoodCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, cha_count, goodObj, tx)
+					service.NewMobileHisGoodCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, cha_count, goodObj, tx)
+
+					service.NewMobileHisGoodAutoCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, cha_count, goodObj, tx)
 
-					service.NewHisGoodAutoCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, cha_count, goodObj, tx)
+					service.ModfiyReduceDialysisAuto(item.PatientId, item.RecordDate, item.Count, item.GoodId, tx)
 				}
 
 				if item.Count == his_count {
@@ -6472,6 +6489,8 @@ func (c *DialysisAPIController) CreateConsumables() {
 						}
 						//出库
 						service.ConsumableNewHisPrescriptionDelivery(adminInfo.Org.Id, patient_id, record_time, &dialyPrepareOne, &lastOut, creater, tx)
+
+						service.ModfiyAddDialysisAuto(item.PatientId, item.RecordDate, item.Count, item.GoodId, tx)
 					}
 				}
 
@@ -6611,6 +6630,13 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 				}
 				count := int64(items["new_count"].(float64))
 
+				if items["project_id"] == nil || reflect.TypeOf(items["project_id"]).String() != "float64" {
+					utils.ErrorLog("project_id")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				project_id := int64(items["project_id"].(float64))
+
 				prepare := &models.DialysisBeforePrepare{
 					GoodTypeId:   good_type_id,
 					GoodId:       good_id,
@@ -6622,6 +6648,7 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 					Ctime:        time.Now().Unix(),
 					Creater:      adminInfo.AdminUser.Id,
 					StorehouseId: houseConfig.StorehouseOutInfo,
+					ProjectId:    project_id,
 				}
 
 				consumables = append(consumables, prepare)
@@ -6636,8 +6663,8 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 		houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
 		//查询是否有库存
 		for _, item := range consumables {
-			good, _ := service.GetGoodInformationByGoodId(item.ProjectId)
-			warehouse, _ := service.FindFirstWarehousingInfoByStockTwo(item.ProjectId, good.GoodTypeId, houseConfig.StorehouseOutInfo)
+			good, _ := service.GetGoodInformationByGoodId(item.GoodId)
+			warehouse, _ := service.FindFirstWarehousingInfoByStockTwo(item.GoodId, good.GoodTypeId, houseConfig.StorehouseOutInfo)
 
 			if item.Count > warehouse.Count {
 				goodErrcode := models.XtGoodErrcode{
@@ -6655,7 +6682,7 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 				}
 				service.CreateGoodErrcode(goodErrcode)
 
-				goodObj, _ := service.GetGoodInformationByGoodId(item.ProjectId)
+				goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
 				c.ServeSuccessJSON(map[string]interface{}{
 					"message":            "1",
 					"good_name":          goodObj.GoodName,
@@ -6668,7 +6695,6 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 		//查询是否有出库单
 		_, err := service.FindStockOutByIsSys(adminInfo.Org.Id, 1, record_time)
 
-		fmt.Println("err000000000000000000000000000000000000000000", err)
 		if err == gorm.ErrRecordNotFound {
 			//没有记录，则创建出库单
 			timeStr := time.Now().Format("2006-01-02")
@@ -6727,7 +6753,6 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 					}
 				}()
 				for _, item := range consumables {
-
 					//出库
 					if item.Count > 0 {
 						timeStr := time.Now().Format("2006-01-02")
@@ -6769,13 +6794,13 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 
 						lastOut, _ := service.FindNewLastPrescriptionWarehouseOut(adminInfo.Org.Id, nowtime, tx)
 
-						goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(item.ProjectId, tx)
+						goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(item.GoodId, tx)
 						houseConfig, _ := service.GetNewAllStoreHouseConfig(adminInfo.Org.Id, tx)
 
 						dialyPrepareOne := models.DialysisBeforePrepare{
 							GoodTypeId:   goodObj.GoodTypeId,
-							GoodId:       item.ProjectId,
-							PatientId:    item.PatientId,
+							GoodId:       item.GoodId,
+							PatientId:    patient_id,
 							RecordDate:   record_time,
 							UserOrgId:    adminInfo.Org.Id,
 							Count:        item.Count,
@@ -6805,180 +6830,50 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 							service.CreateGoodErrcode(goodErrcode)
 							utils.TraceLog("创建出库单失败 err = %v", err)
 						}
+
+						//添加
+						service.ModfiyAddDialysisAuto(item.PatientId, record_time, item.Count, item.GoodId, tx)
 					}
 
 					//退库
 					if item.Count < 0 {
-						goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(item.ProjectId, tx)
+						count := math.Abs(float64(item.Count))
+						item.Count = int64(count)
+
+						goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(item.GoodId, tx)
 						creater := c.GetMobileAdminUserInfo().AdminUser.Id
 
 						newPrescriptionProject := &models.HisPrescriptionProject{
 							ID:         item.ProjectId,
-							ProjectId:  item.ProjectId,
+							ProjectId:  item.GoodId,
 							UserOrgId:  adminInfo.Org.Id,
 							Status:     1,
 							Ctime:      time.Now().Unix(),
 							Mtime:      time.Now().Unix(),
-							PatientId:  item.PatientId,
+							PatientId:  patient_id,
 							RecordDate: record_time,
 						}
 
-						service.NewHisGoodCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, item.Count, goodObj, tx)
-
-						service.NewHisGoodAutoCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, item.Count, goodObj, tx)
-					}
+						fmt.Println("item.Count---------------------------------------", item.Count)
+						service.NewMobileHisGoodCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, item.Count, goodObj, tx)
 
-					//var his_count int64
-					////查询该耗材今日出库了多少
-					//outInfo, _ := service.GetHistoryWarehouseOutInfo(item.PatientId, adminInfo.Org.Id, record_time, item.ProjectId, tx)
-					//
-					//for _, it := range outInfo {
-					//	his_count += it.Count
-					//}
-					//
-					//if item.Count > his_count {
-					//	//如果当前出库数据 大于历史出库数据，那么需要出库
-					//	var cha_count int64
-					//	cha_count = item.Count - his_count
-					//
-					//	timeStr := time.Now().Format("2006-01-02")
-					//	timeArr := strings.Split(timeStr, "-")
-					//	total, _ := service.FindAllWarehouseOut(adminInfo.Org.Id)
-					//
-					//	total = total + 1
-					//	warehousing_out_order := strconv.FormatInt(adminInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-					//	number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-					//	number = number + total
-					//	warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
-					//
-					//	operation_time := time.Now().Unix()
-					//	creater := c.GetMobileAdminUserInfo().AdminUser.Id
-					//
-					//	recordDateStr := time.Now().Format("2006-01-02")
-					//	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
-					//	nowtime := recordDate.Unix()
-					//	//查询默认出库仓库库存
-					//	storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-					//	warehouseOut := models.WarehouseOut{
-					//		WarehouseOutOrderNumber: warehousing_out_order,
-					//		OperationTime:           operation_time,
-					//		OrgId:                   adminInfo.Org.Id,
-					//		Creater:                 creater,
-					//		Ctime:                   time.Now().Unix(),
-					//		Status:                  1,
-					//		WarehouseOutTime:        nowtime,
-					//		Type:                    1,
-					//		StorehouseId:            storeConfig.StorehouseOutInfo,
-					//		IsCheck:                 1,
-					//		IsSys:                   1,
-					//	}
-					//	//查询是否生成出库单
-					//	out, _ := service.FindNewPrescriptionWarehouseOut(adminInfo.Org.Id, nowtime, tx)
-					//	if out.ID == 0 {
-					//		service.AddNewSigleWarehouseOut(&warehouseOut, tx)
-					//	}
-					//
-					//	lastOut, _ := service.FindNewLastPrescriptionWarehouseOut(adminInfo.Org.Id, nowtime, tx)
-					//
-					//	goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(item.ProjectId, tx)
-					//	houseConfig, _ := service.GetNewAllStoreHouseConfig(adminInfo.Org.Id, tx)
-					//
-					//	dialyPrepareOne := models.DialysisBeforePrepare{
-					//		GoodTypeId:   goodObj.GoodTypeId,
-					//		GoodId:       item.ProjectId,
-					//		PatientId:    item.PatientId,
-					//		RecordDate:   record_time,
-					//		UserOrgId:    adminInfo.Org.Id,
-					//		Count:        cha_count,
-					//		Ctime:        time.Now().Unix(),
-					//		Creater:      creater,
-					//		Status:       1,
-					//		StorehouseId: houseConfig.StorehouseOutInfo,
-					//		ProjectId:    item.ProjectId,
-					//	}
-					//	//出库
-					//	service.ConsumableNewHisPrescriptionDelivery(adminInfo.Org.Id, item.PatientId, record_time, &dialyPrepareOne, &lastOut, creater, tx)
-					//
-					//	if err == nil {
-					//		goodErrcode := models.XtGoodErrcode{
-					//			UserOrgId:      adminInfo.Org.Id,
-					//			Errcode:        "自动出库接口报错",
-					//			GoodId:         0,
-					//			Status:         1,
-					//			Ctime:          time.Now().Unix(),
-					//			Mtime:          0,
-					//			Count:          0,
-					//			StockCount:     0,
-					//			Creater:        creator,
-					//			BatchNumberId:  0,
-					//			WarehouseOutId: 0,
-					//		}
-					//		service.CreateGoodErrcode(goodErrcode)
-					//		utils.TraceLog("创建出库单失败 err = %v", err)
-					//	}
-					//}
-					//
-					//if item.Count < his_count {
-					//	var cha_count int64
-					//	cha_count = his_count - item.Count
-					//	goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(item.ProjectId, tx)
-					//	creater := c.GetMobileAdminUserInfo().AdminUser.Id
-					//
-					//	newPrescriptionProject := &models.HisPrescriptionProject{
-					//		ID:         item.ProjectId,
-					//		ProjectId:  item.ProjectId,
-					//		UserOrgId:  adminInfo.Org.Id,
-					//		Status:     1,
-					//		Ctime:      time.Now().Unix(),
-					//		Mtime:      time.Now().Unix(),
-					//		PatientId:  item.PatientId,
-					//		RecordDate: record_time,
-					//	}
-					//
-					//	service.NewHisGoodCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, cha_count, goodObj, tx)
-					//
-					//	service.NewHisGoodAutoCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, cha_count, goodObj, tx)
-					//}
-					//
-					//if item.Count == his_count {
-					//	if his_count == 0 {
-					//		recordDateStr := time.Now().Format("2006-01-02")
-					//		recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
-					//		nowtime := recordDate.Unix()
-					//		lastOut, _ := service.FindNewLastPrescriptionWarehouseOut(adminInfo.Org.Id, nowtime, tx)
-					//		goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(item.ProjectId, tx)
-					//		houseConfig, _ := service.GetNewAllStoreHouseConfig(adminInfo.Org.Id, tx)
-					//		creater := c.GetMobileAdminUserInfo().AdminUser.Id
-					//		dialyPrepareOne := models.DialysisBeforePrepare{
-					//			GoodTypeId:   goodObj.GoodTypeId,
-					//			GoodId:       item.ProjectId,
-					//			PatientId:    item.PatientId,
-					//			RecordDate:   record_time,
-					//			UserOrgId:    adminInfo.Org.Id,
-					//			Count:        item.Count,
-					//			Ctime:        time.Now().Unix(),
-					//			Creater:      creater,
-					//			Status:       1,
-					//			StorehouseId: houseConfig.StorehouseOutInfo,
-					//			ProjectId:    item.ProjectId,
-					//		}
-					//		//出库
-					//		service.ConsumableNewHisPrescriptionDelivery(adminInfo.Org.Id, patient_id, record_time, &dialyPrepareOne, &lastOut, creater, tx)
-					//	}
-					//}
+						service.NewMobileHisGoodAutoCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, item.Count, goodObj, tx)
 
+						//减少
+						service.ModfiyReduceDialysisAuto(item.PatientId, record_time, item.Count, item.GoodId, tx)
+					}
 					//查询剩余库存
-					goodList, _ := service.GetNewAllGoodSumCount(item.ProjectId, adminInfo.Org.Id, houseConfig.StorehouseOutInfo, tx)
+					goodList, _ := service.GetNewAllGoodSumCount(item.GoodId, adminInfo.Org.Id, houseConfig.StorehouseOutInfo, tx)
 					var sum_count int64
 					for _, item := range goodList {
 						sum_count += item.StockCount
 					}
 
 					//更新剩余库存
-					service.UpdateNewGoodFlushCount(houseConfig.StorehouseOutInfo, item.ProjectId, adminInfo.Org.Id, sum_count, tx)
+					service.UpdateNewGoodFlushCount(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id, sum_count, tx)
 
 					//耗材
-					service.UpdateNewGoodSumCountSeven(sum_count, item.ProjectId, adminInfo.Org.Id, tx)
+					service.UpdateNewGoodSumCountSeven(sum_count, item.GoodId, adminInfo.Org.Id, tx)
 
 				}
 
@@ -6999,144 +6894,6 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 						tx.Commit()
 					}
 				}()
-				//var his_count int64
-				////查询该耗材今日出库了多少
-				//outInfo, _ := service.GetHistoryWarehouseOutInfo(item.PatientId, adminInfo.Org.Id, record_time, item.ProjectId, tx)
-				//fmt.Println("outInfo", outInfo)
-				//for _, it := range outInfo {
-				//	his_count += it.Count
-				//}
-				//if item.Count > his_count {
-				//	//如果当前出库数据 大于历史出库数据，那么需要出库
-				//
-				//	var cha_count int64
-				//	cha_count = item.Count - his_count
-				//
-				//	timeStr := time.Now().Format("2006-01-02")
-				//	timeArr := strings.Split(timeStr, "-")
-				//	total, _ := service.FindAllWarehouseOut(adminInfo.Org.Id)
-				//
-				//	total = total + 1
-				//	warehousing_out_order := strconv.FormatInt(adminInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-				//	number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-				//	number = number + total
-				//	warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
-				//
-				//	operation_time := time.Now().Unix()
-				//	creater := c.GetMobileAdminUserInfo().AdminUser.Id
-				//
-				//	recordDateStr := time.Now().Format("2006-01-02")
-				//	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
-				//	nowtime := recordDate.Unix()
-				//	//查询默认出库仓库库存
-				//	storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-				//	warehouseOut := models.WarehouseOut{
-				//		WarehouseOutOrderNumber: warehousing_out_order,
-				//		OperationTime:           operation_time,
-				//		OrgId:                   adminInfo.Org.Id,
-				//		Creater:                 creater,
-				//		Ctime:                   time.Now().Unix(),
-				//		Status:                  1,
-				//		WarehouseOutTime:        nowtime,
-				//		Type:                    1,
-				//		StorehouseId:            storeConfig.StorehouseOutInfo,
-				//		IsCheck:                 1,
-				//		IsSys:                   1,
-				//	}
-				//	//查询是否生成出库单
-				//	out, _ := service.FindNewPrescriptionWarehouseOut(adminInfo.Org.Id, nowtime, tx)
-				//	if out.ID == 0 {
-				//		service.AddNewSigleWarehouseOut(&warehouseOut, tx)
-				//	}
-				//
-				//	lastOut, _ := service.FindNewLastPrescriptionWarehouseOut(adminInfo.Org.Id, nowtime, tx)
-				//
-				//	goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(item.ProjectId, tx)
-				//	houseConfig, _ := service.GetNewAllStoreHouseConfig(adminInfo.Org.Id, tx)
-				//
-				//	dialyPrepareOne := models.DialysisBeforePrepare{
-				//		GoodTypeId:   goodObj.GoodTypeId,
-				//		GoodId:       item.ProjectId,
-				//		PatientId:    item.PatientId,
-				//		RecordDate:   record_time,
-				//		UserOrgId:    adminInfo.Org.Id,
-				//		Count:        cha_count,
-				//		Ctime:        time.Now().Unix(),
-				//		Creater:      creater,
-				//		Status:       1,
-				//		StorehouseId: houseConfig.StorehouseOutInfo,
-				//		ProjectId:    item.ProjectId,
-				//	}
-				//	//出库
-				//	service.ConsumableNewHisPrescriptionDelivery(adminInfo.Org.Id, item.PatientId, record_time, &dialyPrepareOne, &lastOut, creater, tx)
-				//
-				//	if err == nil {
-				//		goodErrcode := models.XtGoodErrcode{
-				//			UserOrgId:      adminInfo.Org.Id,
-				//			Errcode:        "自动出库接口报错",
-				//			GoodId:         0,
-				//			Status:         1,
-				//			Ctime:          time.Now().Unix(),
-				//			Mtime:          0,
-				//			Count:          0,
-				//			StockCount:     0,
-				//			Creater:        creator,
-				//			BatchNumberId:  0,
-				//			WarehouseOutId: 0,
-				//		}
-				//		service.CreateGoodErrcode(goodErrcode)
-				//		utils.TraceLog("创建出库单失败 err = %v", err)
-				//	}
-				//}
-				//
-				//if item.Count < his_count {
-				//	var cha_count int64
-				//	cha_count = his_count - item.Count
-				//	goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(item.ProjectId, tx)
-				//	creater := c.GetMobileAdminUserInfo().AdminUser.Id
-				//
-				//	newPrescriptionProject := &models.HisPrescriptionProject{
-				//		ID:         item.ProjectId,
-				//		ProjectId:  item.ProjectId,
-				//		UserOrgId:  adminInfo.Org.Id,
-				//		Status:     1,
-				//		Ctime:      time.Now().Unix(),
-				//		Mtime:      time.Now().Unix(),
-				//		PatientId:  item.PatientId,
-				//		RecordDate: record_time,
-				//	}
-				//
-				//	service.NewHisGoodCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, cha_count, goodObj, tx)
-				//
-				//	service.NewHisGoodAutoCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, cha_count, goodObj, tx)
-				//}
-				//
-				//if item.Count == his_count {
-				//	if his_count == 0 {
-				//		recordDateStr := time.Now().Format("2006-01-02")
-				//		recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
-				//		nowtime := recordDate.Unix()
-				//		lastOut, _ := service.FindNewLastPrescriptionWarehouseOut(adminInfo.Org.Id, nowtime, tx)
-				//		goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(item.ProjectId, tx)
-				//		houseConfig, _ := service.GetNewAllStoreHouseConfig(adminInfo.Org.Id, tx)
-				//		creater := c.GetMobileAdminUserInfo().AdminUser.Id
-				//		dialyPrepareOne := models.DialysisBeforePrepare{
-				//			GoodTypeId:   goodObj.GoodTypeId,
-				//			GoodId:       item.ProjectId,
-				//			PatientId:    item.PatientId,
-				//			RecordDate:   record_time,
-				//			UserOrgId:    adminInfo.Org.Id,
-				//			Count:        item.Count,
-				//			Ctime:        time.Now().Unix(),
-				//			Creater:      creater,
-				//			Status:       1,
-				//			StorehouseId: houseConfig.StorehouseOutInfo,
-				//			ProjectId:    item.ProjectId,
-				//		}
-				//		//出库
-				//		service.ConsumableNewHisPrescriptionDelivery(adminInfo.Org.Id, patient_id, record_time, &dialyPrepareOne, &lastOut, creater, tx)
-				//	}
-				//}
 
 				//出库
 				if item.Count > 0 {
@@ -7179,13 +6936,13 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 
 					lastOut, _ := service.FindNewLastPrescriptionWarehouseOut(adminInfo.Org.Id, nowtime, tx)
 
-					goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(item.ProjectId, tx)
+					goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(item.GoodId, tx)
 					houseConfig, _ := service.GetNewAllStoreHouseConfig(adminInfo.Org.Id, tx)
 
 					dialyPrepareOne := models.DialysisBeforePrepare{
 						GoodTypeId:   goodObj.GoodTypeId,
-						GoodId:       item.ProjectId,
-						PatientId:    item.PatientId,
+						GoodId:       item.GoodId,
+						PatientId:    patient_id,
 						RecordDate:   record_time,
 						UserOrgId:    adminInfo.Org.Id,
 						Count:        item.Count,
@@ -7215,41 +6972,50 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 						service.CreateGoodErrcode(goodErrcode)
 						utils.TraceLog("创建出库单失败 err = %v", err)
 					}
+					//减少
+					service.ModfiyAddDialysisAuto(item.PatientId, record_time, item.Count, item.GoodId, tx)
 				}
 
 				//退库
 				if item.Count < 0 {
-					goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(item.ProjectId, tx)
+					goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(item.GoodId, tx)
 					creater := c.GetMobileAdminUserInfo().AdminUser.Id
-
+					count := math.Abs(float64(item.Count))
+					item.Count = int64(count)
+					fmt.Println("item.Count---------------------------------------", item.Count)
+					fmt.Println("item.GoodId-----------------------------------", item.GoodId)
 					newPrescriptionProject := &models.HisPrescriptionProject{
 						ID:         item.ProjectId,
-						ProjectId:  item.ProjectId,
+						ProjectId:  item.GoodId,
 						UserOrgId:  adminInfo.Org.Id,
 						Status:     1,
 						Ctime:      time.Now().Unix(),
 						Mtime:      time.Now().Unix(),
 						PatientId:  item.PatientId,
 						RecordDate: record_time,
+						Count:      strconv.FormatInt(item.Count, 10),
 					}
 
-					service.NewHisGoodCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, item.Count, goodObj, tx)
+					service.NewMobileHisGoodCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, item.Count, goodObj, tx)
+
+					service.NewMobileHisGoodAutoCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, item.Count, goodObj, tx)
 
-					service.NewHisGoodAutoCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, item.Count, goodObj, tx)
+					//减少
+					service.ModfiyReduceDialysisAuto(item.PatientId, record_time, item.Count, item.GoodId, tx)
 				}
 
 				//查询剩余库存
-				goodList, _ := service.GetNewAllGoodSumCount(item.ProjectId, adminInfo.Org.Id, houseConfig.StorehouseOutInfo, tx)
+				goodList, _ := service.GetNewAllGoodSumCount(item.GoodId, adminInfo.Org.Id, houseConfig.StorehouseOutInfo, tx)
 				var sum_count int64
 				for _, item := range goodList {
 					sum_count += item.StockCount
 				}
 
 				//更新剩余库存
-				service.UpdateNewGoodFlushCount(houseConfig.StorehouseOutInfo, item.ProjectId, adminInfo.Org.Id, sum_count, tx)
+				service.UpdateNewGoodFlushCount(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id, sum_count, tx)
 
 				//耗材
-				service.UpdateNewGoodSumCountSeven(sum_count, item.ProjectId, adminInfo.Org.Id, tx)
+				service.UpdateNewGoodSumCountSeven(sum_count, item.GoodId, adminInfo.Org.Id, tx)
 			}
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -7321,6 +7087,7 @@ func (c *DialysisAPIController) EditConsumables() {
 	//判断是否开启自动出库
 	_, record := service.FindAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
 
+	fmt.Println("record.IsOpen====================================", record)
 	if record.IsOpen == 1 {
 
 		if dataBody["goods"] != nil && reflect.TypeOf(dataBody["goods"]).String() == "[]interface {}" {
@@ -7395,7 +7162,7 @@ func (c *DialysisAPIController) EditConsumables() {
 					var his_count int64
 					//查询该耗材今日出库了多少
 					outInfo, _ := service.GetHistoryWarehouseOutInfo(item.PatientId, adminInfo.Org.Id, record_time, item.GoodId, tx)
-
+					fmt.Println("outInfo---------------------------------------", outInfo)
 					for _, it := range outInfo {
 						his_count += it.Count
 					}
@@ -7480,12 +7247,13 @@ func (c *DialysisAPIController) EditConsumables() {
 							service.CreateGoodErrcode(goodErrcode)
 							utils.TraceLog("创建出库单失败 err = %v", err)
 						}
+						service.ModfiyAddDialysisAuto(item.PatientId, item.RecordDate, item.Count, item.GoodId, tx)
 					}
 
 					if item.Count < his_count {
 						var cha_count int64
 						cha_count = his_count - item.Count
-						goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(item.ProjectId, tx)
+						goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(item.GoodId, tx)
 						creater := c.GetMobileAdminUserInfo().AdminUser.Id
 
 						newPrescriptionProject := &models.HisPrescriptionProject{
@@ -7499,9 +7267,11 @@ func (c *DialysisAPIController) EditConsumables() {
 							RecordDate: record_time,
 						}
 
-						service.NewHisGoodCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, cha_count, goodObj, tx)
+						service.NewMobileHisGoodCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, cha_count, goodObj, tx)
 
-						service.NewHisGoodAutoCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, cha_count, goodObj, tx)
+						service.NewMobileHisGoodAutoCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, cha_count, goodObj, tx)
+
+						service.ModfiyReduceDialysisAuto(item.PatientId, item.RecordDate, item.Count, item.GoodId, tx)
 					}
 
 					if item.Count == his_count {
@@ -7528,6 +7298,8 @@ func (c *DialysisAPIController) EditConsumables() {
 							}
 							//出库
 							service.ConsumableNewHisPrescriptionDelivery(adminInfo.Org.Id, patient_id, record_time, &dialyPrepareOne, &lastOut, creater, tx)
+
+							service.ModfiyAddDialysisAuto(item.PatientId, item.RecordDate, item.Count, item.GoodId, tx)
 						}
 					}
 
@@ -8010,11 +7782,12 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 				Mtime:      time.Now().Unix(),
 				PatientId:  item.PatientId,
 				RecordDate: record_time,
+				Count:      strconv.FormatInt(item.Count, 10),
 			}
 
-			service.NewHisGoodCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, cha_count, goodObj, tx)
+			service.NewMobileHisGoodCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, cha_count, goodObj, tx)
 
-			service.NewHisGoodAutoCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, cha_count, goodObj, tx)
+			service.NewMobileHisGoodAutoCancelInfo(adminInfo.Org.Id, creater, newPrescriptionProject, cha_count, goodObj, tx)
 
 		}
 
@@ -8060,6 +7833,36 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 		//耗材
 		service.UpdateNewGoodSumCountSeven(sum_count, item.GoodId, adminInfo.Org.Id, tx)
 
+		//查询总共出库了多少支
+		autoGoodInfo, _ := service.GetDialysisAutoGoodInfo(patient_id, record_time, adminInfo.Org.Id, tx, item.GoodId)
+		if len(autoGoodInfo) > 0 {
+			var out_count int64
+			for _, item := range autoGoodInfo {
+				out_count += item.Count
+			}
+			dialysisBeforePrepare := models.DialysisBeforePrepare{
+				UserOrgId:    adminInfo.Org.Id,
+				PatientId:    patient_id,
+				RecordDate:   record_time,
+				GoodId:       item.GoodId,
+				GoodTypeId:   item.GoodTypeId,
+				Count:        out_count,
+				Ctime:        time.Now().Unix(),
+				Mtime:        time.Now().Unix(),
+				Creater:      adminInfo.AdminUser.Id,
+				Modifier:     adminInfo.AdminUser.Id,
+				Status:       1,
+				CommdityCode: "",
+				NewCount:     0,
+				Children:     nil,
+				ProjectId:    item.ProjectId,
+				StorehouseId: houseConfig.StorehouseOutInfo,
+			}
+
+			service.CreateDialysisPrepare(dialysisBeforePrepare, tx)
+
+		}
+
 	}
 
 	finish := models.XtDialysisFinish{
@@ -8079,67 +7882,6 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 		service.CreateDialysisFinish(finish)
 	}
 
-	//查询当天出库的数据
-	//list, _ := service.GetAutoReduceRecordInfoByPatientId(adminInfo.Org.Id, patient_id, record_time)
-	//
-	//for _, item := range list {
-	//	prepare := models.DialysisBeforePrepare{
-	//		UserOrgId:    item.OrgId,
-	//		PatientId:    item.PatientId,
-	//		RecordDate:   item.RecordTime,
-	//		GoodId:       item.GoodId,
-	//		GoodTypeId:   item.GoodTypeId,
-	//		Count:        item.Count,
-	//		Creater:      adminInfo.AdminUser.Id,
-	//		Status:       1,
-	//		Ctime:        time.Now().Unix(),
-	//		ProjectId:    item.ProjectId,
-	//		StorehouseId: houseConfig.StorehouseOutInfo,
-	//	}
-	//	//清空准备表的数据
-	//	err = service.DeleteDialysisBefor(adminInfo.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
-	//	//插入准备表数据
-	//	service.CreateDialysisBeforePrepareOne(&prepare)
-	//
-	//	//查询默认仓库
-	//
-	//	//查询默认仓库
-	//	storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-	//	stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, adminInfo.Org.Id)
-	//	var total_count int64
-	//	for _, it := range stockList {
-	//		total_count += it.StockCount
-	//	}
-	//	//基础库插入数据
-	//	service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminInfo.Org.Id)
-	//
-	//	////更新剩余库存
-	//
-	//	goodList, _ := service.GetSumGoodList(adminInfo.Org.Id, storeHouseConfig.StorehouseOutInfo, item.GoodId)
-	//	var flush_count int64
-	//	for _, it := range goodList {
-	//		flush_count += it.StockCount
-	//	}
-	//	errs := service.UpdateSumGood(adminInfo.Org.Id, storeHouseConfig.StorehouseOutInfo, item.GoodId, flush_count)
-	//	if errs != nil {
-	//		goodErrcode := models.XtGoodErrcode{
-	//			UserOrgId:      item.OrgId,
-	//			Errcode:        "手动出库更新剩余出库失败",
-	//			GoodId:         item.GoodId,
-	//			Status:         1,
-	//			Ctime:          time.Now().Unix(),
-	//			Mtime:          0,
-	//			Count:          0,
-	//			StockCount:     0,
-	//			Creater:        adminInfo.AdminUser.Id,
-	//			BatchNumberId:  0,
-	//			WarehouseOutId: 0,
-	//		}
-	//		service.CreateGoodErrcode(goodErrcode)
-	//	}
-	//
-	//}
-
 	//更新自动出库的地方
 	var errs error
 	if errs == nil {

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -1,15 +1,16 @@
 package mobile_api_controllers
 
 import (
+	"encoding/json"
+	"fmt"
+	"strconv"
+	"time"
+
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
-	"encoding/json"
-	"fmt"
 	"github.com/jinzhu/gorm"
-	"strconv"
-	"time"
 )
 
 // /m/api/monitor/add [post]
@@ -110,6 +111,8 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	replacement_speed, _ := this.GetFloat("replacement_speed")
 	dicarbonate, _ := this.GetFloat("dicarbonate")
 	is_pressure := this.GetString("is_pressure")
+	heparin_one := this.GetString("heparin_one")
+	ultrafiltration_rate_one := this.GetString("ultrafiltration_rate_one")
 	adminInfo := this.GetMobileAdminUserInfo()
 	patient, getPatientErr := service.MobileGetPatientById(adminInfo.Org.Id, patientID)
 	if getPatientErr != nil {
@@ -203,6 +206,8 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 		Dicarbonate:                 dicarbonate,
 		ReplacementSpeed:            replacement_speed,
 		IsPressure:                  is_pressure,
+		HeparinOne:                  heparin_one,
+		UltrafiltrationRateOne:      ultrafiltration_rate_one,
 	}
 
 	err := service.CreateMonitor(&record)
@@ -353,6 +358,8 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	replacement_speed, _ := this.GetFloat("replacement_speed")
 	dicarbonate, _ := this.GetFloat("dicarbonate")
 	is_pressure := this.GetString("is_pressure")
+	ultrafiltration_rate_one := this.GetString("ultrafiltration_rate_one")
+	heparin_one := this.GetString("heparin_one")
 	monitor, err := service.GetMonitor(adminInfo.Org.Id, patientID, id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -413,6 +420,8 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	monitor.Dehydration = dehydration
 	monitor.FilterPressure = filter_pressure
 	monitor.IsPressure = is_pressure
+	monitor.UltrafiltrationRateOne = ultrafiltration_rate_one
+	monitor.HeparinOne = heparin_one
 
 	// 查询信息规挡的设置天数
 

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -2996,7 +2996,7 @@ func (this *NewDialysisApiController) GetInspectionGroup() {
 
 	patient, _ := service.GetPatientDetailTwo(patient_id)
 	inspection, _ := service.GetInspectionGroup(patient.BloodId, org_id)
-
+	fmt.Println("inspection+++++++++=============", inspection)
 	if len(inspection) > 0 {
 		for _, item := range inspection {
 			lastInspection, _ := service.GetLastInspectionProject(item.PatientId, org_id, item.ProjectId)

controllers/patient_api_controller.go

@@ -130,6 +130,8 @@ func PatientApiRegistRouters() {
 
 	beego.Router("/api/patient/savetheapyinformed", &PatientApiController{}, "Post:SaveTheapyInformed")
 
+	beego.Router("/api/patient/savetreamentplan", &PatientApiController{}, "Post:SaveTreatmentPlan")
+
 	beego.Router("api/patient/gettherapyinformed", &PatientApiController{}, "Get:GetTherapyInformed")
 
 	beego.Router("/api/patient/savemedicalhistory", &PatientApiController{}, "Post:SaveMedicalHistory")
@@ -144,6 +146,8 @@ func PatientApiRegistRouters() {
 
 	beego.Router("/api/patient/deletesolution", &PatientApiController{}, "Get:DeleteSolution")
 
+	beego.Router("/api/patient/gettreamentplan", &PatientApiController{}, "Get:GetTreatMentPlanList")
+
 }
 func (c *PatientApiController) GetExportList() {
 	startTime := c.GetString("start_time")
@@ -7040,3 +7044,47 @@ func (c *PatientApiController) DeleteSolution() {
 		"solution": solution,
 	})
 }
+
+func (c *PatientApiController) SaveTreatmentPlan() {
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println("err", err)
+	content := dataBody["content"].(string)
+
+	theapyinformedPrint := models.XtTreatmentPlan{
+		Content:   content,
+		UserOrgId: orgId,
+		Status:    1,
+		Ctime:     time.Now().Unix(),
+		Mtime:     time.Now().Unix(),
+	}
+
+	treamentPlan, _ := service.GetTreamentPland(orgId)
+
+	if treamentPlan.ID == 0 {
+
+		service.CreateTreatqmentPland(theapyinformedPrint)
+	}
+
+	if treamentPlan.ID > 0 {
+
+		service.UpdateTheatmentPland(treamentPlan.ID, content)
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": theapyinformedPrint,
+	})
+}
+
+func (c *PatientApiController) GetTreatMentPlanList() {
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+
+	treamentPlan, _ := service.GetTreamentPland(orgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"treamentPlan": treamentPlan,
+	})
+}

controllers/print_data_api_controller.go

@@ -1,13 +1,14 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	service "XT_New/service/print_data_service/schedule_dialysis"
-	"XT_New/utils"
 	"fmt"
 	"strings"
 	"time"
 
+	"XT_New/enums"
+	service "XT_New/service/print_data_service/schedule_dialysis"
+	"XT_New/utils"
+
 	"github.com/astaxie/beego"
 )
 
@@ -195,6 +196,9 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 					item.Count = listOne.Count
 				}
 			}
+			//上次透后体重
+			lastAfterWeight, _ := service.GetBatchLastAfterWeight(this.GetAdminUserInfo().CurrentOrgId, item.PatientID, item.ScheduleDate)
+			item.LastAfterWeight = lastAfterWeight
 
 		}
 		if getScheduleErr != nil {

controllers/self_drug_api_congtroller.go

@@ -129,6 +129,25 @@ func SelfDrugRouters() {
 	beego.Router("/api/good/getcheckgoodbatchlist", &SelfDrugApiController{}, "Get:GetCheckGoodBatchList")
 
 	beego.Router("/api/drug/getdrugpatientname", &SelfDrugApiController{}, "Get:GetDrugPatientName")
+
+	//自备药的接口
+	beego.Router("/api/drug/getallselfdruginfolist", &SelfDrugApiController{}, "Get:GetAllSelfDrugInfoList")
+
+	beego.Router("/api/drug/getallpatientlist", &SelfDrugApiController{}, "Get:GetAllPatientList")
+
+	beego.Router("/api/drug/postsearchselfdruglist", &SelfDrugApiController{}, "Get:PostSearchSelfDrugList")
+
+	beego.Router("/api/drug/postselfdrugwarehouse", &SelfDrugApiController{}, "Post:PostSelfDrugWarehouse")
+
+	beego.Router("/api/drug/getallselfdrugwarehosueinfolist", &SelfDrugApiController{}, "Get:GetAllSelfDrugWarehouseInfoList")
+
+	beego.Router("/api/drug/getselfdrugwarehouseinfobyid", &SelfDrugApiController{}, "Get:GetSelfDrugWarehouseInfoByID")
+
+	beego.Router("/api/drug/modifyselfdrugwarehouse", &SelfDrugApiController{}, "Post:ModifySelfDrugWarehouse")
+
+	beego.Router("/api/drug/deleteselfwarehouseinfo", &SelfDrugApiController{}, "Get:DeleteSelfDrugWarehouse")
+
+	beego.Router("/api/drug/tocheckselfwarehouseinginfo", &SelfDrugApiController{}, "Get:TocheckSelfWarehouseingInfo")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -3838,6 +3857,7 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 			//期间减少
 			banceOutList, _ := service.GetInitOutBanceList(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 
+			//banceOutList, _ := service.GetInitOutBanceTenty(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 			for _, it := range banceOutList {
 				item.WarehouseOutInfoTenty = append(item.WarehouseOutInfoTenty, it)
 			}
@@ -4427,3 +4447,690 @@ func (this *SelfDrugApiController) GetDrugPatientName() {
 	})
 
 }
+
+func (this *SelfDrugApiController) GetAllSelfDrugInfoList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	drugInfoList, _ := service.GetAllSelfDrugInfoList(orgId)
+
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+
+	dealerList, _ := service.GetAllDealerList(orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"drugInfoList":     drugInfoList,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+	})
+}
+
+func (this *SelfDrugApiController) GetAllPatientList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	patient, _ := service.GetAllPatientListByUserOrg(orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patient": patient,
+	})
+}
+
+func (this *SelfDrugApiController) PostSearchSelfDrugList() {
+
+	keyword := this.GetString("keyword")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	drugList, _ := service.PostSearchSelfDrugList(keyword, orgId)
+
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+
+	dealerList, _ := service.GetAllDealerList(orgId)
+
+	var drugType = "药品类型"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+		"list":             drugList,
+		"drugTypeList":     drugTypeList,
+	})
+}
+
+func (c *SelfDrugApiController) PostSelfDrugWarehouse() {
+
+	patient_id, _ := c.GetInt64("patient_id")
+	warehousing_time := c.GetString("warehousing_time")
+	warehousing_id, _ := c.GetInt64("warehousing_id")
+	adminUserInfo := c.GetAdminUserInfo()
+
+	warehousingDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", warehousing_time)
+
+	if parseDateErr != nil {
+		c.ErrorLog("日期(%v)解析错误：%v", warehousingDate, parseDateErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	// 开始主事务
+	db := service.XTWriteDB()
+	tx := db.Begin()
+
+	// 在函数结束时处理事务回滚
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	timeStr := time.Now().Format("2006-01-02")
+	timeArr := strings.Split(timeStr, "-")
+	total, _ := service.FindSelfAllWarehouseTotal(adminUserInfo.CurrentOrgId, tx)
+	total = total + 1
+
+	operation_time := time.Now().Unix()
+	creater := adminUserInfo.AdminUser.Id
+
+	warehousing_order := "YPRKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+	warehousing := models.XtSelfDrugWarehouse{
+		ID:               warehousing_id,
+		WarehousingOrder: warehousing_order,
+		OperationTime:    operation_time,
+		OrgId:            adminUserInfo.CurrentOrgId,
+		Creater:          creater,
+		Ctime:            time.Now().Unix(),
+		Status:           1,
+		WarehousingTime:  warehousingDate.Unix(),
+		Type:             0,
+		StorehouseId:     0,
+		IsCheck:          2,
+		PatientId:        patient_id,
+	}
+	if warehousing_id == 0 {
+		service.AddSelfDrugWarehouse(&warehousing, tx)
+	}
+	if warehousing_id > 0 {
+		service.UpdateSelfDrugWarehouse(&warehousing, tx)
+	}
+	info, _ := service.FindLastSelfWarehousing(adminUserInfo.CurrentOrgId, patient_id, tx)
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	var warehousingInfo []*models.XtSelfDrugWarehouseInfo
+	if dataBody["stockIn"] != nil && reflect.TypeOf(dataBody["stockIn"]).String() == "[]interface {}" {
+		thisStockIn, _ := dataBody["stockIn"].([]interface{})
+		if len(thisStockIn) > 0 {
+			for _, item := range thisStockIn {
+				items := item.(map[string]interface{})
+
+				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
+					utils.ErrorLog("id")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				id := int64(items["id"].(float64))
+
+				if items["drug_id"] == nil || reflect.TypeOf(items["drug_id"]).String() != "float64" {
+					utils.ErrorLog("drug_id")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				drug_id := int64(items["drug_id"].(float64))
+
+				if items["warehousing_count"] == nil || reflect.TypeOf(items["warehousing_count"]).String() != "string" {
+					utils.ErrorLog("warehousing_count")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+
+				warehousing_count, _ := strconv.ParseInt(items["warehousing_count"].(string), 10, 64)
+
+				var productDates int64
+				var expiryDates int64
+
+				if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "string" {
+					expiryDates = 0
+				} else {
+					if len(items["expiry_date"].(string)) == 0 {
+						expiryDates = 0
+
+					} else {
+						expiryDate, _ := items["expiry_date"].(string)
+						expiry_date, _ := utils.ParseTimeStringToTime("2006-01-02", expiryDate)
+						expiryDates = expiry_date.Unix()
+
+					}
+
+				}
+				if items["product_date"] == nil || reflect.TypeOf(items["product_date"]).String() != "string" {
+					productDates = 0
+				} else {
+					if len(items["product_date"].(string)) == 0 {
+						productDates = 0
+
+					} else {
+						productDate, _ := items["product_date"].(string)
+						product_date, _ := utils.ParseTimeStringToTime("2006-01-02", productDate)
+						productDates = product_date.Unix()
+					}
+
+				}
+
+				number, _ := items["number"].(string)
+
+				batch_number, _ := items["batch_number"].(string)
+
+				if items["max_unit"] == nil || reflect.TypeOf(items["max_unit"]).String() != "string" {
+					utils.ErrorLog("max_unit")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				max_unit, _ := items["max_unit"].(string)
+
+				if items["min_unit"] == nil || reflect.TypeOf(items["min_unit"]).String() != "string" {
+					utils.ErrorLog("min_unit")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				min_unit, _ := items["min_unit"].(string)
+
+				var remark string
+				if items["remark"] == nil || reflect.TypeOf(items["remark"]).String() != "string" {
+					remark = ""
+				} else {
+					remark = items["remark"].(string)
+				}
+
+				manufacturer := int64(items["manufacturer"].(float64))
+
+				dealer := int64(items["dealer"].(float64))
+
+				warehouseInfo := &models.XtSelfDrugWarehouseInfo{
+					ID:               id,
+					WarehousingOrder: warehousing_order,
+					WarehousingId:    info.ID,
+					DrugId:           drug_id,
+					Number:           number,
+					ProductDate:      productDates,
+					ExpiryDate:       expiryDates,
+					WarehousingCount: warehousing_count,
+					Price:            0,
+					TotalPrice:       0,
+					Status:           1,
+					Ctime:            time.Now().Unix(),
+					Remark:           remark,
+					OrgId:            adminUserInfo.CurrentOrgId,
+					Type:             0,
+					Manufacturer:     manufacturer,
+					Dealer:           dealer,
+					StockMaxNumber:   0,
+					RetailTotalPrice: 0,
+					BatchNumber:      batch_number,
+					MaxUnit:          max_unit,
+					MinUnit:          min_unit,
+					RetailPrice:      0,
+					StorehouseId:     0,
+					IsCheck:          2,
+					StockMinNumber:   0,
+					PatientId:        patient_id,
+					IsSys:            0,
+					RecordDate:       warehousingDate.Unix(),
+				}
+				warehousingInfo = append(warehousingInfo, warehouseInfo)
+			}
+		}
+	}
+
+	for _, item := range warehousingInfo {
+		if item.ID == 0 {
+			service.CreatedSlefWarehouseing(item, tx)
+		}
+		if item.ID > 0 {
+			service.UpdateSelfWarehouseing(item, tx)
+		}
+	}
+
+	list, _ := service.FindSelfDrugWarehouseInfoListById(info.ID, adminUserInfo.CurrentOrgId, patient_id, tx)
+	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
+	dealerList, _ := service.GetAllDealerList(adminUserInfo.CurrentOrgId)
+	var drugType = "药品类型"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, adminUserInfo.CurrentOrgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"warehousingInfo":  warehousingInfo,
+		"list":             list,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+		"drugTypeList":     drugTypeList,
+		"info":             info,
+	})
+
+}
+
+func (c *SelfDrugApiController) GetAllSelfDrugWarehouseInfoList() {
+
+	keyword := c.GetString("keyword")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	patient_id, _ := c.GetInt64("patient_id")
+	baseList, _ := service.GetAllBaseDrugListByKeyWord(keyword, orgId)
+	var ids []int64
+	for _, item := range baseList {
+		ids = append(ids, item.ID)
+	}
+	infoList, _ := service.GetAllSelfDrugWarehouseInfoList(ids, orgId, patient_id)
+
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
+	var drugType = "药品类型"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"infoList":         infoList,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+		"drugTypeList":     drugTypeList,
+	})
+}
+
+func (c *SelfDrugApiController) GetSelfDrugWarehouseInfoByID() {
+
+	id, _ := c.GetInt64("id")
+	info, _ := service.GetSelfDrugWarehouseInfoByID(id)
+
+	warehouseInfo, _ := service.GetSelfDrugWarehouseInfo(info.WarehousingId)
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
+	var drugType = "药品类型"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"info":             info,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+		"drugTypeList":     drugTypeList,
+		"warehouseInfo":    warehouseInfo,
+	})
+}
+
+func (c *SelfDrugApiController) ModifySelfDrugWarehouse() {
+
+	patient_id, _ := c.GetInt64("patient_id")
+	warehousing_time := c.GetString("warehousing_time")
+	warehousing_id, _ := c.GetInt64("warehousing_id")
+	adminUserInfo := c.GetAdminUserInfo()
+
+	warehousingDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", warehousing_time)
+
+	if parseDateErr != nil {
+		c.ErrorLog("日期(%v)解析错误：%v", warehousingDate, parseDateErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	// 开始主事务
+	db := service.XTWriteDB()
+	tx := db.Begin()
+
+	// 在函数结束时处理事务回滚
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	timeStr := time.Now().Format("2006-01-02")
+	timeArr := strings.Split(timeStr, "-")
+	total, _ := service.FindSelfAllWarehouseTotal(adminUserInfo.CurrentOrgId, tx)
+	total = total + 1
+
+	operation_time := time.Now().Unix()
+	creater := adminUserInfo.AdminUser.Id
+
+	warehousing_order := "YPRKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+	warehousing := models.XtSelfDrugWarehouse{
+		ID:               warehousing_id,
+		WarehousingOrder: warehousing_order,
+		OperationTime:    operation_time,
+		OrgId:            adminUserInfo.CurrentOrgId,
+		Creater:          creater,
+		Ctime:            time.Now().Unix(),
+		Status:           1,
+		WarehousingTime:  warehousingDate.Unix(),
+		Type:             0,
+		StorehouseId:     0,
+		IsCheck:          2,
+		PatientId:        patient_id,
+	}
+	if warehousing_id == 0 {
+		service.AddSelfDrugWarehouse(&warehousing, tx)
+	}
+	if warehousing_id > 0 {
+		service.UpdateSelfDrugWarehouse(&warehousing, tx)
+	}
+	info, _ := service.FindLastSelfWarehousing(adminUserInfo.CurrentOrgId, patient_id, tx)
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	var warehousingInfo []*models.XtSelfDrugWarehouseInfo
+	if dataBody["stockIn"] != nil && reflect.TypeOf(dataBody["stockIn"]).String() == "[]interface {}" {
+		thisStockIn, _ := dataBody["stockIn"].([]interface{})
+		if len(thisStockIn) > 0 {
+			for _, item := range thisStockIn {
+				items := item.(map[string]interface{})
+
+				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
+					utils.ErrorLog("id")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				id := int64(items["id"].(float64))
+
+				if items["drug_id"] == nil || reflect.TypeOf(items["drug_id"]).String() != "float64" {
+					utils.ErrorLog("drug_id")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				drug_id := int64(items["drug_id"].(float64))
+
+				if items["warehousing_count"] == nil || reflect.TypeOf(items["warehousing_count"]).String() != "string" {
+					utils.ErrorLog("warehousing_count")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+
+				warehousing_count, _ := strconv.ParseInt(items["warehousing_count"].(string), 10, 64)
+
+				var productDates int64
+				var expiryDates int64
+
+				if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "string" {
+					expiryDates = 0
+				} else {
+					if len(items["expiry_date"].(string)) == 0 {
+						expiryDates = 0
+
+					} else {
+						expiryDate, _ := items["expiry_date"].(string)
+						expiry_date, _ := utils.ParseTimeStringToTime("2006-01-02", expiryDate)
+						expiryDates = expiry_date.Unix()
+
+					}
+
+				}
+				if items["product_date"] == nil || reflect.TypeOf(items["product_date"]).String() != "string" {
+					productDates = 0
+				} else {
+					if len(items["product_date"].(string)) == 0 {
+						productDates = 0
+
+					} else {
+						productDate, _ := items["product_date"].(string)
+						product_date, _ := utils.ParseTimeStringToTime("2006-01-02", productDate)
+						productDates = product_date.Unix()
+					}
+
+				}
+
+				number, _ := items["number"].(string)
+
+				batch_number, _ := items["batch_number"].(string)
+
+				if items["max_unit"] == nil || reflect.TypeOf(items["max_unit"]).String() != "string" {
+					utils.ErrorLog("max_unit")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				max_unit, _ := items["max_unit"].(string)
+
+				if items["min_unit"] == nil || reflect.TypeOf(items["min_unit"]).String() != "string" {
+					utils.ErrorLog("min_unit")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				min_unit, _ := items["min_unit"].(string)
+
+				var remark string
+				if items["remark"] == nil || reflect.TypeOf(items["remark"]).String() != "string" {
+					remark = ""
+				} else {
+					remark = items["remark"].(string)
+				}
+
+				manufacturer := int64(items["manufacturer"].(float64))
+
+				dealer := int64(items["dealer"].(float64))
+
+				warehouseInfo := &models.XtSelfDrugWarehouseInfo{
+					ID:               id,
+					WarehousingOrder: warehousing_order,
+					WarehousingId:    info.ID,
+					DrugId:           drug_id,
+					Number:           number,
+					ProductDate:      productDates,
+					ExpiryDate:       expiryDates,
+					WarehousingCount: warehousing_count,
+					Price:            0,
+					TotalPrice:       0,
+					Status:           1,
+					Ctime:            time.Now().Unix(),
+					Remark:           remark,
+					OrgId:            adminUserInfo.CurrentOrgId,
+					Type:             0,
+					Manufacturer:     manufacturer,
+					Dealer:           dealer,
+					StockMaxNumber:   0,
+					RetailTotalPrice: 0,
+					BatchNumber:      batch_number,
+					MaxUnit:          max_unit,
+					MinUnit:          min_unit,
+					RetailPrice:      0,
+					StorehouseId:     0,
+					IsCheck:          2,
+					StockMinNumber:   0,
+					PatientId:        patient_id,
+					IsSys:            0,
+					RecordDate:       warehousingDate.Unix(),
+				}
+				warehousingInfo = append(warehousingInfo, warehouseInfo)
+			}
+		}
+	}
+
+	for _, item := range warehousingInfo {
+		if item.ID == 0 {
+			service.CreatedSlefWarehouseing(item, tx)
+		}
+		if item.ID > 0 {
+			service.UpdateSelfWarehouseing(item, tx)
+		}
+	}
+
+	list, _ := service.FindSelfDrugWarehouseInfoListById(info.ID, adminUserInfo.CurrentOrgId, patient_id, tx)
+	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
+	dealerList, _ := service.GetAllDealerList(adminUserInfo.CurrentOrgId)
+	var drugType = "药品类型"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, adminUserInfo.CurrentOrgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"warehousingInfo":  warehousingInfo,
+		"list":             list,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+		"drugTypeList":     drugTypeList,
+		"info":             info,
+	})
+}
+
+func (c *SelfDrugApiController) DeleteSelfDrugWarehouse() {
+
+	id, _ := c.GetInt64("id")
+	// 开始主事务
+	db := service.XTWriteDB()
+	tx := db.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	service.DeleteSelfDrugWarehouse(id, tx)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "删除成功",
+	})
+}
+
+func (c *SelfDrugApiController) TocheckSelfWarehouseingInfo() {
+
+	id, _ := c.GetInt64("id")
+	patient_id, _ := c.GetInt64("patient_id")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	info, _ := service.GetSelfWarehouseInfoByWarehouseInfo(id, patient_id, orgId)
+
+	db := service.XTWriteDB()
+	tx := db.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	if len(info) > 0 {
+		for _, item := range info {
+			medical, _ := service.GetBaseDrugMedical(item.DrugId)
+
+			if item.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+				//新增库存
+				service.AddSelfDrugWarehouseStockMaxNumber(item.WarehousingCount, item.ID, tx)
+
+			}
+			if item.MaxUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
+				//新增库存
+				service.AddSelfDrugWarehouseStockMaxNumber(item.WarehousingCount, item.ID, tx)
+
+			}
+
+			if item.MaxUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+
+				//新增库存
+				service.AddSelfDrugWarehouseStockMinNumber(item.WarehousingCount, item.ID, tx)
+
+			}
+
+			Creator := c.GetAdminUserInfo().AdminUser.Id
+
+			//查询默认仓库剩余多少库存
+			list, _ := service.GetDrugSumCountByPatient(patient_id, item.OrgId, item.DrugId, tx)
+			var sum_count int64
+			var sum_in_count int64
+			for _, it := range list {
+				baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+				if it.MaxUnit == baseDrug.MaxUnit {
+					it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+					it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+				}
+				sum_count += it.StockMaxNumber + it.StockMinNumber
+				sum_in_count += it.WarehousingCount
+			}
+
+			flow := &models.XtSelfDrugFlow{
+				WarehousingId:           0,
+				DrugId:                  item.DrugId,
+				Number:                  item.Number,
+				BatchNumber:             item.BatchNumber,
+				Count:                   item.WarehousingCount,
+				UserOrgId:               item.OrgId,
+				PatientId:               item.PatientId,
+				SystemTime:              time.Now().Unix(),
+				ConsumableType:          1,
+				IsSys:                   0,
+				WarehousingOrder:        item.WarehousingOrder,
+				WarehouseOutId:          0,
+				WarehouseOutOrderNumber: "",
+				IsEdit:                  0,
+				CancelStockId:           0,
+				CancelOrderNumber:       "",
+				Manufacturer:            0,
+				Dealer:                  0,
+				Creator:                 Creator,
+				UpdateCreator:           Creator,
+				Status:                  1,
+				Ctime:                   item.Ctime,
+				Mtime:                   0,
+				Price:                   item.Price,
+				WarehousingDetailId:     item.ID,
+				WarehouseOutDetailId:    0,
+				CancelOutDetailId:       0,
+				ExpireDate:              item.ExpiryDate,
+				ProductDate:             item.ProductDate,
+				MaxUnit:                 item.MaxUnit,
+				MinUnit:                 item.MinUnit,
+				StorehouseId:            item.StorehouseId,
+				OverCount:               sum_count,
+				OperateTime:             time.Now().Unix(),
+			}
+			service.CreateSelfDrugFlow(flow, tx)
+
+			drugInfolist, _ := service.GetSelfDrugSumCountByStorehouseId(item.PatientId, item.OrgId, item.DrugId, tx)
+			var total_count int64 // 入库总数量
+			var over_count int64  //剩余库存
+			for _, it := range drugInfolist {
+				baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+				if it.MaxUnit == baseDrug.MaxUnit {
+					it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+					it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+				}
+			}
+			for _, it := range drugInfolist {
+				total_count += it.WarehousingCount
+				over_count += it.StockMaxNumber + it.StockMinNumber
+			}
+			//查询该仓库是否有默认数据
+			_, errcode := service.GetSelfDrugStockCount(item.PatientId, item.DrugId, item.OrgId, tx)
+			if errcode == gorm.ErrRecordNotFound {
+				drugStock := models.XtSelfDrugStockCount{
+					UserOrgId:      item.OrgId,
+					PatientId:      item.PatientId,
+					SumInCount:     total_count,
+					SumOutCount:    0,
+					SumCancelCount: 0,
+					DrugId:         item.DrugId,
+					Ctime:          time.Now().Unix(),
+					Mtime:          0,
+					Status:         1,
+					FlushCount:     over_count,
+					SumActOutCount: 0,
+				}
+				service.CreateSelfDrugStockSum(drugStock, tx)
+
+			} else if errcode == nil {
+				service.UpdateSelfDrugStockSum(item.PatientId, item.DrugId, item.OrgId, total_count, over_count, tx)
+			}
+
+		}
+
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": info,
+		})
+	}
+}

controllers/sign_api_controller.go

@@ -1242,7 +1242,7 @@ func (this *SignApiController) ToAutoDiagnose() {
 	//	service.UpdateAllPatient(item.BloodId, item.Diagnose, item.UserOrgId)
 	//}
 
-	list, _ := service.GetAllDialysisOrder(14749)
+	list, _ := service.GetAllDialysisOrder(31831)
 	for _, item := range list {
 		schedule, _ := service.GetLastScheduleByUserOrg(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType)
 		service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType, schedule.ID)

controllers/stock_in_api_controller.go

@@ -1314,6 +1314,8 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 
 				register_number := items["register_number"].(string)
 
+				class_type := items["class_type"].(string)
+
 				timeLayout := "2006-01-02"
 				loc, _ := time.LoadLocation("Local")
 				var expiryDate int64
@@ -1370,6 +1372,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 					RegisterNumber:          register_number,
 					SysRecordTime:           warehouseOut.WarehouseOutTime,
 					PatientId:               patient_id,
+					ClassType:               class_type,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1420,6 +1423,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 			IsCheck:                 2,
 			RegisterNumber:          it.RegisterNumber,
 			PatientId:               it.PatientId,
+			ClassType:               it.ClassType,
 		}
 		if it.ID == 0 {
 			service.AddSigleWarehouseOutInfo(warehouseOutInfo)
@@ -1730,6 +1734,8 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 
 				patient_id := int64(items["patient_id"].(float64))
 
+				class_type := items["class_type"].(string)
+
 				var productDate int64
 				if len(product_date) > 0 {
 					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", product_date+" 00:00:00", loc)
@@ -1770,6 +1776,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						StockCount:              stock_count,
 						RegisterNumber:          register_number,
 						PatientId:               patient_id,
+						ClassType:               class_type,
 					}
 					warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1818,6 +1825,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						StockCount:              stock_count,
 						RegisterNumber:          register_number,
 						PatientId:               patient_id,
+						ClassType:               class_type,
 					}
 					upDateWarehouseOutInfos = append(upDateWarehouseOutInfos, warehouseOutInfo)
 				}
@@ -1845,271 +1853,6 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 	if len(upDateWarehouseOutInfos) > 0 {
 		for _, item := range upDateWarehouseOutInfos {
 			service.UpDateWarehouseOutInfo(item)
-			////1.查询该耗材该批次的最后一次出库记录
-			//lastGood, _ := service.GetLastGoodInformationByGoodId(item.GoodId, item.WarehouseInfotId, item.OrgId)
-			//
-			////如果出库数量大于 最后一次批次的数量(那么要进行出库)
-			//
-			//if item.Count > lastGood.Count {
-			//
-			//	//查询该耗材是否还有库存
-			//	warehouseinfo, _ := service.GetTotalCountByGoodId(item.GoodId, item.StorehouseId)
-			//
-			//	//无库存
-			//	if warehouseinfo.StockCount <= 0 {
-			//		c.ServeSuccessJSON(map[string]interface{}{
-			//			"msg": "5",
-			//		})
-			//		return
-			//	}
-			//
-			//	//有库存,进行出库,调用出库接口
-			//	if warehouseinfo.StockCount > 0 {
-			//		var total int64
-			//		var stock_cout int64
-			//		var total_count int64
-			//		//计算和最后一次出库数据的差
-			//		total = item.Count - lastGood.Count
-			//
-			//		if total > warehouseinfo.StockCount {
-			//			c.ServeSuccessJSON(map[string]interface{}{
-			//				"msg": "6",
-			//			})
-			//			return
-			//		}
-			//		//获取该耗材该批次的剩余库存量
-			//		info, _ := service.GetLastGoodCountById(item.GoodId, item.WarehouseInfotId)
-			//
-			//		//判断该批次的剩余库存 和出库的库存进行比较
-			//		//如果出库的库存大于该批次的剩余库存,那么需要出库下一批次的库存
-			//
-			//		if total > info.StockCount {
-			//			//计算出库和该批次相差的库存
-			//			total_count = item.Count - info.StockCount
-			//			//清空本批次次库存
-			//			service.DeleteWarehouseInfo(item.WarehouseInfotId)
-			//			//调用出库逻辑
-			//			parseDateErr := service.ConsumablesDeliveryTwo(item.OrgId, item, total_count)
-			//			if parseDateErr != nil {
-			//				utils.ErrorLog(errs.Error())
-			//				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
-			//				return
-			//			}
-			//		}
-			//		//如果与上次比的库存小于或等于于该批次的剩余库存,那么需要该批次出库
-			//		if total <= info.StockCount {
-			//			stock_cout = lastGood.Count + total
-			//			fmt.Println(stock_cout)
-			//			//扣减库存
-			//			warehouse := models.WarehousingInfo{
-			//				StockCount: info.StockCount - total,
-			//			}
-			//			errs := service.UpdateWarehousingInfo(warehouse, info.ID)
-			//
-			//			warehouseOutInfo := &models.WarehouseOutInfo{
-			//				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-			//				WarehouseOutId:          id,
-			//				WarehouseInfotId:        item.WarehouseInfotId,
-			//				Status:                  1,
-			//				Ctime:                   time.Now().Unix(),
-			//				Remark:                  item.Remark,
-			//				OrgId:                   item.OrgId,
-			//				Type:                    1,
-			//				Manufacturer:            item.Manufacturer,
-			//				Dealer:                  item.Dealer,
-			//				IsSys:                   0,
-			//				SysRecordTime:           item.SysRecordTime,
-			//				GoodTypeId:              item.GoodTypeId,
-			//				GoodId:                  item.GoodId,
-			//				ExpiryDate:              item.ExpiryDate,
-			//				ProductDate:             item.ProductDate,
-			//				Number:                  item.Number,
-			//				Price:                   item.Price,
-			//				LicenseNumber:           item.LicenseNumber,
-			//				Count:                   item.Count,
-			//				ConsumableType:          2,
-			//				StorehouseId:            item.StorehouseId,
-			//				AdminUserId:             item.AdminUserId,
-			//				StockCount:              item.StockCount,
-			//			}
-			//
-			//			//查询是否存在
-			//			_, errcode := service.GetWarehouseOutInfoIsExist(item.ID)
-			//			if errcode == gorm.ErrRecordNotFound {
-			//
-			//				errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
-			//				if errOne != nil {
-			//					utils.ErrorLog(errs.Error())
-			//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
-			//					return
-			//				}
-			//			} else if errcode == nil {
-			//				service.UpDateWarehouseOutInfo(item)
-			//				//更新流水
-			//				flow := models.VmStockFlow{
-			//					Number:        item.Number,
-			//					LicenseNumber: item.LicenseNumber,
-			//					Count:         item.Count,
-			//					Manufacturer:  item.Manufacturer,
-			//					Dealer:        item.Dealer,
-			//					ProductDate:   item.ProductDate,
-			//					ExpireDate:    item.ExpiryDate,
-			//					Price:         item.Price,
-			//					StorehouseId:  item.StorehouseId,
-			//					AdminUserId:   item.AdminUserId,
-			//					StockCount:    item.StockCount,
-			//				}
-			//				service.UpdateStockFlowByDetailId(flow, item.ID)
-			//
-			//				goodInfo := models.GoodInfo{
-			//					Manufacturer: item.Manufacturer,
-			//					Dealer:       item.Dealer,
-			//				}
-			//				service.UpdatedGoodInfo(goodInfo, item.GoodId)
-			//			}
-			//		}
-			//	}
-			//}
-			//
-			//var last_count int64
-			//var all_total int64
-			//var stock_total int64
-			////如果退库数量小于最后一次批次的数量(要么要进行退库)
-			//if item.Count < lastGood.Count {
-			//
-			//	//退库数量和最后一次出库数据进行计算
-			//	last_count = lastGood.Count - item.Count
-			//
-			//	//获取该耗材该批次的剩余库存量
-			//	infoInfo, _ := service.GetLastGoodCountById(item.GoodId, item.WarehouseInfotId)
-			//
-			//	//退库数量和最后一次出库数据进行计算的差 加上 剩余库存的数量与 该批次的入库数量进行比较
-			//	all_total = last_count + infoInfo.StockCount
-			//
-			//	//如果库存大于总数量，则退回到这个批次
-			//
-			//	if infoInfo.WarehousingCount > all_total {
-			//		stock_total = last_count + infoInfo.StockCount
-			//
-			//		//退回该批次,计算数量
-			//		warehousingInfoOne := models.WarehousingInfo{
-			//			StockCount:   stock_total,
-			//			ID:           item.WarehouseInfotId,
-			//			OrgId:        item.OrgId,
-			//			StorehouseId: item.StorehouseId,
-			//		}
-			//
-			//		parseDateErr := service.UpdateWarehousingInfo(warehousingInfoOne, item.WarehouseInfotId)
-			//
-			//		fmt.Println("parseDateErr", parseDateErr)
-			//		//插入一条新纪录
-			//		warehouseOutInfoThree := &models.WarehouseOutInfo{
-			//			WarehouseOutOrderNumber: item.WarehouseOutOrderNumber,
-			//			WarehouseOutId:          id,
-			//			WarehouseInfotId:        item.WarehouseInfotId,
-			//			Status:                  1,
-			//			Ctime:                   time.Now().Unix(),
-			//			Remark:                  item.Remark,
-			//			OrgId:                   item.OrgId,
-			//			Type:                    1,
-			//			Manufacturer:            item.Manufacturer,
-			//			Dealer:                  item.Dealer,
-			//			IsSys:                   0,
-			//			GoodTypeId:              item.GoodTypeId,
-			//			GoodId:                  item.GoodId,
-			//			ExpiryDate:              item.ExpiryDate,
-			//			ProductDate:             item.ProductDate,
-			//			Number:                  item.Number,
-			//			Price:                   item.Price,
-			//			LicenseNumber:           item.LicenseNumber,
-			//			ConsumableType:          2,
-			//			Count:                   item.Count,
-			//			StorehouseId:            item.StorehouseId,
-			//			AdminUserId:             item.AdminUserId,
-			//			StockCount:              item.StockCount,
-			//		}
-			//		//查询是否存在
-			//		_, errcode := service.GetWarehouseOutInfoIsExist(item.ID)
-			//		if errcode == gorm.ErrRecordNotFound {
-			//			errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfoThree)
-			//			if errOne != nil {
-			//				utils.ErrorLog(errs.Error())
-			//				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
-			//				return
-			//			}
-			//
-			//		} else if errcode == nil {
-			//			service.UpDateWarehouseOutInfo(item)
-			//			flow := models.VmStockFlow{
-			//				Number:        item.Number,
-			//				LicenseNumber: item.LicenseNumber,
-			//				Count:         item.Count,
-			//				Manufacturer:  item.Manufacturer,
-			//				Dealer:        item.Dealer,
-			//				ProductDate:   item.ProductDate,
-			//				ExpireDate:    item.ExpiryDate,
-			//				Price:         item.Price,
-			//				StorehouseId:  item.StorehouseId,
-			//				AdminUserId:   item.AdminUserId,
-			//				StockCount:    item.StockCount,
-			//			}
-			//			service.UpdateStockFlowByDetailId(flow, item.ID)
-			//			goodInfo := models.GoodInfo{
-			//				Manufacturer: item.Manufacturer,
-			//				Dealer:       item.Dealer,
-			//			}
-			//			service.UpdatedGoodInfo(goodInfo, item.GoodId)
-			//
-			//		}
-			//	}
-			//
-			//	//如果库存小于总数量，则报错提醒，该批次的退库数据大于入库数据了无法退库,则需要退库到另一个批次
-			//	if infoInfo.WarehousingCount < all_total {
-			//		c.ServeSuccessJSON(map[string]interface{}{
-			//			"msg": "6",
-			//		})
-			//		return
-			//	}
-			//}
-			//
-			//if item.Count == lastGood.Count {
-			//
-			//	errs = service.UpDateWarehouseOutInfo(item)
-			//	flow := models.VmStockFlow{
-			//		Number:        item.Number,
-			//		LicenseNumber: item.LicenseNumber,
-			//		Count:         item.Count,
-			//		Manufacturer:  item.Manufacturer,
-			//		Dealer:        item.Dealer,
-			//		ProductDate:   item.ProductDate,
-			//		ExpireDate:    item.ExpiryDate,
-			//		Price:         item.Price,
-			//		StorehouseId:  item.StorehouseId,
-			//		AdminUserId:   item.AdminUserId,
-			//		BuyPrice:      item.BuyPrice,
-			//		StockCount:    item.StockCount,
-			//	}
-			//	service.UpdateStockFlowByDetailId(flow, item.ID)
-			//	goodInfo := models.GoodInfo{
-			//		Manufacturer: item.Manufacturer,
-			//		Dealer:       item.Dealer,
-			//	}
-			//	service.UpdatedGoodInfo(goodInfo, item.GoodId)
-			//
-			//}
-			//
-			////查询该机构默认仓库
-			//storeConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
-			////查询剩余库存
-			//goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, item.GoodId, adminUserInfo.CurrentOrgId)
-			//var sum_count int64
-			//var sum_in_count int64
-			//for _, item := range goodList {
-			//	sum_count += item.StockCount
-			//	sum_in_count += item.WarehousingCount
-			//}
-			//service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, item.OrgId)
-
 		}
 	}
 
@@ -5138,7 +4881,6 @@ func (this *StockManagerApiController) GetOrderDetialByOrderId() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	order, _ := service.GetWarehouseOutOrder(idsArray, orgId)
 	list, _ := service.GetOrderDetialByOrderIdOne(idsArray, orgId)
-	fmt.Println("list000000000000000000000000", len(list))
 	stockFlowListGroup, _ := service.GetOrderDetailStockFlowByStorehouseById(idsArray, orgId)
 	stockFlowList, _ := service.GetOrderDetailStockFlow(idsArray, orgId)
 	//获取耗材退库数据

models/dialysis.go

@@ -774,6 +774,8 @@ type MonitoringRecord struct {
 	ReplacementSpeed            float64 `gorm:"column:replacement_speed" json:"replacement_speed" form:"replacement_speed"`
 	Dicarbonate                 float64 `gorm:"column:dicarbonate" json:"dicarbonate" form:"dicarbonate"`
 	IsPressure                  string  `gorm:"column:is_pressure" json:"is_pressure" form:"is_pressure"`
+	UltrafiltrationRateOne      string  `gorm:"column:ultrafiltration_rate_one" json:"ultrafiltration_rate_one" form:"ultrafiltration_rate_one"`
+	HeparinOne                  string  `gorm:"column:heparin_one" json:"heparin_one" form:"heparin_one"`
 }
 
 func (MonitoringRecord) TableName() string {
@@ -887,6 +889,7 @@ type DialysisOrder struct {
 	BloodFlowVolume            string        `gorm:"column:blood_flow_volume" json:"blood_flow_volume" form:"blood_flow_volume"`
 	Condenser                  string        `gorm:"column:condenser" json:"condenser" form:"condenser"`
 	BloodDrawing               int64         `gorm:"column:blood_drawing" json:"blood_drawing" form:"blood_drawing"`
+	DialysisStrainer           string        `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
 }
 
 func (DialysisOrder) TableName() string {

models/drug.go

@@ -106,6 +106,10 @@ type BaseDrugLibSeven struct {
 	IsPharmacy int64  `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
 	OrgId      int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	IsProject  int64  `gorm:"column:is_project" json:"is_project" form:"is_project"`
+	DrugType   int64  `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	IsSelfDrug int64  `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
+	Dose       string `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit   string `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
 }
 
 func (BaseDrugLibSeven) TableName() string {
@@ -297,3 +301,181 @@ type BaseDrugLibTwenty struct {
 func (BaseDrugLibTwenty) TableName() string {
 	return "xt_base_drug"
 }
+
+type BaseDrugLibThrity struct {
+	ID                    int64                   `gorm:"column:id" json:"id" form:"id"`
+	DrugName              string                  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Manufacturer          int64                   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	ManufacturerName      string                  `gorm:"column:manufacturer_name" json:"manufacturer_name"`
+	MaxUnit               string                  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber             int64                   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit               string                  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose                  string                  `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit              string                  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	IsSelfDrug            int64                   `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
+	OrgId                 int64                   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Status                int64                   `gorm:"column:status" json:"status" form:"status"`
+	Dealer                int64                   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	DrugType              int64                   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	LastDrugWarehouseInfo XtSelfDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"first_drug_warehouse_info"`
+}
+
+func (BaseDrugLibThrity) TableName() string {
+	return "xt_base_drug"
+}
+
+type XtSelfDrugWarehouseInfo struct {
+	ID                        int64            `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId             int64            `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId                    int64            `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number                    string           `gorm:"column:number" json:"number" form:"number"`
+	ProductDate               int64            `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate                int64            `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	WarehousingCount          int64            `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	WarehouseingUnit          string           `gorm:"column:warehouseing_unit" json:"warehouseing_unit" form:"warehouseing_unit"`
+	MaxUnit                   string           `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                   string           `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StockMaxNumber            int64            `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber            int64            `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	Price                     float64          `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice                float64          `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	Dealer                    int64            `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer              int64            `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Remark                    string           `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime                     int64            `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                     int64            `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                    int64            `gorm:"column:status" json:"status" form:"status"`
+	OrgId                     int64            `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsReturn                  int64            `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	WarehousingOrder          string           `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	Type                      int64            `gorm:"column:type" json:"type" form:"type"`
+	RetailPrice               float64          `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice          float64          `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	BatchNumber               string           `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	WarehousingInfoId         int64            `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
+	SupplyWarehouseId         int64            `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	SupplyWarehouseDetailInfo int64            `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	StorehouseId              int64            `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId     int64            `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	PharmacyId                int64            `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
+	IsCheck                   int64            `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	ManafacturerName          string           `gorm:"column:manafacturer_name" json:"manafacturer_name" form:"manafacturer_name"`
+	DealerName                string           `gorm:"column:dealer_name" json:"dealer_name" form:"dealer_name"`
+	PatientId                 int64            `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Creater                   int64            `gorm:"column:creater" json:"creater" form:"creater"`
+	IsSys                     int64            `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	RecordDate                int64            `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	BaseDrugLib               BaseDrugLibSeven `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
+}
+
+func (XtSelfDrugWarehouseInfo) TableName() string {
+	return "xt_self_drug_warehouse_info"
+}
+
+type XtSelfDrugWarehouse struct {
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	WarehousingOrder  string `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	OperationTime     int64  `gorm:"column:operation_time" json:"operation_time" form:"operation_time"`
+	OrgId             int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Creater           int64  `gorm:"column:creater" json:"creater" form:"creater"`
+	Ctime             int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Modifier          int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Mtime             int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status            int64  `gorm:"column:status" json:"status" form:"status"`
+	WarehousingTime   int64  `gorm:"column:warehousing_time" json:"warehousing_time" form:"warehousing_time"`
+	Dealer            int64  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer      int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Type              int64  `gorm:"column:type" json:"type" form:"type"`
+	SupplyWarehouseId int64  `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	StorehouseId      int64  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseId int64  `gorm:"column:second_warehouse_id" json:"second_warehouse_id" form:"second_warehouse_id"`
+	IsSys             int64  `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	IsCheck           int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	Checker           int64  `gorm:"column:checker" json:"checker" form:"checker"`
+	PatientId         int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+}
+
+func (XtSelfDrugWarehouse) TableName() string {
+	return "xt_self_drug_warehouse"
+}
+
+type XtSelfDrugFlow struct {
+	ID                        int64   `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId             int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId                    int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number                    string  `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber               string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	Count                     int64   `gorm:"column:count" json:"count" form:"count"`
+	UserOrgId                 int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId                 int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	SystemTime                int64   `gorm:"column:system_time" json:"system_time" form:"system_time"`
+	ConsumableType            int64   `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	IsSys                     int64   `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	WarehousingOrder          string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	WarehouseOutId            int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	WarehouseOutOrderNumber   string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	IsEdit                    int64   `gorm:"column:is_edit" json:"is_edit" form:"is_edit"`
+	CancelStockId             int64   `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
+	CancelOrderNumber         string  `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
+	Manufacturer              int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                    int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Creator                   int64   `gorm:"column:creator" json:"creator" form:"creator"`
+	UpdateCreator             int64   `gorm:"column:update_creator" json:"update_creator" form:"update_creator"`
+	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"`
+	Price                     float64 `gorm:"column:price" json:"price" form:"price"`
+	WarehousingDetailId       int64   `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
+	WarehouseOutDetailId      int64   `gorm:"column:warehouse_out_detail_id" json:"warehouse_out_detail_id" form:"warehouse_out_detail_id"`
+	CancelOutDetailId         int64   `gorm:"column:cancel_out_detail_id" json:"cancel_out_detail_id" form:"cancel_out_detail_id"`
+	ExpireDate                int64   `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
+	ProductDate               int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	MaxUnit                   string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                   string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StockMaxNumber            int64   `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber            int64   `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	LastStockMaxNumber        int64   `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
+	LastStockMinNumber        int64   `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
+	AdviceId                  int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	SupplyWarehouseId         int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	SupplyCancelOutId         int64   `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseDetailInfo int64   `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	StorehouseId              int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId     int64   `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	AdminUserId               int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	LastPrice                 float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	StockCount                string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PharmacyId                int64   `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
+	IsRead                    int64   `gorm:"column:is_read" json:"is_read" form:"is_read"`
+	OverCount                 int64   `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	IsCheck                   int64   `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	RetailPrice               float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	OrderId                   int64   `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	FlushOverCount            int64   `gorm:"column:flush_over_count" json:"flush_over_count" form:"flush_over_count"`
+	Remark                    string  `gorm:"column:remark" json:"remark" form:"remark"`
+	OperateTime               int64   `gorm:"column:operate_time" json:"operate_time" form:"operate_time"`
+}
+
+func (XtSelfDrugFlow) TableName() string {
+	return "xt_self_drug_flow"
+}
+
+type XtSelfDrugStockCount struct {
+	ID             int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId      int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId      int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	SumInCount     int64 `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
+	SumOutCount    int64 `gorm:"column:sum_out_count" json:"sum_out_count" form:"sum_out_count"`
+	SumCancelCount int64 `gorm:"column:sum_cancel_count" json:"sum_cancel_count" form:"sum_cancel_count"`
+	DrugId         int64 `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Ctime          int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime          int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status         int64 `gorm:"column:status" json:"status" form:"status"`
+	FlushCount     int64 `gorm:"column:flush_count" json:"flush_count" form:"flush_count"`
+	SumActOutCount int64 `gorm:"column:sum_act_out_count" json:"sum_act_out_count" form:"sum_act_out_count"`
+	SumOldCount    int64 `gorm:"column:sum_old_count" json:"sum_old_count" form:"sum_old_count"`
+}
+
+func (XtSelfDrugStockCount) TableName() string {
+	return "xt_self_drug_stock_count"
+}

models/drug_stock.go

@@ -195,6 +195,7 @@ type DrugWarehouseOutInfo struct {
 	OverCount               int64       `gorm:"column:over_count" json:"over_count" form:"over_count"`
 	OrderId                 int64       `gorm:"column:order_id" json:"order_id" form:"order_id"`
 	ManafacturerName        string      `gorm:"column:manafacturer_name" json:"manafacturer_name" form:"manafacturer_name"`
+	ClassType               string      `gorm:"column:class_type" json:"class_type" form:"class_type"`
 }
 
 func (DrugWarehouseOutInfo) TableName() string {
@@ -713,6 +714,7 @@ type DrugWarehouseOutInfoNight struct {
 	Drug                    BaseDrugLibSeven `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
 	OverCount               int64            `gorm:"column:over_count" json:"over_count" form:"over_count"`
 	OrderId                 int64            `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	ClassType               string           `gorm:"column:class_type" json:"class_type" form:"class_type"`
 }
 
 func (DrugWarehouseOutInfoNight) TableName() string {

models/new_stock_models.go

@@ -292,7 +292,6 @@ type GoodInfoTwenty struct {
 	WarehouseOutInfoTenty []*WarehouseOutInfoTenty `gorm:"json:"new_warehouse_out_info"`   //减少
 	WareStartInStockFlow  []*VmStockFlowTwenty     `gorm:"json:"new_stock_in_flow"`        //盘盈
 	WareStartOutStockFlow []*VmStockFlowTwenty     `gorm:"json:"new_stock_out_flow"`       //盘亏
-
 	//期初结余
 	StartFlowInfo    []*VmStockFlowTwenty
 	StartOutFlowInfo []*VmStockFlowTwenty

models/patient_models.go

@@ -2750,3 +2750,17 @@ type NewInspection struct {
 	Count           int64
 	LastInspectData int64
 }
+
+type XtTreatmentPlan 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"`
+	Content   string `gorm:"column:content" json:"content" form:"content"`
+	Ctime     int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status    int64  `gorm:"column:status" json:"status" form:"status"`
+	Mtime     int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtTreatmentPlan) TableName() string {
+
+	return "xt_treatment_plan"
+}

models/self_drug_models.go

@@ -706,6 +706,7 @@ type VmDrugWarehouseOutInfo struct {
 	StorehouseId            int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	AdminUserId             int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 	StockCount              string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	ClassType               string  `gorm:"column:class_type" json:"class_type" form:"class_type"`
 }
 
 type XtDrugAdjustPrice struct {

models/stock_models.go

@@ -305,6 +305,7 @@ type WarehouseOutInfo struct {
 	OrderId                 int64                `gorm:"column:order_id" json:"order_id" form:"order_id"`
 	WarehousingInfoNight    WarehousingInfoNight `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfotId"`
 	DealerName              string               `gorm:"column:dealer_name" json:"dealer_name" form:"dealer_name"`
+	ClassType               string               `gorm:"column:class_type" json:"class_type" form:"class_type"`
 }
 
 func (WarehouseOutInfo) TableName() string {
@@ -574,6 +575,7 @@ type WarehouseOutInfoOne struct {
 	StockCount                  string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
 	RegisterNumber              string  `gorm:"column:register_number" json:"register_number" form:"register_number"`
 	WarehouseOutTime            int64   `gorm:"column:warehouse_out_time" json:"warehouse_out_time" form:"warehouse_out_time"`
+	ClassType                   string  `gorm:"column:class_type" json:"class_type" form:"class_type"`
 }
 
 type WarehouseOutInfoTwo struct {

service/dialysis_service.go

@@ -891,6 +891,14 @@ func GetAdminUserEsOne(orgid int64) (admin []*models.UserAdminRoles, err error)
 	return admin, err
 }
 
+func GetAdminUserEsTwo(orgid int64, aapid int64) (admin []*models.UserAdminRoles, err error) {
+	db := readUserDb.Table("sgj_user_admin_role as x")
+	table := readUserDb.Table("sgj_user_admin_electronic_signature as s")
+	fmt.Println("table", table)
+	err = db.Select("x.id,x.admin_user_id,x.user_name,x.org_id,s.creator,s.url,s.hash").Joins("left join sgj_user_admin_electronic_signature as s on s.creator = x.admin_user_id").Where("x.org_id = ? and x.app_id =?", orgid, aapid).Group("user_name").Scan(&admin).Error
+	return admin, err
+}
+
 func UpDateDialysisPrescriptionDoctorSign(patient int64, date int64, orgId int64, doctor_id int64) (err error) {
 	err = writeDb.Model(&models.DialysisPrescription{}).Where("user_org_id = ? AND patient_id = ? AND record_date = ? ", orgId, patient, date).Updates(map[string]interface{}{"prescription_doctor": doctor_id}).Error
 	return
@@ -1508,7 +1516,7 @@ func GetGoodInfoMation(orgid int64) (goodinfo []*models.GoodInfo, err error) {
 
 func GetGoodInfoMationSix(orgid int64, storehouse_id int64) (goodinfo []*models.GoodInfo, err error) {
 
-	err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Preload("GoodSotckInfo", "stock_count > 0 and status = 1 and storehouse_id = ?", storehouse_id).Find(&goodinfo).Error
+	err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Preload("GoodSotckInfo", "stock_count > 0 and status = 1 and storehouse_id = ?", storehouse_id).Order("sort asc").Find(&goodinfo).Error
 
 	return goodinfo, err
 }
@@ -2512,3 +2520,46 @@ func GetHistoryWarehouseOutInfo(patient_id int64, user_org_id int64, record_time
 	}
 	return outInfo, err
 }
+
+func GetDialysisAutoGoodInfo(patient_id int64, record_time int64, org_id int64, tx *gorm.DB, good_id int64) (detail []*models.AutomaticReduceDetail, err error) {
+
+	err = tx.Where("patient_id = ? and record_time=? and org_id=? and status= 1 and good_id = ?", patient_id, record_time, org_id, good_id).Find(&detail).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Commit()
+			return
+		}
+
+	}
+	return detail, err
+}
+
+func CreateDialysisPrepare(prepare models.DialysisBeforePrepare, tx *gorm.DB) error {
+
+	err := tx.Create(&prepare).Error
+	if err != nil {
+		tx.Commit()
+		return err
+	}
+	return err
+}
+
+func ModfiyAddDialysisAuto(patient_id int64, record_date int64, count int64, good_id int64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? and record_date  = ? and good_id = ? and status = 1", patient_id, record_date, good_id).UpdateColumn("count", gorm.Expr("count + ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func ModfiyReduceDialysisAuto(patient_id int64, record_date int64, count int64, good_id int64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? and record_date  = ? and good_id = ? and status = 1", patient_id, record_date, good_id).UpdateColumn("count", gorm.Expr("count - ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}

service/gobal_config_service.go

@@ -941,7 +941,7 @@ func GetSingleOrderDetail(id int64, orgid int64) (info []*models.VmDrugWarehouse
 		db = db.Where("x.warehouse_out_id in(?)", id)
 	}
 
-	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,sum(x.count) as count,x.count_unit,x.price,x.product_date,x.expiry_date,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.retail_price as total_price,x.retail_total_price,x.storehouse_id,x.stock_count,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,x.number,x.batch_number,x.admin_user_id,t.dose,t.dose_unit,t.last_price,t.min_price,t.medical_insurance_number,t.retail_price ,x.warehouse_info_id").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id").Scan(&info).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,sum(x.count) as count,x.count_unit,x.price,x.product_date,x.expiry_date,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.retail_price as total_price,x.retail_total_price,x.storehouse_id,x.stock_count,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,x.number,x.batch_number,x.admin_user_id,t.dose,t.dose_unit,t.last_price,t.min_price,t.medical_insurance_number,t.retail_price ,x.warehouse_info_id,x.class_type").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id").Scan(&info).Error
 	return info, err
 }
 

service/his_project_service.go

@@ -245,7 +245,7 @@ func DeleteProjectList(id int64) error {
 
 func GetHisProject(orgid int64) (project []*models.XtHisProject, err error) {
 
-	err = XTReadDB().Model(&project).Where("user_org_id = ? and status =1 and medical_status!=1", orgid).Find(&project).Error
+	err = XTReadDB().Model(&project).Where("user_org_id = ? and status =1 and medical_status!=1", orgid).Order("sort asc").Find(&project).Error
 	return project, err
 }
 

service/his_service.go

@@ -876,11 +876,29 @@ func GetAllDrugLibList(org_id int64) (list []*BaseDrugLib, err error) {
 }
 
 func GetAllDrugLibListSix(org_id int64, storehouse_id int64) (list []*BaseDrugLib, err error) {
-	err = readDb.Model(&BaseDrugLib{}).Where("org_id = ?  AND status = 1 AND  find_in_set('停用',drug_status) = 0", org_id).Preload("OtherDrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
-		return db.Where("(status = 1 and stock_max_number > 0 and  storehouse_id = ? )  or  (status = 1  AND stock_min_number >0 and  storehouse_id = ?)", storehouse_id, storehouse_id)
-	}).Find(&list).Error
+	if org_id == 10598 {
+		err = readDb.Model(&BaseDrugLib{}).Where("org_id = ?  AND status = 1", org_id).Preload("OtherDrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("(status = 1 and stock_max_number > 0 and  storehouse_id = ? )  or  (status = 1  AND stock_min_number >0 and  storehouse_id = ?)", storehouse_id, storehouse_id)
+		}).Order("sort asc").Find(&list).Error
+
+		return
+	} else {
+		if org_id == 10489 {
+			err = readDb.Model(&BaseDrugLib{}).Where("org_id = ?  AND status = 1 AND  find_in_set('停用',drug_status) = 0 AND sum_count >0", org_id).Preload("OtherDrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+				return db.Where("(status = 1 and stock_max_number > 0 and  storehouse_id = ? )  or  (status = 1  AND stock_min_number >0 and  storehouse_id = ?)", storehouse_id, storehouse_id)
+			}).Order("sort asc").Find(&list).Error
+
+			return
+		} else {
+			err = readDb.Model(&BaseDrugLib{}).Where("org_id = ?  AND status = 1 AND  find_in_set('停用',drug_status) = 0", org_id).Preload("OtherDrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+				return db.Where("(status = 1 and stock_max_number > 0 and  storehouse_id = ? )  or  (status = 1  AND stock_min_number >0 and  storehouse_id = ?)", storehouse_id, storehouse_id)
+			}).Order("sort asc").Find(&list).Error
+
+			return
+		}
+
+	}
 
-	return
 }
 
 func GetAllDrugLibListSeven(org_id int64, storehouse_id int64) (list []*BaseDrugLib, err error) {
@@ -3424,6 +3442,19 @@ func GetGoodWarehouseOutInfoByProjectIdTwo(patient_id int64, user_org_id int64,
 	return outInfo, err
 }
 
+func GetGoodWarehouseOutInfoByProjectIdThree(patient_id int64, user_org_id int64, sys_record_date int64, drug_id int64, tx *gorm.DB) (models.WarehouseOutInfo, error) {
+
+	outInfo := models.WarehouseOutInfo{}
+	err = tx.Where("patient_id = ? and org_id =? and sys_record_time = ? and good_id = ? and status=1", patient_id, user_org_id, sys_record_date, drug_id).Order("id desc").Last(&outInfo).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return outInfo, err
+		}
+	}
+	return outInfo, err
+}
+
 func DeleteGoodWarehouseOutInfoByNumber(id int64, tx *gorm.DB) error {
 
 	err := tx.Model(&models.WarehouseOutInfo{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"status": 0}).Error

service/mobile_dialysis_service.go

@@ -2251,7 +2251,7 @@ func BatchUpdateMonitors(monitors []*models.MonitoringRecord) error {
 func ModifyStartDialysisOrder(order *models.DialysisOrder) error {
 	tx := writeDb.Begin()
 	updateTime := time.Now().Unix()
-	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"start_nurse": order.StartNurse, "updated_time": updateTime, "bed_id": order.BedID, "puncture_nurse": order.PunctureNurse, "start_time": order.StartTime, "modifier": order.Modifier, "schedual_type": order.SchedualType, "washpipe_nurse": order.WashpipeNurse, "change_nurse": order.ChangeNurse, "difficult_puncture_nurse": order.DifficultPunctureNurse, "new_fistula_nurse": order.NewFistulaNurse, "quality_nurse_id": order.QualityNurseId, "puncture_needle": order.PunctureNeedle, "puncture_way": order.PunctureWay, "dialysis_dialyszers": order.DialysisDialyszers, "dialysis_irrigation": order.DialysisIrrigation, "blood_access_id": order.BloodAccessId, "nuclein_date": order.NucleinDate, "schedule_remark": order.ScheduleRemark, "order_remark": order.OrderRemark, "catheter_operation": order.CatheterOperation, "blood_flow_volume": order.BloodFlowVolume, "blood_drawing": order.BloodDrawing}).Error
+	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"start_nurse": order.StartNurse, "updated_time": updateTime, "bed_id": order.BedID, "puncture_nurse": order.PunctureNurse, "start_time": order.StartTime, "modifier": order.Modifier, "schedual_type": order.SchedualType, "washpipe_nurse": order.WashpipeNurse, "change_nurse": order.ChangeNurse, "difficult_puncture_nurse": order.DifficultPunctureNurse, "new_fistula_nurse": order.NewFistulaNurse, "quality_nurse_id": order.QualityNurseId, "puncture_needle": order.PunctureNeedle, "puncture_way": order.PunctureWay, "dialysis_dialyszers": order.DialysisDialyszers, "dialysis_irrigation": order.DialysisIrrigation, "blood_access_id": order.BloodAccessId, "nuclein_date": order.NucleinDate, "schedule_remark": order.ScheduleRemark, "order_remark": order.OrderRemark, "catheter_operation": order.CatheterOperation, "blood_flow_volume": order.BloodFlowVolume, "blood_drawing": order.BloodDrawing, "dialysis_strainer": order.DialysisStrainer}).Error
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -2924,6 +2924,7 @@ type AutomaticReduceDetail struct {
 	VMGoodInfo VMGoodInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"info"`
 	GoodsType  GoodsType  `gorm:"ForeignKey:GoodTypeId;AssociationForeignKey:ID" json:"type"`
 	Count      int64      `gorm:"column:count" json:"count"`
+	ProjectId  int64      `gorm:"column:project_id" json:"project_id" form:"project_id"`
 }
 
 func (AutomaticReduceDetail) TableName() string {

service/new_stock_service.go

@@ -649,3 +649,34 @@ func GetDrugNewInventoryList(org_id int64, keyword string) (drug []*models.BaseD
 
 	return drug, err
 }
+
+func GetSelfDrugStockCount(patient_id int64, drug_id int64, org_id int64, tx *gorm.DB) (*models.XtSelfDrugStockCount, error) {
+
+	drugStockCount := models.XtSelfDrugStockCount{}
+	var err error
+	err = tx.Where("patient_id = ? and drug_id = ? and user_org_id  = ? and status = 1", patient_id, drug_id, org_id).Find(&drugStockCount).Error
+	if err == gorm.ErrRecordNotFound {
+		tx.Rollback()
+		return nil, err
+	}
+	if err != nil {
+		tx.Rollback()
+		return nil, err
+	}
+	return &drugStockCount, nil
+}
+
+func UpdateSelfDrugStockSum(patient_id int64, drug_id int64, user_org_id int64, waresing_count int64, over_count int64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.XtSelfDrugStockCount{}).Where("user_org_id = ? and patient_id  = ? and drug_id  = ? and status = 1", user_org_id, patient_id, drug_id).Update(map[string]interface{}{"sum_in_count": waresing_count}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.XtSelfDrugStockCount{}).Where("user_org_id = ? and patient_id = ? and drug_id = ? and status = 1", user_org_id, patient_id, drug_id).Update(map[string]interface{}{"flush_count": over_count}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}

service/patient_service.go

@@ -4074,3 +4074,26 @@ func GetDialysisTotalCountByTime(user_org_id int64, start_time int64, end_time i
 
 	return order, err
 }
+
+func GetTreamentPland(user_org_id int64) (models.XtTreatmentPlan, error) {
+
+	treatmentPlan := models.XtTreatmentPlan{}
+
+	err := XTReadDB().Where("user_org_id = ? and status =1", user_org_id).Find(&treatmentPlan).Error
+
+	return treatmentPlan, err
+}
+
+func CreateTreatqmentPland(plan models.XtTreatmentPlan) error {
+
+	err := XTWriteDB().Create(&plan).Error
+
+	return err
+}
+
+func UpdateTheatmentPland(id int64, content string) error {
+
+	err := XTWriteDB().Model(&models.XtTreatmentPlan{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"content": content}).Error
+
+	return err
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -111,6 +111,7 @@ type DialysisOrderVM struct {
 	PunctureWay        string          `gorm:"column:puncture_way" json:"puncture_way" form:"puncture_way"`
 	PunctureNeedle     string          `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
 	BloodDrawing       int64           `gorm:"column:blood_drawing" json:"blood_drawing" form:"blood_drawing"`
+	DialysisStrainer   string          `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
 }
 
 func (DialysisOrderVM) TableName() string {
@@ -577,6 +578,8 @@ type MonitoringRecordVM struct {
 	FilterPressure              string  `gorm:"column:filter_pressure" json:"filter_pressure" form:"filter_pressure"`
 	Dicarbonate                 float64 `gorm:"column:dicarbonate" json:"dicarbonate" form:"dicarbonate"`
 	ReplacementSpeed            float64 `gorm:"column:replacement_speed" json:"replacement_speed" form:"replacement_speed"`
+	UltrafiltrationRateOne      string  `gorm:"column:ultrafiltration_rate_one" json:"ultrafiltration_rate_one" form:"ultrafiltration_rate_one"`
+	HeparinOne                  string  `gorm:"column:heparin_one" json:"heparin_one" form:"heparin_one"`
 }
 
 func (MonitoringRecordVM) TableName() string {

service/self_drug_service.go

@@ -3071,6 +3071,29 @@ func GetInitBalanceList(good_id int64, user_org_id int64, start_time int64, end_
 
 }
 
+func GetInitOutBanceTenty(good_id int64, user_org_id int64, start_time int64, end_time int64, storehouse_id int64) (list []*models.VmStockFlowTwenty, err error) {
+
+	db := XTReadDB().Model(&list).Where("status=1 and (consumable_type=2 or consumable_type =3)")
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime<?", start_time)
+	}
+
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
+
+	err = db.Find(&list).Error
+
+	return list, err
+}
+
 func GetInitOutBanceList(good_id int64, user_org_id int64, start_time int64, end_time int64, storehouse_id int64) (list []*models.WarehouseOutInfoTenty, err error) {
 
 	db := XTReadDB().Model(&list).Where("status=1")
@@ -3445,3 +3468,273 @@ func UpdateGoodInfoByIdOne(id int64, total_count_one int64) error {
 
 	return err
 }
+
+func GetAllSelfDrugInfoList(org_id int64) (base []*models.BaseDrugLibThrity, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status =1 and is_self_drug =1", org_id).Find(&base).Error
+
+	return base, err
+}
+
+func GetAllPatientListByUserOrg(org_id int64) (patient []*models.XtPatients, err error) {
+
+	err = XTReadDB().Where("user_org_id =? and status=1", org_id).Find(&patient).Error
+
+	return patient, err
+}
+
+func PostSearchSelfDrugList(keywords string, user_org_id int64) (drug []*models.BaseDrugLibThrity, err error) {
+
+	db := XTReadDB().Model(&drug).Where("org_id=? and status=1 and is_self_drug=1", user_org_id)
+
+	if len(keywords) > 0 {
+		likekey := "%" + keywords + "%"
+		err = db.Where("(drug_name LIKE ?)", likekey).Preload("LastDrugWarehouseInfo", "org_id=? and status = 1 and (stock_max_number > 0 or stock_min_number>0) and storehouse_id = ?", user_org_id).Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0", user_org_id).Group("id")
+		}).Find(&drug).Error
+	} else {
+		err = db.Preload("LastDrugWarehouseInfo", "org_id=? and status = 1 and (stock_max_number > 0 or stock_min_number>0)", user_org_id).Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0 ", user_org_id).Group("id")
+		}).Find(&drug).Error
+	}
+	return
+}
+
+func FindAllSelfDrugList(org_id int64, patient_id int64) (total int64, err error) {
+	err = readDb.Model(&models.XtSelfDrugWarehouseInfo{}).Where("org_id = ? and patient_id", org_id, patient_id).Count(&total).Error
+	return total, err
+}
+
+func CreatedSlefWarehouseing(info *models.XtSelfDrugWarehouseInfo, tx *gorm.DB) {
+
+	err := tx.Create(&info).Error
+	if err != nil {
+		tx.Rollback()
+		return
+	}
+	return
+}
+
+func UpdateSelfWarehouseing(info *models.XtSelfDrugWarehouseInfo, tx *gorm.DB) error {
+
+	err := tx.Save(&info).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func FindSelfDrugWarehouseInfoListById(id int64, org_id int64, patient_id int64, tx *gorm.DB) (info []*models.XtSelfDrugWarehouseInfo, err error) {
+
+	err = tx.Where("warehousing_id = ? and org_id = ? and patient_id = ? and status=1", id, org_id, patient_id).Preload("BaseDrugLib", "status=1").Find(&info).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return info, err
+
+		}
+	}
+	return info, err
+}
+
+func GetAllBaseDrugListByKeyWord(keyword string, org_id int64) (base []*models.BaseDrugLibSeven, err error) {
+
+	likeKey := "%" + keyword + "%"
+
+	db := XTReadDB().Model(&base).Where("status=1 and is_self_drug = 1")
+	if len(keyword) > 0 {
+		db = db.Where("drug_name like ?", likeKey)
+	}
+	if org_id > 0 {
+		db = db.Where("org_id = ?", org_id)
+	}
+	err = db.Find(&base).Error
+
+	return base, err
+
+}
+
+func GetAllSelfDrugWarehouseInfoList(ids []int64, org_id int64, patient_id int64) (info []*models.XtSelfDrugWarehouseInfo, err error) {
+
+	db := XTReadDB().Model(&info).Where("status=1")
+
+	if len(ids) > 0 {
+		db = db.Where("drug_id in(?)", ids)
+	}
+	if org_id > 0 {
+		db = db.Where("org_id = ?", org_id)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	err = db.Preload("BaseDrugLib", "status =1").Find(&info).Error
+
+	return info, err
+}
+
+func AddSelfDrugWarehouse(warehouse *models.XtSelfDrugWarehouse, tx *gorm.DB) error {
+
+	err := tx.Create(&warehouse).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	return err
+}
+
+func UpdateSelfDrugWarehouse(warehouse *models.XtSelfDrugWarehouse, tx *gorm.DB) error {
+
+	err := tx.Save(&warehouse).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	return err
+
+}
+
+func FindSelfAllWarehouseTotal(org_id int64, tx *gorm.DB) (total int64, err2 error) {
+
+	err = tx.Model(&models.XtSelfDrugWarehouse{}).Where("org_id = ?", org_id).Count(&total).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return total, err
+		}
+	}
+	return total, err
+}
+
+func FindLastSelfWarehousing(user_org_id int64, patient_id int64, tx *gorm.DB) (models.XtSelfDrugWarehouse, error) {
+
+	selfDrugWarehouse := models.XtSelfDrugWarehouse{}
+	err := tx.Where("org_id=? and patient_id =?", user_org_id, patient_id).Last(&selfDrugWarehouse).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return selfDrugWarehouse, err
+		}
+	}
+	return selfDrugWarehouse, err
+}
+
+func GetSelfDrugWarehouseInfoByID(id int64) (models.XtSelfDrugWarehouseInfo, error) {
+
+	selfDrugWarehouseInfo := models.XtSelfDrugWarehouseInfo{}
+
+	err := XTReadDB().Where("id = ? and status=1", id).Preload("BaseDrugLib", "status=1").Find(&selfDrugWarehouseInfo).Error
+
+	return selfDrugWarehouseInfo, err
+}
+
+func GetSelfDrugWarehouseInfo(id int64) (models.XtSelfDrugWarehouse, error) {
+
+	warehouse := models.XtSelfDrugWarehouse{}
+
+	err := XTReadDB().Where("id = ? and status=1", id).Find(&warehouse).Error
+
+	return warehouse, err
+}
+
+func DeleteSelfDrugWarehouse(id int64, tx *gorm.DB) error {
+
+	info := models.XtSelfDrugWarehouseInfo{}
+
+	err := tx.Model(&info).Where("id = ? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	return err
+}
+
+func GetSelfWarehouseInfoByWarehouseInfo(id int64, patient_id int64, org_id int64) (info []*models.XtSelfDrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("id =? and patient_id =? and warehousing_id = ? and status=1 and org_id =?", id, patient_id, org_id).Find(&info).Error
+	return info, err
+}
+
+func AddSelfDrugWarehouseStockMaxNumber(count int64, id int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.XtSelfDrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.XtSelfDrugWarehouse{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	return err
+}
+
+func AddSelfDrugWarehouseStockMinNumber(count int64, id int64, tx *gorm.DB) error {
+
+	err := XTWriteDB().Model(&models.XtSelfDrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = XTWriteDB().Model(&models.XtSelfDrugWarehouse{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+
+	return err
+}
+
+func GetDrugSumCountByPatient(patient_id int64, org_id int64, drug_id int64, tx *gorm.DB) (info []*models.XtSelfDrugWarehouseInfo, err error) {
+
+	err = tx.Where("patient_id = ? and org_id = ? and drug_id = ? and status =1", patient_id, org_id, drug_id).Find(&info).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return
+		}
+	}
+
+	return info, err
+}
+
+func CreateSelfDrugFlow(flow *models.XtSelfDrugFlow, tx *gorm.DB) error {
+
+	err := tx.Create(&flow).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func GetSelfDrugSumCountByStorehouseId(patient_id int64, orgid int64, drug_id int64, tx *gorm.DB) (info []*models.XtSelfDrugWarehouseInfo, err error) {
+
+	err = tx.Where("patient_id = ? and org_id = ? and status = 1  and drug_id =? and is_check = 1", patient_id, orgid, drug_id).Find(&info).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return info, err
+		}
+	}
+	return info, err
+}
+
+func CreateSelfDrugStockSum(drug models.XtSelfDrugStockCount, tx *gorm.DB) error {
+
+	err := tx.Create(&drug).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}

service/sign_service.go

@@ -2112,7 +2112,7 @@ func UpdateAllPatient(id int64, diagose string, orgid int64) error {
 
 func GetAllDialysisOrder(user_org_id int64) (list []*models.XtDialysisOrder, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and status =1", 26973).Find(&list).Error
+	err = XTReadDB().Where("patient_id = ? and status =1", 31831).Find(&list).Error
 
 	return list, err
 }

service/stock_service.go

@@ -1871,6 +1871,7 @@ type DrugWarehouseOutInfo struct {
 	LastPrice               float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
 	StockCount              string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
 	PatientId               int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ClassType               string  `gorm:"column:class_type" json:"class_type" form:"class_type"`
 }
 
 func (DrugWarehouseOutInfo) TableName() string {
@@ -4588,7 +4589,7 @@ func GetOrderDetialByOrderIdOne(id []string, orgid int64) (out []*models.Warehou
 		db = db.Where("x.org_id = ?", orgid)
 	}
 
-	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,t.social_security_directory_code,x.is_sys,x.sys_record_time,n.number,x.remark,x.license_number,x.storehouse_id,x.admin_user_id,x.buy_price,x.stock_count,x.warehouse_info_id,x.remark,x.patient_id,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit,t.packing_price,x.register_number").Joins("left join xt_warehouse_info as n on n.id=x.warehouse_info_id").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.warehouse_out_id,x.good_id").Order("x.ctime desc").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,t.social_security_directory_code,x.is_sys,x.sys_record_time,n.number,x.remark,x.license_number,x.storehouse_id,x.admin_user_id,x.buy_price,x.stock_count,x.warehouse_info_id,x.remark,x.patient_id,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit,t.packing_price,x.register_number,x.class_type").Joins("left join xt_warehouse_info as n on n.id=x.warehouse_info_id").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.warehouse_out_id,x.good_id").Order("x.ctime desc").Scan(&out).Error
 
 	return out, err
 }
@@ -8120,7 +8121,7 @@ func UpdateDrugWarehouseInfoTwenty(id int64, info *models.DrugWarehouseInfo) err
 
 func UpdatedDrugWarehouseInfo(info *models.DrugWarehouseOutInfo, id int64) error {
 
-	err := XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"drug_id": info.DrugId, "count": info.Count, "count_unit": info.CountUnit, "price": info.Price, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "remark": info.Remark, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "retail_price": info.RetailPrice, "retail_total_price": info.RetailTotalPrice, "number": info.Number, "batch_number": info.BatchNumber, "admin_user_id": info.AdminUserId, "last_price": info.LastPrice, "stock_count": info.StockCount, "storehouse_id": info.StorehouseId, "patient_id": info.PatientId}).Error
+	err := XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"drug_id": info.DrugId, "count": info.Count, "count_unit": info.CountUnit, "price": info.Price, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "remark": info.Remark, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "retail_price": info.RetailPrice, "retail_total_price": info.RetailTotalPrice, "number": info.Number, "batch_number": info.BatchNumber, "admin_user_id": info.AdminUserId, "last_price": info.LastPrice, "stock_count": info.StockCount, "storehouse_id": info.StorehouseId, "patient_id": info.PatientId, "class_type": info.ClassType}).Error
 	return err
 }
 

service/warhouse_service.go

@@ -9442,3 +9442,295 @@ func HisFaDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdvi
 
 	return
 }
+
+func NewMobileHisGoodCancelInfo(orgID int64, creater int64, project *models.HisPrescriptionProject, cha_count int64, good models.GoodInformationThirty, tx *gorm.DB) (err error) {
+
+	storeConfig, _ := GetNewAllStoreHouseConfig(orgID, tx)
+
+	//查找患者最后一条的退库数据是否满足要求
+	var out_count int64
+	GoodOutInfo, _ := GetGoodWarehouseOutInfoByProjectIdThree(project.PatientId, project.UserOrgId, project.RecordDate, project.ProjectId, tx)
+
+	out_count = GoodOutInfo.Count
+	//如果最后1条出库数量大于退库数量,则直接退库,满足退库要求
+
+	if out_count >= cha_count {
+		//退库 退回 cha_count 的数量
+		ModifyNewGoodWarehouseInfoStockMinNumber(cha_count, GoodOutInfo.GoodId, GoodOutInfo.OrgId, GoodOutInfo.WarehouseInfotId, tx)
+
+		if out_count == cha_count {
+			//删除该出库单
+			DeleteGoodWarehouseOutInfoByNumber(GoodOutInfo.ID, tx)
+		} else {
+			//减去出库单里面的数量
+			ModifyGoodWarehouseOutInfoByNumber(GoodOutInfo.ID, cha_count, tx)
+		}
+
+		//创建退库单
+		goodList, _ := GetNewAllGoodSumCount(project.ProjectId, orgID, storeConfig.StorehouseOutInfo, tx)
+		var sum_count int64
+		for _, item := range goodList {
+			sum_count += item.StockCount
+		}
+
+		operation_time := time.Now().Unix()
+
+		//创建退库单
+		timeStr := time.Now().Format("2006-01-02")
+		timeArr := strings.Split(timeStr, "-")
+		total, _ := FindNewAllCancelStockTotal(orgID, tx)
+		total = total + 1
+		orderNumber := "CKTKD" + strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+		cancelStock := models.CancelStock{
+			OrderNumber:  orderNumber,
+			OperaTime:    operation_time,
+			OrgId:        orgID,
+			Creater:      creater,
+			Ctime:        time.Now().Unix(),
+			Status:       1,
+			ReturnTime:   project.RecordDate,
+			Type:         1,
+			StorehouseId: storeConfig.StorehouseOutInfo,
+			IsCheck:      1,
+		}
+		_, msgerrkonde := GetNewCancelStockDetailByOrderNumberOne(project.RecordDate, orgID, tx)
+		if msgerrkonde == gorm.ErrRecordNotFound {
+			AddNewSigleCancelStock(&cancelStock, tx)
+		}
+
+		manufactureName, _ := GetNewManufactureById(GoodOutInfo.Manufacturer, tx)
+		dealer, _ := GetNewDealerById(GoodOutInfo.Dealer, tx)
+
+		cancelInfo, _ := GetNewLastCancelStockById(orgID, tx)
+
+		cancelStockInfo := models.CancelStockInfo{
+			GoodId:          project.ProjectId,
+			CancelStockId:   cancelInfo.ID,
+			GoodTypeId:      good.GoodTypeId,
+			Count:           cha_count,
+			Price:           project.Price,
+			Total:           0,
+			ProductDate:     GoodOutInfo.ProductDate,
+			ExpiryDate:      GoodOutInfo.ExpiryDate,
+			Ctime:           time.Now().Unix(),
+			Status:          1,
+			OrgId:           orgID,
+			OrderNumber:     cancelInfo.OrderNumber,
+			Type:            0,
+			Dealer:          dealer.DealerName,
+			Manufacturer:    manufactureName.ManufacturerName,
+			Number:          GoodOutInfo.Number,
+			RegisterAccount: "",
+			Remark:          "",
+			WarehouseInfoId: GoodOutInfo.WarehouseInfotId,
+			PatientId:       project.ProjectId,
+			RecordDate:      project.RecordDate,
+			StorehouseId:    storeConfig.StorehouseOutInfo,
+			IsCheck:         1,
+		}
+		CreateNewCancelStockInfoOne(&cancelStockInfo, tx)
+
+		flow := models.VmStockFlow{
+			WarehousingId:           GoodOutInfo.WarehouseInfotId,
+			GoodId:                  project.ProjectId,
+			Number:                  GoodOutInfo.Number,
+			LicenseNumber:           GoodOutInfo.LicenseNumber,
+			Count:                   cha_count,
+			UserOrgId:               orgID,
+			PatientId:               project.PatientId,
+			SystemTime:              project.RecordDate,
+			ConsumableType:          7,
+			IsSys:                   1,
+			WarehousingOrder:        "",
+			WarehouseOutId:          GoodOutInfo.WarehouseOutId,
+			WarehouseOutOrderNumber: GoodOutInfo.WarehouseOutOrderNumber,
+			IsEdit:                  0,
+			CancelStockId:           cancelInfo.ID,
+			CancelOrderNumber:       cancelInfo.OrderNumber,
+			Manufacturer:            manufactureName.ID,
+			Dealer:                  0,
+			Creator:                 creater,
+			UpdateCreator:           0,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Mtime:                   0,
+			Price:                   GoodOutInfo.Price,
+			WarehousingDetailId:     GoodOutInfo.WarehouseInfotId,
+			WarehouseOutDetailId:    GoodOutInfo.ID,
+			CancelOutDetailId:       cancelInfo.ID,
+			ProductDate:             GoodOutInfo.ProductDate,
+			ExpireDate:              GoodOutInfo.ExpiryDate,
+			StorehouseId:            storeConfig.StorehouseOutInfo,
+			BuyPrice:                project.Price,
+			ProjectId:               project.ID,
+			OverCount:               sum_count,
+			RegisterNumber:          GoodOutInfo.RegisterNumber,
+			OperateTime:             time.Now().Unix(),
+		}
+		CreateNewStockFlowOne(flow, tx)
+
+		AddGoodNewCancelSumCountOne(storeConfig.StorehouseOutInfo, project.ProjectId, orgID, flow.Count, tx)
+
+		ReduceNewGoodCountTwo(project.ProjectId, orgID, storeConfig.StorehouseOutInfo, flow.Count, tx)
+
+	}
+
+	//如果出库的数据小于这个退库的数量差,则先该批次出库数量出完
+	if out_count < cha_count {
+
+		//把该出库单的数量退完
+		ModifyNewGoodWarehouseInfoStockMinNumber(out_count, GoodOutInfo.GoodId, GoodOutInfo.OrgId, GoodOutInfo.WarehouseInfotId, tx)
+
+		//删除该出库单
+		DeleteGoodWarehouseOutInfoByNumber(GoodOutInfo.ID, tx)
+
+		//查询剩余库存
+		goodList, _ := GetNewAllGoodSumCount(project.ProjectId, orgID, storeConfig.StorehouseOutInfo, tx)
+		var sum_count int64
+		for _, item := range goodList {
+			sum_count += item.StockCount
+		}
+
+		operation_time := time.Now().Unix()
+		//创建退库单
+		timeStr := time.Now().Format("2006-01-02")
+		timeArr := strings.Split(timeStr, "-")
+		total, _ := FindNewAllCancelStockTotal(orgID, tx)
+		total = total + 1
+		orderNumber := "CKTKD" + strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+		cancelStock := models.CancelStock{
+			OrderNumber:  orderNumber,
+			OperaTime:    operation_time,
+			OrgId:        orgID,
+			Creater:      creater,
+			Ctime:        time.Now().Unix(),
+			Status:       1,
+			ReturnTime:   project.RecordDate,
+			Type:         1,
+			StorehouseId: storeConfig.StorehouseOutInfo,
+			IsCheck:      1,
+		}
+		_, msgerrkonde := GetNewCancelStockDetailByOrderNumberOne(project.RecordDate, orgID, tx)
+		if msgerrkonde == gorm.ErrRecordNotFound {
+			AddNewSigleCancelStock(&cancelStock, tx)
+		}
+
+		manufactureName, _ := GetNewManufactureById(GoodOutInfo.Manufacturer, tx)
+		dealer, _ := GetNewDealerById(GoodOutInfo.Dealer, tx)
+
+		cancelInfo, _ := GetNewLastCancelStockById(orgID, tx)
+
+		cancelStockInfo := models.CancelStockInfo{
+			GoodId:          project.ProjectId,
+			CancelStockId:   cancelInfo.ID,
+			GoodTypeId:      good.GoodTypeId,
+			Count:           out_count,
+			Price:           project.Price,
+			Total:           0,
+			ProductDate:     GoodOutInfo.ProductDate,
+			ExpiryDate:      GoodOutInfo.ExpiryDate,
+			Ctime:           time.Now().Unix(),
+			Status:          1,
+			OrgId:           orgID,
+			OrderNumber:     cancelInfo.OrderNumber,
+			Type:            0,
+			Dealer:          dealer.DealerName,
+			Manufacturer:    manufactureName.ManufacturerName,
+			Number:          GoodOutInfo.Number,
+			RegisterAccount: "",
+			Remark:          "",
+			WarehouseInfoId: GoodOutInfo.WarehouseInfotId,
+			PatientId:       project.ProjectId,
+			RecordDate:      project.RecordDate,
+			StorehouseId:    storeConfig.StorehouseOutInfo,
+			IsCheck:         1,
+		}
+		CreateNewCancelStockInfoOne(&cancelStockInfo, tx)
+
+		flow := models.VmStockFlow{
+			WarehousingId:           GoodOutInfo.WarehouseInfotId,
+			GoodId:                  project.ProjectId,
+			Number:                  GoodOutInfo.Number,
+			LicenseNumber:           GoodOutInfo.LicenseNumber,
+			Count:                   out_count,
+			UserOrgId:               orgID,
+			PatientId:               project.PatientId,
+			SystemTime:              project.RecordDate,
+			ConsumableType:          7,
+			IsSys:                   1,
+			WarehousingOrder:        "",
+			WarehouseOutId:          GoodOutInfo.WarehouseOutId,
+			WarehouseOutOrderNumber: GoodOutInfo.WarehouseOutOrderNumber,
+			IsEdit:                  0,
+			CancelStockId:           cancelInfo.ID,
+			CancelOrderNumber:       cancelInfo.OrderNumber,
+			Manufacturer:            manufactureName.ID,
+			Dealer:                  0,
+			Creator:                 creater,
+			UpdateCreator:           0,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Mtime:                   0,
+			Price:                   GoodOutInfo.Price,
+			WarehousingDetailId:     GoodOutInfo.WarehouseInfotId,
+			WarehouseOutDetailId:    GoodOutInfo.ID,
+			CancelOutDetailId:       cancelInfo.ID,
+			ProductDate:             GoodOutInfo.ProductDate,
+			ExpireDate:              GoodOutInfo.ExpiryDate,
+			StorehouseId:            storeConfig.StorehouseOutInfo,
+			BuyPrice:                project.Price,
+			ProjectId:               project.ID,
+			OverCount:               sum_count,
+			RegisterNumber:          GoodOutInfo.RegisterNumber,
+			OperateTime:             time.Now().Unix(),
+		}
+		CreateNewStockFlowOne(flow, tx)
+
+		AddGoodNewCancelSumCountOne(storeConfig.StorehouseOutInfo, project.ProjectId, orgID, flow.Count, tx)
+
+		ReduceNewGoodCountTwo(project.ProjectId, orgID, storeConfig.StorehouseOutInfo, flow.Count, tx)
+
+		//计算还有多少没有退库
+		var over_count = cha_count - out_count
+
+		NewHisGoodCancelInfo(orgID, creater, project, over_count, good, tx)
+	}
+	return err
+
+}
+
+func NewMobileHisGoodAutoCancelInfo(orgID int64, creater int64, project *models.HisPrescriptionProject, cha_count int64, good models.GoodInformationThirty, tx *gorm.DB) error {
+
+	//查找患者最后一条的退库数据是否满足要求
+	var out_count int64
+	goodOutInfo, _ := GetGoodWarehouseOutInfoByProjectIdThree(project.PatientId, project.UserOrgId, project.RecordDate, project.ProjectId, tx)
+
+	out_count = goodOutInfo.Count
+
+	//如果最后1条出库数量大于退库数量,则直接退库,满足退库要求
+	if out_count >= cha_count {
+
+		//减去出库单里面的数量
+		ModifyGoodAuToWarehouseOut(goodOutInfo.ID, cha_count, tx)
+
+		if out_count == cha_count {
+			//删除该出库单
+			DeleteGoodWarehouseAutoByNumberTwo(goodOutInfo.ID, tx)
+		}
+	}
+
+	//如果出库的数据小于这个退库的数量差,则先该批次出库数量出完
+	if out_count < cha_count {
+
+		//删除该出库单
+		DeleteGoodWarehouseAutoByNumberTwo(goodOutInfo.ID, tx)
+
+		//计算还有多少没有退库
+		var over_count = cha_count - out_count
+
+		NewHisGoodAutoCancelInfo(orgID, creater, project, over_count, good, tx)
+	}
+	return err
+}