历史排班

controllers/dialysis_record_api_controller.go

@@ -1645,9 +1645,9 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 		tempassessmentAfterDislysis.SealingFluidDispose = lastAssessmentAfterDislysis.SealingFluidDispose
 		tempassessmentAfterDislysis.SealingFluidSpecial = lastAssessmentAfterDislysis.SealingFluidSpecial
 
-		if adminUserInfo.CurrentOrgId == 10375 {
-			tempassessmentAfterDislysis.SystolicBloodPressure = 0
-			tempassessmentAfterDislysis.DiastolicBloodPressure = 0
+		if adminUserInfo.CurrentOrgId != 10375 {
+			tempassessmentAfterDislysis.SystolicBloodPressure = lastAssessmentAfterDislysis.SystolicBloodPressure
+			tempassessmentAfterDislysis.DiastolicBloodPressure = lastAssessmentAfterDislysis.DiastolicBloodPressure
 		}
 
 	}

controllers/drug_stock_api_contorller.go

@@ -251,7 +251,7 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 					Price:            last_price,
 					TotalPrice:       total,
 					Status:           1,
-					Ctime:            ctime,
+					Ctime:            warehousingDate.Unix(),
 					Remark:           remark,
 					OrgId:            adminUserInfo.CurrentOrgId,
 					Type:             types,
@@ -267,7 +267,6 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 					IsCheck:          2,
 					StockMinNumber:   0,
 				}
-				//fmt.Println(warehouseInfo)
 				warehousingInfo = append(warehousingInfo, warehouseInfo)
 			}
 		}
@@ -3616,7 +3615,7 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 				Creator:                 Creator,
 				UpdateCreator:           Creator,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
+				Ctime:                   item.Ctime,
 				Mtime:                   0,
 				Price:                   item.Price,
 				WarehousingDetailId:     item.ID,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1315,7 +1315,6 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	diastolic_blood_pressure, _ := c.GetFloat("diastolic_blood_pressure", 0)
 	actual_ultrafiltration, _ := c.GetFloat("actual_ultrafiltration", 0)
 
-	fmt.Println("actual_ultrafiltration233232322323", actual_ultrafiltration)
 	actual_displacement, _ := c.GetFloat("actual_displacement", 0)
 
 	actualtreatHour, _ := c.GetInt64("actual_treatment_hour", 0)
@@ -2561,9 +2560,6 @@ func (c *DialysisAPIController) Finish() {
 		if adminUserInfo.Org.Id != 10375 {
 			tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
 			tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
-		} else {
-			tempassessmentAfterDislysis.SystolicBloodPressure = 0
-			tempassessmentAfterDislysis.DiastolicBloodPressure = 0
 		}
 
 		if adminUserInfo.Org.Id != 10445 {
@@ -2774,9 +2770,6 @@ func (c *DialysisAPIController) Finish() {
 		if adminUserInfo.Org.Id != 10375 {
 			tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
 			tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
-		} else {
-			tempassessmentAfterDislysis.SystolicBloodPressure = 0
-			tempassessmentAfterDislysis.DiastolicBloodPressure = 0
 		}
 
 	}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1384,313 +1384,307 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			defer redis.Close()
 		}
 
-		if err == nil {
-
-			//药品管理信息
-			_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
+		//药品管理信息
+		_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
 
-			storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-			if drugStockConfig.IsOpen == 1 {
-				for _, item := range advices {
-					//查询改药品信息
-					medical, _ := service.GetBaseDrugMedical(item.DrugId)
-
-					//判断单位是否合格
-					if item.PrescribingNumberUnit != medical.MaxUnit && item.PrescribingNumberUnit != medical.MinUnit {
-						//查询该药品是否有出库记录
-						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:             adminInfo.Org.Id,
-									DrugId:                item.DrugId,
-									RecordDate:            item.AdviceDate,
-									PatientId:             item.PatientId,
-									Remark:                "单位不统一,执行失败",
-									Status:                1,
-									Ctime:                 time.Now().Unix(),
-									Mtime:                 0,
-									SumCount:              0,
-									Prescribingnumber:     item.PrescribingNumber,
-									PrescribingNumberUnit: item.PrescribingNumberUnit,
-								}
-								service.CreateDrugError(drugError)
+		storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+		if drugStockConfig.IsOpen == 1 {
+			for _, item := range advices {
+				//查询改药品信息
+				medical, _ := service.GetBaseDrugMedical(item.DrugId)
+
+				//判断单位是否合格
+				if item.PrescribingNumberUnit != medical.MaxUnit && item.PrescribingNumberUnit != medical.MinUnit {
+					//查询该药品是否有出库记录
+					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:             adminInfo.Org.Id,
+								DrugId:                item.DrugId,
+								RecordDate:            item.AdviceDate,
+								PatientId:             item.PatientId,
+								Remark:                "单位不统一,执行失败",
+								Status:                1,
+								Ctime:                 time.Now().Unix(),
+								Mtime:                 0,
+								SumCount:              0,
+								Prescribingnumber:     item.PrescribingNumber,
+								PrescribingNumberUnit: item.PrescribingNumberUnit,
 							}
+							service.CreateDrugError(drugError)
 						}
-						advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, item.ID)
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg":    "7",
-							"advice": advice,
-							"ids":    ids,
-						})
-						return
 					}
+					advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, item.ID)
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "7",
+						"advice": advice,
+						"ids":    ids,
+					})
+					return
+				}
 
