2024/6/17

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 = 10206 //机构id
+		subscibe.OrgId = 10633 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10206 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10633 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 7421  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10206 //机构id小英9675或4
+		subscibe.OrgId = 10633 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10206 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10633 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 7421  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/dialysis_api_controller.go

@@ -3178,7 +3178,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		}
 
 		//针对孝昌康桥超滤率计算问题
-		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 {
+		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10721 {
 			if assessmentBeforeDislysis.ID == 0 {
 				dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
 				if dialysisPrescribeOne.ID > 0 && assessmentBeforeDislysis.ID > 0 {

controllers/doctors_api_controller.go

@@ -109,6 +109,8 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	config, _ := service.GetHisDoctorConfig(orgID)
 	project_config, _ := service.GetHisProjectConfig(orgID)
 
+	drugs, _ := service.GetAllBaseDrugLibListTwo(orgID)
+
 	if config.IsOpen == 0 || config.IsOpen == 2 {
 		scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way, 0, execution_frequency, keyword)
 		adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
@@ -127,6 +129,7 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 				"adminUser":      adminUser,
 				"config":         config,
 				"project_config": project_config,
+				"drugs":          drugs,
 			})
 		}
 	}
@@ -167,6 +170,7 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 				"project_config": project_config,
 				"project":        project,
 				"drug":           drug,
+				"drugs":          drugs,
 			})
 		}
 	}

controllers/his_api_controller.go

