Merge branch '20211122' of http://git.shengws.com/csx/XT_New into 20211122

controllers/dialysis_record_api_controller.go

@@ -77,7 +77,7 @@ func (this *DialysisRecordAPIController) GetSchedules() {
 	redis := service.RedisClient()
 	defer redis.Close()
 	key := "scheduals_" + schedualDate + "_" + strconv.FormatInt(orgID, 10)
-
+	patients, _ := service.GetAllPcPatientListByListSeven(orgID)
 	scheduals_json_str, _ := redis.Get(key).Result()
 
 	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
@@ -89,8 +89,6 @@ func (this *DialysisRecordAPIController) GetSchedules() {
 		} else {
 			if len(scheduals) > 0 {
 
-				patients, _ := service.GetAllPcPatientListByListSeven(orgID)
-
 				dialysisOrders, _ := service.GetAllPcDialysisOrdersByList(orgID, date.Unix())
 
 				prescriptions, _ := service.GetAllPrescriptionsByList(orgID, date.Unix())

controllers/drug_stock_api_contorller.go

@@ -853,7 +853,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				//查询默认仓库
 				houseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 				//查询默认仓库剩余多少库存
-				list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseInfo, adminUserInfo.CurrentOrgId, item.DrugId)
+				list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, adminUserInfo.CurrentOrgId, item.DrugId)
 				var sum_count int64
 				var sum_in_count int64
 				for _, it := range list {
@@ -899,7 +899,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				//查询默认仓库
 				houseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 				//查询默认仓库剩余多少库存
-				list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseInfo, adminUserInfo.CurrentOrgId, item.DrugId)
+				list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, adminUserInfo.CurrentOrgId, item.DrugId)
 				var sum_count int64
 				var sum_in_count int64
 				for _, it := range list {
@@ -989,7 +989,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				//查询默认仓库
 				houseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 				//查询默认仓库剩余多少库存
-				list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseInfo, adminUserInfo.CurrentOrgId, item.DrugId)
+				list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, adminUserInfo.CurrentOrgId, item.DrugId)
 				var sum_count int64
 				var sum_in_count int64
 				for _, it := range list {

controllers/gobal_config_api_controller.go

@@ -112,6 +112,8 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/drug/getexportoutorderdruglist", &GobalConfigApiController{}, "Get:GetExportOutOrderDrugList")
 	beego.Router("/api/drug/getdrugflow", &GobalConfigApiController{}, "Get:GetDrugFlow")
 	beego.Router("/api/drug/getcancelstockdetail", &GobalConfigApiController{}, "Get:GetCancelStockDetail")
+
+	beego.Router("/api/changestocksetting/isopen", &GobalConfigApiController{}, "Get:ChangeStockSetting")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -1557,9 +1559,11 @@ func (c *GobalConfigApiController) GetAllIsOpenConfig() {
 	_, config := service.FindXTHisRecordByOrgId(adminUserInfo.CurrentOrgId)
 	_, project_config := service.FindXTHisProjectByOrgIdOne(adminUserInfo.CurrentOrgId)
 
+	stockSetting, _ := service.FindStockSettingById(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"is_open_xt_his":         config.IsOpen,
 		"is_open_xt_his_project": project_config.IsOpen,
+		"is_open_stock":          stockSetting.IsType,
 	})
 
 }
@@ -2331,3 +2335,31 @@ func (c *GobalConfigApiController) GetCancelStockDetail() {
 		"list": list,
 	})
 }
+
+func (c *GobalConfigApiController) ChangeStockSetting() {
+
+	is_type, _ := c.GetInt64("is_type")
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	setting := models.XtStockSetting{
+		IsType:    is_type,
+		UserOrgId: orgId,
+		Status:    1,
+		Ctime:     time.Now().Unix(),
+		Mtime:     0,
+	}
+
+	//查询机该机构是否已经配置
+	_, errcode := service.GetStockSettingIsExsit(orgId)
+	if errcode == gorm.ErrRecordNotFound {
+		service.CreateStockSetting(setting)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": 1,
+		})
+	} else if errcode == nil {
+		service.UpdateStockSetting(orgId, setting)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": 1,
+		})
+	}
+}

controllers/his_api_controller.go