-					//查询这个患者这个患者这个药已经出库的所有数量
-					advicelist, _ := service.GetAllHisDoctorAdviceById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
-					drugoutlist, _ := service.GetAllDrugFlowById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
-					var total_count int64
-					var drug_count int64
-					for _, it := range advicelist {
-						if it.PrescribingNumberUnit == medical.MaxUnit {
-							prescribingNumber_temp := strconv.FormatFloat(math.Abs(it.PrescribingNumber), 'f', 0, 64)
-							prenumber, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-							total_count += prenumber * medical.MinNumber
-						}
-						if it.PrescribingNumberUnit == medical.MinUnit {
-							prescribingNumber_temp := strconv.FormatFloat(math.Abs(it.PrescribingNumber), 'f', 0, 64)
-							prenumber, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-							total_count += prenumber
-						}
-
+				//查询这个患者这个患者这个药已经出库的所有数量
+				advicelist, _ := service.GetAllHisDoctorAdviceById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
+				drugoutlist, _ := service.GetAllDrugFlowById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
+				var total_count int64
+				var drug_count int64
+				for _, it := range advicelist {
+					if it.PrescribingNumberUnit == medical.MaxUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(it.PrescribingNumber), 'f', 0, 64)
+						prenumber, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						total_count += prenumber * medical.MinNumber
+					}
+					if it.PrescribingNumberUnit == medical.MinUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(it.PrescribingNumber), 'f', 0, 64)
+						prenumber, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						total_count += prenumber
 					}
 
-					for _, its := range drugoutlist {
-						if its.CountUnit == medical.MaxUnit {
-							drug_count += its.Count * medical.MinNumber
-						}
-						if its.CountUnit == medical.MinUnit {
-							drug_count += its.Count
-						}
+				}
+
+				for _, its := range drugoutlist {
+					if its.CountUnit == medical.MaxUnit {
+						drug_count += its.Count * medical.MinNumber
 					}
-					if total_count == drug_count {
-
-						advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, item.ID)
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg":    "1",
-							"advice": advice,
-							"ids":    ids,
-						})
-						return
+					if its.CountUnit == medical.MinUnit {
+						drug_count += its.Count
 					}
+				}
+				if total_count == drug_count {
 
 					advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, item.ID)
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "1",
+						"advice": advice,
+						"ids":    ids,
+					})
+					return
+				}
 
-					var total int64
-					var prescribing_number_total int64
+				advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, item.ID)
 
-					config, _ := service.GetDrugOpenConfigOne(adminInfo.Org.Id)
+				var total int64
+				var prescribing_number_total int64
 
-					if config.IsOpen != 1 {
-						//查询该药品是否有库存
-						houseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
-						list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId, houseConfig.DrugStorehouseOut)
+				config, _ := service.GetDrugOpenConfigOne(adminInfo.Org.Id)
 
-						//判断单位是否相等
-						if medical.MaxUnit == advice.PrescribingNumberUnit {
-							prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-							count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-							//转化为最小单位
-							total = list.Count*medical.MinNumber + list.StockMinNumber
-							prescribing_number_total = count * medical.MinNumber
-						}
-						//fmt.Println("医嘱开的数量", total)
-						if medical.MinUnit == advice.PrescribingNumberUnit {
-							prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-							count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-							total = list.Count*medical.MinNumber + list.StockMinNumber
-							prescribing_number_total = count
-						}
+				if config.IsOpen != 1 {
+					//查询该药品是否有库存
+					houseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
+					list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId, houseConfig.DrugStorehouseOut)
 
-						if medical.IsUse == 1 {
-
-							if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
-								drugError := models.XtDrugError{
-									UserOrgId:             adminInfo.Org.Id,
-									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:     advice.PrescribingNumber,
-									PrescribingNumberUnit: advice.PrescribingNumberUnit,
-								}
-								service.CreateDrugError(drugError)
-								c.ServeSuccessJSON(map[string]interface{}{
-									"msg":    "1",
-									"advice": advice,
-									"ids":    ids,
-								})
-								return
+					//判断单位是否相等
+					if medical.MaxUnit == advice.PrescribingNumberUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						//转化为最小单位
+						total = list.Count*medical.MinNumber + list.StockMinNumber
+						prescribing_number_total = count * medical.MinNumber
+					}
+					//fmt.Println("医嘱开的数量", total)
+					if medical.MinUnit == advice.PrescribingNumberUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						total = list.Count*medical.MinNumber + list.StockMinNumber
+						prescribing_number_total = count
+					}
+
+					if medical.IsUse == 1 {
+
+						if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+							drugError := models.XtDrugError{
+								UserOrgId:             adminInfo.Org.Id,
+								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:     advice.PrescribingNumber,
+								PrescribingNumberUnit: advice.PrescribingNumberUnit,
 							}
+							service.CreateDrugError(drugError)
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":    "1",
+								"advice": advice,
+								"ids":    ids,
+							})
+							return
 						}