@@ -3197,7 +3197,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 == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 {
+	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 == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -3824,7 +3824,445 @@ func (c *HisApiController) CreateHisPrescription() {
 
 								//查询保存耗材出库开关是否打开
 								if p.PatientId != 30038 {
-									if goodOutConfig.IsOpen == 1 {
+
+									//用机构ID区分
+									if adminInfo.CurrentOrgId != 10721 && adminInfo.CurrentOrgId != 10164 {
+										if goodOutConfig.IsOpen == 1 {
+											//耗材出库
+											if p.Type == 3 {
+
+												//对比当前数据和历史出库数据
+
+												historyProject, _ := service.GetHistoryProject(p.PatientId, p.UserOrgId, p.RecordDate, p.ID, p.ProjectId, tx)
+
+												historyCount, _ := strconv.ParseInt(historyProject.Count, 10, 64)
+
+												nowCount, _ := strconv.ParseInt(p.Count, 10, 64)
+
+												//如果当前处方数量大于历史数据,则需要出库
+												if nowCount > historyCount {
+
+													var cha_count int64
+													cha_count = nowCount - historyCount
+
+													timeStr := time.Now().Format("2006-01-02")
+													timeArr := strings.Split(timeStr, "-")
+													total, _ := service.FindAllWarehouseOut(adminInfo.CurrentOrgId)
+
+													total = total + 1
+													warehousing_out_order := strconv.FormatInt(adminInfo.CurrentOrgId, 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.GetAdminUserInfo().AdminUser.Id
+
+													recordDateStr := time.Now().Format("2006-01-02")
+													recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+													nowtime := recordDate.Unix()
+													warehouseOut := models.WarehouseOut{
+														WarehouseOutOrderNumber: warehousing_out_order,
+														OperationTime:           operation_time,
+														OrgId:                   adminInfo.CurrentOrgId,
+														Creater:                 creater,
+														Ctime:                   time.Now().Unix(),
+														Status:                  1,
+														WarehouseOutTime:        nowtime,
+														Type:                    1,
+														StorehouseId:            storeConfig.StorehouseOutInfo,
+														IsCheck:                 1,
+														IsSys:                   1,
+													}
+													//查询是否生成出库单
+													out, _ := service.FindNewPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime, tx)
+													if out.ID == 0 {
+														service.AddNewSigleWarehouseOut(&warehouseOut, tx)
+													}
+
+													lastOut, _ := service.FindNewLastPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime, tx)
+
+													goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(p.ProjectId, tx)
+													houseConfig, _ := service.GetNewAllStoreHouseConfig(p.UserOrgId, tx)
+
+													dialyPrepareOne := models.DialysisBeforePrepare{
+														GoodTypeId:   goodObj.GoodTypeId,
+														GoodId:       p.ProjectId,
+														PatientId:    p.PatientId,
+														RecordDate:   p.RecordDate,
+														UserOrgId:    adminInfo.CurrentOrgId,
+														Count:        cha_count,
+														Ctime:        time.Now().Unix(),
+														Creater:      creater,
+														Status:       1,
+														StorehouseId: houseConfig.StorehouseOutInfo,
+														ProjectId:    p.ID,
+													}
+													//出库
+													service.ConsumableNewHisPrescriptionDelivery(adminInfo.CurrentOrgId, p.PatientId, p.RecordDate, &dialyPrepareOne, &lastOut, creater, tx)
+
+												}
+
+												//如果当前处方数量小于历史数据，怎需要退库
+												if nowCount < historyCount {
+
+													var cha_count int64
+													cha_count = historyCount - nowCount
+													goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(p.ProjectId, tx)
+													creater := c.GetAdminUserInfo().AdminUser.Id
+
+													newPrescriptionProject := &models.HisPrescriptionProject{
+														ID:                   p.ID,
+														ProjectId:            p.ProjectId,
+														Price:                p.Price,
+														UserOrgId:            p.UserOrgId,
+														Status:               1,
+														Ctime:                time.Now().Unix(),
+														Mtime:                time.Now().Unix(),
+														PatientId:            p.PatientId,
+														HisPatientId:         p.HisPatientId,
+														RecordDate:           p.RecordDate,
+														PrescriptionId:       p.PrescriptionId,
+														Count:                p.Count,
+														FeedetlSn:            p.FeedetlSn,
+														MedListCodg:          p.MedListCodg,
+														SingleDose:           p.SingleDose,
+														DeliveryWay:          p.DeliveryWay,
+														ExecutionFrequency:   p.ExecutionFrequency,
+														Day:                  p.Day,
+														HisProject:           models.HisProject{},
+														GoodInfo:             models.GoodInfo{},
+														Remark:               p.Remark,
+														Unit:                 p.Unit,
+														Type:                 p.Type,
+														Doctor:               p.Doctor,
+														ExecutionTime:        p.ExecutionTime,
+														ExecutionStaff:       p.ExecutionStaff,
+														ExecutionState:       p.ExecutionState,
+														CheckTime:            p.CheckTime,
+														CheckState:           p.CheckState,
+														Checker:              p.Checker,
+														StartTime:            p.StartTime,
+														TeamId:               p.TeamId,
+														XtHisProjectTeam:     models.XtHisProjectTeam{},
+														FrequencyType:        p.FrequencyType,
+														DayCount:             p.DayCount,
+														WeekDay:              p.WeekDay,
+														IsCheckTeam:          p.IsCheckTeam,
+														HisOrderInfo:         models.HisOrderInfo{},
+														ExecutionFrequencyId: p.ExecutionFrequencyId,
+														IsOut:                p.IsOut,
+														YbSyncStatus:         p.YbSyncStatus,
+													}
+
+													service.NewHisGoodCancelInfo(adminInfo.CurrentOrgId, creater, newPrescriptionProject, cha_count, goodObj, tx)
+
+													service.NewHisGoodAutoCancelInfo(adminInfo.CurrentOrgId, creater, newPrescriptionProject, cha_count, goodObj, tx)
+
+												}
+
+												if nowCount == historyCount {
+													if historyCount == 0 {
+														recordDateStr := time.Now().Format("2006-01-02")
+														recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+														nowtime := recordDate.Unix()
+														lastOut, _ := service.FindNewLastPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime, tx)
+														goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(p.ProjectId, tx)
+														houseConfig, _ := service.GetNewAllStoreHouseConfig(p.UserOrgId, tx)
+														creater := c.GetAdminUserInfo().AdminUser.Id
+														dialyPrepareOne := models.DialysisBeforePrepare{
+															GoodTypeId:   goodObj.GoodTypeId,
+															GoodId:       p.ProjectId,
+															PatientId:    p.PatientId,
+															RecordDate:   p.RecordDate,
+															UserOrgId:    adminInfo.CurrentOrgId,
+															Count:        nowCount,
+															Ctime:        time.Now().Unix(),
+															Creater:      creater,
+															Status:       1,
+															StorehouseId: houseConfig.StorehouseOutInfo,
+															ProjectId:    p.ID,
+														}
+														//出库
+														service.ConsumableNewHisPrescriptionDelivery(adminInfo.CurrentOrgId, p.PatientId, p.RecordDate, &dialyPrepareOne, &lastOut, creater, tx)
+													}
+												}
+
+												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 {
+													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)
+												//	//查询默认出库仓库库存
+												//	storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
+												//	if len(wareOut) > 0 {
+												//
+												//		for _, it := range wareOut {
+												//			//回退库存
+												//			service.ModifyGoodWarehouseInfo(it.GoodId, it.WarehouseInfotId, it.OrgId, it.Count)
+												//
+												//			//删除出库记录
+												//			service.DeleteGoodWarehouseOutInfo(it.GoodId, it.SysRecordTime, it.OrgId, it.ProjectId)
+												//
+												//		}
+												//	}
+												//
+												//	timeStr := time.Now().Format("2006-01-02")
+												//	timeArr := strings.Split(timeStr, "-")
+												//	total, _ := service.FindAllWarehouseOut(adminInfo.CurrentOrgId)
+												//
+												//	total = total + 1
+												//	warehousing_out_order := strconv.FormatInt(adminInfo.CurrentOrgId, 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.GetAdminUserInfo().AdminUser.Id
+												//
+												//	recordDateStr := time.Now().Format("2006-01-02")
+												//	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+												//	nowtime := recordDate.Unix()
+												//	warehouseOut := models.WarehouseOut{
+												//		WarehouseOutOrderNumber: warehousing_out_order,
+												//		OperationTime:           operation_time,
+												//		OrgId:                   adminInfo.CurrentOrgId,
+												//		Creater:                 creater,
+												//		Ctime:                   time.Now().Unix(),
+												//		Status:                  1,
+												//		WarehouseOutTime:        nowtime,
+												//		Type:                    1,
+												//		StorehouseId:            storeConfig.StorehouseOutInfo,
+												//		IsCheck:                 1,
+												//		IsSys:                   1,
+												//	}
+												//	//查询是否生成出库单
+												//	out, _ := service.FindNewPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime, tx)
+												//	if out.ID == 0 {
+												//		service.AddNewSigleWarehouseOut(&warehouseOut, tx)
+												//	}
+												//
+												//	lastOut, _ := service.FindNewLastPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime, tx)
+												//
+												//	goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(p.ProjectId, tx)
+												//	houseConfig, _ := service.GetNewAllStoreHouseConfig(p.UserOrgId, tx)
+												//
+												//	dialyPrepareOne := models.DialysisBeforePrepare{
+												//		GoodTypeId:   goodObj.GoodTypeId,
+												//		GoodId:       p.ProjectId,
+												//		PatientId:    p.PatientId,
+												//		RecordDate:   p.RecordDate,
+												//		UserOrgId:    adminInfo.CurrentOrgId,
+												//		Count:        parseIntCount,
+												//		Ctime:        time.Now().Unix(),
+												//		Creater:      creater,
+												//		Status:       1,
+												//		StorehouseId: houseConfig.StorehouseOutInfo,
+												//		ProjectId:    lastHisProject.ID,
+												//	}
+												//	//判断是否是零用耗材(非零用)
+												//	if goodObj.IsUse == 2 || goodObj.IsUse == 0 {
+												//
+												//		//查询历史出库数据
+												//		flowGood, _ := service.GetNewStockFlowIsBatchNumberSeventy(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID, tx)
+												//		var out_count int64
+												//		for _, item := range flowGood {
+												//			out_count += item.Count
+												//		}
+												//		//如果历史数和当前数据不想等才进行退库出库
+												//		if out_count != parseIntCount {
+												//			service.ConsumableNewPrescriptionDelivery(adminInfo.CurrentOrgId, p.PatientId, p.RecordDate, &dialyPrepareOne, &lastOut, creater, parseIntCount, tx)
+												//
+												//			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)
+												//
+												//			//查询剩余库存
+												//			goodList, _ := service.GetNewAllGoodSumCount(p.ProjectId, adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, tx)
+												//			var sum_count int64
+												//			for _, item := range goodList {
+												//				sum_count += item.StockCount
+												//			}
+												//
+												//			//更新剩余库存
+												//			service.UpdateNewGoodFlushCount(houseConfig.StorehouseOutInfo, p.ProjectId, adminInfo.CurrentOrgId, sum_count, tx)
+												//
+												//			//耗材
+												//			service.UpdateNewGoodSumCountSeven(sum_count, p.ProjectId, adminInfo.CurrentOrgId, tx)
+												//
+												//		}
+												//		//判断是否是零用耗材(零用但是是出库耗材)
+												//		if goodObj.IsUse == 1 && goodObj.IsWarehouse == 1 {
+												//
+												//			//查询历史出库数据
+												//			flowGood, _ := service.GetStockFlowIsBatchNumberSeventy(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID)
+												//			var out_count int64
+												//			for _, item := range flowGood {
+												//				out_count += item.Count
+												//			}
+												//			//如果历史数和当前数据不想等才进行退库出库
+												//			if out_count != parseIntCount {
+												//				service.ConsumableNewPrescriptionDelivery(adminInfo.CurrentOrgId, p.PatientId, p.RecordDate, &dialyPrepareOne, &lastOut, creater, parseIntCount, tx)
+												//
+												//				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:               p.ID,
+												//					StorehouseId:            0,
+												//				}
+												//
+												//				service.CreateNewAutoDetail(detail, tx)
+												//
+												//				//查询剩余库存
+												//				goodList, _ := service.GetNewAllGoodSumCount(p.ProjectId, adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, tx)
+												//				var sum_count int64
+												//				for _, item := range goodList {
+												//					sum_count += item.StockCount
+												//				}
+												//
+												//				//更新剩余库存
+												//				service.UpdateNewGoodFlushCount(houseConfig.StorehouseOutInfo, p.ProjectId, adminInfo.CurrentOrgId, sum_count, tx)
+												//
+												//				//耗材
+												//				service.UpdateNewGoodSumCountSeven(sum_count, p.ProjectId, adminInfo.CurrentOrgId, tx)
+												//			}
+												//
+												//		}
+												//
+												//	}
+												//
+												//}
+
+												//记录日志
+												byterequest, _ := json.Marshal(p)
+												adviceLog := models.XtDoctorAdviceLog{
+													UserOrgId:   p.UserOrgId,
+													PatientId:   p.PatientId,
+													AdminUserId: adminInfo.AdminUser.Id,
+													Module:      1,
+													ErrLog:      string(byterequest),
+													Status:      1,
+													Ctime:       time.Now().Unix(),
+													Mtime:       0,
+													Source:      "电脑端新建his项目",
+													RecordDate:  p.RecordDate,
+												}
+												service.CreateDoctorAdviceLog(adviceLog)
+
+												projectList = append(projectList, p)
+
+												if p.Type == 2 { //因为项目和耗材的基础库存在id相同的情况，所以需要根据该字段来判断，type为2的话为从项目开出来的
+													//新增或者编辑项目，修改对应的标签数据
+													labelOrigin, _ := service.GetProjectById(p.UserOrgId, p.ID, patient_id, recordDateTime)
+													if labelOrigin.ID == 0 { //当天某个人的处方中的项目不存在
+														var label models.HisLabelPrintInfo
+														project, _ := service.GetProjectDetail(p.ProjectId)
+														if project.CostClassify == 3 { //类别为检验检查
+															if p.TeamId > 0 { //检验检查组套
+																tempLabel, _ := service.GetProjectByTeamId(p.UserOrgId, p.TeamId, patient_id, recordDateTime)
+																if tempLabel.ID == 0 {
+																	team, _ := service.GetProjectTeamDetail(p.TeamId)
+																	label.Number = tempPrescription.PrescriptionNumber
+																	label.ProjectId = project.ID
+																	label.Status = 1
+																	label.IsPrint = 2
+																	label.DoctorId = info.DoctorId
+																	label.UserOrgId = p.UserOrgId
+																	label.PatientId = patient_id
+																	label.RecordDate = recordDateTime
+																	label.Ctime = time.Now().Unix()
+																	label.Mtime = time.Now().Unix()
+																	label.ItemId = p.TeamId
+																	label.FeedetlSn = p.FeedetlSn
+																	label.PProjectId = p.ID
+																	label.ProjectName = team.ProjectTeam
+																	label.PatientName = patient.Name
+																	service.CreateNewHisLabelRecord(&label, tx)
+																}
+															} else { //单条检验检查项目
+																label.Number = tempPrescription.PrescriptionNumber
+																label.ProjectId = project.ID
+																label.Status = 1
+																label.DoctorId = info.DoctorId
+																label.UserOrgId = p.UserOrgId
+																label.PatientId = patient_id
+																label.RecordDate = recordDateTime
+																label.IsPrint = 2
+																label.Ctime = time.Now().Unix()
+																label.Mtime = time.Now().Unix()
+																label.FeedetlSn = p.FeedetlSn
+																label.PProjectId = p.ID
+																label.ItemId = p.TeamId
+																label.ProjectName = project.ProjectName
+																label.PatientName = patient.Name
+																service.CreateNewHisLabelRecord(&label, tx)
+															}
+														}
+													}
+												}
+
+											}
+										}
+									}
+
+									if adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10164 {
+
 										//耗材出库
 										if p.Type == 3 {
 
@@ -3836,9 +4274,6 @@ 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 {
 
@@ -3998,9 +4433,6 @@ func (c *HisApiController) CreateHisPrescription() {
 											}
 											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)
@@ -4262,6 +4694,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 										}
 									}
+
 								}
 
 								//插入检验数据

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -960,7 +960,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		}
 
 		//针对患者称重两次没有数据的问题
