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 = 10697 //机构id
+		subscibe.OrgId = 10567 //机构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 = 10697 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 17260 //4
+		adminUserInfo.CurrentOrgId = 10567 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 10697 //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 = 10697 //机构id小英9675或4
+		subscibe.OrgId = 10567 //机构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 = 10697 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 17260 //4
+		adminUserInfo.CurrentOrgId = 10567 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 16787 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/device_api_controller.go

@@ -778,6 +778,7 @@ func (this *DeviceAPIController) CreateNumber() {
 	zoneID, _ := this.GetInt64("zone")
 	groupID, _ := this.GetInt64("group")
 	sort, _ := this.GetInt64("sort")
+	number_type := this.GetString("number_type")
 	if len(num) == 0 || zoneID <= 0 || groupID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -806,20 +807,21 @@ func (this *DeviceAPIController) CreateNumber() {
 
 	_, errcode := service.GetCreateDeviceNumber(num, adminInfo.CurrentOrgId)
 	if errcode == gorm.ErrRecordNotFound {
-		number, createErr := service.CreateDeviceNumber(adminInfo.CurrentOrgId, num, zoneID, groupID, sort)
+		number, createErr := service.CreateDeviceNumber(adminInfo.CurrentOrgId, num, zoneID, groupID, sort, number_type)
 		if createErr != nil {
 			this.ErrorLog("创建机号失败:%v", createErr)
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
 			return
 		}
 		numberJson := map[string]interface{}{
-			"id":         number.ID,
-			"number":     number.Number,
-			"zone_id":    number.ZoneID,
-			"group_id":   number.GroupID,
-			"zone_name":  zone.Name,
-			"group_name": group.Name,
-			"sort":       number.Sort,
+			"id":          number.ID,
+			"number":      number.Number,
+			"zone_id":     number.ZoneID,
+			"group_id":    number.GroupID,
+			"zone_name":   zone.Name,
+			"group_name":  group.Name,
+			"sort":        number.Sort,
+			"number_type": number.NumberType,
 		}
 		this.ServeSuccessJSON(map[string]interface{}{
 			"number": numberJson,
@@ -842,6 +844,7 @@ func (this *DeviceAPIController) ModifyNumber() {
 	zoneID, _ := this.GetInt64("zone")
 	groupID, _ := this.GetInt64("group")
 	sort, _ := this.GetInt64("sort")
+	number_type := this.GetString("number_type")
 	if id <= 0 || len(num) == 0 || zoneID <= 0 || groupID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -882,6 +885,7 @@ func (this *DeviceAPIController) ModifyNumber() {
 	number.ZoneID = zoneID
 	number.GroupID = groupID
 	number.Sort = sort
+	number.NumberType = number_type
 	byName, _ := service.GetDeviceNumberByName(num, zoneID, adminInfo.CurrentOrgId)
 	if byName.ID > 0 && byName.ID != id {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -906,13 +910,14 @@ func (this *DeviceAPIController) ModifyNumber() {
 	}
 
 	numberJson := map[string]interface{}{
-		"id":         number.ID,
-		"number":     number.Number,
-		"zone_id":    number.ZoneID,
-		"group_id":   number.GroupID,
-		"zone_name":  zone.Name,
-		"group_name": group.Name,
-		"sort":       number.Sort,
+		"id":          number.ID,
+		"number":      number.Number,
+		"zone_id":     number.ZoneID,
+		"group_id":    number.GroupID,
+		"zone_name":   zone.Name,
+		"group_name":  group.Name,
+		"sort":        number.Sort,
+		"number_type": number.NumberType,
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"number": numberJson,

controllers/dialysis_api_controller.go

@@ -4577,6 +4577,8 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	patientDiagnose, _ := service.FindPatientDianose(adminUserInfo.CurrentOrgId)
 
 	lastSchedule, _ := service.FindLastSchedule(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+
+	numberList, _ := service.GetAllBedNumberList(adminUserInfo.CurrentOrgId)
 	//if config.IsOpen == 1 && project_config.IsOpen == 1 && len(projects) > 0 {
 	//	for _, item := range projects {
 	//		var advice *models.HisDoctorAdviceInfo
@@ -4635,6 +4637,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 			"prescriptionInfo":          prescriptionInfo,
 			"patientDiagnose":           patientDiagnose,
 			"lastSchedule":              lastSchedule,
+			"numberList":                numberList,
 		})
 
 	}
@@ -4675,6 +4678,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 			"prescriptionInfo":          prescriptionInfo,
 			"patientDiagnose":           patientDiagnose,
 			"lastSchedule":              lastSchedule,
+			"numberList":                numberList,
 		})
 	}
 

controllers/his_api_controller.go

@@ -3816,6 +3816,9 @@ func (c *HisApiController) CreateHisPrescription() {
 
 											nowCount, _ := strconv.ParseInt(p.Count, 10, 64)
 
+											//fmt.Println("p----------------------------------------------------", p.ProjectId)
+											//fmt.Println("p----------------------------------------------------", nowCount)
+											//fmt.Println("p----------------------------------------------------", historyCount)
 											//如果当前处方数量大于历史数据,则需要出库
 											if nowCount > historyCount {
 
@@ -3965,18 +3968,41 @@ func (c *HisApiController) CreateHisPrescription() {
 												}
 											}
 
-											//lastHisProject, _ := service.GetLastHisProject(p.PatientId, p.UserOrgId, p.RecordDate, tx, p.ProjectId)
-											////查询历史出库数据
-											//flowGood, _ := service.GetStockFlowIsBatchNumberSeventy(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID)
-											//
-											//var out_count_five int64
-											//for _, item := range flowGood {
-											//	out_count_five += item.Count
-											//}
-											//parseIntCount, _ := strconv.ParseInt(p.Count, 10, 64)
-											//
-											////如果当前处方的出库数量和已经出库的数量不一致,需要进行退库或者出库
-											//if out_count_five != parseIntCount {
+											lastHisProject, _ := service.GetLastHisProject(p.PatientId, p.UserOrgId, p.RecordDate, tx, p.ProjectId)
+											//查询历史出库数据
+											flowGood, _ := service.GetStockFlowIsBatchNumberSeventy(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID)
+
+											var out_count_five int64
+											for _, item := range flowGood {
+												out_count_five += item.Count
+											}
+											parseIntCount, _ := strconv.ParseInt(p.Count, 10, 64)
+
+											//fmt.Println("p.ProjectId-----------------", p.ProjectId)
+											//fmt.Println("out_count_five===============", out_count_five)
+											//fmt.Println("parseIntCount===============", parseIntCount)
+											//如果当前处方的出库数量和已经出库的数量不一致,需要进行退库或者出库
+											if out_count_five != parseIntCount {
+												service.UpdateNewAutomaticReduce(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID, tx)
+												detail := models.AutomaticReduceDetail{
+													WarehouseOutId:          0,
+													WarehouseOutOrderNumber: "",
+													PatientId:               p.PatientId,
+													Ctime:                   time.Now().Unix(),
+													Mtime:                   0,
+													Status:                  1,
+													RecordTime:              p.RecordDate,
+													OrgId:                   p.UserOrgId,
+													GoodId:                  p.ProjectId,
+													GoodTypeId:              0,
+													Count:                   parseIntCount,
+													Type:                    0,
+													ProjectId:               lastHisProject.ID,
+													StorehouseId:            0,
+												}
+
+												service.CreateNewAutoDetail(detail, tx)
+											}
 											//	//查询耗材最后一次出库记录
 											//	wareOut, _ := service.GetLastGoodWarehouseOutInfoByProjectId(p.ProjectId, patient_id, recordDateTime, lastHisProject.ID)
 											//	//查询默认出库仓库库存

controllers/mobile_api_controllers/patient_api_controller.go

@@ -300,7 +300,10 @@ func (c *PatientApiController) EditDoctorAdvice() {
 	advice.UpdatedTime = time.Now().Unix()
 	advice.UserOrgId = adminUserInfo.Org.Id
 	advice.Modifier = adminUserInfo.AdminUser.Id
-	advice.AdviceDoctor = adminUserInfo.AdminUser.Id
+	if adminUserInfo.Org.Id == 10580 {
+		advice.AdviceDoctor = adminUserInfo.AdminUser.Id
+	}
+
 	//处理修改医嘱开始时间逻辑(不包括子医嘱)
 	//1.一组医嘱内只有一条医嘱(不包括子医嘱)的情况下，只需要直接修改医嘱开始时间，不需要重新分配组号
 	//2.一组医嘱内有多条医嘱(不包括子医嘱)的情况下,需要为修改的那条医嘱重新分配组号，并修改医嘱开始时间
@@ -5685,6 +5688,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 
 	dialysiscount, err := service.GetDialysisCountByPatientId(firstMonthDate, xttime, patientInfo.ID, adminUserInfo.Org.Id)
 	lastWeight, _ := service.MobileGetLast(adminUserInfo.Org.Id, patientInfo.ID, xttime)
+	numberList, _ := service.GetAllBedNumberList(adminUserInfo.Org.Id)
 	if config.IsOpen == 1 {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"users":                   adminUser,
@@ -5708,6 +5712,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 			"lastSchedule":            lastSchedule,
 			"DoctorAdvice":            DoctorAdvice,
 			"hisAdvice":               hisAdvice,
+			"numberList":              numberList,
 		})
 	}
 
@@ -5734,6 +5739,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 			"lastSchedule":            lastSchedule,
 			"DoctorAdvice":            DoctorAdvice,
 			"hisAdvice":               hisAdvice,
+			"numberList":              numberList,
 		})
 	}
 

controllers/patient_dataconfig_api_controller.go

@@ -158,15 +158,15 @@ func (this *PatientDataConfigAPIController) GetSickHistorys() {
 	}
 
 	adminUserInfo := this.GetAdminUserInfo()
-	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
-	if getPatientErr != nil {
-		this.ErrorLog("获取患者信息失败:%v", getPatientErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if patient == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-		return
-	}
+	//patient, _ := service.GetPatientByIDOne(adminUserInfo.CurrentOrgId, patientID)
+	//if getPatientErr != nil {
+	//	this.ErrorLog("获取患者信息失败:%v", getPatientErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//} else if patient == nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+	//	return
+	//}
 
 	records, getRecordsErr := service.GetPatientSickHistory(adminUserInfo.CurrentOrgId, patientID, startTime.Unix(), endTime.Unix())
 	if getRecordsErr != nil {
@@ -198,10 +198,10 @@ func (this *PatientDataConfigAPIController) CreateSickHistory() {
 	guominyaowu_desc := this.GetString("guominyaowu_desc")
 	doctor_id, _ := this.GetInt64("doctor_id")
 
-	if patientID <= 0 || len(content) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
+	//if patientID <= 0 || len(content) == 0 {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
 
 	if len(record_time_str) == 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -213,15 +213,15 @@ func (this *PatientDataConfigAPIController) CreateSickHistory() {
 	checkDate_two, _ := utils.ParseTimeStringToTime("2006-01-02", record_date[0])
 
 	adminUserInfo := this.GetAdminUserInfo()
-	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
-	if getPatientErr != nil {
-		this.ErrorLog("获取患者信息失败:%v", getPatientErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if patient == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-		return
-	}
+	//patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
+	//if getPatientErr != nil {
+	//	this.ErrorLog("获取患者信息失败:%v", getPatientErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//} else if patient == nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+	//	return
+	//}
 
 	now := time.Now().Unix()
 	record := models.XtPatientSickHistory{
@@ -371,15 +371,15 @@ func (this *PatientDataConfigAPIController) GetPhysiqueChecks() {
 	}
 
 	adminUserInfo := this.GetAdminUserInfo()
-	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
-	if getPatientErr != nil {
-		this.ErrorLog("获取患者信息失败:%v", getPatientErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if patient == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-		return
-	}
+	//patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
+	//if getPatientErr != nil {
+	//	this.ErrorLog("获取患者信息失败:%v", getPatientErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//} else if patient == nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+	//	return
+	//}
 
 	records, getRecordsErr := service.GetPatientPhysiqueCheck(adminUserInfo.CurrentOrgId, patientID, startTime.Unix(), endTime.Unix())
 	if getRecordsErr != nil {
@@ -479,15 +479,15 @@ func (this *PatientDataConfigAPIController) CreatePhysiqueCheck() {
 	checkDate_two, _ := utils.ParseTimeStringToTime("2006-01-02", record_date[0])
 
 	adminUserInfo := this.GetAdminUserInfo()
-	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
-	if getPatientErr != nil {
-		this.ErrorLog("获取患者信息失败:%v", getPatientErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if patient == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-		return
-	}
+	//patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
+	//if getPatientErr != nil {
+	//	this.ErrorLog("获取患者信息失败:%v", getPatientErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//} else if patient == nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+	//	return
+	//}
 
 	now := time.Now().Unix()
 	record := models.XtPatientPhysiqueCheck{
@@ -673,15 +673,15 @@ func (this *PatientDataConfigAPIController) ModifyPhysiqueCheck() {
 
 	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", record_time_str)
 	adminUserInfo := this.GetAdminUserInfo()
-	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
-	if getPatientErr != nil {
-		this.ErrorLog("获取患者信息失败:%v", getPatientErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if patient == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-		return
-	}
+	//patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
+	//if getPatientErr != nil {
+	//	this.ErrorLog("获取患者信息失败:%v", getPatientErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//} else if patient == nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+	//	return
+	//}
 	now := time.Now().Unix()
 
 	record := models.XtPatientPhysiqueCheck{

controllers/pharmacy_controller.go

@@ -466,7 +466,6 @@ func (this *PharmacyController) DispensingMedicine() {
 	if orgid == 10480 || orgid == 10188 || orgid == 10217 || orgid == 10164 || orgid == 10666 {
 		//发药逻辑
 
-		fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhhhh尽力")
 		service.DispensingMedicineOne(orgid, patient_id, stime, etime, creater)
 
 		//针对桑植盛康

controllers/print_data_api_controller.go

@@ -38,7 +38,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 	idStrs := strings.Split(schIDStr, ",")
 	adminUserInfo := this.GetAdminUserInfo()
 
-	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 || this.GetAdminUserInfo().CurrentOrgId == 9905 || this.GetAdminUserInfo().CurrentOrgId == 10346 || this.GetAdminUserInfo().CurrentOrgId == 10441 || this.GetAdminUserInfo().CurrentOrgId == 9970 || this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 10495 || this.GetAdminUserInfo().CurrentOrgId == 10013 || this.GetAdminUserInfo().CurrentOrgId == 10014 {
+	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 || this.GetAdminUserInfo().CurrentOrgId == 9905 || this.GetAdminUserInfo().CurrentOrgId == 10346 || this.GetAdminUserInfo().CurrentOrgId == 10441 || this.GetAdminUserInfo().CurrentOrgId == 9970 || this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 10495 || this.GetAdminUserInfo().CurrentOrgId == 10013 || this.GetAdminUserInfo().CurrentOrgId == 10014 || this.GetAdminUserInfo().CurrentOrgId == 10307 {
 		schedules, getScheduleErr := service.GetSchedulesSeven(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 
@@ -135,16 +135,18 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 		name, getScheduleErr := service.GetAllName(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
 		templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
+		numberList, _ := service.GetAllBedNumberList(adminUserInfo.CurrentOrgId)
 		this.ServeSuccessJSON(map[string]interface{}{
 			"schedules":      schedules,
 			"medical_staffs": medicalStaffs,
 			"users":          adminUser,
 			"templateInfo":   templateInfo,
 			"name":           name,
+			"numberList":     numberList,
 		})
 	}
 
-	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 && this.GetAdminUserInfo().CurrentOrgId != 10188 && this.GetAdminUserInfo().CurrentOrgId != 10217 && this.GetAdminUserInfo().CurrentOrgId != 10340 && this.GetAdminUserInfo().CurrentOrgId != 9905 && this.GetAdminUserInfo().CurrentOrgId != 10346 && this.GetAdminUserInfo().CurrentOrgId != 10441 && this.GetAdminUserInfo().CurrentOrgId != 9970 && this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 10495 && this.GetAdminUserInfo().CurrentOrgId != 10013 && this.GetAdminUserInfo().CurrentOrgId != 10014 {
+	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 && this.GetAdminUserInfo().CurrentOrgId != 10188 && this.GetAdminUserInfo().CurrentOrgId != 10217 && this.GetAdminUserInfo().CurrentOrgId != 10340 && this.GetAdminUserInfo().CurrentOrgId != 9905 && this.GetAdminUserInfo().CurrentOrgId != 10346 && this.GetAdminUserInfo().CurrentOrgId != 10441 && this.GetAdminUserInfo().CurrentOrgId != 9970 && this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 10495 && this.GetAdminUserInfo().CurrentOrgId != 10013 && this.GetAdminUserInfo().CurrentOrgId != 10014 && this.GetAdminUserInfo().CurrentOrgId != 10307 {
 
 		schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
@@ -217,13 +219,14 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 		adminUser, _ := service.GetAllAdminUsers(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
 		name, getScheduleErr := service.GetAllName(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
 		templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
-
+		numberList, _ := service.GetAllBedNumberList(adminUserInfo.CurrentOrgId)
 		this.ServeSuccessJSON(map[string]interface{}{
 			"schedules":      schedules,
 			"medical_staffs": medicalStaffs,
 			"users":          adminUser,
 			"templateInfo":   templateInfo,
 			"name":           name,
+			"numberList":     numberList,
 		})
 	}
 

controllers/schedule_api_controller.go

@@ -4548,6 +4548,10 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 			assessmentBeforFourty, _ := service.GetAssessmentBeforFourty(orgId, item.PatientId, item.ScheduleDate)
 			item.XtAssessmentBeforeDislysis = assessmentBeforFourty
 
+			templateList, _ := service.GetHisPrescriptionTemplateList(orgId, item.PatientId, item.ModeId)
+
+			item.HisPrescriptionTemplate = templateList
+
 		}
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -4583,6 +4587,10 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 			assessmentBeforFourty, _ := service.GetAssessmentBeforFourty(orgId, item.PatientId, item.ScheduleDate)
 			item.XtAssessmentBeforeDislysis = assessmentBeforFourty
 
+			templateList, _ := service.GetHisPrescriptionTemplateList(orgId, item.PatientId, item.ModeId)
+
+			item.HisPrescriptionTemplate = templateList
+
 		}
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

controllers/self_drug_api_congtroller.go

@@ -6433,12 +6433,26 @@ func (c *SelfDrugApiController) GetDrugInventoryModePrintList() {
 	//查询本月出库
 	outList, _ := service.GetDrugWarhouseHouseOutInfo(orgId, startTime, endTime)
 
+	//查询本月退库
+	cancelOutInfo, _ := service.GetDrugWarehouseCancelOutInfo(orgId, startTime, endTime)
+
 	drugList, _ := service.GetAllDrugList(orgId)
+
+	warehouseInfoFlow, _ := service.GetDrugMonthWarehouseInfo(orgId, startTime)
+
+	warehouseOutFlow, _ := service.GetDrugMonthWarehouseOutInfo(orgId, startTime)
+
+	cancelFlow, _ := service.GetDrugMonthCancelOutInfo(orgId, startTime)
+
 	c.ServeSuccessJSON(map[string]interface{}{
-		"list":             list,
-		"manufacturerList": manufacturerList,
-		"outList":          outList,
-		"infoList":         infoList,
-		"drugList":         drugList,
+		"list":              list,
+		"manufacturerList":  manufacturerList,
+		"outList":           outList,
+		"infoList":          infoList,
+		"drugList":          drugList,
+		"warehouseInfoFlow": warehouseInfoFlow,
+		"warehouseOutFlow":  warehouseOutFlow,
+		"cancelFlow":        cancelFlow,
+		"cancelOutInfo":     cancelOutInfo,
 	})
 }

controllers/stock_in_api_controller.go

@@ -5060,10 +5060,14 @@ func (this *StockManagerApiController) GetCancelStockOrderPrint() {
 func (this *StockManagerApiController) GetStockBatchNumber() {
 
 	id, _ := this.GetInt64("id")
+	storehouse_id, _ := this.GetInt64("storehouse_id")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	list, _ := service.GetStockBatchNumber(id, orgId)
+	lastWarehouseInfoTwo, _ := service.GetLastWarehouseInfoTwo(id, storehouse_id, orgId)
+
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": list,
+		"list":                 list,
+		"lastWarehouseInfoTwo": lastWarehouseInfoTwo,
 	})
 }
 
@@ -8420,6 +8424,9 @@ func (this *StockManagerApiController) GetStockInventoryModePrintList() {
 	//获取盘亏的数据
 	flowNoProList, _ := service.GetGoodStockFlowNoProList(startTime, endTime, orgId)
 
+	//获取盘点退库
+	CancelFlowList, _ := service.GetCancelStockFlowList(startTime, endTime, orgId)
+
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 
 	//获取期初结余数量
@@ -8441,6 +8448,7 @@ func (this *StockManagerApiController) GetStockInventoryModePrintList() {
 		"warehouseinfo":    warehouseinfo,
 		"warehouseOutInfo": warehouseOutInfo,
 		"cancelInfo":       cancelInfo,
+		"CancelFlowList":   CancelFlowList,
 	})
 
 }

models/device_models.go

@@ -245,6 +245,7 @@ type DeviceNumber struct {
 	CreateTime int64      `gorm:"column:ctime" json:"-"`
 	ModifyTime int64      `gorm:"column:mtime" json:"-"`
 	Sort       int64      `gorm:"column:sort" json:"sort" form:"sort"`
+	NumberType string     `gorm:"column:number_type" json:"number_type" form:"number_type"`
 	DeviceZone DeviceZone `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:ZoneID;"`
 }
 

models/schedule_models.go

@@ -296,6 +296,7 @@ type VmSchedulesRemind struct {
 	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
 	LastAfterWeight            AssessmentAfterDislysis    `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
 	XtDialysisOrderSix         XtDialysisOrderSix         `json:"dialysis_order" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	HisPrescriptionTemplate    HisPrescriptionTemplateSix `json:"his_prescription_template" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId;"`
 }
 
 func (VmSchedulesRemind) TableName() string {
@@ -579,6 +580,7 @@ type GoodInfoNight struct {
 	GoodName          string `gorm:"column:good_name" json:"good_name" form:"good_name"`
 	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
 	GoodTypeId        int64  `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	PackingUnit       string `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 }
 
 func (GoodInfoNight) TableName() string {

models/self_drug_models.go

@@ -986,22 +986,23 @@ func (SgjDrugWarehouseOutInfo) TableName() string {
 }
 
 type PatientDrugWarehouseInfo struct {
-	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"`
-	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"`
-	BatchNumber    string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	DrugName       string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	MaxUnit        string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinUnit        string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	MinNumber      int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	Dose           string `gorm:"column:dose" json:"dose" form:"dose"`
-	DoseUnit       string `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
-	Manufacturer   int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer         int64  `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	SumCount       int64  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	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"`
+	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"`
+	BatchNumber      string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	DrugName         string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	MaxUnit          string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit          string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	MinNumber        int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	Dose             string `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit         string `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	Manufacturer     int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer           int64  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	SumCount         int64  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	WarehousingCount int64  `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
 }
 
 type NewGoodInformation struct {

models/stock_models.go

@@ -1344,6 +1344,7 @@ type PatientWarehouseInfo struct {
 	Remark            string `gorm:"column:remark" json:"remark" form:"remark"`
 	OrgId             int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	StockCount        int64  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	WarehousingCount  int64  `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
 }
 
 func (PatientWarehouseInfo) TableName() string {

service/device_service.go

@@ -393,13 +393,14 @@ func UpdateDeviceGroup(group *models.DeviceGroup) error {
 //////// 机号 Number
 
 type DeviceNumberVM struct {
-	ID      int64  `gorm:"column:id" json:"id"`
-	OrgID   int64  `gorm:"column:org_id" json:"-"`
-	Number  string `gorm:"column:number" json:"number"`
-	ZoneID  int64  `gorm:"column:zone_id" json:"zone_id"`
-	Status  int64  `gorm:"column:status" json:"status" form:"status"`
-	Sort    int64  `gorm:"column:sort" json:"sort" form:"sort"`
-	GroupId int64  `gorm:"column:group_id" json:"group_id" form:"group_id"`
+	ID         int64  `gorm:"column:id" json:"id"`
+	OrgID      int64  `gorm:"column:org_id" json:"-"`
+	Number     string `gorm:"column:number" json:"number"`
+	ZoneID     int64  `gorm:"column:zone_id" json:"zone_id"`
+	Status     int64  `gorm:"column:status" json:"status" form:"status"`
+	Sort       int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	GroupId    int64  `gorm:"column:group_id" json:"group_id" form:"group_id"`
+	NumberType string `gorm:"column:number_type" json:"number_type" form:"number_type"`
 }
 
 func (DeviceNumberVM) TableName() string {
@@ -487,7 +488,7 @@ func GetCreateDeviceNumber(num string, orgid int64) (*models.DeviceNumber, error
 	return &number, nil
 }
 
-func CreateDeviceNumber(orgID int64, number string, zoneID int64, groupID int64, sort int64) (*models.DeviceNumber, error) {
+func CreateDeviceNumber(orgID int64, number string, zoneID int64, groupID int64, sort int64, number_type string) (*models.DeviceNumber, error) {
 	now := time.Now().Unix()
 	numberModel := models.DeviceNumber{
 		OrgID:      orgID,
@@ -498,6 +499,7 @@ func CreateDeviceNumber(orgID int64, number string, zoneID int64, groupID int64,
 		CreateTime: now,
 		ModifyTime: now,
 		Sort:       sort,
+		NumberType: number_type,
 	}
 	err := writeDb.Model(&models.DeviceNumber{}).Create(&numberModel).Error
 	if err != nil {

service/dialysis_solution_service.go

@@ -103,11 +103,17 @@ func GetDialysisAdviceTemplateList(keywords string, limit int64, page int64, par
 		db = db.Joins("JOIN xt_patients AS patient ON patient.id=xt_schedule.patient_id AND patient.status = 1 AND patient.user_org_id = ? AND patient.name Like ?", orgID, keywords)
 		err = db.Count(&total).Offset(offset).Limit(limit).Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Preload("HisDoctorAdvice", "status=1 and user_org_id =? and advice_date =?", orgID, scheduleDate).Find(&schedule).Error
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+			Preload("DialysisSolution", "status=1 and solution_status =1 and user_org_id=?", orgID).
+			Preload("DialysisPrescription", "status=1 and record_date = ?  and user_org_id=?", scheduleDate, orgID).
+			Preload("HisDoctorAdvice", "status=1 and user_org_id =? and advice_date =?", orgID, scheduleDate).Find(&schedule).Error
 	} else {
 		err = db.Count(&total).Offset(offset).Limit(limit).Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Preload("HisDoctorAdvice", "status=1 and user_org_id =? and advice_date =?", orgID, scheduleDate).Find(&schedule).Error
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+			Preload("DialysisSolution", "status=1 and solution_status =1 and user_org_id=?", orgID).
+			Preload("DialysisPrescription", "status=1 and record_date = ?  and user_org_id=?", scheduleDate, orgID).
+			Preload("HisDoctorAdvice", "status=1 and user_org_id =? and advice_date =?", orgID, scheduleDate).Find(&schedule).Error
 	}
 
 	return schedule, total, err

service/mobile_dialysis_service.go

@@ -3261,6 +3261,18 @@ func GetAssessmentBeforFourty(orgid int64, patientid int64, recorddate int64) (m
 	return evaluation, err
 }
 
+func GetHisPrescriptionTemplateList(user_org_id int64, patient_id int64, mode_id int64) (models.HisPrescriptionTemplateSix, error) {
+
+	templateSix := models.HisPrescriptionTemplateSix{}
+	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and mode = ? and status =1", user_org_id, patient_id, mode_id).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ? and type =2", user_org_id).Preload("HisPrescriptionProjectTemplateSeven", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ? and type =3", user_org_id).Preload("GoodInfo", "org_id = ? and status=1 ", user_org_id)
+		})
+	}).Find(&templateSix).Error
+
+	return templateSix, err
+}
+
 func GetAllHisDoctorAdvice(orgid int64, patientid int64, recorddate int64) (his []*models.HisDoctorAdviceInfo, err error) {
 	redis := RedisClient()
 	defer redis.Close()

service/pharmacy_service.go

@@ -563,6 +563,8 @@ func GetManyDrugs(orgid int64, keyword string) (map[int64]models.PharmacyBaseDru
 // 查询(
 func GetTodayMedicine(stime, etime, orgid, is_medicine int64, keyword string) (finlly []*models.ListOfDrugs, err error) {
 	InitDrugidIsNil(orgid, stime, etime)
+
+	fmt.Println("startime==========================", stime)
 	var tmp []*models.TmpLLL
 	if is_medicine == 0 {
 		if keyword != "" {
@@ -879,13 +881,15 @@ func DispensingMedicineOne(orgid, patient_id, stime, etime, creater int64) (err
 	if len(adviceList) > 0 {
 		for _, item := range adviceList {
 
-			pharmacyConfig := IsPharmacyConfig(orgid)
-			if pharmacyConfig == true {
-				//扣减库存
-				err = HisFaDrugsDelivery(orgid, creater, item)
-				if err != nil {
-					err = fmt.Errorf("!:%v", err)
-					return
+			if orgid != 10480 {
+				pharmacyConfig := IsPharmacyConfig(orgid)
+				if pharmacyConfig == true {
+					//扣减库存
+					err = HisFaDrugsDelivery(orgid, creater, item)
+					if err != nil {
+						err = fmt.Errorf("!:%v", err)
+						return
+					}
 				}
 			}
 
@@ -1050,7 +1054,7 @@ func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error)
 	}
 
 	//针对阜阳经沃
-	if orgid != 104801 {
+	if orgid != 10480 {
 		for _, v := range advice_info {
 
 			//扣减库存

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -1,11 +1,12 @@
 package schedule_dialysis
 
 import (
+	"fmt"
+	"time"
+
 	"XT_New/models"
 	p_service "XT_New/service"
 	"XT_New/utils"
-	"fmt"
-	"time"
 
 	"github.com/jinzhu/gorm"
 )
@@ -111,6 +112,12 @@ func GetAllAdminUsers(orgId int64, appid int64) (list []*AdminUserList, err erro
 	return
 }
 
+func GetAllBedNumberList(orgid int64) (number []*models.DeviceNumber, err error) {
+	db := p_service.XTReadDB()
+	err = db.Where("org_id =? and status =1", orgid).Find(&number).Error
+	return number, err
+}
+
 func GetAllName(orgId int64, appid int64) (list []AdminUserListTwo, err error) {
 	db := p_service.UserReadDB()
 	err = db.Table("sgj_user_admin_role as uar").Joins("left join sgj_user_admin as ua on ua.id = uar.admin_user_id").Joins("left join sgj_user_admin_electronic_signature  as e on e.creator = uar.admin_user_id").Where("uar.org_id=? and uar.app_id =? and ua.status=1 and e.status = 1 and e.org_id = ? and e.app_id = ?", orgId, appid, orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type,e.url").Scan(&list).Error

service/self_drug_service.go

@@ -1244,7 +1244,7 @@ func GetDamageByDrugId(drugid int64, warhousingorder string, drugtype int64) (dr
 
 func GetInventoryModeList(orgid int64) (info []*models.PatientDrugWarehouseInfo, err error) {
 
-	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1 and (x.stock_max_number>0 or x.stock_min_number>0)")
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1 and (x.warehousing_count>0)")
 	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
 	fmt.Println(table)
 	if orgid > 0 {
@@ -5292,3 +5292,75 @@ func GetDrugWarhouseHouseOutInfo(org_id int64, start_time int64, end_time int64)
 	return flow, err
 
 }
+
+func GetDrugWarehouseCancelOutInfo(org_id int64, start_time int64, end_time int64) (flow []*models.XtDrugFlowList, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and (consumable_type= 7)")
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime >= ?", start_time)
+	}
+
+	if end_time > 0 {
+		db = db.Where("ctime<=?", end_time)
+	}
+
+	err = db.Find(&flow).Error
+
+	return flow, err
+}
+
+func GetDrugMonthWarehouseInfo(org_id int64, start_time int64) (flow []*models.XtDrugFlowList, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and (consumable_type=1 or consumable_type=10)")
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime < ?", start_time)
+	}
+
+	err = db.Find(&flow).Error
+
+	return flow, err
+}
+
+func GetDrugMonthWarehouseOutInfo(org_id int64, start_time int64) (flow []*models.XtDrugFlowList, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and (consumable_type=2 or consumable_type=3 or consumable_type=11)")
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime < ?", start_time)
+	}
+
+	err = db.Find(&flow).Error
+
+	return flow, err
+}
+
+func GetDrugMonthCancelOutInfo(org_id int64, start_time int64) (flow []*models.XtDrugFlowList, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and (consumable_type=7)")
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime < ?", start_time)
+	}
+
+	err = db.Find(&flow).Error
+
+	return flow, err
+}

service/stock_service.go

@@ -6208,6 +6208,13 @@ func GetLastWarehouseInfo(goodid int64) (models.WarehousingInfo, error) {
 	return info, err
 }
 
+func GetLastWarehouseInfoTwo(goodid int64, storehouse_id int64, user_org_id int64) (models.WarehousingInfo, error) {
+
+	info := models.WarehousingInfo{}
+	err := XTReadDB().Model(&info).Where("good_id = ? and status = 1 and storehouse_id=? and org_id = ?  and stock_count > 0", goodid, storehouse_id, user_org_id).Order("ctime").First(&info).Error
+	return info, err
+}
+
 func GetFirstWarehouseInfo(goodid int64) (models.WarehousingInfo, error) {
 	info := models.WarehousingInfo{}
 	err := XTReadDB().Model(&info).Where("good_id = ? and status = 1", goodid).First(&info).Error
@@ -6932,7 +6939,7 @@ func UpdatedGoodInfo(info models.GoodInfo, goodid int64) error {
 
 func GetInventoryExportList(orgid int64) (info []*models.PatientWarehouseInfo, err error) {
 
-	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1 and x.stock_count>0")
+	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1 and x.warehousing_count>0")
 	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
 	fmt.Println(table)
 	if orgid > 0 {
@@ -8203,7 +8210,7 @@ func AddDrugReturnWarehouseStockMinNumber(count int64, id int64) error {
 
 func UpdateDrugWarehouseInfoTwenty(id int64, info *models.DrugWarehouseInfo) error {
 
-	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"drug_id": info.DrugId, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "warehousing_count": info.WarehousingCount, "price": info.Price, "total_price": info.TotalPrice, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "remark": info.Remark, "retail_price": info.RetailPrice, "max_unit": info.MaxUnit, "min_unit": info.MinUnit, "drug_code": info.DrugCode}).Error
+	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"drug_id": info.DrugId, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "warehousing_count": info.WarehousingCount, "price": info.Price, "total_price": info.TotalPrice, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "remark": info.Remark, "retail_price": info.RetailPrice, "max_unit": info.MaxUnit, "min_unit": info.MinUnit, "drug_code": info.DrugCode, "batch_number": info.BatchNumber}).Error
 	return err
 }
 
@@ -9673,6 +9680,24 @@ func GetGoodStockFlowNoProList(startTime int64, endTime int64, orgId int64) (flo
 	return flow, err
 }
 
+func GetCancelStockFlowList(startTime int64, endTime int64, orgId int64) (flow []*models.VmStockFlow, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and consumable_type = 7")
+
+	if startTime > 0 {
+		db = db.Where("ctime>=?", startTime)
+	}
+	if endTime > 0 {
+		db = db.Where("ctime<=?", endTime)
+	}
+	if orgId > 0 {
+		db = db.Where("user_org_id = ?", orgId)
+	}
+	err = db.Find(&flow).Error
+
+	return flow, err
+}
+
 func GetLastMonthCount(startTime int64, orgId int64) (flow []*models.VmStockFlow, err error) {
 
 	db := XTReadDB().Model(&flow).Where("status=1 and (consumable_type = 1 or consumable_type = 10)")