-						if medical.IsUse != 1 {
-
-							if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
-								drugError := models.XtDrugError{
-									UserOrgId:             adminInfo.Org.Id,
-									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:     advice.PrescribingNumber,
-									PrescribingNumberUnit: advice.PrescribingNumberUnit,
-								}
-								service.CreateDrugError(drugError)
-								c.ServeSuccessJSON(map[string]interface{}{
-									"msg":    "3",
-									"advice": advice,
-									"ids":    ids,
-								})
-								return
+					}
+					if medical.IsUse != 1 {
+
+						if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+							drugError := models.XtDrugError{
+								UserOrgId:             adminInfo.Org.Id,
+								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:     advice.PrescribingNumber,
+								PrescribingNumberUnit: advice.PrescribingNumberUnit,
 							}
-							if prescribing_number_total > total {
-								drugError := models.XtDrugError{
-									UserOrgId:             adminInfo.Org.Id,
-									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:     advice.PrescribingNumber,
-									PrescribingNumberUnit: advice.PrescribingNumberUnit,
-								}
-								service.CreateDrugError(drugError)
-								c.ServeSuccessJSON(map[string]interface{}{
-									"msg":    "2",
-									"advice": advice,
-									"ids":    ids,
-								})
-								return
+							service.CreateDrugError(drugError)
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":    "3",
+								"advice": advice,
+								"ids":    ids,
+							})
+							return
+						}
+						if prescribing_number_total > total {
+							drugError := models.XtDrugError{
+								UserOrgId:             adminInfo.Org.Id,
+								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:     advice.PrescribingNumber,
+								PrescribingNumberUnit: advice.PrescribingNumberUnit,
 							}
+							service.CreateDrugError(drugError)
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":    "2",
+								"advice": advice,
+								"ids":    ids,
+							})
+							return
 						}
+					}
 
-						if prescribing_number_total <= total {
+					if prescribing_number_total <= total {
 
-							pharmacyConfig, _ := service.FindPharmacyConfig(advice.UserOrgId)
-							//判断药品是否零用
-							if medical.IsUse == 2 {
+						pharmacyConfig, _ := service.FindPharmacyConfig(advice.UserOrgId)
+						//判断药品是否零用
+						if medical.IsUse == 2 {
 
-								if config.IsOpen != 1 {
-									if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
-										service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-
-										if adminInfo.Org.Id == 3877 || adminInfo.Org.Id == 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:             adminInfo.Org.Id,
-														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:     advice.PrescribingNumber,
-														PrescribingNumberUnit: advice.PrescribingNumberUnit,
-													}
-													service.CreateDrugError(drugError)
+							if config.IsOpen != 1 {
+								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
+									service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+
+									if adminInfo.Org.Id == 3877 || adminInfo.Org.Id == 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:             adminInfo.Org.Id,
+													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:     advice.PrescribingNumber,
+													PrescribingNumberUnit: advice.PrescribingNumberUnit,
 												}
-												c.ServeSuccessJSON(map[string]interface{}{
-													"msg":    "6",
-													"advice": advice,
-													"ids":    ids,
-												})
-												return
+												service.CreateDrugError(drugError)
 											}
+											c.ServeSuccessJSON(map[string]interface{}{
+												"msg":    "6",
+												"advice": advice,
+												"ids":    ids,
+											})
+											return
 										}
 									}
-									if pharmacyConfig.IsOpen != 1 {
+								}
+								if pharmacyConfig.IsOpen != 1 {
 
-										service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-										if adminInfo.Org.Id == 3877 || adminInfo.Org.Id == 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:             adminInfo.Org.Id,
-														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:     advice.PrescribingNumber,
-														PrescribingNumberUnit: advice.PrescribingNumberUnit,
-													}
-													service.CreateDrugError(drugError)
+									service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+									if adminInfo.Org.Id == 3877 || adminInfo.Org.Id == 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:             adminInfo.Org.Id,
+													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:     advice.PrescribingNumber,
+													PrescribingNumberUnit: advice.PrescribingNumberUnit,
 												}
-												c.ServeSuccessJSON(map[string]interface{}{
-													"msg":    "6",
-													"advice": advice,
-													"ids":    ids,
-												})
-												return
+												service.CreateDrugError(drugError)
 											}
