hahah

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10745 //机构id
+		subscibe.OrgId = 10751 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10745 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10751 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 18734 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10745 //机构id小英9675或4
+		subscibe.OrgId = 10751 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10745 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10751 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 18734 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/common_api_controller.go

@@ -1436,7 +1436,7 @@ func (this *CommonApiController) GetPatientscontrol() {
 	startimeStrUnix := startimeStr.Unix()
 
 	endtime := this.GetString("endtime")
-	fmt.Println("结束时间", endtime)
+
 	endtimeStr := endtime + " 23:59:59"
 	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
 	endtimeStrsUnix := endtimeStrs.Unix()
@@ -1467,34 +1467,20 @@ func (this *CommonApiController) GetPatientscontrol() {
 func (this *CommonApiController) GetCartogramList() {
 	adminUser := this.GetAdminUserInfo()
 	orgid := adminUser.CurrentOrgId
-	//fmt.Println("orgid", orgid)
 	lapstor, _ := this.GetInt64("lapstor")
 	fmt.Println("lapstor", lapstor)
 	startime := this.GetString("startime")
-	//fmt.Println("开始时间", startime)
 	startimeStr, _ := utils.ParseTimeStringToTime("2006-01-02", startime)
 	startimeStrUnix := startimeStr.Unix()
-	//fmt.Println("时间搓", startimeStrUnix)
 	endtime := this.GetString("endtime")
-	//fmt.Println("结束时间", endtime)
 	endtimeStr := endtime + " 23:59:59"
 	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
 	endtimeStrsUnix := endtimeStrs.Unix()
-	//fmt.Println("结束时间搓", endtimeStrsUnix)
-	//limit, _ := this.GetInt64("limit")
-	//page, _ := this.GetInt64("page")
-
 	//统计总共
 	_, total, err := service.GetTotalPatientsControl(orgid, startimeStrUnix, endtimeStrsUnix)
-	//fmt.Println("total=================", total)
 	//统计rangetype= 1
 	_, standtotal, err := service.GetStandControl(orgid, startimeStrUnix, endtimeStrsUnix)
-	//fmt.Println(standtotal)
 	_, standtotalOne, err := service.GetStandControlOne(orgid, startimeStrUnix, endtimeStrsUnix)
-	//fmt.Println(standtotalOne)
-	//cartogramlist, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
-	//infectiouscontrol, err := service.GetInfectiousPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
-	//_, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, page, limit)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return

controllers/drug_stock_api_contorller.go

@@ -3473,7 +3473,6 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 
 		flowList, _ := service.GetNewDrugFlowList(item.DrugId, item.OrgId, item.ID, tx)
 
-		fmt.Println("FlowList=================", flowList)
 		var his_count int64
 		if len(flowList) > 0 {
 			for _, item := range flowList {
@@ -3489,8 +3488,6 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 				}
 			}
 		}
-		fmt.Println("incount_0000000000000000", in_cout)
-		fmt.Println("his_count--------------", his_count)
 
 		if in_cout != his_count {
 			is_success = 1
@@ -3498,6 +3495,32 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeFlow)
 			return
 		}
+
+		goodcodelist := strings.Split(item.DrugCode, ",")
+
+		if len(goodcodelist) > 0 {
+			goodInfo, _ := service.GetNewDrugByIdIsStop(item.DrugId, item.OrgId, tx)
+			for _, it := range goodcodelist {
+				if it != "" {
+					codeInfo := models.XtDrugCodeInfo{
+						DrugId:          item.DrugId,
+						BatchNumber:     item.Number,
+						DrugCode:        it,
+						WarehouseInfoId: item.ID,
+						IsUserCount:     0,
+						IsOutStatus:     2,
+						Status:          1,
+						UserOrgId:       item.OrgId,
+						Ctime:           time.Now().Unix(),
+						Mtime:           time.Now().Unix(),
+						SplitOfNumber:   goodInfo.SplitOfNumber,
+					}
+					service.CreateDrugCodeInfo(codeInfo, tx)
+				}
+
+			}
+		}
+
 	}
 
 	if is_success != 1 {
@@ -3600,6 +3623,32 @@ func (c *StockDrugApiController) ReturnCheckWarehouseingInfo() {
 		//扣减库存
 		service.ReduceNewDrugStockCount(item.StorehouseId, item.DrugId, item.OrgId, total_count, over_count, tx)
 
+		//改变扫码库里面的状态
+		goodcodelist := strings.Split(item.DrugCode, ",")
+
+		if len(goodcodelist) > 0 {
+			goodInfo, _ := service.GetNewGoodByIdIsStop(item.DrugId, item.OrgId, tx)
+			for _, it := range goodcodelist {
+				if it != "" {
+					codeInfo := models.XtDrugCodeInfo{
+						DrugId:          item.DrugId,
+						BatchNumber:     item.Number,
+						DrugCode:        it,
+						WarehouseInfoId: item.ID,
+						IsUserCount:     0,
+						IsOutStatus:     2,
+						Status:          0,
+						UserOrgId:       item.OrgId,
+						Ctime:           time.Now().Unix(),
+						Mtime:           time.Now().Unix(),
+						SplitOfNumber:   goodInfo.SplitOfNumber,
+					}
+					service.UpdateDrugCodeInfo(codeInfo, tx)
+				}
+
+			}
+		}
+
 	}
 	//更新审核
 	err := service.ReturnNewCheckWarehouseingInfo(warehousing_id, orgId, tx)

controllers/manager_center_api_controller.go

@@ -172,6 +172,8 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	scan_code := c.GetString("scan_code")
 	drug_identification_code := c.GetString("drug_identification_code")
 
+	split_of_number, _ := c.GetInt64("split_of_number")
+
 	hans := drug_name // 要转换的汉字字符串
 
 	// 创建一个拼音转换器
@@ -266,6 +268,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 		IsZeroFlag:                  is_zero_flag,
 		ScanCode:                    scan_code,
 		DrugIdentificationCode:      drug_identification_code,
+		SplitOfNumber:               split_of_number,
 	}
 	drugLib.FirstLetter = firstLetter
 	drugLib.Pinyin = firstLetter
