历史排班

controllers/dialysis_api_controller.go

@@ -4916,7 +4916,7 @@ func (this *DialysisApiController) GetPatientDialysisSolutionGroupList() {
 	goodType, _ := service.GetAllGoodType(orgId)
 	if config.IsOpen != 1 {
 		list, total, err := service.GetPatientDialysisSolutionGroupList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId, ids)
-		fmt.Println("list2232323223332323232", list)
+
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
 				"list":     list,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -7943,9 +7943,68 @@ func (this *DialysisAPIController) ExectionMobileAdvice() {
 							if config.IsOpen != 1 {
 								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
 									service.HisDrugsDelivery(orgId, creater, &advice)
+									if orgId == 3877 || orgId == 10265 {
+										//查询该药品是否有出库记录
+										flowMap, _ := service.GetDrugFLowByAdviceById(advice.DrugId, advice.PatientId, advice.UserOrgId, advice.AdviceDate)
+										if len(flowMap) == 0 {
+											errs := service.UpdateHisAdviceById(advice.ID)
+											if errs != nil {
+												drugError := models.XtDrugError{
+													UserOrgId:             orgId,
+													DrugId:                item.DrugId,
+													RecordDate:            item.AdviceDate,
+													PatientId:             item.PatientId,
+													Remark:                "透析医嘱页面出库记录为空,更新执行人失败",
+													Status:                1,
+													Ctime:                 time.Now().Unix(),
+													Mtime:                 0,
+													SumCount:              0,
+													Prescribingnumber:     advice.PrescribingNumber,
+													PrescribingNumberUnit: advice.PrescribingNumberUnit,
+												}
+												service.CreateDrugError(drugError)
+											}
+											this.ServeSuccessJSON(map[string]interface{}{
+												"msg":  "2",
+												"drug": medical,
+												"ids":  ids,
+											})
+											return
+
+										}
+									}
 								}
 								if pharmacyConfig.IsOpen != 1 {
 									service.HisDrugsDelivery(orgId, creater, &advice)
+									if orgId == 3877 || orgId == 10265 {
+										//查询该药品是否有出库记录
+										flowMap, _ := service.GetDrugFLowByAdviceById(advice.DrugId, advice.PatientId, advice.UserOrgId, advice.AdviceDate)
+										if len(flowMap) == 0 {
+											errs := service.UpdateHisAdviceById(advice.ID)
+											if errs != nil {
+												drugError := models.XtDrugError{
+													UserOrgId:             orgId,
+													DrugId:                item.DrugId,
+													RecordDate:            item.AdviceDate,
+													PatientId:             item.PatientId,
+													Remark:                "透析医嘱页面出库记录为空,更新执行人失败",
+													Status:                1,
+													Ctime:                 time.Now().Unix(),
+													Mtime:                 0,
+													SumCount:              0,
+													Prescribingnumber:     advice.PrescribingNumber,
+													PrescribingNumberUnit: advice.PrescribingNumberUnit,
+												}
+												service.CreateDrugError(drugError)
+											}
+											this.ServeSuccessJSON(map[string]interface{}{
+												"msg":  "2",
+												"drug": medical,
+												"ids":  ids,
+											})
+											return
+										}
+									}
 								}
 
 								//更新字典里面的库存

models/dialysis.go

@@ -1241,6 +1241,7 @@ type HisDoctorAdvice struct {
 	DrugId                int64              `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 	DrugNameId            int64              `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
 	ExecutionFrequencyId  int64              `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
+	IsMobile              int64              `gorm:"column:is_mobile" json:"is_mobile" form:"is_mobile"`
 }
 
 func (HisDoctorAdvice) TableName() string {

service/dialysis_service.go

@@ -1988,7 +1988,7 @@ func GetHisMobileAdviceList(orgid int64, ids []string) (advice []*models.HisDoct
 func ExectionMobileAdvice(orgid int64, ids []string, execution_time int64, execution_staff int64) error {
 
 	advice := models.HisDoctorAdvice{}
-	err := XTWriteDB().Model(&advice).Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Updates(map[string]interface{}{"execution_time": execution_time, "execution_staff": execution_staff, "execution_state": 1}).Error
+	err := XTWriteDB().Model(&advice).Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Updates(map[string]interface{}{"execution_time": execution_time, "execution_staff": execution_staff, "execution_state": 1, "is_mobile": 3}).Error
 	return err
 }