+											c.ServeSuccessJSON(map[string]interface{}{
+												"msg":    "6",
+												"advice": advice,
+												"ids":    ids,
+											})
+											return
 										}
 									}
+								}
 
-									//更新字典里面的库存
-									stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-									var sum_count int64
-									for _, its := range stockInfo {
-										if its.MaxUnit == medical.MaxUnit {
-											its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
-										}
-										sum_count += its.StockMaxNumber + its.StockMinNumber
+								//更新字典里面的库存
+								stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+								var sum_count int64
+								for _, its := range stockInfo {
+									if its.MaxUnit == medical.MaxUnit {
+										its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
 									}
-									service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
-									//剩余库存
-									service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+									sum_count += its.StockMaxNumber + its.StockMinNumber
 								}
-
+								service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+								//剩余库存
+								service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 							}
+
 						}
 					}
+				}
 
-					//
-					//if config.IsOpen == 1 && item.UserOrgId == 10188 {
-					//
-					//	service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-					//	//更新字典里面的库存
-					//	stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-					//	var sum_count int64
-					//	for _, its := range stockInfo {
-					//		if its.MaxUnit == medical.MaxUnit {
-					//			its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
-					//		}
-					//		sum_count += its.StockMaxNumber + its.StockMinNumber
-					//	}
-					//	service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
-					//	//剩余库存
-					//	service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
-					//}
+				//
+				//if config.IsOpen == 1 && item.UserOrgId == 10188 {
+				//
+				//	service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+				//	//更新字典里面的库存
+				//	stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+				//	var sum_count int64
+				//	for _, its := range stockInfo {
+				//		if its.MaxUnit == medical.MaxUnit {
+				//			its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+				//		}
+				//		sum_count += its.StockMaxNumber + its.StockMinNumber
+				//	}
+				//	service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+				//	//剩余库存
+				//	service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+				//}
 
-				}
 			}
-			for _, item := range advices {
-				advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, item.ID)
-				c.ServeSuccessJSON(map[string]interface{}{
-					"msg":    "1",
-					"advice": advice,
-					"ids":    ids,
-				})
-			}
-
-		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		}
+		for _, item := range advices {
+			advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, item.ID)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg":    "1",
+				"advice": advice,
+				"ids":    ids,
+			})
 		}
 
 	}

controllers/self_drug_api_congtroller.go