@@ -393,7 +396,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	is_zero_flag, _ := c.GetInt64("is_zero_flag")
 	scan_code := c.GetString("scan_code")
 	drug_identification_code := c.GetString("drug_identification_code")
-
+	split_of_number, _ := c.GetInt64("split_of_number")
 	adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
 
@@ -494,6 +497,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		IsZeroFlag:                  is_zero_flag,
 		ScanCode:                    scan_code,
 		DrugIdentificationCode:      drug_identification_code,
+		SplitOfNumber:               split_of_number,
 	}
 	if adminInfo.CurrentOrgId == 10206 || adminInfo.CurrentOrgId == 10344 {
 
@@ -1661,6 +1665,8 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 	is_show, _ := c.GetInt64("is_show")
 	is_zero_flag, _ := c.GetInt64("is_zero_flag")
 
+	split_of_number, _ := c.GetInt64("split_of_number")
+
 	adminUserInfo := c.GetAdminUserInfo()
 
 	totals := service.FindGoodInfoByNameTwo(specification_name, adminUserInfo.CurrentOrgId, good_id, good_name)
@@ -1745,6 +1751,7 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 		Bck01b:                      "55",
 		IsShow:                      is_show,
 		IsZeroFlag:                  is_zero_flag,
+		SplitOfNumber:               split_of_number,
 	}
 	err, goodInfos := service.AddSigleGoodInfo(&goodInfo)
 	if err == nil {
@@ -1816,7 +1823,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 	bby01 := c.GetString("bby01")
 	is_show, _ := c.GetInt64("is_show")
 	is_zero_flag, _ := c.GetInt64("is_zero_flag")
-
+	split_of_number, _ := c.GetInt64("split_of_number")
 	// 创建一个拼音转换器
 	p := pinyin.NewArgs()
 
@@ -1893,6 +1900,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 		Bck01b:                      "55",
 		IsShow:                      is_show,
 		IsZeroFlag:                  is_zero_flag,
+		SplitOfNumber:               split_of_number,
 	}
 
 	totals := service.FindGoodInfoByNameOne(specification_name, adminUserInfo.CurrentOrgId, good_id, id, good_name)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -4388,7 +4388,7 @@ func (this *DialysisAPIController) StartDialysis() {
 				}
 			}
 
-			if adminUserInfo.Org.Id == 10766 || adminUserInfo.Org.Id == 10768 {
+			if adminUserInfo.Org.Id == 10766 || adminUserInfo.Org.Id == 10768 || adminUserInfo.Org.Id == 9478 {
 				if prescription.ModeId == 2 || prescription.ModeId == 13 {
 					totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
 					if totalMin == 0 {
@@ -5953,25 +5953,8 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		var displacement_quantity float64
 		totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
 
-		//replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*60) / 1000
-		////乘10 除10是为了保留一位小数
 		replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
-		fmt.Println("replacement_rate", replacement_rate)
-		record.ReplacementRate = replacement_rate
-		displacement_quantity = math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime)/3600) * replacement_rate
-		record.DisplacementQuantity = displacement_quantity
-		//fmt.Println("totalMin", totalMin)
-		//fmt.Println("math.Floor(prescription", math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*60))
-		//fmt.Println("replacement_rate", replacement_rate)
-		//fmt.Println("math.Floor", math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime)/3600))
-		//fmt.Println("displacement_quantity===================", displacement_quantity)
-	}
 
-	if adminInfo.Org.Id == 9478 {
-		var replacement_rate float64
-		var displacement_quantity float64
-		totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-		replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*60) / 1000
 		record.ReplacementRate = replacement_rate
 		displacement_quantity = math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime)/3600) * replacement_rate
 		record.DisplacementQuantity = displacement_quantity
