耗材参数

controllers/doctors_api_controller.go

@@ -678,14 +678,15 @@ func (this *DoctorsApiController) GetAccessList() {
 func (this *DoctorsApiController) GetInspectionMajorItem() {
 
 	other_start_time := this.GetString("other_start_time")
+	last_time := this.GetString("last_time")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", other_start_time+" 23:59:59", loc)
-	fmt.Println("startTime2222345555533344334334433433344", startTime.Unix())
+	lastTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", last_time+" 00:00:00", loc)
 	patient_id, _ := this.GetInt64("patient_id")
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
-	list, err := service.GetInspectionMajorItem(startTime.Unix(), orgId, patient_id)
+	list, err := service.GetInspectionMajorItem(startTime.Unix(), lastTime.Unix(), orgId, patient_id)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"list": list,
@@ -794,7 +795,7 @@ func (this *DoctorsApiController) SaveCreationInspection() {
 	record_time := this.GetString("record_time")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	recordTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
+	recordTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_time, loc)
 	after_pressure := this.GetString("after_pressure")
 	template_summary_id, _ := this.GetInt64("template_summary_id")
 	template_plan_id, _ := this.GetInt64("template_plan_id")
@@ -863,6 +864,7 @@ func (this *DoctorsApiController) GetTemplateSummaryList() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	fmt.Println("hhhhhhhhhhhhhh777777", endTime.Unix())
 	list, err := service.GetTemplateSummaryList(patient_id, orgId, startTime.Unix(), endTime.Unix())
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
@@ -943,7 +945,7 @@ func (this *DoctorsApiController) UpdateTempalteSummary() {
 	record_time := this.GetString("record_time")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	recordTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
+	recordTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_time, loc)
 	after_pressure := this.GetString("after_pressure")
 	template_summary_id, _ := this.GetInt64("template_summary_id")
 	template_plan_id, _ := this.GetInt64("template_plan_id")

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -2817,15 +2817,23 @@ func (this *NewDialysisApiController) GetAllDoctorList() {
 }
 
 func (this *NewDialysisApiController) GetTreateSummary() {
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
 
 	startTime := this.GetString("start_time")
-	startTimeUnix, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", startTime)
+	fmt.Println("开始烧豆腐阿方阿方阿方", startTime)
+
 	endTime := this.GetString("end_time")
-	endTimeUnix, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", endTime)
+	startTimeUnix, _ := time.ParseInLocation(timeLayout+" 15:04:05", startTime+" 00:00:00", loc)
+	endTimeUnix, _ := time.ParseInLocation(timeLayout+" 15:04:05", endTime+" 23:59:59", loc)
+
 	limit, _ := this.GetInt64("limit")
 	page, _ := this.GetInt64("page")
 	creater, _ := this.GetInt64("creater")
+
 	patient_id, _ := this.GetInt64("patient_id")
+
+	fmt.Println("hhhhhhhhhhhhhhhkaishi", startTimeUnix.Unix())
 	list, total, err := service.GetTreateSummary(startTimeUnix.Unix(), endTimeUnix.Unix(), limit, page, creater, patient_id)
 
 	//var inspectionTemplate []*models.VmInspection

controllers/print_data_api_controller.go

@@ -208,12 +208,14 @@ func (this *PrintDataAPIController) GetGoodDetailPrintList() {
 	//出库详情
 	if types == 2 {
 		list, err := service.GetWarehouseOutInfoGoodDetailPrintList(adminUserInfo.CurrentOrgId, startTime, endTime, limit, page)
+		stockTotal, err := service.GetOutStockTotalCountTwo(startTime, endTime, adminUserInfo.CurrentOrgId)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list": list,
+			"list":       list,
+			"stockTotal": stockTotal,
 		})
 	}
 

controllers/stock_in_api_controller.go

@@ -107,6 +107,7 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/stock/getadjustpriceinfo", &StockManagerApiController{}, "Get:GetAdjustPriceById")
 	beego.Router("/api/stock/savereportstock", &StockManagerApiController{}, "Post:SaveReportStock")
 	beego.Router("/api/stock/getreportstocklist", &StockManagerApiController{}, "Get:GetReportStockList")
+	beego.Router("/api/stock/savecheckdamage", &StockManagerApiController{}, "Get:SaveCheckDamage")
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
@@ -5129,7 +5130,7 @@ func (this *StockManagerApiController) SaveReportStock() {
 }
 
 func (this *StockManagerApiController) GetReportStockList() {
-	fmt.Println("2323323322332323232233232322323232323")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	start_time := this.GetString("start_time")
@@ -5155,7 +5156,7 @@ func (this *StockManagerApiController) GetReportStockList() {
 			return
 		}
 		endTime = theTime.Unix()
-		fmt.Println("endtime2322332233223", endTime)
+
 	}
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
@@ -5163,10 +5164,40 @@ func (this *StockManagerApiController) GetReportStockList() {
 	fmt.Println("startTime", startTime, "endTime", endTime)
 	list, total, _ := service.GetReportStockList(startTime, endTime, orgId, keyword, page, limit)
 	doctorlist, _ := service.GetAllDoctorThree(orgId)
-	fmt.Println("list232232322332232323", list)
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list":       list,
 		"total":      total,
 		"doctorlist": doctorlist,
 	})
 }