@@ -1771,7 +1771,8 @@ func (this *SelfDrugApiController) GetWarehoseInfoById() {
 
 	id, _ := this.GetInt64("id")
 	storehouse_id, _ := this.GetInt64("storehouse_id")
-	list, _ := service.GetWarehoseInfoById(id, storehouse_id)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, _ := service.GetWarehoseInfoById(id, storehouse_id, orgId)
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": list,

controllers/sign_api_controller.go

@@ -84,6 +84,8 @@ func SignApiRegistRouters() {
 	//删除
 	beego.Router("/api/device/tosavepdfinformation", &SignApiController{}, "Get:SavePdfInformation")
 
+	beego.Router("/api/device/tocheckinformation", &SignApiController{}, "Get:ToCheckInformation")
+
 }
 
 // 短信服务接口
@@ -669,17 +671,20 @@ func (this *SignApiController) SavePdfInformation() {
 	//业务单号
 	maprequest["orderId"] = "13318464642"
 
-	maprequest["signTitle"] = "新合同"
+	maprequest["signTitle"] = "举报合同"
 
-	file := "C:/Users/28169/Desktop/2.pdf"
+	//file := "C:/Users/28169/Desktop/2.pdf"
+	file := "/swspan/gopath/src/XT_New/static/2.pdf"
 
 	fileBytes, _ := ioutil.ReadFile(file) // 读取file
 
 	contractBase64 := base64.StdEncoding.EncodeToString(fileBytes) // 加密成base64字符串
 	//文件获取方式
-	maprequest["fileType"] = contractBase64
+	maprequest["fileType"] = 1
+
+	maprequest["pdfBase64"] = contractBase64
 	//合同内容
-	maprequest["fileContent"] = "绝密文件"
+	maprequest["fileContent"] = contractBase64
 
 	//签署用户人ID
 	maprequest["userId"] = "JMO9U8JH4TN8E3QOI0GUVUF2"
@@ -701,63 +706,95 @@ func (this *SignApiController) SavePdfInformation() {
 	//证件编码
 	Receiver["cardNumber"] = "430526199408156511"
 
-	stepStamper := make([]map[string]interface{}, 0)
-	for _, item := range stepStamper {
-		fmt.Println(item)
-		keywordSignControls := make(map[string]interface{})
-		keywordSignControls["sealName"] = "1"
-		keywordSignControls["keyword"] = ""
-		keywordSignControls["pages"] = "0"
-		keywordSignControls["offsetX"] = "100"
-		keywordSignControls["offsetY"] = "100"
-		stepStamper = append(stepStamper, keywordSignControls)
-
-		crossSignControls := make(map[string]interface{})
-		crossSignControls["sealName"] = "2"
-		crossSignControls["positionX"] = "100"
-		crossSignControls["positionY"] = "100"
-		stepStamper = append(stepStamper, crossSignControls)
-
-		xySignControls := make(map[string]interface{})
-		xySignControls["sealName"] = "2"
-		xySignControls["positionX"] = "100"
-		xySignControls["positionY"] = "100"
-
-		stepStamper = append(stepStamper, xySignControls)
-	}
+	stepStamper := make(map[string]interface{})
+
+	keywordSignControls := make([]map[string]interface{}, 0)
+
+	inputArrOne := make(map[string]interface{})
+
+	inputArrOne["sealName"] = "1"
+	inputArrOne["keyword"] = ""
+	inputArrOne["pages"] = "0"
+	inputArrOne["offsetX"] = "100"
+	inputArrOne["offsetY"] = "100"
+
+	keywordSignControls = append(keywordSignControls, inputArrOne)
+
+	stepStamper["keywordSignControls"] = keywordSignControls
+
+	crossSignControls := make([]map[string]interface{}, 0)
+
+	inputArrTwo := make(map[string]interface{})
+	inputArrTwo["sealName"] = "2"
+	inputArrTwo["positionX"] = "100"
+	inputArrTwo["positionY"] = "100"
+	crossSignControls = append(crossSignControls, inputArrTwo)
+
+	stepStamper["crossSignControls"] = crossSignControls
+
+	xySignControls := make([]map[string]interface{}, 0)
+
+	inputArrThree := make(map[string]interface{})
+	inputArrThree["sealName"] = "2"
+	inputArrThree["positionX"] = "100"
+	inputArrThree["positionY"] = "100"
+
+	xySignControls = append(xySignControls, inputArrThree)
+
+	stepStamper["xySignControls"] = xySignControls
 
 	maprequest["stepStamper"] = stepStamper
 
 	seals := make([]map[string]interface{}, 0)
 
-	sealImages := make(map[string]interface{})
-	sealImages["sealBase64"] = "2"
-	sealImages["width"] = "100"
-	sealImages["height"] = "100"
-	sealImages["verticalAlign"] = "middle"
+	sealImagesList := make(map[string]interface{})
+
+	fileOne := "/swspan/gopath/src/XT_New/static/seal.jpg"
+
+	fileBytesOne, _ := ioutil.ReadFile(fileOne) // 读取file
+
+	contractBase64One := base64.StdEncoding.EncodeToString(fileBytesOne) // 加密成base64字符串
+	sealImagesList["sealBase64"] = contractBase64One
+	sealImagesList["width"] = "100"
+	sealImagesList["height"] = "100"
+	sealImagesList["verticalAlign"] = "middle"
 
-	seals = append(seals, sealImages)
+	sealTextsList := make(map[string]interface{})
+	sealTextsList["text"] = "2"
+	sealTextsList["fontSize"] = "100"
+	sealTextsList["fontColor"] = "100"
+	sealTextsList["isTextArea"] = true
+	sealTextsList["textAlign"] = 0
+	sealTextsList["width"] = 300
+	sealTextsList["height"] = 300
 
-	sealTexts := make(map[string]interface{})
-	sealTexts["text"] = "2"
-	sealTexts["fontSize"] = "100"
-	sealTexts["fontColor"] = "100"
-	sealTexts["isTextArea"] = true
-	sealTexts["textAlign"] = 0
-	sealTexts["width"] = 300
-	sealTexts["height"] = 300
+	sealsObj := make(map[string]interface{})
 
-	seals = append(seals, sealTexts)
+	sealsObj["sealWidth"] = "300"
+	sealsObj["sealHeight"] = "300"
+	sealsObj["sealName"] = 1
+	sealsObj["sealImage"] = sealImagesList
+	sealsObj["sealText"] = sealTextsList
 
+	seals = append(seals, sealsObj)
 	maprequest["seals"] = seals
 
 	maprequest["isUserWishes"] = true
 	maprequest["phone"] = "13318464642"
 	maprequest["verificationCode"] = "18888888888"
 	this.ServeSuccessJSON(map[string]interface{}{
+		"maprequest":  maprequest,
 		"information": information,
 		"orderId":     orderId,
-		"maprequest":  maprequest,
 	})
 
 }
+
+func (this *SignApiController) ToCheckInformation() {
+
+	information := service.ToCheckInformation()
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"information": information,
+	})
+}

controllers/stock_in_api_controller.go