@@ -1198,6 +1198,7 @@ func (c *HisApiController) CreateHisPrescription() {
 										//}
 
 										good, _ := service.GetGoodInformationByGoodId(project_id)
+										fmt.Println("parsetotal3232323223233232232323233", parsetotal, good.SumCount)
 										if parsetotal > good.SumCount {
 											c.ServeDynamicFailJsonSend(project_name + "库存不足")
 											return

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -90,6 +90,7 @@ func (this *DialysisAPIController) Scheduals() {
 
 	scheduals_json_str, _ := redis.Get(key).Result()
 	redis.Set(key, "", time.Second)
+	patients, _ := service.GetAllPatientListSix(orgID)
 	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		scheduals, err := service.MobileGetDialysisScheduals(orgID, date.Unix(), schedualType)
 
@@ -98,7 +99,7 @@ func (this *DialysisAPIController) Scheduals() {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		} else {
 			if len(scheduals) > 0 {
-				patients, _ := service.GetAllPatientListSix(orgID)
+
 				devices, _ := service.GetAllDevicetByListSix(orgID)
 				advices, _ := service.GetAllAdvicestByList(orgID, date.Unix())
 				prescriptions, _ := service.GetAllPrescriptionsByList(orgID, date.Unix())
@@ -4163,7 +4164,7 @@ func (c *DialysisAPIController) CreateConsumables() {
 							service.CreateDialysisBeforePrepareOne(&prepare)
 							//查询默认仓库
 							houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
-							goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseInfo, item.GoodId, adminUser.Org.Id)
+							goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminUser.Org.Id)
 							var sum_count int64
 							var sum_in_count int64
 							for _, it := range goodList {
@@ -4314,7 +4315,7 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 					service.CreateDialysisBeforePrepareOne(&prepare)
 					//查询默认仓库
 					houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-					goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseInfo, item.GoodId, adminInfo.Org.Id)
+					goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
 					var sum_count int64
 					var sum_in_count int64
 					for _, it := range goodList {
@@ -4357,7 +4358,7 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 					service.CreateDialysisBeforePrepareOne(&prepare)
 					//查询默认仓库
 					houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-					goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseInfo, item.GoodId, adminInfo.Org.Id)
+					goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
 					var sum_count int64
 					var sum_in_count int64
 					for _, it := range goodList {
@@ -4875,6 +4876,7 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 
 	//出库逻辑
 	err = service.ConsumablesDeliveryTotal(adminInfo.Org.Id, patient_id, record_time, beforePrepares, newBeforePrepares, adminInfo.AdminUser.Id)
+
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -4905,14 +4907,14 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 
 		//查询默认仓库
 		houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-		goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseInfo, item.ProjectId, adminInfo.Org.Id)
+		goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
 		var sum_count int64
 		var sum_in_count int64
 		for _, it := range goodList {
 			sum_count += it.StockCount
 			sum_in_count += it.WarehousingCount
 		}
-		service.UpdateGoodByGoodId(item.ProjectId, sum_count, sum_in_count, adminInfo.Org.Id)
+		service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
 
 	}
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -3855,7 +3855,6 @@ func (c *PatientApiController) DelDoctorAdvice() {
 
 			err = service.DeleteDoctorAdviceByGroupNo(&advice)
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
-			fmt.Println("key2332323223323232323232323", key)
 
 			redis.Set(key, "", time.Second)
 
@@ -3870,9 +3869,9 @@ func (c *PatientApiController) DelDoctorAdvice() {
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
 
 			redis.Set(key, "", time.Second)
-			fmt.Println("key2332323223323232323232323", key)
+
 			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":advice_list_all"
-			fmt.Println("key2332323223323232323232323", keyTwo)
+
 			redis.Set(keyTwo, "", time.Second)
 			keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":his_doctor_advice"
 			redis.Set(keyThree, "", time.Second)
@@ -4009,6 +4008,52 @@ func (c *PatientApiController) ExecProject() {
 	adminInfo := c.GetMobileAdminUserInfo()
 
 	project, _ := service.FindHisProjectById(adminInfo.Org.Id, project_id)
+
+	if project.Type == 3 {
+		good, _ := service.GetGoodInformationByGoodId(project.ProjectId)
+		if good.IsUser != 1 {
+
+			//查询开关是否开启
+			stockSetting, _ := service.FindStockSettingById(adminInfo.Org.Id)
+
+			//开关已经开启
+			if stockSetting.IsType == 1 {
+				theTime, _ := time.ParseInLocation(timeLayout2, execution_time, loc)
+				scheduleDateStart := theTime.Format("2006-01-02")
+				timeLayout3 := "2006-01-02"
+				loc, _ := time.LoadLocation("Local")
+				execuTime, _ := time.ParseInLocation(timeLayout3, scheduleDateStart, loc)
+				//查询该耗材是否已经出库
+				auto, _ := service.GetAutoStockOutById(project.ProjectId, execuTime.Unix(), adminInfo.Org.Id, project.PatientId)
+				if auto.ID == 0 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeStockExced)
+					return
+				}
+			}
+		}
+
+		if good.IsUser == 1 && good.IsWarehouse == 1 {
+
+			//查询开关是否开启
+			stockSetting, _ := service.FindStockSettingById(adminInfo.Org.Id)
+
+			//开关已经开启
+			if stockSetting.IsType == 1 {
+				theTime, _ := time.ParseInLocation(timeLayout2, execution_time, loc)
+				scheduleDateStart := theTime.Format("2006-01-02")
+				timeLayout3 := "2006-01-02"
+				loc, _ := time.LoadLocation("Local")
+				execuTime, _ := time.ParseInLocation(timeLayout3, scheduleDateStart, loc)
+				//查询该耗材是否已经出库
+				auto, _ := service.GetAutoStockOutById(project.ProjectId, execuTime.Unix(), adminInfo.Org.Id, project.PatientId)
+				if auto.ID == 0 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeStockExced)
+					return
+				}
+			}
+		}
+	}
+
 	if project.ExecutionState == 1 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExced)
 		return

controllers/patient_api_controller.go

@@ -568,6 +568,14 @@ func (c *PatientApiController) EditPatient() {
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
 
+	nowTimeUinx := time.Now()
+	today := nowTimeUinx.Format("2006-01-02")
+
+	redis := service.RedisClient()
+	defer redis.Close()
+	key := "scheduals_" + today + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+	redis.Set(key, "", time.Second*60*60*18)
+
 	if len(record_date) > 0 {
 		var recordTime int64
 		timeLayout := "2006-01-02"

controllers/secondary_order_api_contorller.go

@@ -40,25 +40,6 @@ func SecondaryOrderApiRegistRouters() {
 	beego.Router("/api/secondary/byliinit", &SecondaryOrderApiController{}, "get:Byliinit")                         //初始化旧数据
 	beego.Router("/api/secondary/getcreaterid", &SecondaryOrderApiController{}, "get:GetCreaterId")                 //获取当前登录的人的id
 
-	beego.Router("/api/secondary/getcode", &SecondaryOrderApiController{}, "get:GetStoreCode")                      //获取仓库编码
-	beego.Router("/api/secondary/updatestatus", &SecondaryOrderApiController{}, "get:UpdateStatus")                 //修改仓库状态
-	beego.Router("/api/secondary/deletestorehouse", &SecondaryOrderApiController{}, "get:DeleteStorehouse")         //删除仓库
-	beego.Router("/api/secondary/isstorehousename", &SecondaryOrderApiController{}, "get:IsStorehouseName")         //仓库名称是否重复
-	beego.Router("/api/secondary/isstorehouseaddress", &SecondaryOrderApiController{}, "get:IsStorehouseAddress")   //仓库地址是否重复
-	beego.Router("/api/secondary/storehouselist", &SecondaryOrderApiController{}, "get:StorehouseList")             //分页
-	beego.Router("/api/secondary/addstorehouse", &SecondaryOrderApiController{}, "post:AddStorehouse")              //新增仓库
-	beego.Router("/api/secondary/updatestorehouse", &SecondaryOrderApiController{}, "post:UpdateStorehouse")        //修改
-	beego.Router("/api/secondary/getonestorehouse", &SecondaryOrderApiController{}, "get:GetOneStorehouse")         //查一条仓库的信息
-	beego.Router("/api/secondary/getallstorehousename", &SecondaryOrderApiController{}, "get:GetAllStorehouseName") //获取当前机构的所有可用仓库名称
-	beego.Router("/api/secondary/findstorehouseconfig", &SecondaryOrderApiController{}, "get:FindStorehouseConfig") //查询该机构的仓库配置
-	beego.Router("/api/secondary/updateinfo", &SecondaryOrderApiController{}, "get:UpdateInfo")                     //更改耗材自动入库仓库
-	beego.Router("/api/secondary/updateoutinfo", &SecondaryOrderApiController{}, "get:UpdateOutInfo")               //更改耗材自动出库仓库
-	beego.Router("/api/secondary/updatedruginfo", &SecondaryOrderApiController{}, "get:UpdateDrugInfo")             //更改药品自动入库仓库
-	beego.Router("/api/secondary/updatedrugout", &SecondaryOrderApiController{}, "get:UpdateDrugOut")               //更改药品自动出库仓库
-	beego.Router("/api/secondary/getusername", &SecondaryOrderApiController{}, "get:GetuserName")                   //获取仓库管理员信息
-	beego.Router("/api/secondary/byliinit", &SecondaryOrderApiController{}, "get:Byliinit")                         //初始化旧数据
-	beego.Router("/api/secondary/getcreaterid", &SecondaryOrderApiController{}, "get:GetCreaterId")
-
 	beego.Router("/api/seconde/getsencondegoodlist", &SecondaryOrderApiController{}, "Get:GetSencondeGoodList")
 	beego.Router("/api/senconde/savesencondorder", &SecondaryOrderApiController{}, "Post:SaveSencondOrder")
 	beego.Router("/api/senconde/getallsecondeorderlist", &SecondaryOrderApiController{}, "Get:GetAllSecondeOrderList")
@@ -664,7 +645,6 @@ func (this *SecondaryOrderApiController) SaveSencondOrder() {
 func (this *SecondaryOrderApiController) GetAllSecondeOrderList() {
 
 	check_id, _ := this.GetInt64("check_id")
-	fmt.Println("checkd_id3232323233233223", check_id)
 	start_time := this.GetString("start_time")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -950,7 +930,7 @@ func (this *SecondaryOrderApiController) GetSecondOrderById() {
 	warehouse, _ := service.GetSecondWarehouseOrderById(id)
 	list, _ := service.GetSencondOrderDetail(id, orgId)
 	appId := this.GetAdminUserInfo().CurrentAppId
-	doctor, _ := service.GetAllDoctor(orgId, appId)
+	doctor, _ := service.GetAllDoctorSix(orgId, appId)
 	houseList, _ := service.GetAllStoreHouseList(orgId)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"warehouse":  warehouse,
@@ -1508,7 +1488,7 @@ func (this *SecondaryOrderApiController) ReturnCheckSecondOrder() {
 			//查询默认仓库
 			houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
 			//查询默认仓库剩余多少库存
-			list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseInfo, orgId, item.ProjectId)
+			list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, orgId, item.ProjectId)
 			var sum_count int64
 			var sum_in_count int64
 			for _, it := range list {
@@ -1539,7 +1519,7 @@ func (this *SecondaryOrderApiController) ReturnCheckSecondOrder() {
 				outList, _ := service.GetStoreWarehouseOutList(item.ProjectId, item.ID, item.UserOrgId)
 				for _, it := range outList {
 					//回退库存
-					service.ModifyStoreWarehouseById(it.WarehouseInfotId, item.Count)
+					service.ModifyStoreWarehouseById(it.WarehouseInfotId, it.Count)
 
 					//获取入库单
 					storeWareing, _ := service.GetStoreWarehouseById(item.WarehouseId, it.OrgId)
@@ -1554,7 +1534,7 @@ func (this *SecondaryOrderApiController) ReturnCheckSecondOrder() {
 
 			//查询默认仓库
 			houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
-			goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseInfo, item.ProjectId, item.UserOrgId)
+			goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.ProjectId, item.UserOrgId)
 			var sum_count int64
 			var sum_in_count int64
 			for _, it := range goodList {
@@ -1786,6 +1766,22 @@ func (this *SecondaryOrderApiController) UpdateInfo() {
 	}
 	id, _ := this.GetInt64("id")
 	err = service.UpdateInfo(orgId, id)
+
+	//查询默认仓库
+	houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+
+	list, _ := service.GetAllGoodList(orgId)
+	for _, item := range list {
+		var sum_count int64
+		var sum_in_count int64
+		goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.ID, orgId)
+		for _, it := range goodList {
+			sum_count += it.StockCount
+			sum_in_count += it.WarehousingCount
+		}
+		service.UpdateGoodByGoodId(item.ID, sum_count, sum_in_count, orgId)
+	}
+
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 		return
@@ -1810,6 +1806,22 @@ func (this *SecondaryOrderApiController) UpdateOutInfo() {
 	}
 	id, _ := this.GetInt64("id")
 	err = service.UpdateOutInfo(orgId, id)
+
+	//查询默认仓库
+	houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+
+	list, _ := service.GetAllGoodList(orgId)
+	for _, item := range list {
+		var sum_count int64
+		var sum_in_count int64
+		goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.ID, orgId)
+		for _, it := range goodList {
+			sum_count += it.StockCount
+			sum_in_count += it.WarehousingCount
+		}
+		service.UpdateGoodByGoodId(item.ID, sum_count, sum_in_count, orgId)
+	}
+
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 		return
@@ -1833,7 +1845,30 @@ func (this *SecondaryOrderApiController) UpdateDrugInfo() {
 		return
 	}
 	id, _ := this.GetInt64("id")
+
 	err = service.UpdateDrugInfo2(orgId, id)
+
+	//查询默认仓库
+	houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+	baseDrug, _ := service.GetAllBaseDrugList(orgId)
+
+	for _, item := range baseDrug {
+		var sum_drug_count int64
+		var sum_drug_in_count int64
+
+		//查询默认仓库剩余多少库存
+		list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, orgId, item.ID)
+		for _, it := range list {
+			if it.MaxUnit == item.MaxUnit {
+				it.StockMaxNumber = it.StockMaxNumber * item.MinNumber
+				it.WarehousingCount = it.WarehousingCount * item.MinNumber
+			}
+			sum_drug_count += it.StockMaxNumber + it.StockMinNumber
+			sum_drug_in_count += it.WarehousingCount
+		}
+		service.UpdateMedicalSumCount(item.ID, sum_drug_count, sum_drug_in_count, orgId)
+	}
+
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 		return
@@ -1858,6 +1893,28 @@ func (this *SecondaryOrderApiController) UpdateDrugOut() {
 	}
 	id, _ := this.GetInt64("id")
 	err = service.UpdateDrugOut(orgId, id)
+
+	//查询默认仓库
+	houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+	baseDrug, _ := service.GetAllBaseDrugList(orgId)
+
+	for _, item := range baseDrug {
+		var sum_drug_count int64
+		var sum_drug_in_count int64
+
+		//查询默认仓库剩余多少库存
+		list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, orgId, item.ID)
+		for _, it := range list {
+			if it.MaxUnit == item.MaxUnit {
+				it.StockMaxNumber = it.StockMaxNumber * item.MinNumber
+				it.WarehousingCount = it.WarehousingCount * item.MinNumber
+			}
+			sum_drug_count += it.StockMaxNumber + it.StockMinNumber
+			sum_drug_in_count += it.WarehousingCount
+		}
+		service.UpdateMedicalSumCount(item.ID, sum_drug_count, sum_drug_in_count, orgId)
+	}
+
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 		return

controllers/stock_good_api_controller.go

@@ -176,7 +176,7 @@ func (c *StockGoodApiController) GetAllGoodType() {
 	goodTypes, err := service.FindAllGoodType(adminUserInfo.CurrentOrgId)
 	houseList, _ := service.GetAllStoreHouseListTwo(adminUserInfo.CurrentOrgId)
 	storehouselist, _ := service.GetAllStoreHouseList(adminUserInfo.CurrentOrgId)
-	goodInfo, _ := service.FindAllGoodInfo(adminUserInfo.CurrentOrgId)
+	goodInfo, _ := service.FindAllGoodInfoTwo(adminUserInfo.CurrentOrgId)
 	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{

controllers/stock_in_api_controller.go

@@ -783,7 +783,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 				//查询该机构默认仓库
 				storeConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 				//查询剩余库存
-				goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseInfo, item.GoodId, adminUserInfo.CurrentOrgId)
+				goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, item.GoodId, adminUserInfo.CurrentOrgId)
 				var sum_count int64
 				var sum_in_count int64
 				for _, item := range goodList {
@@ -823,7 +823,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 				//查询该机构默认仓库
 				storeConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 				//查询剩余库存
-				goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseInfo, item.GoodId, adminUserInfo.CurrentOrgId)
+				goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, item.GoodId, adminUserInfo.CurrentOrgId)
 				var sum_count int64
 				var sum_in_count int64
 				for _, item := range goodList {
@@ -7711,9 +7711,9 @@ func (this *StockManagerApiController) GetDrugDetailSummary() {
 	page, _ := this.GetInt64("page")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	list, total, err := service.GetDrugDetailSummary(startTime, endTime, keyword, limit, page, orgId)
-
+	fmt.Println("list23323232233232233223232323", list)
 	druglist, _, _ := service.GetDrugDetailSummaryOne(startTime, endTime, keyword, limit, page, orgId)
-
+	fmt.Println("druglist2332322332223322323", druglist)
 	patients, _ := service.GetAllpatient(orgId)
 	var drugType = "药品类型"
 	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
@@ -7753,7 +7753,7 @@ func (this *StockManagerApiController) GetGoodDetailSummary() {
 			return
 		}
 		startTime = theTime.Unix()
-		fmt.Println("开始时间", startTime)
+
 	}
 	var endTime int64
 	if len(end_time) > 0 {

enums/error_code.go

@@ -90,6 +90,7 @@ const ( // ErrorCode
 	ErrorCodeNotSelectLapsetoType           = 1042
 	ErrorCodeNotSelectLapsetoTime           = 1043
 	ErrorCodeEquitNoExist                   = 1045
+	ErrorCodeStockExced                     = 1046
 
 	ErrorCodeInspectionDateExit    = 1201
 	ErrorCodeInspectionAddFail     = 1202
@@ -477,6 +478,8 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeHospitalExistDataException: "该患者已经入院，请选办理出院结算后再进行办理入院操作",
 
 	ErrorCodeRecordFailedException: "记录不存在",
+
+	ErrorCodeStockExced: "请先出库,执行失败",
 }
 
 type SGJError struct {

models/patient_models.go

@@ -22,6 +22,7 @@ type MSchedualPatientList struct {
 	Name               string `gorm:"column:name" json:"name" form:"name"`
 	IdCardNo           string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
 	UserSysBeforeCount int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+	TrobleShoot        int64  `gorm:"column:troble_shoot" json:"troble_shoot" form:"troble_shoot"`
 }
 
 func (MSchedualPatientList) TableName() string {

models/stock_models.go

@@ -1332,3 +1332,16 @@ type BloodHisPrescriptionProject struct {
 func (BloodHisPrescriptionProject) TableName() string {
 	return "his_prescription_project"
 }
+
+type XtStockSetting struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	IsType    int64 `gorm:"column:is_type" json:"is_type" form:"is_type"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtStockSetting) TableName() string {
+	return "xt_stock_setting"
+}

service/secondary_service.go

@@ -980,9 +980,9 @@ func ModifyStoreWarehouse(id int64, orgid int64, good_id int64) error {
 
 	err := XTWriteDB().Model(&models.Warehousing{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"status": 0}).Error
 
-	err = XTWriteDB().Model(&models.WarehousingInfo{}).Where("warehousing_id in(?) and org_id = ? and status =1 and good_id = ?", id, orgid, good_id).Update(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.WarehousingInfo{}).Where("warehousing_id  = ? and org_id = ? and status =1 and good_id = ?", id, orgid, good_id).Update(map[string]interface{}{"status": 0}).Error
 
-	err = XTWriteDB().Model(&models.VmStockFlow{}).Where("warehousing_id in(?) and user_org_id = ? and status = 1 and good_id = ?", id, orgid, good_id).Update(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.VmStockFlow{}).Where("warehousing_id = ? and user_org_id = ? and status = 1 and good_id = ?", id, orgid, good_id).Update(map[string]interface{}{"status": 0}).Error
 	return err
 }
 
@@ -996,9 +996,9 @@ func GetStoreWarehouseOutById(id int64, orgid int64) (models.WarehouseOut, error
 func ModifyWarehouseOut(id int64, orgid int64, good_id int64) error {
 	err := XTWriteDB().Model(&models.WarehouseOut{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"status": 0}).Error
 
-	err = XTWriteDB().Model(&models.WarehouseOutInfo{}).Where("warehouse_out_id in(?) and org_id = ? and status =1 and good_id = ?", id, orgid, good_id).Update(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.WarehouseOutInfo{}).Where("warehouse_out_id = ? and org_id = ? and status =1 and good_id = ?", id, orgid, good_id).Update(map[string]interface{}{"status": 0}).Error
 
-	err = XTWriteDB().Model(&models.VmStockFlow{}).Where("warehouse_out_id in(?) and user_org_id = ? and status = 1 and good_id = ?", id, orgid, good_id).Update(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.VmStockFlow{}).Where("warehouse_out_id = ? and user_org_id = ? and status = 1 and good_id = ?", id, orgid, good_id).Update(map[string]interface{}{"status": 0}).Error
 	return err
 }
 
@@ -1030,9 +1030,9 @@ func DeleteStoreWarehousingId(id int64, orgid int64, drug_id int64) error {
 
 	err := XTWriteDB().Model(&models.DrugWarehouse{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"status": 0}).Error
 
-	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("warehousing_id in(?) and org_id = ? and status = 1 and drug_id = ?", id, orgid, drug_id).Update(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("warehousing_id  = ? and org_id = ? and status = 1 and drug_id = ?", id, orgid, drug_id).Update(map[string]interface{}{"status": 0}).Error
 
-	err = XTWriteDB().Model(&models.DrugFlow{}).Where("warehousing_id in(?) and user_org_id =? and status = 1 and drug_id = ?", id, orgid, drug_id).Update(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.DrugFlow{}).Where("warehousing_id = ? and user_org_id =? and status = 1 and drug_id = ?", id, orgid, drug_id).Update(map[string]interface{}{"status": 0}).Error
 	return err
 }
 
@@ -1046,9 +1046,9 @@ func GetStoreDrugWarehouseOutById(id int64, orgid int64) (models.DrugWarehouseOu
 func DeleteStoreWarehouseOut(id int64, orgid int64, drug_id int64) error {
 	err := XTWriteDB().Model(&models.DrugWarehouseOut{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"status": 0}).Error
 
-	err = XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("warehouse_out_id in(?) and org_id = ? and status = 1 and drug_id = ?", id, orgid, drug_id).Update(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("warehouse_out_id = ? and org_id = ? and status = 1 and drug_id = ?", id, orgid, drug_id).Update(map[string]interface{}{"status": 0}).Error
 
-	err = XTWriteDB().Model(&models.DrugFlow{}).Where("warehouse_out_id in(?) and user_org_id =? and status = 1 and drug_id = ?", id, orgid, drug_id).Update(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.DrugFlow{}).Where("warehouse_out_id = ? and user_org_id =? and status = 1 and drug_id = ?", id, orgid, drug_id).Update(map[string]interface{}{"status": 0}).Error
 	return err
 }
 

service/stock_service.go

@@ -6329,8 +6329,9 @@ func UpdateGoodByGoodId(good_id int64, sum_count int64, sum_in_count int64, orgi
 
 func GetDrugDetailSummary(startime int64, endtime int64, keyword string, limit int64, page int64, orgid int64) (adviceinfo []*models.BloodHisDoctorAdviceInfo, total int64, err error) {
 
-	db := XTReadDB().Table("his_doctor_advice_info as x").Where("x.status = 1 and x.execution_state = 1")
-
+	db := XTReadDB().Table("his_doctor_advice_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as x d")
+	fmt.Println(table)
 	if startime > 0 {
 		db = db.Where("x.advice_date >= ?", startime)
 	}
@@ -6344,17 +6345,19 @@ func GetDrugDetailSummary(startime int64, endtime int64, keyword string, limit i
 
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
-		db = db.Joins("left join sgj_xt.xt_base_drug as d on d.id = x.drug_id").Where("d.drug_name like ?", likeKey).Group("d.id")
+		db = db.Select("x.patient_id,x.user_org_id,x.id,x.advice_date,x.advice_date,x.prescribing_number_unit,x.drug_id").Joins("left join sgj_xt.xt_base_drug as d on d.id = x.drug_id").Where("d.drug_name like ?", likeKey)
 	}
+
 	offset := (page - 1) * limit
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.created_time desc").Group("x.drug_id").Find(&adviceinfo).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.created_time desc").Group("x.drug_id").Scan(&adviceinfo).Error
 	return adviceinfo, total, err
 }
 
 func GetDrugDetailSummaryOne(startime int64, endtime int64, keyword string, limit int64, page int64, orgid int64) (adviceinfo []*models.BloodHisDoctorAdviceInfo, total int64, err error) {
 
-	db := XTReadDB().Table("his_doctor_advice_info as x").Where("x.status = 1 and x.execution_state = 1")
-
+	db := XTReadDB().Table("his_doctor_advice_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as x d")
+	fmt.Println(table)
 	if startime > 0 {
 		db = db.Where("x.advice_date >= ?", startime)
 	}
@@ -6369,10 +6372,10 @@ func GetDrugDetailSummaryOne(startime int64, endtime int64, keyword string, limi
 
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
-		db = db.Joins("left join sgj_xt.xt_base_drug as d on d.id = x.drug_id").Where("d.drug_name like ?", likeKey).Group("d.id")
+		db = db.Select("x.patient_id,x.user_org_id,x.id,x.advice_date,x.advice_date,x.prescribing_number_unit,x.drug_id").Joins("left join sgj_xt.xt_base_drug as d on d.id = x.drug_id").Where("d.drug_name like ?", likeKey)
 	}
-	offset := (page - 1) * limit
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.created_time desc").Find(&adviceinfo).Error
+
+	err = db.Order("x.created_time desc").Scan(&adviceinfo).Error
 	return adviceinfo, total, err
 }
 
@@ -6384,8 +6387,9 @@ func GetAllDrugSummary(orgid int64) (drug []*models.BaseDrugLib, err error) {
 
 func GetGoodDetailSummary(startime int64, endtime int64, keyword string, limit int64, page int64, orgid int64) (project []*models.BloodHisPrescriptionProject, total int64, err error) {
 
-	db := XTReadDB().Table("his_prescription_project as x").Where("x.status = 1 and x.execution_state = 1 and x.type = 3")
-
+	db := XTReadDB().Table("his_prescription_project as x").Where("x.status = 1  and x.type = 3")
+	table := XTReadDB().Table("xt_good_information as d")
+	fmt.Println(table)
 	if startime > 0 {
 		db = db.Where("x.record_date >= ?", startime)
 	}
@@ -6399,17 +6403,19 @@ func GetGoodDetailSummary(startime int64, endtime int64, keyword string, limit i
 
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
-		db = db.Joins("left join sgj_xt.xt_good_information as d on d.id = x.drug_id").Where("d.good_name like ?", likeKey).Group("d.id")
+		db = db.Select("x.id,x.project_id,x.user_org_id,x.patient_id,x.record_date").Joins("left join xt_good_information as d on d.id = x.project_id").Where("d.good_name like ?", likeKey).Group("d.id")
 	}
+
 	offset := (page - 1) * limit
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Group("x.project_id").Find(&project).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Group("x.project_id").Scan(&project).Error
 	return project, total, err
 }
 
 func GetGoodDetailSummaryOne(startime int64, endtime int64, keyword string, limit int64, page int64, orgid int64) (project []*models.BloodHisPrescriptionProject, total int64, err error) {
 
-	db := XTReadDB().Table("his_prescription_project as x").Where("x.status = 1 and x.execution_state = 1 and x.type = 3")
-
+	db := XTReadDB().Table("his_prescription_project as x").Where("x.status = 1 and x.type = 3")
+	table := XTReadDB().Table("xt_good_information as d")
+	fmt.Println(table)
 	if startime > 0 {
 		db = db.Where("x.record_date >= ?", startime)
 	}
@@ -6423,10 +6429,10 @@ func GetGoodDetailSummaryOne(startime int64, endtime int64, keyword string, limi
 
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
-		db = db.Joins("left join sgj_xt.xt_good_information as d on d.id = x.drug_id").Where("d.good_name like ?", likeKey).Group("d.id")
+		db = db.Select("x.id,x.project_id,x.user_org_id,x.patient_id,x.record_date").Joins("left join xt_good_information as d on d.id = x.project_id").Where("d.good_name like ? ", likeKey).Group("d.id")
 	}
-	offset := (page - 1) * limit
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Find(&project).Error
+
+	err = db.Order("x.ctime desc").Group("x.id").Scan(&project).Error
 	return project, total, err
 }
 
@@ -6435,3 +6441,43 @@ func GeAllGoodInformation(orgid int64) (good []*models.GoodInfo, err error) {
 	err = XTReadDB().Where("org_id =? and status = 1 and is_user = 1", orgid).Find(&good).Error
 	return good, err
 }
+
+func GetStockSettingIsExsit(orgid int64) (*models.XtStockSetting, error) {
+
+	setting := models.XtStockSetting{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&setting).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &setting, nil
+}
+
+func CreateStockSetting(setting models.XtStockSetting) error {
+
+	err := XTWriteDB().Create(&setting).Error
+
+	return err
+}
+
+func UpdateStockSetting(orgid int64, setting models.XtStockSetting) error {
+
+	err := XTWriteDB().Model(&models.XtStockSetting{}).Where("user_org_id = ? and status = 1", orgid).Update(map[string]interface{}{"is_type": setting.IsType}).Error
+	return err
+}
+
+func FindStockSettingById(orgid int64) (models.XtStockSetting, error) {
+
+	setting := models.XtStockSetting{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&setting).Error
+	return setting, err
+}
+
+func GetAutoStockOutById(good_id, record_date int64, orgid int64, patient_id int64) (models.BloodAutomaticReduceDetail, error) {
+
+	detail := models.BloodAutomaticReduceDetail{}
+	err := XTReadDB().Where("good_id = ? and record_time = ? and org_id = ? and status = 1 and patient_id = ?", good_id, record_date, orgid, patient_id).Find(&detail).Error
+	return detail, err
+}