-		if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10723 {
+		if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10723 || adminUserInfo.Org.Id == 10721 {
 
 			dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 			lastDialysisPrescription, _ := service.GetLastDialysisPrescription(id, adminUserInfo.Org.Id)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -6469,6 +6469,8 @@ func (c *DialysisAPIController) CreateConsumables() {
 			}
 		}
 
+		fmt.Println("active-----------------------", active)
+		fmt.Println("len(goods)-----------------------", len(goods))
 		//新增
 		if active == 1 && len(goods) > 0 {
 			for _, item := range dialysisBefor {

controllers/patient_dataconfig_api_controller.go

@@ -262,15 +262,15 @@ func (this *PatientDataConfigAPIController) DeleteSickHistory() {
 	}
 
 	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
+	//}
 
 	recordIDStrs := strings.Split(idsStr, ",")
 	recordIDs := make([]int64, 0, len(recordIDStrs))
@@ -312,17 +312,16 @@ func (this *PatientDataConfigAPIController) ModifySickHistory() {
 	//loc, _ := time.LoadLocation("Local")
 	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", record_time_str)
 
-	fmt.Println("checkDate--------------", checkDate)
 	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()
 

models/stock_models.go

@@ -344,17 +344,29 @@ func (WarehouseOutInfoNight) TableName() string {
 }
 
 type WarehouseOutInfoSeven struct {
-	ID            int64 `gorm:"column:id" json:"id"`
-	Count         int64 `gorm:"column:count" json:"count"`
-	SysRecordTime int64 `gorm:"column:sys_record_time" json:"sys_record_time"`
-	PatientId     int64 `gorm:"column:patient_id" json:"patient_id"`
-	GoodId        int64 `gorm:"column:good_id" json:"good_id"`
+	ID            int64                  `gorm:"column:id" json:"id"`
+	Count         int64                  `gorm:"column:count" json:"count"`
+	SysRecordTime int64                  `gorm:"column:sys_record_time" json:"sys_record_time"`
+	PatientId     int64                  `gorm:"column:patient_id" json:"patient_id"`
+	GoodId        int64                  `gorm:"column:good_id" json:"good_id"`
+	GoodInfo      XtGoodInformationTenty `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
 }
 
 func (WarehouseOutInfoSeven) TableName() string {
 	return "xt_warehouse_out_info"
 }
 
+type XtGoodInformationTenty struct {
+	ID         int64 `gorm:"column:id" json:"id" form:"id"`
+	GoodTypeId int64 `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	Status     int64 `gorm:"column:status" json:"status" form:"status"`
+	OrgId      int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+}
+
+func (XtGoodInformationTenty) TableName() string {
+	return "xt_good_information"
+}
+
 type SalesReturn struct {
 	ID           int64  `gorm:"column:id" json:"id"`
 	OrderNumber  string `gorm:"column:order_number" json:"order_number"`

service/mobile_dialysis_service.go

@@ -3127,7 +3127,7 @@ func GetPatientAutoMatic(patient_id int64, orgID int64, record_time int64, good_
 
 func GetAllWarehouseOutSumList(patient_id int64, orgID int64, record_time int64) (info []*models.WarehouseOutInfoSeven, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and org_id = ? and sys_record_time = ? and status = 1", patient_id, orgID, record_time).Find(&info).Error
+	err = XTReadDB().Where("patient_id = ? and org_id = ? and sys_record_time = ? and status = 1", patient_id, orgID, record_time).Preload("GoodInfo", "status=1 and org_id = ?", orgID).Find(&info).Error
 	return info, err
 }
 

service/self_drug_service.go

@@ -600,6 +600,13 @@ func GetAllBaseDrugLibList(org_id int64) (drugs []*Drugs, err error) {
 	return
 }
 
+func GetAllBaseDrugLibListTwo(org_id int64) (drugs []*Drugs, err error) {
+
+	err = readDb.Model(&models.BaseDrugLib{}).Where("org_id = ?  AND status = 1", org_id).Find(&drugs).Error
+
+	return drugs, err
+}
+
 type PrivateDrug struct {
 	DrugName           string         `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
 	ID                 int64          `gorm:"column:id" json:"id" form:"id"`

service/statistis_qc_service.go

@@ -126,7 +126,7 @@ func GetDialysisStats(start int64, end int64, mode int64, org_id int64, time_way
         JOIN
             xt_treatment_mode t ON p.mode_id = t.mode_id
         WHERE
-            FROM_UNIXTIME(p.record_date) >= ? AND FROM_UNIXTIME(p.record_date) <= ? AND p.user_org_id = ? and p.mode_id = ?
+            FROM_UNIXTIME(p.record_date) >= ? AND FROM_UNIXTIME(p.record_date) <= ? AND p.user_org_id = ? and p.mode_id = ? and p.status=1
         GROUP BY
            日期
     `, strings.Join(selectClauses, ", "))
@@ -141,7 +141,7 @@ func GetDialysisStats(start int64, end int64, mode int64, org_id int64, time_way
         JOIN
             xt_treatment_mode t ON p.mode_id = t.mode_id
         WHERE
-            FROM_UNIXTIME(p.record_date) >= ? AND FROM_UNIXTIME(p.record_date) <= ? AND p.user_org_id = ? 
+            FROM_UNIXTIME(p.record_date) >= ? AND FROM_UNIXTIME(p.record_date) <= ? AND p.user_org_id = ? and p.status=1
         GROUP BY
            日期
     `, strings.Join(selectClauses, ", "))

service/stock_service.go

@@ -9796,7 +9796,7 @@ func GetHisDrugCodeQuery(orgId int64, start_time int64, end_time int64, limit in
 		db = db.Where("is_upload = 2 or is_upload =0")
 	}
 	err = db.Count(&total).Offset(offset).Limit(limit).Order("record_date desc").Find(&list).Error
-
+	fmt.Println("totla====================", total)
 	return list, total, err
 }