@@ -406,7 +406,7 @@ func (c *StockManagerApiController) CreateWarehouse() {
 					Price:            price,
 					TotalPrice:       total,
 					Status:           1,
-					Ctime:            ctime,
+					Ctime:            warehousingDate.Unix(),
 					Remark:           remark,
 					OrgId:            adminUserInfo.CurrentOrgId,
 					Type:             types,
@@ -1413,18 +1413,6 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 		if it.ID > 0 {
 			service.ModifyWarehouseOutInfo(it.ID, warehouseOutInfo)
 		}
-
-		//lastWarehouseOutInfo, _ := service.GetLastGoodWarehouseOutInfoById(it.OrgId)
-
-		//if(it.ID == 0){
-		//  //创建出库流水
-		//  service.CreateStockFlowOne(stockFlow)
-		//}
-		//if(it.ID > 0){
-		//  //更新流水
-		//  service.UpdateWarehouseOutFlow(stockFlow,it.ID)
-		//}
-
 	}
 	appId := adminUserInfo.CurrentAppId
 
@@ -6873,13 +6861,19 @@ func (this *StockManagerApiController) SaveStockInventoryList() {
 				//更改库存
 				service.UpdatedWarehousingInfo(info, id)
 			}
+			//查询该机构默认仓库
+			storeConfig, _ := service.GetAllStoreHouseConfig(warehosueinfos.OrgId)
+			goodListOne, _ := service.GetSumGoodList(orgId, storeConfig.StorehouseOutInfo, good_id)
+			var flush_count int64
+			for _, it := range goodListOne {
+				flush_count += it.StockCount
+			}
 
 			if stock_count != last_stock_count {
+				stockFlow.OverCount = flush_count
 				service.CreateStockFlowOne(stockFlow)
 			}
 
-			//查询该机构默认仓库
-			storeConfig, _ := service.GetAllStoreHouseConfig(warehosueinfos.OrgId)
 			//查询已审核单据的剩余库存
 			goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, good_id, warehosueinfos.OrgId)
 			var sum_count int64
@@ -6890,11 +6884,6 @@ func (this *StockManagerApiController) SaveStockInventoryList() {
 			}
 			service.UpdateGoodByGoodId(good_id, sum_count, sum_in_count, warehosueinfos.OrgId)
 