+
+func (this *StockManagerApiController) SaveCheckDamage() {
+	fmt.Println("hhhhhhhhhhhhhhhhhhhh")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	idstr := this.GetString("ids")
+	ids := strings.Split(idstr, ",")
+	check_time := this.GetString("check_time")
+	var checkTime int64
+	if len(check_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", check_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		checkTime = theTime.Unix()
+	}
+	checker, _ := this.GetInt64("checker")
+	reportprice := models.XtStockReportPrice{
+		Checker:       checker,
+		CheckerStatus: 1,
+		CheckerTime:   checkTime,
+	}
+	err := service.UpdateCheckDamage(ids, reportprice)
+	fmt.Println(err)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"reportPrice": reportprice,
+	})
+}

service/patientmanage_service.go

@@ -1622,12 +1622,15 @@ func GetTotalBedNumber(orgid int64, ids []string) (list []*models.XtDeviceNumber
 	return list, total, err
 }
 
-func GetInspectionMajorItem(startime int64, orgid int64, patientid int64) (inspection []*models.XtInspection, err error) {
+func GetInspectionMajorItem(startime int64, lasttime int64, orgid int64, patientid int64) (inspection []*models.XtInspection, err error) {
 
 	db := XTReadDB().Table("xt_inspection as x").Where("x.status = 1")
 	if startime > 0 {
 		db = db.Where("x.inspect_date<=?", startime)
 	}
+	if lasttime > 0 {
+		db = db.Where("x.inspect_date>=?", lasttime)
+	}
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
@@ -1750,10 +1753,10 @@ func UpdateTempalteSummary(summary *models.XtTemplateSummary) error {
 func GetTemplateSummaryList(patientid int64, orgid int64, startime int64, endtime int64) (summary []*models.XtTemplateSummary, err error) {
 	db := XTReadDB().Model(&summary).Where("status = 1")
 	if startime > 0 {
-		db = db.Where("ctime >=?", startime)
+		db = db.Where("record_time >=?", startime)
 	}
 	if endtime > 0 {
-		db = db.Where("ctime<=?", endtime)
+		db = db.Where("record_time<=?", endtime)
 	}
 	if patientid > 0 {
 		db = db.Where("patient_id = ?", patientid)
@@ -1761,7 +1764,7 @@ func GetTemplateSummaryList(patientid int64, orgid int64, startime int64, endtim
 	if orgid > 0 {
 		db = db.Where("user_org_id = ?", orgid)
 	}
-	err = db.Order("ctime desc").Find(&summary).Error
+	err = db.Order("record_time desc").Find(&summary).Error
 	return summary, err
 }
 
@@ -1794,7 +1797,7 @@ func GetTreateSummary(startime int64, endtime int64, limit int64, page int64, cr
 	if patient_id > 0 {
 		db = db.Where("patient_id = ?", patient_id)
 	}
-	err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("record_time desc").Find(&list).Error
 	return list, total, err
 }
 

service/user_service.go

@@ -177,3 +177,9 @@ func GetAllHisDoctor(orgid int64) (appRole []*models.App_Role, err error) {
 	err = UserReadDB().Where("org_id = ?  AND status = 1 AND  (user_type = ? OR user_type = ?) ", orgid, 2, 1).Find(&appRole).Error
 	return appRole, err
 }
+
+func UpdateCheckDamage(ids []string, reportPrice models.XtStockReportPrice) error {
+
+	err := XTWriteDB().Model(&reportPrice).Where("id in(?) and status = 1", ids).Updates(map[string]interface{}{"checker": reportPrice.Checker, "checker_time": reportPrice.CheckerTime}).Error
+	return err
+}