历史排班

controllers/dialysis_record_api_controller.go

@@ -415,6 +415,9 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 
 	//统计表
 	dryWeightList, _ := service.GetPatientDryWeight(adminInfo.CurrentOrgId, patientID)
+
+	allDoctor, _ := service.GetAllDoctor(adminInfo.CurrentOrgId, adminInfo.CurrentAppId)
+
 	if getDryErr != nil {
 		this.ErrorLog("获取最后一条干体重失败:%v", getDryErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -470,6 +473,7 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 			"is_advice_open":              adviceConfig,
 			"lastOrder":                   lastOrder,
 			"dryWeightList":               dryWeightList,
+			"docList":                     allDoctor,
 		}
 		this.ServeSuccessJSON(returnData)
 
@@ -508,6 +512,7 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 			"is_advice_open":              adviceConfig,
 			"lastOrder":                   lastOrder,
 			"dryWeightList":               dryWeightList,
+			"docList":                     allDoctor,
 		}
 		this.ServeSuccessJSON(returnData)
 	}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -6079,11 +6079,10 @@ func (c *DialysisAPIController) EditConsumables() {
 					}
 				}
 
-				fmt.Println("lnet---------------------------", len(outbefor))
 				if len(outbefor) > 0 {
 					//出库
 					for _, item := range outbefor {
-						fmt.Println("出库ID", item.GoodId)
+
 						var last_total int64
 						//1.查看该患者该耗材型号最后一次出库数量
 						goodInfoOne, _ := service.GetLastGoodListByPatientIdOne(record_time, patient_id, item.GoodId, item.GoodTypeId)
@@ -6140,7 +6139,6 @@ func (c *DialysisAPIController) EditConsumables() {
 							//1.查看该患者该耗材型号最后一次出库数量
 							goodInfoTwo, _ := service.GetLastGoodListByPatientIdOne(record_time, patient_id, item.GoodId, item.GoodTypeId)
 
-							fmt.Println("count2323323222323wi", item.Count)
 							prepare := models.DialysisBeforePrepare{
 								UserOrgId:    adminInfo.Org.Id,
 								PatientId:    patient_id,

controllers/patient_api_controller.go

@@ -2382,6 +2382,20 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 
 					if medical.IsUse == 1 {
+						drugError := models.XtDrugError{
+							UserOrgId:             item.UserOrgId,
+							DrugId:                item.DrugId,
+							RecordDate:            item.AdviceDate,
+							PatientId:             item.PatientId,
+							Remark:                "电脑端零用药品",
+							Status:                1,
+							Ctime:                 time.Now().Unix(),
+							Mtime:                 0,
+							SumCount:              list.Count*medical.MinNumber + list.StockMinNumber,
+							Prescribingnumber:     item.PrescribingNumber,
+							PrescribingNumberUnit: item.PrescribingNumberUnit,
+						}
+						service.CreateDrugError(drugError)
 						c.ServeSuccessJSON(map[string]interface{}{
 							"msg":    "1",
 							"advice": advice,
@@ -2390,6 +2404,20 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 					if medical.IsUse != 1 {
 						if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+							drugError := models.XtDrugError{
+								UserOrgId:             item.UserOrgId,
+								DrugId:                item.DrugId,
+								RecordDate:            item.AdviceDate,
+								PatientId:             item.PatientId,
+								Remark:                "电脑端药品库存不足",
+								Status:                1,
+								Ctime:                 time.Now().Unix(),
+								Mtime:                 0,
+								SumCount:              list.Count*medical.MinNumber + list.StockMinNumber,
+								Prescribingnumber:     item.PrescribingNumber,
+								PrescribingNumberUnit: item.PrescribingNumberUnit,
+							}
+							service.CreateDrugError(drugError)
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg":    "3",
 								"advice": advice,
@@ -2398,6 +2426,20 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 
 						if prescribing_number_total > total {
+							drugError := models.XtDrugError{
+								UserOrgId:             item.UserOrgId,
+								DrugId:                item.DrugId,
+								RecordDate:            item.AdviceDate,
+								PatientId:             item.PatientId,
+								Remark:                "电脑端出库数量大于总库存",
+								Status:                1,
+								Ctime:                 time.Now().Unix(),
+								Mtime:                 0,
+								SumCount:              list.Count*medical.MinNumber + list.StockMinNumber,
+								Prescribingnumber:     item.PrescribingNumber,
+								PrescribingNumberUnit: item.PrescribingNumberUnit,
+							}
+							service.CreateDrugError(drugError)
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg":    "2",
 								"advice": advice,
@@ -2414,10 +2456,66 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
 									service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 
+									if item.UserOrgId == 3877 || item.UserOrgId == 10265 {
+										//查询该药品是否有出库记录
+										flowMap, _ := service.GetDrugFLowByAdviceById(item.DrugId, item.PatientId, item.UserOrgId, item.AdviceDate)
+										if len(flowMap) == 0 {
+											errs := service.UpdateHisAdviceById(item.ID)
+											if errs != nil {
+												drugError := models.XtDrugError{
+													UserOrgId:             item.UserOrgId,
+													DrugId:                item.DrugId,
+													RecordDate:            item.AdviceDate,
+													PatientId:             item.PatientId,
+													Remark:                "出库记录为空,更新执行人失败",
+													Status:                1,
+													Ctime:                 time.Now().Unix(),
+													Mtime:                 0,
+													SumCount:              list.Count*medical.MinNumber + list.StockMinNumber,
+													Prescribingnumber:     item.PrescribingNumber,
+													PrescribingNumberUnit: item.PrescribingNumberUnit,
+												}
+												service.CreateDrugError(drugError)
+											}
+											c.ServeSuccessJSON(map[string]interface{}{
+												"msg":    "6",
+												"advice": advice,
+											})
+											return
+										}
+									}
 								}
 								//不通过药房发药
 								if pharmacyConfig.IsOpen != 1 {
 									service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+									if item.UserOrgId == 3877 || item.UserOrgId == 10265 {
+										//查询该药品是否有出库记录
+										flowMap, _ := service.GetDrugFLowByAdviceById(item.DrugId, item.PatientId, item.UserOrgId, item.AdviceDate)
+										if len(flowMap) == 0 {
+											errs := service.UpdateHisAdviceById(item.ID)
+											if errs != nil {
+												drugError := models.XtDrugError{
+													UserOrgId:             item.UserOrgId,
+													DrugId:                item.DrugId,
+													RecordDate:            item.AdviceDate,
+													PatientId:             item.PatientId,
+													Remark:                "出库记录为空,更新执行人失败",
+													Status:                1,
+													Ctime:                 time.Now().Unix(),
+													Mtime:                 0,
+													SumCount:              list.Count*medical.MinNumber + list.StockMinNumber,
+													Prescribingnumber:     item.PrescribingNumber,
+													PrescribingNumberUnit: item.PrescribingNumberUnit,
+												}
+												service.CreateDrugError(drugError)
+											}
+											c.ServeSuccessJSON(map[string]interface{}{
+												"msg":    "6",
+												"advice": advice,
+											})
+											return
+										}
+									}
 								}
 								//查询默认仓库
 								storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)

controllers/stock_in_api_controller.go

@@ -7546,36 +7546,38 @@ func (this *StockManagerApiController) ReturnCheckWarehouseInfo() {
 			return
 		}
 	}
-	for _, item := range list {
-
-		//扣减数量
-		service.UpdateWarehouseInfoByIdListTwo(item.WarehousingCount, item.ID)
-
-		//删除流水
-		service.UpdateWarehouseInfoFlow(item.ID)
-
-		goodList, _ := service.GetSumGoodList(orgId, item.StorehouseId, item.GoodId)
-		var flush_count int64
-		for _, it := range goodList {
-			flush_count += it.StockCount
-		}
-
-		//扣减数量
-		service.UpdateGoodInCount(item.WarehousingCount, item.OrgId, item.GoodId, item.StorehouseId, flush_count)
+	//for _, item := range list {
+	//
+	//	//扣减数量
+	//	service.UpdateWarehouseInfoByIdListTwo(item.WarehousingCount, item.ID)
+	//
+	//	//删除流水
+	//	service.UpdateWarehouseInfoFlow(item.ID)
+	//
+	//	goodList, _ := service.GetSumGoodList(orgId, item.StorehouseId, item.GoodId)
+	//	var flush_count int64
+	//	for _, it := range goodList {
+	//		flush_count += it.StockCount
+	//	}
+	//
+	//	//扣减数量
+	//	service.UpdateGoodInCount(item.WarehousingCount, item.OrgId, item.GoodId, item.StorehouseId, flush_count)
+	//
+	//	//查询默认仓库
+	//	storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+	//	//查询该耗材剩余多少库存
+	//	stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, orgId)
+	//	var sum_count int64
+	//	var sum_in_count int64
+	//	for _, it := range stockList {
+	//		sum_count += it.StockCount
+	//		sum_in_count += it.WarehousingCount
+	//	}
+	//	service.UpdateGoodInfoAddSumCount(item.GoodId, sum_count, orgId, sum_in_count)
+	//}
+	//err := service.ReturnCheckWarehouseInfo(warehousing_info_id)
 
-		//查询默认仓库
-		storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
-		//查询该耗材剩余多少库存
-		stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, orgId)
-		var sum_count int64
-		var sum_in_count int64
-		for _, it := range stockList {
-			sum_count += it.StockCount
-			sum_in_count += it.WarehousingCount
-		}
-		service.UpdateGoodInfoAddSumCount(item.GoodId, sum_count, orgId, sum_in_count)
-	}
-	err := service.ReturnCheckWarehouseInfo(warehousing_info_id)
+	err := service.UpdateWarehouseInfoMap(list, warehousing_info_id, orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"msg": "反审核成功!",

service/dialysis_service.go

@@ -357,7 +357,7 @@ func ExecBatchDoctorAdvice(patient_id int64, orgid int64, ids []string, creater
 }
 
 func ExceHidDoctorAdviceById(m *models.HisDoctorAdviceInfo, id int64, patientId int64) error {
-	err := writeDb.Model(&models.HisDoctorAdviceInfo{}).Where("patient_id = ? AND (id = ? Or parent_id=?)  AND status = 1 ", patientId, id, id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
+	err := writeDb.Model(&models.HisDoctorAdviceInfo{}).Where("patient_id = ? AND (id = ? Or parent_id=?)  AND status = 1 ", patientId, id, id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1, "is_mobile": 2}).Error
 	return err
 }
 

service/mobile_dialysis_service.go

@@ -7237,9 +7237,9 @@ func GetHisDoctorAdvicesTwentyOne(orgID int64, scheduleDate int64, deliverWay st
 	return vms, err
 }
 
-func GetPatientDryWeight(org_id int64, patient_id int64) (weight []*models.XtPatientDryweight, err error) {
+func GetPatientDryWeight(org_id int64, patient_id int64) (weight []*models.SgjPatientDryweight, err error) {
 
-	err = XTReadDB().Where("user_org_id = ? and patient_id = ? and status =1", org_id, patient_id).Find(&weight).Error
+	err = XTReadDB().Where("user_org_id = ? and patient_id = ? and status =1", org_id, patient_id).Order("id asc").Limit(6).Find(&weight).Error
 
 	return weight, err
 }

service/stock_service.go

@@ -8521,3 +8521,83 @@ func UpdateDeleteAutoGood(good_id int64, record_date int64, patient_id int64) er
 	err = XTWriteDB().Model(&models.DialysisBeforePrepare{}).Where("good_id = ? and record_date = ? and patient_id = ?", good_id, record_date, patient_id).Updates(map[string]interface{}{"status": 1}).Error
 	return err
 }
+
+func UpdateWarehouseInfoMap(list []*models.WarehousingInfo, warehousing_info_id int64, orgId int64) error {
+
+	tx := XTWriteDB().Begin()
+
+	for _, item := range list {
+
+		err := tx.Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", item.ID).UpdateColumn("stock_count", gorm.Expr("stock_count - ?", item.WarehousingCount)).Error
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+		err = tx.Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", item.ID).Update(map[string]interface{}{"is_check": 2}).Error
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+
+		err = tx.Model(models.VmStockFlow{}).Where("warehousing_detail_id =  ?", item.ID).Update(map[string]interface{}{"status": 0, "is_check": 2}).Error
+
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+
+		var goodList []*models.WarehousingInfo
+		err = tx.Where("org_id = ? and storehouse_id = ? and good_id = ? and status =1  and is_check = 1", orgId, item.StorehouseId, item.GoodId).Find(&goodList).Error
+
+		var flush_count int64
+		for _, it := range goodList {
+			flush_count += it.StockCount
+		}
+
+		err = tx.Model(&models.XtGoodStockCount{}).Where("user_org_id = ? and good_id  = ? and storehouse_id = ? and status = 1", item.OrgId, item.GoodId, item.StorehouseId).UpdateColumn("stock_in_count", gorm.Expr("stock_in_count - ?", item.WarehousingCount)).Error
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+		err = tx.Model(&models.XtGoodStockCount{}).Where("user_org_id = ? and good_id = ? and storehouse_id = ? and status = 1", item.OrgId, item.GoodId, item.StorehouseId).Update(map[string]interface{}{"flush_count": flush_count}).Error
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+
+		storeHouseConfig := models.XtStorehouseConfig{}
+		err = tx.Where("user_org_id = ? and status = 1", orgId).First(&storeHouseConfig).Error
+
+		var stockList []*models.WarehousingInfo
+		//查询该耗材剩余多少库存
+		err = tx.Where("good_id = ? and storehouse_id = ? and org_id = ? and status = 1 and is_check = 1", item.GoodId, storeHouseConfig.StorehouseOutInfo, orgId).Find(&stockList).Error
+
+		var sum_count int64
+		var sum_in_count int64
+		for _, it := range stockList {
+			sum_count += it.StockCount
+			sum_in_count += it.WarehousingCount
+		}
+
+		err = tx.Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", item.GoodId, orgId).Update(map[string]interface{}{"sum_count": sum_count}).Error
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+		err = tx.Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", item.GoodId, orgId).Update(map[string]interface{}{"sum_in_count": sum_in_count}).Error
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+
+	}
+	err := tx.Model(&models.Warehousing{}).Where("id = ? and status = 1", warehousing_info_id).Update(map[string]interface{}{"is_check": 2}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.WarehousingInfo{}).Where("warehousing_id = ? and status = 1", warehousing_info_id).Update(map[string]interface{}{"is_check": 2}).Error
+	tx.Commit()
+	return err
+
+}