-			goodListOne, _ := service.GetSumGoodList(orgId, storeConfig.StorehouseOutInfo, good_id)
-			var flush_count int64
-			for _, it := range goodListOne {
-				flush_count += it.StockCount
-			}
 			service.UpdateSumGood(orgId, storeConfig.StorehouseOutInfo, good_id, flush_count)
 			this.ServeSuccessJSON(map[string]interface{}{
 				"inventory": inventory,
@@ -7496,7 +7485,7 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 				Creator:                 Creator,
 				UpdateCreator:           0,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
+				Ctime:                   item.Ctime,
 				Mtime:                   0,
 				Price:                   item.PackingPrice,
 				WarehousingDetailId:     item.ID,

service/dialysis_service.go

@@ -1471,7 +1471,7 @@ func GetGoodInfoMationSix(orgid int64, storehouse_id int64) (goodinfo []*models.
 
 func GetGoodInfoMationSeven(orgid int64, storehouse_id int64) (goodinfo []*models.GoodInfo, err error) {
 
-	err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Preload("GoodSotckInfo", "status = 1 and storehouse_id = ?", storehouse_id).Find(&goodinfo).Error
+	err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Preload("GoodSotckInfo", "status = 1 and storehouse_id = ? and stock_count>0", storehouse_id).Find(&goodinfo).Error
 
 	return goodinfo, err
 }

service/self_drug_service.go

@@ -827,7 +827,7 @@ func GetLastDrugWarehouseOutInfo(drugid int64, warehouseOutId int64, orgid int64
 }
 
 func PostSearchDrugWarehouseList(keyword string, orgid int64, storehouse_id int64) (info []*models.BloodDrugWarehouseInfo, err error) {
-	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1 and x.is_check = 1")
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1 and x.is_check = 1 and (x.stock_max_number>0 or x.stock_min_number>0)")
 	table := XTReadDB().Table("xt_base_drug as t").Where("t.status")
 	fmt.Println(table)
 	likeKey := "%" + keyword + "%"
@@ -979,10 +979,16 @@ func GetDrugDamagePrint(ids []string) (damage []*models.XtDrugDamage, err error)
 	return damage, err
 }
 
-func GetWarehoseInfoById(id int64, storehouse_id int64) (info []*models.XtDrugWarehouseInfo, err error) {
+func GetWarehoseInfoById(id int64, storehouse_id int64, orgid int64) (info []*models.XtDrugWarehouseInfo, err error) {
+
+	if orgid == 10191 {
+		err = XTReadDB().Model(&info).Where("drug_id=? and status = 1 and storehouse_id = ? and is_check = 1", id, storehouse_id).Preload("XtBaseDrug", "status= 1").Find(&info).Error
+		return info, err
+	} else {
+		err = XTReadDB().Model(&info).Where("drug_id=? and status = 1 and storehouse_id = ? and is_check = 1 and (stock_max_number>0 or stock_min_number>0)", id, storehouse_id).Preload("XtBaseDrug", "status= 1").Find(&info).Error
+		return info, err
+	}
 
-	err = XTReadDB().Model(&info).Where("drug_id=? and status = 1 and storehouse_id = ? and is_check = 1", id, storehouse_id).Preload("XtBaseDrug", "status= 1").Find(&info).Error
-	return info, err
 }
 
 func CreateDrugInventory(inventory models.XtDrugInventory) error {

service/sign_service.go

@@ -1671,17 +1671,20 @@ func SavePdfInformation() (string, string) {
 	//业务单号
 	maprequest["orderId"] = "13318464642"
 
-	maprequest["signTitle"] = "新合同"
+	maprequest["signTitle"] = "举报合同"
 
-	file := "C:/Users/28169/Desktop/2.pdf"
+	//file := "C:/Users/28169/Desktop/2.pdf"
+	file := "/swspan/gopath/src/XT_New/static/2.pdf"
 
-	fileBytes, err := ioutil.ReadFile(file) // 读取file
+	fileBytes, _ := ioutil.ReadFile(file) // 读取file
 
 	contractBase64 := base64.StdEncoding.EncodeToString(fileBytes) // 加密成base64字符串
 	//文件获取方式
-	maprequest["fileType"] = contractBase64
+	maprequest["fileType"] = 1
+
+	maprequest["pdfBase64"] = contractBase64
 	//合同内容
-	maprequest["fileContent"] = "绝密文件"
+	maprequest["fileContent"] = contractBase64
 
 	//签署用户人ID
 	maprequest["userId"] = "JMO9U8JH4TN8E3QOI0GUVUF2"
@@ -1703,54 +1706,79 @@ func SavePdfInformation() (string, string) {
 	//证件编码
 	Receiver["cardNumber"] = "430526199408156511"
 
-	stepStamper := make([]map[string]interface{}, 0)
+	stepStamper := make(map[string]interface{})
 
-	keywordSignControls := make(map[string]interface{})
+	keywordSignControls := make([]map[string]interface{}, 0)
+
+	inputArrOne := make(map[string]interface{})
+
+	inputArrOne["sealName"] = "1"
+	inputArrOne["keyword"] = "王志文"
+	inputArrOne["pages"] = "0"
+	inputArrOne["offsetX"] = "100"
+	inputArrOne["offsetY"] = "100"
+
+	keywordSignControls = append(keywordSignControls, inputArrOne)
+
+	stepStamper["keywordSignControls"] = keywordSignControls
+
+	crossSignControls := make([]map[string]interface{}, 0)
 
-	keywordSignControls["sealName"] = "1"
-	keywordSignControls["keyword"] = ""
-	keywordSignControls["pages"] = "0"
-	keywordSignControls["offsetX"] = "100"
-	keywordSignControls["offsetY"] = "100"
+	inputArrTwo := make(map[string]interface{})
+	inputArrTwo["sealName"] = "1"
+	inputArrTwo["positionX"] = "100"
+	inputArrTwo["positionY"] = "100"
+	inputArrTwo["pages"] = "0"
+	crossSignControls = append(crossSignControls, inputArrTwo)
 
-	stepStamper = append(stepStamper, keywordSignControls)
+	stepStamper["crossSignControls"] = crossSignControls
 
-	crossSignControls := make(map[string]interface{})
-	crossSignControls["sealName"] = "2"
-	crossSignControls["positionX"] = "100"
-	crossSignControls["positionY"] = "100"
-	stepStamper = append(stepStamper, crossSignControls)
+	xySignControls := make([]map[string]interface{}, 0)
 
-	xySignControls := make(map[string]interface{})
-	xySignControls["sealName"] = "2"
-	xySignControls["positionX"] = "100"
-	xySignControls["positionY"] = "100"
+	inputArrThree := make(map[string]interface{})
+	inputArrThree["sealName"] = "1"
+	inputArrThree["positionX"] = "100"
+	inputArrThree["positionY"] = "100"
+	inputArrThree["pages"] = "0"
 
-	stepStamper = append(stepStamper, xySignControls)
+	xySignControls = append(xySignControls, inputArrThree)
+
+	stepStamper["xySignControls"] = xySignControls
 
 	maprequest["stepStamper"] = stepStamper
 
 	seals := make([]map[string]interface{}, 0)
 
-	sealImages := make(map[string]interface{})
-	sealImages["sealBase64"] = "2"
-	sealImages["width"] = "100"
-	sealImages["height"] = "100"
-	sealImages["verticalAlign"] = "middle"
+	sealImagesList := make(map[string]interface{})
+
+	fileOne := "/swspan/gopath/src/XT_New/static/seal.jpg"
+
+	fileBytesOne, _ := ioutil.ReadFile(fileOne) // 读取file
+
+	contractBase64One := base64.StdEncoding.EncodeToString(fileBytesOne) // 加密成base64字符串
+	sealImagesList["sealBase64"] = contractBase64One
+	sealImagesList["width"] = "100"
+	sealImagesList["height"] = "100"
+	sealImagesList["verticalAlign"] = "middle"
 
-	seals = append(seals, sealImages)
+	sealTextsList := make(map[string]interface{})
+	sealTextsList["text"] = "2"
+	sealTextsList["fontSize"] = "100"
+	sealTextsList["fontColor"] = "100"
+	sealTextsList["isTextArea"] = true
+	sealTextsList["textAlign"] = 0
+	sealTextsList["width"] = 300
+	sealTextsList["height"] = 300
 
-	sealTexts := make(map[string]interface{})
-	sealTexts["text"] = "2"
-	sealTexts["fontSize"] = "100"
-	sealTexts["fontColor"] = "100"
-	sealTexts["isTextArea"] = true
-	sealTexts["textAlign"] = 0
-	sealTexts["width"] = 300
-	sealTexts["height"] = 300
+	sealsObj := make(map[string]interface{})
 
-	seals = append(seals, sealTexts)
+	sealsObj["sealWidth"] = "300"
+	sealsObj["sealHeight"] = "300"
+	sealsObj["sealName"] = "1"
+	sealsObj["sealImage"] = sealImagesList
+	sealsObj["sealText"] = sealTextsList
 
+	seals = append(seals, sealsObj)
 	maprequest["seals"] = seals
 
 	maprequest["isUserWishes"] = true
@@ -1802,3 +1830,64 @@ func SavePdfInformation() (string, string) {
 	//fmt.Println("str", orderId)
 	return str, orderId
 }
+
+func ToCheckInformation() string {
+
+	var url string
+
+	url = "http://localhost:8890/sdk/pdf/verify"
+	maprequest := make(map[string]interface{})
+
+	file := "/swspan/gopath/src/XT_New/static/2.pdf"
+
+	fileBytes, _ := ioutil.ReadFile(file) // 读取file
+
+	contractBase64 := base64.StdEncoding.EncodeToString(fileBytes) // 加密成base64字符串
+
+	maprequest["fileType"] = 1
+
+	maprequest["fileContent"] = contractBase64
+
+	byterequest, _ := json.Marshal(maprequest)
+
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	reader := bytes.NewReader(byterequest)
+	serviceCode := beego.AppConfig.String("serviceCode")
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+	fmt.Println("请求参数", request)
+	fmt.Println("Content-Signature", signatureStr)
+
+	request.Header.Set("appId", appId)
+	request.Header.Set("appKey", serviceKye)
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("Content-Signature", signatureStr)
+	client := http.Client{}
+
+	resp, err := client.Do(request)
+
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
+
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(respBytes)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+	}
+
+	return str
+}

service/stock_service.go

@@ -6231,7 +6231,7 @@ func ModifyDrugWarehouseInfoSix(info *models.DrugWarehouseInfo, id int64) error
 
 func GetGoodInventoryWarehouseList(id int64, storehouse_id int64) (info []*models.WarehousingInfo, err error) {
 
-	err = XTReadDB().Model(&info).Where("good_id = ? and status = 1 and storehouse_id=? and is_check= 1", id, storehouse_id).Preload("GoodInfo", "status = 1").Find(&info).Error
+	err = XTReadDB().Model(&info).Where("good_id = ? and status = 1 and storehouse_id=? and is_check= 1 and stock_count>0", id, storehouse_id).Preload("GoodInfo", "status = 1").Find(&info).Error
 	return info, err
 }
 
@@ -8242,8 +8242,14 @@ func ReduceGoodSumOutCount(storehouse_id int64, good_id int64, user_org_id int64
 
 func GetInvetoryWarehouseInfoList(orgid int64, storehouse_id int64) (info []*models.WarehousingInfo, err error) {
 
-	err = XTReadDB().Model(&info).Where("status = 1 and storehouse_id=? and is_check= 1 and org_id = ? and stock_count >0", storehouse_id, orgid).Preload("GoodInfo", "status = 1").Order("good_id").Find(&info).Error
-	return info, err
+	if orgid == 10191 {
+		err = XTReadDB().Model(&info).Where("status = 1 and storehouse_id=? and is_check= 1 and org_id = ?", storehouse_id, orgid).Preload("GoodInfo", "status = 1").Order("good_id").Find(&info).Error
+		return info, err
+	} else {
+		err = XTReadDB().Model(&info).Where("status = 1 and storehouse_id=? and is_check= 1 and org_id = ? and stock_count >0", storehouse_id, orgid).Preload("GoodInfo", "status = 1").Order("good_id").Find(&info).Error
+		return info, err
+	}
+
 }
 
 func GetSettleOpenConfig(user_org_id int64) (*models.HisSettleStockConfig, error) {