@@ -5996,6 +5979,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		var displacement_quantity float64
 		totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
 		replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*60) / 1000
+
 		record.ReplacementRate = replacement_rate
 		displacement_quantity = math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime)/3600) * replacement_rate
 		record.DisplacementQuantity = displacement_quantity
@@ -6032,6 +6016,22 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		record.UltrafiltrationVolume = ultrafiltration_volume / 1000
 	}
 
+	if adminInfo.Org.Id == 9478 {
+		totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
+		if totalMin == 0 {
+			totalMin = 240
+		}
+		if prescription.DisplaceLiquiValue == 0 {
+			prescription.DisplaceLiquiValue = 15
+		}
+		var replacement_rate float64
+		//乘10 除10是为了保留一位小数
+		replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
+
+		fmt.Println("hahahahahhaahahah", replacement_rate)
+		record.ReplacementRate = replacement_rate
+	}
+
 	lastMonitorRecordList, _ := service.GetLastMonitorRecordList(patientID, monitorDate, adminInfo.Org.Id)
 
 	fisrtMonitorRecordList, _ := service.GetFisrtMonitorRecordList(patientID, monitorDate, adminInfo.Org.Id)
@@ -13353,6 +13353,7 @@ func (c *DialysisAPIController) BatchAdviceExeCutionList() {
 
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -13360,6 +13361,7 @@ func (c *DialysisAPIController) BatchAdviceExeCutionList() {
 	}
 	orgId := c.GetMobileAdminUserInfo().Org.Id
 	patient_id := int64(dataBody["patient_id"].(float64))
+
 	record_date := int64(dataBody["record_date"].(float64))
 
 	execution_staff := int64(dataBody["execution_staff"].(float64))
@@ -13367,6 +13369,7 @@ func (c *DialysisAPIController) BatchAdviceExeCutionList() {
 	execution_time := dataBody["execution_time"].(string)
 
 	executionTime, parseStartDateErr := utils.ParseTimeStringToTime("2006-01-02 15:04:05", execution_time)
+
 	if parseStartDateErr != nil {
 		c.ErrorLog("时间解析失败:%v", parseStartDateErr)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -13378,6 +13381,7 @@ func (c *DialysisAPIController) BatchAdviceExeCutionList() {
 	var team_list []int64
 	if dataBody["new_advice_list"] != nil && reflect.TypeOf(dataBody["new_advice_list"]).String() == "[]interface {}" {
 		newAdviceList, _ := dataBody["new_advice_list"].([]interface{})
+
 		if len(newAdviceList) > 0 {
 			for _, item := range newAdviceList {
 				items := item.(map[string]interface{})

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -2,7 +2,6 @@ package mobile_api_controllers
 
 import (
 	"encoding/json"
-	"fmt"
 	"strconv"
 	"time"
 
@@ -60,8 +59,6 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 		operateTime = 0
 		// recordTime = ""
 	}
-	fmt.Println(date)
-	fmt.Println(operateTime)
 
 	pulseFrequency, _ := this.GetFloat("pulse_frequency")
 	//breathingRated, _ := this.GetFloat("breathing_rated")
@@ -267,7 +264,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 		AccumulatedBloodVolumeOne:        accumulated_blood_volume_one,
 	}
 
-	err := service.CreateMonitor(&record)
+	service.CreateMonitor(&record)
 	//记录日志
 	byterequest, _ := json.Marshal(record)
 	monitorRecordLog := models.XtMonitorRecordLog{
@@ -297,7 +294,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 		PatientId:  patientID,
 	}
 
-	dialysisFinish, err := service.GetDialysisFinish(record.UserOrgId, record.MonitoringDate, 7, patientID)
+	dialysisFinish, _ := service.GetDialysisFinish(record.UserOrgId, record.MonitoringDate, 7, patientID)
 	if dialysisFinish.ID == 0 {
 		service.CreateDialysisFinish(finish)
 	}
@@ -308,10 +305,10 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	keyOne := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(date, 10) + ":monitor_record_list_all"
 	redis.Set(keyOne, "", time.Second)
 	defer redis.Close()
-	if err != nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeMonitorCreate)
-		return
-	}
+	//if err != nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeMonitorCreate)
+	//	return
+	//}
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"monitor": record,

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -3068,6 +3068,7 @@ func (this *NewDialysisApiController) GetInspectionGroup() {
 	org_id := this.GetMobileAdminUserInfo().Org.Id
 
 	patient, _ := service.GetPatientDetailTwo(patient_id)
+
 	inspection, _ := service.GetInspectionGroup(patient.BloodId, org_id)
 
 	if len(inspection) > 0 {

controllers/self_drug_api_congtroller.go

@@ -203,6 +203,8 @@ func SelfDrugRouters() {
 
 	beego.Router("/api/drug/getdrugwarehouseinfoprintlist", &SelfDrugApiController{}, "Get:GetDrugWarehouseInfoPrintList")
 
+	beego.Router("/api/patient/changegoodwarehouseinfo", &SelfDrugApiController{}, "Post:ChangeGoodWarehouseInfo")
+
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -2960,6 +2962,7 @@ func (this *SelfDrugApiController) GetGoodNewQuery() {
 	keyword := this.GetString("keyword")
 	page, _ := this.GetInt64("page")
 	limit, _ := this.GetInt64("limit")
+	good_type_id, _ := this.GetInt64("good_type_id")
 
 	// 查询该机构所有耗材入库信息
 	//goodList, _ := service.GetAllGoodListSeven(orgId)
@@ -2983,7 +2986,7 @@ func (this *SelfDrugApiController) GetGoodNewQuery() {
 		}
 	}
 
-	stockList, total, err := service.GetGoodStockList(orgId, storehouse_id, good_type, keyword, page, limit, ids)
+	stockList, total, err := service.GetGoodStockList(orgId, storehouse_id, good_type, keyword, page, limit, ids, good_type_id)
 
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取查询信息失败")
@@ -3867,6 +3870,8 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 	start_time := this.GetString("start_time")
 	end_time := this.GetString("end_time")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	query_type, _ := this.GetInt64("query_type")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var startTime int64
@@ -3906,10 +3911,10 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 	medicalInsuranceLevelParent, _ := service.GetDrugDataConfig(0, medicalInsuranceLevel)
 	medicalInsuranceLevelList, _ := service.GetParentDataConfig(medicalInsuranceLevelParent.ID, orgId)
 
-	if orgId == 10265 {
+	if orgId == 10265 || orgId == 10138 {
 		//storeConfig, _ := service.GetAllStoreHouseConfig(orgId)
 
-		list, total, err := service.GetGoodNewPurchaseStockQuery(good_type, keyword, page, limit, orgId, ids, goodIds)
+		list, total, err := service.GetGoodNewPurchaseStockQuery(good_type, keyword, page, limit, orgId, ids, goodIds, query_type)
 
 		for _, item := range list {
 
@@ -3979,8 +3984,8 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 		})
 	}
 
-	if orgId != 10265 {
-		list, total, err := service.GetGoodNewPurchaseStockQueryOne(good_type, keyword, page, limit, orgId, ids, goodIds)
+	if orgId != 10265 && orgId != 10138 {
+		list, total, err := service.GetGoodNewPurchaseStockQueryOne(good_type, keyword, page, limit, orgId, ids, goodIds, query_type)
 		storeConfig, _ := service.GetAllStoreHouseConfig(orgId)
 		for _, item := range list {
 
@@ -4094,6 +4099,8 @@ func (this *SelfDrugApiController) GetPurchaseNewDrugQuery() {
 
 	start_time := this.GetString("start_time")
 	end_time := this.GetString("end_time")
+
+	query_type, _ := this.GetInt64("query_type")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -4130,7 +4137,7 @@ func (this *SelfDrugApiController) GetPurchaseNewDrugQuery() {
 	}
 
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
-	list, total, err := service.GetDrugNewPurchaseStockQuery(good_type, keyword, page, limit, orgId, startTime, endTime, ids, infoIds)
+	list, total, err := service.GetDrugNewPurchaseStockQuery(good_type, keyword, page, limit, orgId, startTime, endTime, ids, infoIds, query_type)
 
 	for _, item := range list {
 
@@ -6910,3 +6917,19 @@ func (this *SelfDrugApiController) GetDrugWarehouseInfoPrintList() {
 	})
 
 }
+
+func (this *SelfDrugApiController) ChangeGoodWarehouseInfo() {
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+	id := int64(dataBody["id"].(float64))
+	good_code := dataBody["good_code"].(string)
+
+	service.ModifyGoodCodeWarehouseInfo(id, good_code)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+
+}

controllers/stock_in_api_controller.go

@@ -7616,6 +7616,31 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 				return
 			}
 
+			goodcodelist := strings.Split(item.GoodCode, ",")
+
+			if len(goodcodelist) > 0 {
+				goodInfo, _ := service.GetNewGoodByIdIsStop(item.GoodId, item.OrgId, tx)
+				for _, it := range goodcodelist {
+					if it != "" {
+						codeInfo := models.XtGoodCodeInfo{
+							GoodId:          item.GoodId,
+							BatchNumber:     item.Number,
+							GoodCode:        it,
+							WarehouseInfoId: item.ID,
+							IsUserCount:     0,
+							IsOutStatus:     2,
+							Status:          1,
+							UserOrgId:       item.OrgId,
+							Ctime:           time.Now().Unix(),
+							Mtime:           time.Now().Unix(),
+							SplitOfNumber:   goodInfo.SplitOfNumber,
+						}
+						service.CreateCodeInfo(codeInfo, tx)
+					}
+
+				}
+			}
+
 		}
 	}
 	if is_success != 1 {
@@ -7657,6 +7682,32 @@ func (this *StockManagerApiController) ReturnCheckWarehouseInfo() {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCheckGoodParamWrong)
 			return
 		}
+
+		//改变扫码库里面的状态
+		goodcodelist := strings.Split(item.GoodCode, ",")
+
+		if len(goodcodelist) > 0 {
+			goodInfo, _ := service.GetNewGoodByIdIsStop(item.GoodId, item.OrgId, tx)
+			for _, it := range goodcodelist {
+				if it != "" {
+					codeInfo := models.XtGoodCodeInfo{
+						GoodId:          item.GoodId,
+						BatchNumber:     item.Number,
+						GoodCode:        it,
+						WarehouseInfoId: item.ID,
+						IsUserCount:     0,
+						IsOutStatus:     2,
+						Status:          0,
+						UserOrgId:       item.OrgId,
+						Ctime:           time.Now().Unix(),
+						Mtime:           time.Now().Unix(),
+						SplitOfNumber:   goodInfo.SplitOfNumber,
+					}
+					service.UpdateCodeInfo(codeInfo, tx)
+				}
+
+			}
+		}
 	}
 
 	err := service.UpdateNewWarehouseInfoMap(list, warehousing_info_id, orgId, tx)

models/drug.go

@@ -94,6 +94,7 @@ type BaseDrugLib struct {
 	IsZeroFlag             int64  `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 	ScanCode               string `gorm:"column:scan_code" json:"scan_code" form:"scan_code"`
 	DrugIdentificationCode string `gorm:"column:drug_identification_code" json:"drug_identification_code" form:"drug_identification_code"`
+	SplitOfNumber          int64  `gorm:"column:split_of_number" json:"split_of_number" form:"split_of_number"`
 }
 
 func (BaseDrugLib) TableName() string {
@@ -118,6 +119,7 @@ type BaseDrugLibSeven struct {
 	IsZeroFlag                  int64  `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 	MedicalInsuranceLevel       int64  `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
 	SocialSecurityDirectoryCode string `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	SplitOfNumber               int64  `gorm:"column:split_of_number" json:"split_of_number" form:"split_of_number"`
 }
 
 func (BaseDrugLibSeven) TableName() string {

models/good_models.go

@@ -106,8 +106,8 @@ type GoodInfo struct {
 	Bby01                       string               `gorm:"column:bby01" json:"bby01" form:"bby01"`
 	Bck01b                      string               `gorm:"column:bck01b" json:"bck01b" form:"bck01b"`
 	IsZeroFlag                  int64                `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
-
-	ZuobiaoId string `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
+	SplitOfNumber               int64                `gorm:"column:split_of_number" json:"split_of_number" form:"split_of_number"`
+	ZuobiaoId                   string               `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
 
 	WarehousingInfoOne []*StartWarehousingInfo `gorm:"json:"warehouse_info"` //期间增加
 
@@ -330,6 +330,7 @@ type GoodInfoSeven struct {
 	GoodStatus        string `gorm:"column:good_status" json:"good_status" form:"good_status"`
 	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
 	SumCount          int64  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	SplitOfNumber     int64  `gorm:"column:split_of_number" json:"split_of_number" form:"split_of_number"`
 }
 
 func (GoodInfoSeven) TableName() string {

models/new_stock_models.go

@@ -290,6 +290,7 @@ type GoodInfoTwenty struct {
 	GoodNumber                  string                  `gorm:"column:good_number" json:"good_number" form:"good_number"`
 	SocialSecurityDirectoryCode string                  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
 	MedicalInsuranceLevel       int64                   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	StockWarnCount              int64                   `gorm:"column:stock_warn_count" json:"stock_warn_count" form:"stock_warn_count"`
 	StWarehousingInfo           []*StWarehousingInfo    `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"xt_warehouse_info"`
 	WarehousingInfoOne          []*StartWarehousingInfo `gorm:"json:"warehouse_info"` //期间增加
 	WarehousingInfoStart        []*StartWarehousingInfo `gorm:"json:"warehouse_info_start"`
@@ -428,6 +429,7 @@ type VmBaseDrugTwenty struct {
 	Mtime                            int64             `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	OrgId                            int64             `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	IsSelfDrug                       int64             `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
+	DrugStockLimitCount              int64             `gorm:"column:drug_stock_limit_count" json:"drug_stock_limit_count" form:"drug_stock_limit_count"`
 	MedicalInsuranceNumber           string            `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
 	DrugFlowWarehouseInfo            []*DrugFlowTwenty `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_flow_info"`
 	DrugActFlowWarehouseInfo         []*DrugFlowTwenty `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_act_flow_info"`

models/stock_models.go

@@ -1783,6 +1783,7 @@ type XtWarehouseInfoEight struct {
 	IsUpload                  int64   `gorm:"column:is_upload" json:"is_upload" form:"is_upload"`
 	ManafacturerName          string  `gorm:"column:manafacturer_name" json:"manafacturer_name" form:"manafacturer_name"`
 	DealerName                string  `gorm:"column:dealer_name" json:"dealer_name" form:"dealer_name"`
+	GoodCode                  string  `gorm:"column:good_code" json:"good_code" form:"good_code"`
 }
 
 func (XtWarehouseInfoEight) TableName() string {
@@ -1953,3 +1954,41 @@ type PrintDrugWarehouseInfo struct {
 func (PrintDrugWarehouseInfo) TableName() string {
 	return "xt_drug_warehouse_info"
 }
+
+type XtGoodCodeInfo struct {
+	ID              int64  `gorm:"column:id" json:"id" form:"id"`
+	GoodId          int64  `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	BatchNumber     string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	GoodCode        string `gorm:"column:good_code" json:"good_code" form:"good_code"`
+	WarehouseInfoId int64  `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	IsUserCount     int64  `gorm:"column:is_user_count" json:"is_user_count" form:"is_user_count"`
+	IsOutStatus     int64  `gorm:"column:is_out_status" json:"is_out_status" form:"is_out_status"`
+	Status          int64  `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId       int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime           int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime           int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	SplitOfNumber   int64  `gorm:"column:split_of_number" json:"split_of_number" form:"split_of_number"`
+}
+
+func (XtGoodCodeInfo) TableName() string {
+	return "xt_good_code_info"
+}
+
+type XtDrugCodeInfo struct {
+	ID              int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugId          int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	BatchNumber     string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	DrugCode        string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	WarehouseInfoId int64  `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	IsUserCount     int64  `gorm:"column:is_user_count" json:"is_user_count" form:"is_user_count"`
+	IsOutStatus     int64  `gorm:"column:is_out_status" json:"is_out_status" form:"is_out_status"`
+	Status          int64  `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId       int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime           int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime           int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	SplitOfNumber   int64  `gorm:"column:split_of_number" json:"split_of_number" form:"split_of_number"`
+}
+
+func (XtDrugCodeInfo) TableName() string {
+	return "xt_drug_code_info"
+}

service/common_service.go

@@ -2493,7 +2493,7 @@ func GetMonthProjectListThree(orgid int64, lapseto int64, modetype int64, januar
 func GetPatientsControl(orgid int64, lapstor int64, startime int64, endtime int64, page int64, limit int64) (inspection []*models.PatientInspectionCount, total int64, err error) {
 
 	db := readDb.Table("xt_inspection as x").Where("x.status =1")
-	table := readDb.Table("xt_patients as s")
+	table := readDb.Table("xt_patients as s").Where("s.patient_type =1")
 	fmt.Println(table)
 	d := readDb.Table(" xt_inspection_reference as r")
 	fmt.Println(d)
@@ -2557,7 +2557,7 @@ func GetPatientsControl(orgid int64, lapstor int64, startime int64, endtime int6
 func GetLastPatientsControl(orgid int64, lapstor int64, startime int64, endtime int64) (inspection []*models.PatientInspectionCount, err error) {
 
 	db := readDb.Table("xt_inspection as x").Where("x.status =1")
-	table := readDb.Table("xt_patients as s")
+	table := readDb.Table("xt_patients as s").Where("s.patient_type =1")
 	//fmt.Println(table)
 	d := readDb.Table(" xt_inspection_reference as r")
 	fmt.Println(d)
@@ -2673,7 +2673,7 @@ func GetInfectiousPatientsControl(orgid int64, lapstor int64, startime int64, en
 
 func GetInfectiousControl(orgid int64, lapstor int64, startime int64, endtime int64) (inspection []*models.PatientInspectionCount, err error) {
 	db := readDb.Table("xt_inspection as x").Where("x.status =1")
-	table := readDb.Table("xt_patients as s")
+	table := readDb.Table("xt_patients as s").Where("s.patient_type =1")
 	fmt.Println(table)
 	d := readDb.Table(" xt_inspection_reference as r")
 	fmt.Println(d)

service/doctor_advice_service.go

@@ -550,7 +550,7 @@ func GetDoctorAdivceMonthList(user_org_id int64, start_time int64, end_time int6
 		db = db.Where("advice_date<=?", end_time)
 	}
 
-	err = db.Find(&list).Error
+	err = db.Order("advice_name").Find(&list).Error
 
 	return list, err
 }
@@ -569,7 +569,7 @@ func GetHisDoctorAdivceMonthList(user_org_id int64, start_time int64, end_time i
 		db = db.Where("advice_date<=?", end_time)
 	}
 
-	err = db.Preload("Drug", "status=1 and org_id = ?", user_org_id).Find(&list).Error
+	err = db.Preload("Drug", "status=1 and org_id = ?", user_org_id).Order("advice_name").Find(&list).Error
 
 	return list, err
 }

service/his_service.go

@@ -3117,6 +3117,72 @@ func GetGoodByIdIsStop(good_id int64, org_id int64) (models.GoodInfoSeven, error
 	return goodInfoSeven, err
 }
 
+func GetNewGoodByIdIsStop(good_id int64, org_id int64, tx *gorm.DB) (models.GoodInfoSeven, error) {
+
+	goodInfoSeven := models.GoodInfoSeven{}
+	err = tx.Where("org_id = ? and status = 1  and id =?", org_id, good_id).Find(&goodInfoSeven).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return goodInfoSeven, err
+		}
+	}
+	return goodInfoSeven, err
+}
+
+func GetNewDrugByIdIsStop(good_id int64, org_id int64, tx *gorm.DB) (models.BaseDrugLibSeven, error) {
+
+	goodInfoSeven := models.BaseDrugLibSeven{}
+	err = tx.Where("org_id = ? and status = 1  and id =?", org_id, good_id).Find(&goodInfoSeven).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return goodInfoSeven, err
+		}
+	}
+	return goodInfoSeven, err
+}
+
+func CreateCodeInfo(info models.XtGoodCodeInfo, tx *gorm.DB) error {
+
+	err := tx.Create(&info).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func CreateDrugCodeInfo(info models.XtDrugCodeInfo, tx *gorm.DB) error {
+
+	err := tx.Create(&info).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func UpdateCodeInfo(info models.XtGoodCodeInfo, tx *gorm.DB) error {
+
+	err := tx.Model(&info).Where("warehouse_info_id = ? and good_code =? and status=1 and user_org_id =?", info.WarehouseInfoId, info.GoodCode, info.UserOrgId).Updates(map[string]interface{}{"status": 0}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func UpdateDrugCodeInfo(info models.XtDrugCodeInfo, tx *gorm.DB) error {
+
+	err := tx.Model(&info).Where("warehouse_info_id = ? and drug_code =? and status=1 and user_org_id =?", info.WarehouseInfoId, info.DrugCode, info.UserOrgId).Updates(map[string]interface{}{"status": 0}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func GetHisPrescriptionByBatchNumber(org_id int64, number string) (prescription []*models.HisPrescription, err error) {
 	err = readDb.Model(&models.HisPrescription{}).
 		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {

service/manage_center_service.go

@@ -1140,3 +1140,12 @@ func UpdateHisAdviceListTemplate(id int64, price float64) error {
 	err := XTWriteDB().Model(&models.HisPrescriptionAdviceTemplate{}).Where("id =? and status=1", id).Updates(map[string]interface{}{"price": price}).Error
 	return err
 }
+
+func ModifyGoodCodeWarehouseInfo(id int64, good_code string) (models.XtWarehouseInfoEight, error) {
+
+	info := models.XtWarehouseInfoEight{}
+
+	err := XTWriteDB().Model(&info).Where("id = ? and status=1", id).Updates(map[string]interface{}{"good_code": good_code}).Error
+
+	return info, err
+}

service/new_stock_service.go

@@ -110,14 +110,18 @@ func CreateGoodErrcode(errcode models.XtGoodErrcode) error {
 	return err
 }
 
-func GetGoodStockList(orgId int64, storehouse_id int64, good_type int64, keyword string, page int64, limit int64, ids []int64) (good []*models.GoodInformation, total int64, err error) {
+func GetGoodStockList(orgId int64, storehouse_id int64, good_type int64, keyword string, page int64, limit int64, ids []int64, good_type_id int64) (good []*models.GoodInformation, total int64, err error) {
 	offset := (page - 1) * limit
 	likeKey := "%" + keyword + "%"
 
 	db := XTReadDB().Table("xt_good_information as x").Where("x.status = 1  and x.org_id =? and find_in_set('停用',x.good_status) = 0", orgId)
 
+	if good_type_id > 0 {
+		db = db.Where("x.good_type_id = ?", good_type_id)
+	}
+
 	if good_type == 2 {
-		db = db.Where(" x.total_count<=x.stock_warn_count")
+		db = db.Where(" x.sum_count<=x.stock_warn_count")
 	}
 
 	if good_type == 3 {

service/self_drug_service.go

@@ -2858,7 +2858,7 @@ func CreateDrugStockCount(stockCount models.XtDrugStockCount) error {
 	return err
 }
 
-func GetGoodNewPurchaseStockQuery(good_type int64, keyword string, page int64, limit int64, orgid int64, ids []int64, goodIds []int64) (goodinfo []*models.GoodInfoTwenty, total int64, err error) {
+func GetGoodNewPurchaseStockQuery(good_type int64, keyword string, page int64, limit int64, orgid int64, ids []int64, goodIds []int64, query_type int64) (goodinfo []*models.GoodInfoTwenty, total int64, err error) {
 
 	db := XTReadDB().Model(&goodinfo).Where("status = 1")
 	offset := (page - 1) * limit
@@ -2870,6 +2870,17 @@ func GetGoodNewPurchaseStockQuery(good_type int64, keyword string, page int64, l
 	if orgid > 0 {
 		db = db.Where("org_id = ?", orgid)
 	}
+
+	if query_type == 2 {
+		db = db.Where("sum_count<=stock_warn_count")
+	}
+	if query_type == 3 {
+		db = db.Where("sum_count = 0")
+	}
+
+	if query_type == 4 {
+		db = db.Where("sum_count > 0")
+	}
 	//if len(ids) > 0 {
 	//	db = db.Where("id in(?)", goodIds)
 	//}
@@ -2881,7 +2892,7 @@ func GetGoodNewPurchaseStockQuery(good_type int64, keyword string, page int64, l
 	return goodinfo, total, err
 }
 
-func GetGoodNewPurchaseStockQueryOne(good_type int64, keyword string, page int64, limit int64, orgid int64, ids []int64, goodIds []int64) (goodinfo []*models.GoodInfoTwenty, total int64, err error) {
+func GetGoodNewPurchaseStockQueryOne(good_type int64, keyword string, page int64, limit int64, orgid int64, ids []int64, goodIds []int64, query_type int64) (goodinfo []*models.GoodInfoTwenty, total int64, err error) {
 
 	db := XTReadDB().Model(&goodinfo).Where("status = 1")
 	if orgid == 10697 || orgid == 10644 {
@@ -2893,6 +2904,17 @@ func GetGoodNewPurchaseStockQueryOne(good_type int64, keyword string, page int64
 		db = db.Where("good_type_id = ?", good_type)
 	}
 
+	if query_type == 2 {
+		db = db.Where("sum_count<=stock_warn_count")
+	}
+	if query_type == 3 {
+		db = db.Where("sum_count = 0")
+	}
+
+	if query_type == 4 {
+		db = db.Where("sum_count > 0")
+	}
+
 	if orgid > 0 {
 		db = db.Where("org_id = ?", orgid)
 	}
@@ -2942,7 +2964,7 @@ func GetGoodWarehosueInfo(id int64) (models.WarehousingInfo, error) {
 	return info, err
 }
 
-func GetDrugNewPurchaseStockQuery(good_type int64, keyword string, page int64, limit int64, orgid int64, startime int64, endtime int64, ids []int64, infos []int64) (druginfo []*models.VmBaseDrugTwenty, total int64, err error) {
+func GetDrugNewPurchaseStockQuery(good_type int64, keyword string, page int64, limit int64, orgid int64, startime int64, endtime int64, ids []int64, infos []int64, query_type int64) (druginfo []*models.VmBaseDrugTwenty, total int64, err error) {
 
 	db := XTReadDB().Model(&druginfo).Where("status = 1 and is_self_drug!=1")
 	offset := (page - 1) * limit
@@ -2954,6 +2976,17 @@ func GetDrugNewPurchaseStockQuery(good_type int64, keyword string, page int64, l
 		db = db.Where("find_in_set('停用',drug_status) = 0")
 	}
 
+	if query_type == 2 {
+		db = db.Where("sum_count<=drug_stock_limit_count")
+	}
+	if query_type == 3 {
+		db = db.Where("sum_count = 0")
+	}
+
+	if query_type == 4 {
+		db = db.Where("sum_count > 0")
+	}
+
 	if orgid > 0 {
 		db = db.Where("org_id = ?", orgid)
 	}

service/stock_service.go

@@ -280,6 +280,7 @@ func ModifyGoodInfo(goodInfo *models.GoodInfo) (error, *models.GoodInfo) {
 		"first_letter":                   goodInfo.FirstLetter,
 		"is_show":                        goodInfo.IsShow,
 		"is_zero_flag":                   goodInfo.IsZeroFlag,
+		"split_of_number":                goodInfo.SplitOfNumber,
 	}).Error
 
 	writeDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND org_id = ?", goodInfo.ID, goodInfo.OrgId).Updates(map[string]interface{}{"good_type_id": goodInfo.GoodTypeId})