历史排班

controllers/drug_stock_api_contorller.go

@@ -241,7 +241,7 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 
 				warehouseInfo := &models.DrugWarehouseInfo{
 					ID:               id,
-					WarehousingOrder: warehousing.WarehousingOrder,
+					WarehousingOrder: info.WarehousingOrder,
 					WarehousingId:    info.ID,
 					DrugId:           drug_id,
 					Number:           number,

controllers/his_api_controller.go

@@ -104,6 +104,30 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/changeorderdesc", &HisApiController{}, "get:ChangeOrderDesc")
 
+	beego.Router("/api/getfapiaonumber", &HisApiController{}, "get:GetFaPiaoNumber")
+
+}
+func (c *HisApiController) GetFaPiaoNumber() {
+	max_order, _ := service.GetLastHisOrderTwo(c.GetAdminUserInfo().CurrentOrgId)
+	count, _ := strconv.ParseInt(max_order.FaPiaoNumber, 10, 64)
+	fmt.Println(count)
+	var zero string
+	number := count + 1
+	if number >= 1000 {
+		zero = "0000" + strconv.FormatInt(number, 10)
+	} else if number >= 10000 {
+		zero = "000" + strconv.FormatInt(number, 10)
+	} else if number >= 100000 {
+		zero = "00" + strconv.FormatInt(number, 10)
+	} else if number >= 1000000 {
+		zero = "0" + strconv.FormatInt(number, 10)
+	} else {
+		zero = strconv.FormatInt(number, 10)
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"fapiao_number": zero,
+	})
+	return
 }
 func (c *HisApiController) ChangeOrderDesc() {
 	id, _ := c.GetInt64("id")
@@ -3859,8 +3883,8 @@ func (c *HisApiController) DeletePrescription() {
 					if item.Type == 3 && item.IsOut == 1 {
 						good, _ := service.FindGoodInfoByIdTwo(item.ProjectId)
 						f_count, _ := strconv.ParseFloat(item.Count, 64)
-						//good.Total = good.Total + f_count
-						//service.UpdateGoodInfo(&good)
+						good.Total = good.Total + f_count
+						service.UpdateGoodInfo(&good)
 						operation_time := time.Now().Unix()
 						creater := c.GetAdminUserInfo().AdminUser.Id
 						//创建退库单
@@ -3977,21 +4001,6 @@ func (c *HisApiController) DeletePrescription() {
 								service.UpdateSumAddCancelCount(c.GetAdminUserInfo().CurrentOrgId, item.ProjectId, houseConfig.StorehouseOutInfo, total_count)
 								//出库数量减少
 								service.UpdateSumCount(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId, total_count)
-
-								//防止先出库 后开药的情况,查找当天是否出库完全
-								numberList, _ := service.GetHisPrescriptionNumberList(item.ProjectId, item.RecordDate, c.GetAdminUserInfo().CurrentOrgId, item.PatientId)
-								if len(numberList) == 0 {
-									infor, _ := service.GetWarehouseOutnfoByProjectId(item.ProjectId, item.RecordDate, c.GetAdminUserInfo().CurrentOrgId, item.PatientId)
-
-									for _, item := range infor {
-										//退库数量
-										service.UpdateWarehouseInfoByProject(item.ProjectId, item.WarehouseInfotId, c.GetAdminUserInfo().CurrentOrgId, item.Count)
-									}
-
-									//清空数据表
-									service.UpdateWarehouseInfoByPatientId(item.ProjectId, item.RecordDate, c.GetAdminUserInfo().CurrentOrgId, item.PatientId)
-
-								}
 							}
 
 							if info.Count < total_count {
@@ -4098,20 +4107,6 @@ func (c *HisApiController) DeletePrescription() {
 							//更新基础库库存
 							service.UpdateGoodInfoSumCountSix(item.ProjectId, flush_count, c.GetAdminUserInfo().CurrentOrgId)
 
-							//防止先出库 后开药的情况,查找当天是否出库完全
-							numberList, _ := service.GetHisPrescriptionNumberList(item.ProjectId, item.RecordDate, c.GetAdminUserInfo().CurrentOrgId, item.PatientId)
-							if len(numberList) == 0 {
-								infor, _ := service.GetWarehouseOutnfoByProjectId(item.ProjectId, item.RecordDate, c.GetAdminUserInfo().CurrentOrgId, item.PatientId)
-
-								for _, item := range infor {
-									//退库数量
-									service.UpdateWarehouseInfoByProject(item.ProjectId, item.WarehouseInfotId, c.GetAdminUserInfo().CurrentOrgId, item.Count)
-								}
-
-								//清空数据表
-								service.UpdateWarehouseInfoByPatientId(item.ProjectId, item.RecordDate, c.GetAdminUserInfo().CurrentOrgId, item.PatientId)
-
-							}
 						}
 
 					}
@@ -4168,7 +4163,8 @@ func (c *HisApiController) DeletePrescription() {
 					for _, it := range goodList {
 						flush_count += it.StockCount
 					}
-
+					fmt.Println("历史出库数据", info.Count)
+					fmt.Println("出库数量", total_count)
 					if info.ID > 0 {
 						cancelStockInfo := models.CancelStockInfo{
 							GoodId:          item.ProjectId,
@@ -4214,6 +4210,7 @@ func (c *HisApiController) DeletePrescription() {
 									flush_count_one += it.StockCount
 								}
 								//查询该批次是否有退库数据
+								//flow, _ := service.GetWarehouseStockFlow(it.WarehouseInfotId, it.GoodId, c.GetAdminUserInfo().CurrentOrgId, it.PatientId, it.SysRecordTime)
 								creater := c.GetAdminUserInfo().AdminUser.Id
 
 								flow := models.VmStockFlow{
@@ -4251,10 +4248,48 @@ func (c *HisApiController) DeletePrescription() {
 								}
 								service.CreateStockFlowOne(flow)
 
+								//if flow.ID > 0 {
+								//	service.AddCountFlowOne(it.WarehouseInfotId, it.GoodId, c.GetAdminUserInfo().CurrentOrgId, it.PatientId, it.Count, it.SysRecordTime, flush_count_one)
+								//}
 							}
 
 						}
 
+						//flow := models.VmStockFlow{
+						//	WarehousingId:           info.WarehouseInfotId,
+						//	GoodId:                  item.ProjectId,
+						//	Number:                  info.Number,
+						//	LicenseNumber:           info.LicenseNumber,
+						//	Count:                   prescribingNumber,
+						//	UserOrgId:               c.GetAdminUserInfo().CurrentOrgId,
+						//	PatientId:               item.PatientId,
+						//	SystemTime:              info.SysRecordTime,
+						//	ConsumableType:          7,
+						//	IsSys:                   0,
+						//	WarehousingOrder:        "",
+						//	WarehouseOutId:          info.WarehouseOutId,
+						//	WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+						//	IsEdit:                  0,
+						//	CancelStockId:           cancel.ID,
+						//	CancelOrderNumber:       cancel.OrderNumber,
+						//	Manufacturer:            manufacturer.ID,
+						//	Dealer:                  0,
+						//	Creator:                 c.GetAdminUserInfo().CurrentOrgId,
+						//	UpdateCreator:           0,
+						//	Status:                  1,
+						//	Ctime:                   time.Now().Unix(),
+						//	Mtime:                   0,
+						//	Price:                   info.Price,
+						//	WarehousingDetailId:     info.WarehouseInfotId,
+						//	WarehouseOutDetailId:    info.ID,
+						//	CancelOutDetailId:       cancelInfo.ID,
+						//	ProductDate:             info.ProductDate,
+						//	ExpireDate:              info.ExpiryDate,
+						//	StorehouseId:            houseConfig.StorehouseOutInfo,
+						//	OverCount:               flush_count,
+						//}
+						//service.CreateStockFlowOne(flow)
+
 						//退库数量增加
 						service.UpdateSumAddCancelCount(c.GetAdminUserInfo().CurrentOrgId, item.ProjectId, houseConfig.StorehouseOutInfo, total_count)
 						//出库数量减少
@@ -4263,13 +4298,11 @@ func (c *HisApiController) DeletePrescription() {
 						//查询已出库数量
 						dialysisInfo, _ := service.GetGoodDialysisOutInfoSix(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, item.ProjectId)
 
-						//如果当前处方数量 小于 出库数量
 						if prescribingNumber < dialysisInfo.Count {
 							//改变数量
 							service.UpdateAutoGood(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, item.ProjectId, item.ID, prescribingNumber)
 						}
 
-						//如果当前处方数量 大于或者等于出库数量
 						if prescribingNumber >= dialysisInfo.Count {
 							//删除出库表
 							service.DeleteAutoRedeceDetailTwenty(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, item.ProjectId, item.ID)
@@ -4283,7 +4316,7 @@ func (c *HisApiController) DeletePrescription() {
 
 						//更新库存
 						msgerrkonde := service.UpdateSumGood(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId, flush_count_one)
-						fmt.Println("msgerrkonde", msgerrkonde)
+						fmt.Println("msgerrkonde23332323", msgerrkonde)
 
 						//更新基础库库存
 						service.UpdateGoodInfoReduceSumCount(item.ProjectId, flush_count_one, c.GetAdminUserInfo().CurrentOrgId)
@@ -6802,23 +6835,6 @@ func (c *HisApiController) GetUploadInfo() {
 	tmp_decimal := c.GetString("tmp_decimal")
 
 	//last_order, _ := service.GetLastHisOrderThree(c.GetAdminUserInfo().CurrentOrgId)
-	max_order, _ := service.GetLastHisOrderTwo(c.GetAdminUserInfo().CurrentOrgId)
-	count, _ := strconv.ParseInt(max_order.FaPiaoNumber, 10, 64)
-	fmt.Println(count)
-	var zero string
-	number := count + 1
-	if number >= 1000 {
-		zero = "0000" + strconv.FormatInt(number, 10)
-	} else if number >= 10000 {
-		zero = "000" + strconv.FormatInt(number, 10)
-	} else if number >= 100000 {
-		zero = "00" + strconv.FormatInt(number, 10)
-	} else if number >= 1000000 {
-		zero = "0" + strconv.FormatInt(number, 10)
-	} else {
-		zero = strconv.FormatInt(number, 10)
-	}
-	fapiao_number = zero
 
 	var decimal float64 //本次使用的押金
 	var errmsg error

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -437,6 +437,12 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.DialysisDurationMinute = 0
 				newprescribe.BloodAccess = dialysisSolution.BloodAccess
 			}
+
+			if adminUserInfo.Org.Id == 10445 {
+				lastDialysisPrescription, _ := service.GetLastDialysisPrescription(id, adminUserInfo.Org.Id)
+				newprescribe.Remark = lastDialysisPrescription.Remark
+			}
+
 			//插入透析处方
 			err := service.AddSigleRecord(&newprescribe)
 
@@ -538,6 +544,11 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 					newprescribe.DialysisDurationMinute = 0
 					newprescribe.BloodAccess = dialysisSolution.BloodAccess
 				}
+
+				if adminUserInfo.Org.Id == 10445 {
+					lastDialysisPrescription, _ := service.GetLastDialysisPrescription(id, adminUserInfo.Org.Id)
+					newprescribe.Remark = lastDialysisPrescription.Remark
+				}
 				err := service.AddSigleRecord(&newprescribe)
 
 				//记录日志
@@ -629,6 +640,10 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 					newprescribe.DialysisDurationMinute = 0
 					newprescribe.BloodAccess = dialysisSolution.BloodAccess
 				}
+				if adminUserInfo.Org.Id == 10445 {
+					lastDialysisPrescription, _ := service.GetLastDialysisPrescription(id, adminUserInfo.Org.Id)
+					newprescribe.Remark = lastDialysisPrescription.Remark
+				}
 				err := service.AddSigleRecord(&newprescribe)
 
 				//记录日志
@@ -671,7 +686,10 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.DewaterAmount = dewater_amount
 				newprescribe.TargetUltrafiltration = dewater_amount
 				newprescribe.Status = 1
-
+				if adminUserInfo.Org.Id == 10445 {
+					lastDialysisPrescription, _ := service.GetLastDialysisPrescription(id, adminUserInfo.Org.Id)
+					newprescribe.Remark = lastDialysisPrescription.Remark
+				}
 				err := service.AddSigleRecord(&newprescribe)
 				//记录日志
 				byterequest, _ := json.Marshal(newprescribe)
@@ -713,6 +731,10 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			if adminUserInfo.Org.Id == 10340 {
 				dialysisPrescribe.TargetUltrafiltration = 0
 			}
+			if adminUserInfo.Org.Id == 10445 {
+				lastDialysisPrescription, _ := service.GetLastDialysisPrescription(id, adminUserInfo.Org.Id)
+				dialysisPrescribe.Remark = lastDialysisPrescription.Remark
+			}
 			updateErr := service.UpDateDialysisPrescription(dialysisPrescribe)
 			//记录日志
 			byterequest, _ := json.Marshal(dialysisPrescribe)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -600,6 +600,8 @@ func (this *DialysisAPIController) DialysisRecord() {
 	if remind_config.ID > 0 && remind_config.IsOpen == 1 {
 		remind_lists, _ = service.GetAllInspectionRemind(adminInfo.Org.Id, patientID)
 	}
+
+	lastDialysisPrescription, _ := service.GetLastDialysisPrescription(patientID, adminInfo.Org.Id)
 	returnData := map[string]interface{}{
 		"patient":                        patient,
 		"schedual":                       schedual,
@@ -634,6 +636,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 		"prescription_open":              prescriptionConfig.IsOpen,
 		"lastOrder":                      lastOrder,
 		"remind_lists":                   remind_lists,
+		"lastDialysisPrescription":       lastDialysisPrescription,
 	}
 
 	this.ServeSuccessJSON(returnData)

controllers/stock_in_api_controller.go

@@ -1363,6 +1363,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 			}
 		}
 	}
+	fmt.Println("warehouseOut_id", warehouseOut_id)
 	if warehouseOut_id == 0 {
 		//查询是否生成出库单
 		_, errcodes := service.FindStockOutByIsSys(adminUserInfo.CurrentOrgId, 0, operation_time)
@@ -1370,6 +1371,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 			service.AddSigleWarehouseOut(&warehouseOut)
 		}
 	}
+
 	if warehouseOut_id > 0 {
 		service.UpdateSingleWarehoseOut(warehouseOut_id, storehouse_id)
 	}

service/stock_service.go

@@ -5553,7 +5553,7 @@ func DeleteDrugAutoWarehouseSeven(drugid int64, patient_id int64, record_time in
 
 	err := XTWriteDB().Model(models.DrugAutomaticReduceDetail{}).Where("drug_id = ? and patient_id = ? and record_time = ? and status = 1 and advice_id = ?", drugid, patient_id, record_time, advice_id).Updates(map[string]interface{}{"status": 0}).Error
 	//err = XTWriteDB().Model(models.DrugWarehouseOutInfo{}).Where("drug_id = ? and patient_id = ? and sys_record_time = ? and status = 1 and advice_id = ?", drugid, patient_id, record_time, advice_id).Updates(map[string]interface{}{"status": 0}).Error
-	//err = XTWriteDB().Model(models.DrugFlow{}).Where("drug_id = ? and patient_id = ? and system_time = ? and status = 1 and advice_id = ?", drugid, patient_id, record_time, advice_id).Updates(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(models.DrugFlow{}).Where("drug_id = ? and patient_id = ? and system_time = ? and status = 1 and advice_id = ?", drugid, patient_id, record_time, advice_id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }