耗材参数

controllers/base_api_controller.go

@@ -71,7 +71,7 @@ func (this *BaseAuthAPIController) Prepare() {
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
 		userAdmin.Id = 1448
-		userAdmin.Mobile = "13318599895"
+		userAdmin.Mobile = "13318464649"
 
 		//userAdmin.Id = 597
 		//userAdmin.Mobile = "19874122664"
@@ -91,7 +91,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 4
+		adminUserInfo.CurrentOrgId = 7957
 		adminUserInfo.CurrentAppId = 8642
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -317,7 +317,7 @@ func (this *BaseServeAPIController) Prepare() {
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
 		userAdmin.Id = 1448
-		userAdmin.Mobile = "13318599895"
+		userAdmin.Mobile = "13318464649"
 
 		//userAdmin.Id = 597
 		//userAdmin.Mobile = "19874122664"
@@ -337,7 +337,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 4
+		adminUserInfo.CurrentOrgId = 7957
 		adminUserInfo.CurrentAppId = 8642
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/dialysis_api_controller.go

@@ -246,6 +246,7 @@ func (c *DialysisApiController) PostPrescription() {
 	blood := c.GetString("blood")
 	dialysis_dialyszers := c.GetString("dialysis_dialyszers")
 	dialysis_irrigation := c.GetString("dialysis_irrigation")
+	antioxidant_commodity_name := c.GetString("antioxidant_commodity_name")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -327,6 +328,7 @@ func (c *DialysisApiController) PostPrescription() {
 		Blood:                      blood,
 		DialysisDialyszers:         dialysis_dialyszers,
 		DialysisIrrigation:         dialysis_irrigation,
+		AntioxidantCommodityName:   antioxidant_commodity_name,
 	}
 
 	if appRole.UserType == 2 || appRole.UserType == 1 {
@@ -495,6 +497,7 @@ func (c *DialysisApiController) PostSoulution() {
 	blood := c.GetString("blood")
 	dialysis_dialyszers := c.GetString("dialysis_dialyszers")
 	dialysis_irrigation := c.GetString("dialysis_irrigation")
+	antioxidant_commodity_name := c.GetString("antioxidant_commodity_name")
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -587,6 +590,7 @@ func (c *DialysisApiController) PostSoulution() {
 		Blood:                     blood,
 		DialysisIrrigation:        dialysis_irrigation,
 		DialysisDialyszers:        dialysis_dialyszers,
+		AntioxidantCommodityName:  antioxidant_commodity_name,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
@@ -2902,7 +2906,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if template.TemplateId == 6 { //adminInfo.CurrentOrgId == 9538
+			if template.TemplateId == 6 || template.TemplateId == 32 { //adminInfo.CurrentOrgId == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
@@ -2929,7 +2933,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 {
+	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 {
 		if ultrafiltration_rate > 0 && adminInfo.CurrentOrgId != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume

controllers/dialysis_record_api_controller.go

@@ -11,10 +11,10 @@ import (
 	"XT_New/enums"
 	"XT_New/service"
 	"XT_New/utils"
-	"net/http"
-	"net/url"
 	"fmt"
 	"github.com/astaxie/beego"
+	"net/http"
+	"net/url"
 )
 
 func DialysisRecordAPIControllerRegistRouter() {
@@ -548,7 +548,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 	schedual_type, _ := this.GetInt64("schedual_type")
 
 	washpipe_nurse, _ := this.GetInt64("washpipe_nurse")
-
+	change_nurse, _ := this.GetInt64("change_nurse")
 	bedID, _ := this.GetInt64("bed")
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -720,6 +720,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		Modifier:      adminUserInfo.AdminUser.Id,
 		SchedualType:  schedual_type,
 		WashpipeNurse: washpipe_nurse,
+		ChangeNurse:   change_nurse,
 	}
 
 	createErr := service.MobileCreateDialysisOrder(adminUserInfo.CurrentOrgId, patientID, dialysisRecord)
@@ -743,7 +744,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 			if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 				totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-				if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 {
+				if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 {
 					ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				}
 				// 只针对方济医院
@@ -779,16 +780,16 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 			}
 		}
 
-		go func (){
+		go func() {
 			ssoDomain := beego.AppConfig.String("call_domain")
 			api := ssoDomain + "/index/uppatient"
 			values := make(url.Values)
-			values.Set("org_id",  strconv.FormatInt(adminUserInfo.CurrentOrgId,10))
-			values.Set("admin_user_id", strconv.FormatInt(nurseID,10))
-			values.Set("patient_id",  strconv.FormatInt(patientID,10))
-			values.Set("up_time",  strconv.FormatInt(startDate.Unix(),10))
+			values.Set("org_id", strconv.FormatInt(adminUserInfo.CurrentOrgId, 10))
+			values.Set("admin_user_id", strconv.FormatInt(nurseID, 10))
+			values.Set("patient_id", strconv.FormatInt(patientID, 10))
+			values.Set("up_time", strconv.FormatInt(startDate.Unix(), 10))
 			http.PostForm(api, values)
-		} ()
+		}()
 
 		this.ServeSuccessJSON(map[string]interface{}{
 			"dialysis_order": dialysisRecord,
@@ -1010,15 +1011,15 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 		return
 	}
 
-	go func (){
+	go func() {
 		ssoDomain := beego.AppConfig.String("call_domain")
 		api := ssoDomain + "/index/downpatient"
 		values := make(url.Values)
-		values.Set("org_id",  strconv.FormatInt(adminUserInfo.CurrentOrgId,10))
-		values.Set("admin_user_id", strconv.FormatInt(nurseID,10))
-		values.Set("patient_id",  strconv.FormatInt(patientID,10))
+		values.Set("org_id", strconv.FormatInt(adminUserInfo.CurrentOrgId, 10))
+		values.Set("admin_user_id", strconv.FormatInt(nurseID, 10))
+		values.Set("patient_id", strconv.FormatInt(patientID, 10))
 		http.PostForm(api, values)
-	} ()
+	}()
 
 	updateErr := service.ModifyDialysisRecord(dialysisRecord.ID, nurseID, endDate.Unix(), adminUserInfo.AdminUser.Id)
 	if updateErr != nil {
@@ -1049,7 +1050,7 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 	washpipe_nurse, _ := this.GetInt64("washpipe_nurse")
 
 	schedual_type, _ := this.GetInt64("schedual_type")
-
+	change_nurse, _ := this.GetInt64("change_nurse")
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1178,6 +1179,7 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 		Modifier:      adminUserInfo.AdminUser.Id,
 		SchedualType:  schedual_type,
 		WashpipeNurse: washpipe_nurse,
+		ChangeNurse:   change_nurse,
 	}
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)

controllers/gobal_config_api_controller.go

@@ -72,6 +72,13 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/passdetail/export", &GobalConfigApiController{}, "get:GetPassExportData")
 	beego.Router("/api/consumedetail/export", &GobalConfigApiController{}, "get:GetExportData")
 
+	beego.Router("/api/drugstock/getdrugindetail", &GobalConfigApiController{}, "get:GetDrugInDetail")
+
+	beego.Router("/api/drugstock/getdrugcancelorder", &GobalConfigApiController{}, "get:GetDrugCancelOrder")
+
+	beego.Router("/api/drugstock/getdrugoutdetail", &GobalConfigApiController{}, "get:GetDrugOutDetail")
+
+	beego.Router("/api/drugstock/getdrugcanceldetail", &GobalConfigApiController{}, "get:GetDrugCancelDetail")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -1406,3 +1413,179 @@ func (c *GobalConfigApiController) GetExportData() {
 	})
 
 }
+
+func (c *GobalConfigApiController) GetDrugInDetail() {
+
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	adminInfo := c.GetAdminUserInfo()
+	order_type, _ := c.GetInt64("order_type")
+	manufacturer_id, _ := c.GetInt64("manufacturer_id")
+	keyword := c.GetString("keyword")
+	page, _ := c.GetInt64("page")
+	limit, _ := c.GetInt64("limit")
+
+	detail, total, err := service.GetDrugInOrderDetail(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit)
+
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"detail": detail,
+		"total":  total,
+	})
+}
+
+func (c *GobalConfigApiController) GetDrugCancelOrder() {
+
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	adminInfo := c.GetAdminUserInfo()
+	order_type, _ := c.GetInt64("order_type")
+	manufacturer_id, _ := c.GetInt64("manufacturer_id")
+	keyword := c.GetString("keyword")
+	limit, _ := c.GetInt64("limit")
+	page, _ := c.GetInt64("page")
+
+	order, total, err := service.GetDrugReturnOrder(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, limit, page)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"order": order,
+		"total": total,
+	})
+}
+
+func (c *GobalConfigApiController) GetDrugOutDetail() {
+
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	adminInfo := c.GetAdminUserInfo()
+	order_type, _ := c.GetInt64("order_type")
+	manufacturer_id, _ := c.GetInt64("manufacturer_id")
+	keyword := c.GetString("keyword")
+	limit, _ := c.GetInt64("limit")
+	page, _ := c.GetInt64("page")
+
+	order, total, err := service.GetDrugOutOrder(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"order": order,
+		"total": total,
+	})
+}
+
+func (c *GobalConfigApiController) GetDrugCancelDetail() {
+
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	adminInfo := c.GetAdminUserInfo()
+	order_type, _ := c.GetInt64("order_type")
+	manufacturer_id, _ := c.GetInt64("manufacturer_id")
+	keyword := c.GetString("keyword")
+	limit, _ := c.GetInt64("limit")
+	page, _ := c.GetInt64("page")
+	order, total, err := service.GetDrugCancelOrder(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"order": order,
+		"total": total,
+	})
+}

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -619,26 +619,28 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			}
 
 			if lastPredialysisEvaluation != nil {
-				evaluation.BloodAccessPartId = lastPredialysisEvaluation.BloodAccessPartId           //血管通路部位
-				evaluation.BloodAccessPartOperaId = lastPredialysisEvaluation.BloodAccessPartOperaId //血管通路
-				evaluation.AdditionalWeight = lastPredialysisEvaluation.AdditionalWeight             //衣物重
-				evaluation.Temperature = lastPredialysisEvaluation.Temperature                       //温度
-				evaluation.BreathingRate = lastPredialysisEvaluation.BreathingRate                   //呼吸
-				evaluation.Catheter = lastPredialysisEvaluation.Catheter                             //导管
-				evaluation.InternalFistula = lastPredialysisEvaluation.InternalFistula               //内瘘
-				evaluation.PulseFrequency = lastPredialysisEvaluation.PulseFrequency                 //脉搏
-				evaluation.Complication = lastPredialysisEvaluation.Complication                     //并发症
-				evaluation.LastPostDialysis = lastPredialysisEvaluation.LastPostDialysis             //前次透析后症状
-				evaluation.DialysisInterphase = lastPredialysisEvaluation.DialysisInterphase         //透析期间
-				evaluation.SymptomBeforeDialysis = lastPredialysisEvaluation.SymptomBeforeDialysis   //透析前症状
-				evaluation.PunctureNeedle = lastPredialysisEvaluation.PunctureNeedle                 //穿刺针
-				evaluation.PunctureWay = lastPredialysisEvaluation.PunctureWay                       //穿刺方法
+				evaluation.BloodAccessPartId = lastPredialysisEvaluation.BloodAccessPartId
+				evaluation.BloodAccessPartOperaId = lastPredialysisEvaluation.BloodAccessPartOperaId
+				evaluation.AdditionalWeight = lastPredialysisEvaluation.AdditionalWeight
+				evaluation.Temperature = lastPredialysisEvaluation.Temperature
+				evaluation.BreathingRate = lastPredialysisEvaluation.BreathingRate
+				evaluation.Catheter = lastPredialysisEvaluation.Catheter
+				evaluation.InternalFistula = lastPredialysisEvaluation.InternalFistula
+				evaluation.PulseFrequency = lastPredialysisEvaluation.PulseFrequency
+				evaluation.Complication = lastPredialysisEvaluation.Complication
+				evaluation.LastPostDialysis = lastPredialysisEvaluation.LastPostDialysis
+				evaluation.DialysisInterphase = lastPredialysisEvaluation.DialysisInterphase
+				evaluation.SymptomBeforeDialysis = lastPredialysisEvaluation.SymptomBeforeDialysis
+				evaluation.PunctureNeedle = lastPredialysisEvaluation.PunctureNeedle
+				evaluation.PunctureWay = lastPredialysisEvaluation.PunctureWay
 
 				evaluation.InternalFistulaSkin = lastPredialysisEvaluation.InternalFistulaSkin //血透通路皮肤情况
 				evaluation.CatheterBend = lastPredialysisEvaluation.CatheterBend               //导管打折
 				evaluation.IsHemorrhage = lastPredialysisEvaluation.IsHemorrhage               //出血
 				evaluation.IsInfect = lastPredialysisEvaluation.IsInfect                       //感染
 				evaluation.Exposed = lastPredialysisEvaluation.Exposed                         // 外漏
+				evaluation.DialysisCount = lastPredialysisEvaluation.DialysisCount             //呼吸频次
+				evaluation.Phinholing = lastPredialysisEvaluation.Phinholing
 
 			}
 		} else {
@@ -736,9 +738,8 @@ func (c *CheckWeightApiController) GetPatientList() {
 	adminUserInfo := c.GetMobileAdminUserInfo()
 
 	patientList, total, error := service.GetPatientListByUpdateTime(adminUserInfo.Org.Id, int64(syncTime))
-	if len(patientList) > 0 {
 	need_update := 0
-	if syncTime ==  0 {
+	if syncTime == 0 {
 		need_update = 1
 	}
 	if error != nil {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -13,10 +13,10 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
+	"github.com/astaxie/beego"
 	"math"
 	"net/http"
 	"net/url"
-	"github.com/astaxie/beego"
 )
 
 // type DialysisTestAPIController struct {
@@ -1064,6 +1064,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	blood := c.GetString("blood")
 	dialysis_dialyszers := c.GetString("dialysis_dialyszers")
 	dialysis_irrigation := c.GetString("dialysis_irrigation")
+	antioxidant_commodity_name := c.GetString("antioxidant_commodity_name")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 	//
@@ -1149,6 +1150,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		Blood:                      blood,
 		DialysisDialyszers:         dialysis_dialyszers,
 		DialysisIrrigation:         dialysis_irrigation,
+		AntioxidantCommodityName:   antioxidant_commodity_name,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -1448,15 +1450,15 @@ func (c *DialysisAPIController) Finish() {
 		dialysisOrder.FinishModifier = adminUserInfo.AdminUser.Id
 		dialysisOrder.EndTime = endDate.Unix()
 
-		go func (){
+		go func() {
 			ssoDomain := beego.AppConfig.String("call_domain")
 			api := ssoDomain + "/index/downpatient"
 			values := make(url.Values)
-			values.Set("org_id",  strconv.FormatInt(adminUserInfo.AdminUser.Id,10))
-			values.Set("admin_user_id", strconv.FormatInt(nurseID,10))
-			values.Set("patient_id",  strconv.FormatInt(id,10))
+			values.Set("org_id", strconv.FormatInt(adminUserInfo.AdminUser.Id, 10))
+			values.Set("admin_user_id", strconv.FormatInt(nurseID, 10))
+			values.Set("patient_id", strconv.FormatInt(id, 10))
 			http.PostForm(api, values)
-		} ()
+		}()
 
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -1515,7 +1517,7 @@ func (this *DialysisAPIController) StartDialysis() {
 	bedID, _ := this.GetInt64("bed")
 	start_time := this.GetString("start_time")
 	washpipe_nurse, _ := this.GetInt64("washpipe_nurse")
-
+	change_nurse, _ := this.GetInt64("change_nurse")
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1683,6 +1685,7 @@ func (this *DialysisAPIController) StartDialysis() {
 		Modifier:      adminUserInfo.AdminUser.Id,
 		SchedualType:  schedual_type,
 		WashpipeNurse: washpipe_nurse,
+		ChangeNurse:   change_nurse,
 	}
 
 	createErr := service.MobileCreateDialysisOrder(adminUserInfo.Org.Id, patientID, dialysisRecord)
@@ -1700,7 +1703,7 @@ func (this *DialysisAPIController) StartDialysis() {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if template.TemplateId == 6 { //adminUserInfo.Org.Id == 9538
+			if template.TemplateId == 6 || template.TemplateId == 32 { //adminUserInfo.Org.Id == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 			}
 
@@ -1733,7 +1736,7 @@ func (this *DialysisAPIController) StartDialysis() {
 	}
 
 	//只针对广慈医院
-	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 || adminUserInfo.Org.Id == 9526 {
+	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 || adminUserInfo.Org.Id == 9526 || template.TemplateId == 32 {
 		// 查询病人是否有透前评估数据
 		befor, errcode := service.GetAssessmentBefor(adminUserInfo.Org.Id, patientID, recordDate.Unix())
 		//如果有数据就插入
@@ -1755,16 +1758,16 @@ func (this *DialysisAPIController) StartDialysis() {
 		}
 	}
 
-	go func (){
+	go func() {
 		ssoDomain := beego.AppConfig.String("call_domain")
 		api := ssoDomain + "/index/uppatient"
 		values := make(url.Values)
-		values.Set("org_id",  strconv.FormatInt(adminUserInfo.Org.Id,10))
-		values.Set("admin_user_id", strconv.FormatInt(nurseID,10))
-		values.Set("patient_id",  strconv.FormatInt(patientID,10))
-		values.Set("up_time",  strconv.FormatInt(startDate.Unix(),10))
+		values.Set("org_id", strconv.FormatInt(adminUserInfo.Org.Id, 10))
+		values.Set("admin_user_id", strconv.FormatInt(nurseID, 10))
+		values.Set("patient_id", strconv.FormatInt(patientID, 10))
+		values.Set("up_time", strconv.FormatInt(startDate.Unix(), 10))
 		http.PostForm(api, values)
-	} ()
+	}()
 
 	if createErr != nil {
 		this.ErrorLog("上机失败：%v", createErr)
@@ -1864,6 +1867,7 @@ func (c *DialysisAPIController) PostSolution() {
 	blood := c.GetString("blood")
 	dialysis_dialyszers := c.GetString("dialysis_dialyszers")
 	dialysis_irrigation := c.GetString("dialysis_irrigation")
+	antioxidant_commodity_name := c.GetString("antioxidant_commodity_name")
 	if mode_id > 0 {
 		service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id)
 	}
@@ -1950,6 +1954,7 @@ func (c *DialysisAPIController) PostSolution() {
 		Blood:                     blood,
 		DialysisDialyszers:        dialysis_dialyszers,
 		DialysisIrrigation:        dialysis_irrigation,
+		AntioxidantCommodityName:  antioxidant_commodity_name,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -2120,7 +2125,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 			fmt.Println("4444444445555")
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if template.TemplateId == 6 {
+			if template.TemplateId == 6 || template.TemplateId == 32 {
 				fmt.Println("12222222")
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -2148,7 +2153,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 { //adminInfo.Org.Id == 9538
+	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 { //adminInfo.Org.Id == 9538
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume
@@ -2169,7 +2174,7 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 	start_time := this.GetString("start_time")
 	schedual_type, _ := this.GetInt64("schedual_type")
 	washpipe_nurse, _ := this.GetInt64("washpipe_nurse")
-
+	change_nurse, _ := this.GetInt64("change_nurse")
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -2298,6 +2303,7 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 		Modifier:      adminUserInfo.AdminUser.Id,
 		WashpipeNurse: washpipe_nurse,
 		SchedualType:  schedual_type,
+		ChangeNurse:   change_nurse,
 	}
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)
@@ -4046,10 +4052,11 @@ func (c *DialysisAPIController) GetDialysisGoodsStatistics() {
 
 	adminUser := c.GetMobileAdminUserInfo()
 	outInfo, err := service.MobileGetGoodsStatistics(adminUser.Org.Id, theStartTime, theEndtTime)
-
+	stockCount, err := service.GetOutStockTotalCountOne(theStartTime, theEndtTime, adminUser.Org.Id)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
-			"stock_out": outInfo,
+			"stock_out":  outInfo,
+			"stockCount": stockCount,
 		})
 		return
 

controllers/patient_api_controller.go

@@ -254,29 +254,29 @@ func (c *PatientApiController) CreatePatient() {
 	//获取老表的最后一条数据
 	patients, err := service.GetLastPatientData(adminUserInfo.CurrentOrgId)
 	patientsNew := models.XtPatientsNew{
-		UserOrgId:          adminUserInfo.CurrentOrgId,
-		UserId:             0,
-		Avatar:             patients.Avatar,
-		PatientType:        patients.PatientType,
-		DialysisNo:         patients.DialysisNo,
-		AdmissionNumber:    patients.AdmissionNumber,
-		Source:             patients.Source,
-		Lapseto:            patients.Lapseto,
-		PartitionId:        patients.PartitionId,
-		BedId:              patients.BedId,
-		Name:               patients.Name,
-		Alias:              patients.Alias,
-		Gender:             patients.Gender,
-		MaritalStatus:      patients.MaritalStatus,
-		IdCardNo:           patients.IdCardNo,
-		Birthday:           patients.Birthday,
-		ReimbursementWayId: patients.ReimbursementWayId,
-		HealthCareType:     patients.HealthCareType,
-		HealthCareNo:       patients.HealthCareNo,
-		HealthCareDueDate:  patients.HealthCareDueDate,
-		Height:             patients.Height,
-		BloodType:          patients.BloodType,
-		Rh:                 patients.Rh,
+		UserOrgId:                    adminUserInfo.CurrentOrgId,
+		UserId:                       0,
+		Avatar:                       patients.Avatar,
+		PatientType:                  patients.PatientType,
+		DialysisNo:                   patients.DialysisNo,
+		AdmissionNumber:              patients.AdmissionNumber,
+		Source:                       patients.Source,
+		Lapseto:                      patients.Lapseto,
+		PartitionId:                  patients.PartitionId,
+		BedId:                        patients.BedId,
+		Name:                         patients.Name,
+		Alias:                        patients.Alias,
+		Gender:                       patients.Gender,
+		MaritalStatus:                patients.MaritalStatus,
+		IdCardNo:                     patients.IdCardNo,
+		Birthday:                     patients.Birthday,
+		ReimbursementWayId:           patients.ReimbursementWayId,
+		HealthCareType:               patients.HealthCareType,
+		HealthCareNo:                 patients.HealthCareNo,
+		HealthCareDueDate:            patients.HealthCareDueDate,
+		Height:                       patients.Height,
+		BloodType:                    patients.BloodType,
+		Rh:                           patients.Rh,
 		HealthCareDueAlertDate:       patients.HealthCareDueAlertDate,
 		EducationLevel:               patients.EducationLevel,
 		Profession:                   patients.Profession,
@@ -322,28 +322,28 @@ func (c *PatientApiController) CreatePatient() {
 		Nation:                       patients.Nation,
 		NativePlace:                  patients.NativePlace,
 		Age:                          patients.Age,
-		InfectiousNextRecordTime: patients.InfectiousNextRecordTime,
-		IsInfectious:             patients.IsInfectious,
-		RemindCycle:              patients.RemindCycle,
-		ResponseResult:           patients.ResponseResult,
-		IsOpenRemind:             patients.IsOpenRemind,
-		FirstTreatmentDate:       patients.FirstTreatmentDate,
-		DialysisAge:              patients.DialysisAge,
-		ExpenseKind:              patients.ExpenseKind,
-		TellPhone:                patients.TellPhone,
-		ContactName:              patients.ContactName,
-		BloodPatients:            1,
-		SlowPatients:             0,
-		MemberPatients:           0,
-		EcommerPatients:          "",
-		BloodId:                  patients.ID,
-		SlowId:                   0,
-		MemberId:                 0,
-		MemberFistdate:           0,
-		MemberPatienttype:        0,
-		MemberTreatement:         0,
-		EquitmentId:              "",
-		UserSysBeforeCount:       patient.UserSysBeforeCount,
+		InfectiousNextRecordTime:     patients.InfectiousNextRecordTime,
+		IsInfectious:                 patients.IsInfectious,
+		RemindCycle:                  patients.RemindCycle,
+		ResponseResult:               patients.ResponseResult,
+		IsOpenRemind:                 patients.IsOpenRemind,
+		FirstTreatmentDate:           patients.FirstTreatmentDate,
+		DialysisAge:                  patients.DialysisAge,
+		ExpenseKind:                  patients.ExpenseKind,
+		TellPhone:                    patients.TellPhone,
+		ContactName:                  patients.ContactName,
+		BloodPatients:                1,
+		SlowPatients:                 0,
+		MemberPatients:               0,
+		EcommerPatients:              "",
+		BloodId:                      patients.ID,
+		SlowId:                       0,
+		MemberId:                     0,
+		MemberFistdate:               0,
+		MemberPatienttype:            0,
+		MemberTreatement:             0,
+		EquitmentId:                  "",
+		UserSysBeforeCount:           patient.UserSysBeforeCount,
 	}
 
 	err = service.CreatePatientsNew(&patientsNew)
@@ -481,28 +481,28 @@ func (c *PatientApiController) EditPatient() {
 		return
 	}
 	patientsNew := models.XtPatientsNew{
-		UserOrgId:          patient.UserOrgId,
-		UserId:             patient.UserId,
-		Avatar:             patient.Avatar,
-		PatientType:        patient.PatientType,
-		DialysisNo:         patient.DialysisNo,
-		AdmissionNumber:    patient.AdmissionNumber,
-		Source:             patient.Source,
-		PartitionId:        patient.PartitionId,
-		BedId:              patient.BedId,
-		Name:               patient.Name,
-		Alias:              patient.Alias,
-		Gender:             patient.Gender,
-		MaritalStatus:      patient.MaritalStatus,
-		IdCardNo:           patient.IdCardNo,
-		Birthday:           patient.Birthday,
-		ReimbursementWayId: patient.ReimbursementWayId,
-		HealthCareType:     patient.HealthCareType,
-		HealthCareNo:       patient.HealthCareNo,
-		HealthCareDueDate:  patient.HealthCareDueDate,
-		Height:             patient.Height,
-		BloodType:          patient.BloodType,
-		Rh:                 patient.Rh,
+		UserOrgId:                 patient.UserOrgId,
+		UserId:                    patient.UserId,
+		Avatar:                    patient.Avatar,
+		PatientType:               patient.PatientType,
+		DialysisNo:                patient.DialysisNo,
+		AdmissionNumber:           patient.AdmissionNumber,
+		Source:                    patient.Source,
+		PartitionId:               patient.PartitionId,
+		BedId:                     patient.BedId,
+		Name:                      patient.Name,
+		Alias:                     patient.Alias,
+		Gender:                    patient.Gender,
+		MaritalStatus:             patient.MaritalStatus,
+		IdCardNo:                  patient.IdCardNo,
+		Birthday:                  patient.Birthday,
+		ReimbursementWayId:        patient.ReimbursementWayId,
+		HealthCareType:            patient.HealthCareType,
+		HealthCareNo:              patient.HealthCareNo,
+		HealthCareDueDate:         patient.HealthCareDueDate,
+		Height:                    patient.Height,
+		BloodType:                 patient.BloodType,
+		Rh:                        patient.Rh,
 		HealthCareDueAlertDate:    patient.HealthCareDueAlertDate,
 		EducationLevel:            patient.EducationLevel,
 		Profession:                patient.Profession,
@@ -544,19 +544,19 @@ func (c *PatientApiController) EditPatient() {
 		Nation:                    patient.Nation,
 		NativePlace:               patient.NativePlace,
 		Age:                       patient.Age,
-		InfectiousNextRecordTime: patient.InfectiousNextRecordTime,
-		IsInfectious:             patient.IsInfectious,
-		RemindCycle:              patient.RemindCycle,
-		ResponseResult:           patient.ResponseResult,
-		IsOpenRemind:             patient.IsOpenRemind,
-		FirstTreatmentDate:       patient.FirstTreatmentDate,
-		DialysisAge:              patient.DialysisAge,
-		ExpenseKind:              patient.ExpenseKind,
-		TellPhone:                patient.TellPhone,
-		ContactName:              patient.ContactName,
-		UpdatedTime:              time.Now().Unix(),
-		BloodPatients:            1,
-		Lapseto:                  patient.Lapseto,
+		InfectiousNextRecordTime:  patient.InfectiousNextRecordTime,
+		IsInfectious:              patient.IsInfectious,
+		RemindCycle:               patient.RemindCycle,
+		ResponseResult:            patient.ResponseResult,
+		IsOpenRemind:              patient.IsOpenRemind,
+		FirstTreatmentDate:        patient.FirstTreatmentDate,
+		DialysisAge:               patient.DialysisAge,
+		ExpenseKind:               patient.ExpenseKind,
+		TellPhone:                 patient.TellPhone,
+		ContactName:               patient.ContactName,
+		UpdatedTime:               time.Now().Unix(),
+		BloodPatients:             1,
+		Lapseto:                   patient.Lapseto,
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
@@ -659,8 +659,8 @@ func (c *PatientApiController) EditLapseto() {
 		return
 	}
 	lapsetoType := int64(patientBody["lapseto_type"].(float64))
-	if lapsetoType <= 0 || lapsetoType >= 3 {
-		utils.ErrorLog("lapsetoType <= 0 || lapsetoType >= 3")
+	if lapsetoType <= 0 || lapsetoType > 3 {
+		utils.ErrorLog("lapsetoType <= 0 || lapsetoType > 3")
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}

controllers/print_data_api_controller.go

@@ -91,13 +91,14 @@ func (this *PrintDataAPIController) StockRecordPrintData() {
 	}
 
 	list, err := service.FindPrintStockGoodInfoByType(types, startTime, endTime, adminUserInfo.CurrentOrgId)
-
+	stockTotal, err := service.GetOutStockTotalCountTwo(startTime, endTime, adminUserInfo.CurrentOrgId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 	} else {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list": list,
-			"type": types,
+			"list":       list,
+			"type":       types,
+			"stockTotal": stockTotal,
 		})
 	}
 }

controllers/schedule_api_controller.go

@@ -40,6 +40,10 @@ func ScheduleApiRegistRouters() {
 
 	beego.Router("/api/schedule_template/cancel", &ScheduleApiController{}, "post:CancelScheduleTemplate")
 	beego.Router("/api/schedule/getnextscheduleweekday", &ScheduleApiController{}, "Get:GetNextWeekDaySchedule")
+
+	beego.Router("/api/schedule/getthreeweeklist", &ScheduleApiController{}, "Get:GetThreeWeekList")
+
+	beego.Router("/api/schedule/getallzones", &ScheduleApiController{}, "Get:GetAllZones")
 }
 
 func (c *ScheduleApiController) GetWeekPanels() {
@@ -1915,3 +1919,57 @@ func (this *ScheduleApiController) GetNextWeekDaySchedule() {
 		"schedule": schedule,
 	})
 }
+
+func (this *ScheduleApiController) GetThreeWeekList() {
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	partition_id, _ := this.GetInt64("partition_id")
+	schedule_type, _ := this.GetInt64("schedule_type")
+	fmt.Println(partition_id, schedule_type)
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	var theStartTIme int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theStartTIme = theTime.Unix()
+	}
+	var theEndtTIme int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theEndtTIme = theTime.Unix()
+	}
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	partitions, _ := service.GetSchedulePartitionPanel(orgId)
+	list, err := service.GetThreeWeekList(theStartTIme, theEndtTIme, orgId, schedule_type, partition_id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":       list,
+		"partitions": partitions,
+	})
+}
+
+func (this *ScheduleApiController) GetAllZones() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	zones, err := service.GetAllZoneOne(orgId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"zones": zones,
+	})
+}

controllers/self_drug_api_congtroller.go

@@ -51,6 +51,7 @@ func SelfDrugRouters() {
 	beego.Router("/api/drug/deleteDrugNamebyid", &SelfDrugApiController{}, "Get:DeleteDrugNameById")
 	beego.Router("/api/drug/getpatientdetail", &SelfDrugApiController{}, "Get:GetPatientDetail")
 	//beego.Router("/api/drug/getpatientdetail",&SelfDrugApiController{},"Get:ToPatientDetail")
+	beego.Router("/api/drug/getselfstockquery", &SelfDrugApiController{}, "Get:GetSelfStockQuery")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -881,3 +882,34 @@ func (this *SelfDrugApiController) GetPatientDetail() {
 //    "patient": patient,
 //  })
 //}
+
+func (this *SelfDrugApiController) GetSelfStockQuery() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	type_name, _ := this.GetInt64("type_name")
+	keywords := this.GetString("keywords")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	startUnix := theTime.Unix()
+	end_time := this.GetString("end_time")
+	endTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	endTimeUnix := endTimes.Unix()
+	page, _ := this.GetInt64("page")
+	limit, _ := this.GetInt64("limit")
+	//统计入库数量
+	stockQuery, total, err := service.GetSelfStockQuery(type_name, keywords, startUnix, endTimeUnix, orgId, limit, page)
+	//统计出库数量
+	stockOutQuery, err := service.GetSelfOutStockQuery(startUnix, endTimeUnix, orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"stockQuery":    stockQuery,
+		"total":         total,
+		"stockOutQuery": stockOutQuery,
+	})
+}

models/device_models.go

@@ -881,3 +881,14 @@ func (VmDeviceInformation) TableName() string {
 
 	return "xt_device_information"
 }
+
+type VmSchedule struct {
+	ScheduleDate int64  `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType int64  `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek int64  `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	BedId        int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	Partition    int64  `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	Name         string `gorm:"column:name" json:"name" form:"name"`
+	Number       string `gorm:"column:number" json:"number" form:"number"`
+	ZoneName     string `gorm:"column:name" json:"zon_name" form:"name"`
+}

models/dialysis.go

@@ -736,6 +736,7 @@ type DialysisOrder struct {
 	SchedualType   int64         `gorm:"column:schedual_type" json:"schedual_type"`
 	UserAdminRole  UserAdminRole `json:"role" gorm:"foreignkey:AdminUserId;AssociationForeignKey:StartNurse;"`
 	WashpipeNurse  int64         `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
+	ChangeNurse    int64         `gorm:"column:change_nurse" json:"change_nurse" form:"change_nurse"`
 }
 
 func (DialysisOrder) TableName() string {

models/patient_models.go

@@ -227,6 +227,7 @@ type DialysisPrescription struct {
 	Blood                      string        `gorm:"column:blood" json:"blood"`
 	DialysisDialyszers         string        `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
 	DialysisIrrigation         string        `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	AntioxidantCommodityName   string        `gorm:"column:antioxidant_commodity_name" json:"antioxidant_commodity_name" form:"antioxidant_commodity_name"`
 }
 
 func (DialysisPrescription) TableName() string {
@@ -234,13 +235,15 @@ func (DialysisPrescription) TableName() string {
 }
 
 type DialysisPrescriptionList struct {
-	ID                         int64  `gorm:"column:id" json:"id"`
-	UserOrgId                  int64  `gorm:"column:user_org_id" json:"user_org_id"`
-	PatientId                  int64  `gorm:"column:patient_id" json:"patient_id"`
-	RecordDate                 int64  `gorm:"column:record_date" json:"record_date"`
-	RecordId                   int64  `gorm:"column:record_id" json:"record_id"`
-	Creater                    int64  `gorm:"column:creater" json:"creater"`
-	DialyzerPerfusionApparatus string `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus" form:"dialyzer_perfusion_apparatus"`
+	ID                         int64   `gorm:"column:id" json:"id"`
+	UserOrgId                  int64   `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId                  int64   `gorm:"column:patient_id" json:"patient_id"`
+	RecordDate                 int64   `gorm:"column:record_date" json:"record_date"`
+	RecordId                   int64   `gorm:"column:record_id" json:"record_id"`
+	Creater                    int64   `gorm:"column:creater" json:"creater"`
+	DialyzerPerfusionApparatus string  `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus" form:"dialyzer_perfusion_apparatus"`
+	TargetUltrafiltration      float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration"`
+	BloodAccess                int64   `gorm:"column:blood_access" json:"blood_access"`
 }
 
 func (DialysisPrescriptionList) TableName() string {

models/self_drug_models.go

@@ -410,3 +410,125 @@ type XtDrugStockConfig struct {
 func (XtDrugStockConfig) TableName() string {
 	return "xt_drug_stock_config"
 }
+
+type XtSelfOutStockOne struct {
+	DrugName   string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugNameId int64  `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
+	DrugSpec   string `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	Count      int64
+	drug_type  int64 `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+}
+
+type BloodDrugWarehouseInfo struct {
+	ID               int64   `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId    int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId           int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number           string  `gorm:"column:number" json:"number" form:"number"`
+	ProductDate      int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate       int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	WarehousingCount int64   `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	Price            float64 `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice       float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	Dealer           int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer     int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Remark           string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime            int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime            int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status           int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId            int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsReturn         int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	WarehousingOrder string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	Type             int64   `gorm:"column:type" json:"type" form:"type"`
+	RetailPrice      float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	DrugType         int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugName         string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugSpec         string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	Creater          int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	MinUnit          string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+}
+
+type BloodDrugCancelStockInfo struct {
+	ID               int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugId           int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	CancelStockId    int64   `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
+	Count            int64   `gorm:"column:count" json:"count" form:"count"`
+	Price            float64 `gorm:"column:price" json:"price" form:"price"`
+	Total            float64 `gorm:"column:total" json:"total" form:"total"`
+	ProductDate      int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate       int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Ctime            int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime            int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status           int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId            int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	OrderNumber      string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	Type             int64   `gorm:"column:type" json:"type" form:"type"`
+	Dealer           int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer     int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	RetailPrice      float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	Number           string  `gorm:"column:number" json:"number" form:"number"`
+	DrugType         int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugName         string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugSpec         string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	Creater          int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	MinUnit          string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+}
+
+type BloodDrugSalesReturnInfo struct {
+	ID               int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugId           int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	SalesReturnId    int64   `gorm:"column:sales_return_id" json:"sales_return_id" form:"sales_return_id"`
+	Count            int64   `gorm:"column:count" json:"count" form:"count"`
+	Price            float64 `gorm:"column:price" json:"price" form:"price"`
+	Total            float64 `gorm:"column:total" json:"total" form:"total"`
+	ProductDate      int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate       int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Ctime            int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime            int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status           int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId            int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	OrderNumber      string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	Type             int64   `gorm:"column:type" json:"type" form:"type"`
+	Dealer           int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer     int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	RetailPrice      float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	Number           string  `gorm:"column:number" json:"number" form:"number"`
+	DrugType         int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugName         string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugSpec         string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	Creater          int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	MinUnit          string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+}
+
+type BloodDrugWarehouseOutInfo struct {
+	ID                      int64   `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	DrugId                  int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingOutTarget    int64   `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
+	Count                   int64   `gorm:"column:count" json:"count" form:"count"`
+	Price                   float64 `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice              float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	ProductDate             int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate              int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Mtime                   int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Ctime                   int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status                  int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId                   int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Remark                  string  `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCancel                int64   `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
+	WarehouseOutOrderNumber string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	Type                    int64   `gorm:"column:type" json:"type" form:"type"`
+	Dealer                  int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	IsSys                   int64   `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SysRecordTime           int64   `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
+	RetailPrice             float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice        float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	DrugType                int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugName                string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugSpec                string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	Creater                 int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	MinUnit                 string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+}

service/dialysis_service.go

@@ -637,7 +637,7 @@ func GetDialysisScheduals(orgID int64, scheduleDate int64) ([]*MDialysisSchedule
 		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 		Preload("TreatmentSummary", "status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).
 		Preload("Advices", "status = 1 AND user_org_id = ? AND advice_date = ? ", orgID, scheduleDate).
-
+		Preload("AssessmentAfterDislysis", "status = 1 AND user_org_id = ? and assessment_date = ?", orgID, scheduleDate).
 		// Preload("DialysisOrder.MonitoringRecords", "status = 1 AND user_org_id = ?", orgID).
 		Where("status = 1 AND user_org_id = ?", orgID)
 	if scheduleDate != 0 {

service/doctor_schedule_service.go

@@ -592,7 +592,7 @@ func GetPatientSchedule(startime int64, zoneid int64, classtype int64, orgid int
 		db = db.Where("s.schedule_type = ?", classtype)
 	}
 	err = db.Preload("DeviceZone", " status= 1").Preload("DeviceNumber", "status= 1").
-		Preload("DialysisOrder", "status =1").Joins("JOIN xt_patients as p ON p.id = s.patient_id").Where("s.user_org_id = ? and s.schedule_date = ? and s.status =1", orgid, startime).
+		Preload("DialysisOrder", "status =1").Joins("JOIN xt_patients as p ON p.id = s.patient_id and p.lapseto = 1 and p.user_org_id =?", orgid).Where("s.user_org_id = ? and s.schedule_date = ? and s.status =1", orgid, startime).
 		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id,p.name as patient").Find(&schedule).Error
 	return schedule, err
 }

service/gobal_config_service.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"XT_New/models"
+	"fmt"
 	"github.com/jinzhu/gorm"
 )
 
@@ -213,3 +214,143 @@ func GetExportHisOrderList(user_org_id int64, start_time int64, end_time int64)
 	err = db.Order("ctime desc").Find(&order).Error
 	return
 }
+
+func GetDrugInOrderDetail(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string, page int64, limit int64) (drugInfo []*models.BloodDrugWarehouseInfo, total int64, err error) {
+
+	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
+
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	dbOne := XTReadDB().Table("xt_base_drug as t").Where("t.status =1")
+	dbTwo := XTReadDB().Table("xt_drug_warehouse as s").Where("s.status = 1")
+	fmt.Print(dbOne, dbTwo)
+	if startime > 0 {
+		db = db.Where("x.ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime <=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id =?", orgid)
+	}
+	if orderType > 0 {
+		db = db.Where("x.type = ?", orderType)
+	}
+
+	if len(keyword) > 0 {
+
+		db = db.Where("x.warehousing_order like ? or t.drug_spec like ? or s.creater like ?", likeKey, likeKey, likeKey)
+
+	}
+
+	if manufacturerId > 0 {
+		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,t.manufacturer,x.remark,x.ctime,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,t.drug_type,t.drug_name,t.drug_spec,t.min_unit,s.creater").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Joins("left join xt_drug_warehouse as s on s.id = x.warehousing_id and s.org_id = ? and s.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&drugInfo).Error
+	} else {
+		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,t.manufacturer,x.remark,x.ctime,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,t.drug_type,t.drug_name,t.drug_spec,t.min_unit,s.creater").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ? and t.status =1", orgid).Joins("left join xt_drug_warehouse as s on s.id = x.warehousing_id and s.org_id = ? and s.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&drugInfo).Error
+	}
+
+	return drugInfo, total, err
+}
+
+func GetDrugReturnOrder(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string, limit int64, page int64) (returninfo []*models.BloodDrugSalesReturnInfo, total int64, err error) {
+
+	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
+	db := XTReadDB().Table("xt_drug_sales_return_info as x").Where("x.status =1")
+	dbOne := XTReadDB().Table("xt_base_drug as s").Where("s.status =1")
+	dbTwo := XTReadDB().Table("xt_drug_sales_return as r").Where("r.status = 1")
+	fmt.Print(dbOne, dbTwo)
+	if startime > 0 {
+		db = db.Where("x.ctime >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime <=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if orderType > 0 {
+		db = db.Where("x.type = ?", orderType)
+	}
+
+	if len(keyword) > 0 {
+
+		db = db.Where("x.order_number like ? or s.drug_spec like ? or r.creater like ?", likeKey, likeKey, likeKey)
+	}
+
+	if manufacturerId > 0 {
+		err = db.Select("x.id,x.drug_id,x.sales_return_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,s.drug_name,s.drug_spec,s.drug_type,s.min_unit,r.creater").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_sales_return as r on r.id = x.sales_return_id and r.org_id = ? and r.status =1", orgid).Where("r.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&returninfo).Error
+	} else {
+		err = db.Select("x.id,x.drug_id,x.sales_return_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,s.drug_name,s.drug_spec,s.drug_type,s.min_unit,r.creater").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_sales_return as r on r.id = x.sales_return_id and r.org_id = ? and r.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&returninfo).Error
+	}
+
+	return returninfo, total, err
+}
+
+func GetDrugOutOrder(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string, page int64, limit int64) (outinfo []*models.BloodDrugWarehouseOutInfo, total int64, err error) {
+
+	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
+	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status =1")
+	dbOne := XTReadDB().Table("xt_base_drug as b").Where("b.status =1")
+	dbTwo := XTReadDB().Table("xt_drug_warehouse_out as t").Where("t.status = 1")
+	fmt.Print(dbOne, dbTwo)
+	if startime > 0 {
+		db = db.Where("x.ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime <=?", endtime)
+	}
+
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if orderType > 0 {
+		db = db.Where("x.type = ?", orderType)
+	}
+
+	if len(keyword) > 0 {
+		db = db.Where("x.warehouse_out_order_number like ? or b.drug_spec like ? or t.creater like ?", likeKey, likeKey, likeKey)
+	}
+
+	if manufacturerId > 0 {
+		err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,t.creater").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
+	} else {
+		err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,t.creater").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
+	}
+
+	return outinfo, total, err
+}
+
+func GetDrugCancelOrder(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string, page int64, limit int64) (cancel []*models.BloodDrugCancelStockInfo, total int64, err error) {
+
+	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
+	db := XTReadDB().Table("xt_drug_cancel_stock_info as x").Where("x.status =1")
+	dbOne := XTReadDB().Table("xt_base_drug as s").Where("s.status =1")
+	dbTwo := XTReadDB().Table("xt_drug_cancel_stock as t").Where("t.status = 1")
+	fmt.Print(dbOne, dbTwo)
+	if startime > 0 {
+		db = db.Where("x.ctime >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if orderType > 0 {
+		db = db.Where("x.type = ? ", orderType)
+	}
+	if len(keyword) > 0 {
+		db = db.Where("x.order_number like ? or s.drug_spec like ? or t.creater like ?", likeKey, likeKey, likeKey)
+	}
+
+	if manufacturerId > 0 {
+		err = db.Select("x.id,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
+	} else {
+		err = db.Select("x.id,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
+	}
+
+	return cancel, total, err
+}

service/mobile_dialysis_service.go

@@ -1126,7 +1126,7 @@ func BatchUpdateMonitors(monitors []*models.MonitoringRecord) error {
 func ModifyStartDialysisOrder(order *models.DialysisOrder) error {
 	tx := writeDb.Begin()
 	updateTime := time.Now().Unix()
-	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"start_nurse": order.StartNurse, "updated_time": updateTime, "bed_id": order.BedID, "puncture_nurse": order.PunctureNurse, "start_time": order.StartTime, "modifier": order.Modifier, "schedual_type": order.SchedualType, "washpipe_nurse": order.WashpipeNurse}).Error
+	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"start_nurse": order.StartNurse, "updated_time": updateTime, "bed_id": order.BedID, "puncture_nurse": order.PunctureNurse, "start_time": order.StartTime, "modifier": order.Modifier, "schedual_type": order.SchedualType, "washpipe_nurse": order.WashpipeNurse, "change_nurse": order.ChangeNurse}).Error
 	if err != nil {
 		tx.Rollback()
 		return err

service/patient_service.go

@@ -1193,8 +1193,8 @@ func GetAllWaitRemindPatient(org_id int64, page int64, limit int64) (total int64
 	var totals Total
 
 	offset := (page - 1) * limit
-	err = readDb.Raw("select *  from xt_patients where user_org_id = ? AND infectious_next_record_time > 0 AND status = 1  AND date_sub(DATE_FORMAT(date(from_unixtime(`xt_patients`.`infectious_next_record_time`)),'%Y-%m-%d'), interval 7 day) <= now() Order by infectious_next_record_time", org_id).Offset(offset).Limit(limit).Scan(&patient).Error
-	readDb.Raw("select Count(id) as count  from xt_patients where user_org_id = ? AND infectious_next_record_time > 0 AND status = 1  AND date_sub(DATE_FORMAT(date(from_unixtime(`xt_patients`.`infectious_next_record_time`)),'%Y-%m-%d'), interval 7 day) <= now() Order by infectious_next_record_time", org_id).Scan(&totals)
+	err = readDb.Raw("select *  from xt_patients where user_org_id = ? AND lapseto = 1 AND infectious_next_record_time > 0 AND status = 1  AND date_sub(DATE_FORMAT(date(from_unixtime(`xt_patients`.`infectious_next_record_time`)),'%Y-%m-%d'), interval 7 day) <= now() Order by infectious_next_record_time", org_id).Offset(offset).Limit(limit).Scan(&patient).Error
+	readDb.Raw("select Count(id) as count  from xt_patients where user_org_id = ? AND lapseto = 1 AND infectious_next_record_time > 0 AND status = 1  AND date_sub(DATE_FORMAT(date(from_unixtime(`xt_patients`.`infectious_next_record_time`)),'%Y-%m-%d'), interval 7 day) <= now() Order by infectious_next_record_time", org_id).Scan(&totals)
 
 	return totals.Count, patient, err
 }

service/patientmanage_service.go

@@ -1167,7 +1167,7 @@ func DeleteGroup(id int64) error {
 
 func GetAllZoneOne(orgid int64) (zone []*models.DeviceZone, err error) {
 
-	err = XTReadDB().Model(&zone).Where("org_id = ?", orgid).Find(&zone).Error
+	err = XTReadDB().Model(&zone).Where("org_id = ? and status =1", orgid).Find(&zone).Error
 	return zone, err
 }
 

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -42,7 +42,7 @@ func GetSchedules(orgID int64, schIDs []string) ([]*ScheduleVM, error) {
 				Where("user_org_id = ? AND advice_type = 2 AND status = 1", orgID).
 				Order("start_time asc, groupno desc, advice_order desc, id asc")
 		}).
-		Where("user_org_id = ? AND status = 1 AND id in (?)", orgID, schIDs).
+		Where("user_org_id = ? AND status = 1 AND id in (?)", orgID, schIDs).Order("schedule_date desc").
 		Find(&schedules).
 		Error
 	if err != nil {
@@ -186,3 +186,10 @@ func GetDialysisOrderCount(orgID int64, patient_id int64, recordDate int64) (cou
 	err = p_service.XTReadDB().Model(&models.DialysisOrder{}).Where("dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
 	return
 }
+
+func GetOutStockTotalCountTwo(startime int64, endtime int64, orgid int64) (autoMatic []*models.NewXtAutomaticReduceDetail, err error) {
+
+	err = p_service.XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.record_time,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time<=? and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error
+
+	return autoMatic, err
+}

service/schedule_service.go

@@ -662,3 +662,26 @@ func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endt
 		Find(&schedules).Error
 	return schedules, err
 }
+
+func GetThreeWeekList(startime int64, endtime int64, orgid int64, scheduletype int64, partionid int64) (schedule []*models.VmSchedule, err error) {
+
+	db := XTReadDB().Table("xt_schedule as x").Where("x.status =1")
+	if startime > 0 {
+		db = db.Where("x.schedule_date >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.schedule_date <=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	if scheduletype > 0 {
+		db = db.Where("x.schedule_type = ?", scheduletype)
+	}
+	if partionid > 0 {
+		db = db.Where("x.partition_id = ?", partionid)
+	}
+	err = db.Select("x.schedule_date,x.schedule_type,x.schedule_week,x.bed_id,x.partition_id,t.name,n.number,z.name").Joins("left join xt_patients as t on t.id = x.patient_id and t.user_org_id = ? and t.status = 1", orgid).Joins("left join xt_device_zone as z on z.id = x.partition_id and z.org_id = ? and z.status =1", orgid).Joins("left join xt_device_number as n on n.id = x.bed_id and n.org_id = ? and n.status =1", orgid).Scan(&schedule).Error
+
+	return schedule, err
+}

service/self_drug_service.go

@@ -752,3 +752,47 @@ func UpdatedSelfOutSatock(id int64, stock *models.XtSelfOutStock) error {
 	err := XTWriteDB().Model(&stock).Where("id = ?", id).Updates(map[string]interface{}{"drug_name": stock.DrugName, "drug_name_id": stock.DrugNameId, "drug_spec": stock.DrugSpec, "outstore_number": stock.OutstoreNumber, "admin_user_id": stock.AdminUserId, "storck_time": stock.StorckTime, "patient_id": stock.PatientId, "stock_out_number": stock.StockOutNumber, "exit_mode": stock.ExitMode, "medic_id": stock.MedicId, "updated_time": time.Now().Unix()}).Error
 	return err
 }
+
+func GetSelfStockQuery(typename int64, keywords string, startime int64, endtime int64, orgid int64, limit int64, page int64) (selfoutstock []*models.XtSelfOutStockOne, total int64, err error) {
+	offset := (page - 1) * limit
+	db := XTReadDB().Table("xt_self_stock as x").Where("x.status = 1")
+	likeKey := "%" + keywords + "%"
+	if len(keywords) > 0 {
+		db = db.Where("x.drug_name like ? ", likeKey)
+	}
+
+	if startime > 0 {
+		db = db.Where("x.storck_time >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.storck_time<=?", endtime)
+	}
+
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+
+	if typename > 0 {
+		err = db.Select("x.drug_name,x.drug_name_id,x.drug_spec,Sum(store_number) as count,b.drug_type").Joins("left join xt_base_drug as b on b.id = x.drug_name_id and b.org_id = ? and b.status =1 ", orgid).Where("b.drug_type = ?", typename).Group("x.drug_name_id").Count(&total).Offset(offset).Limit(limit).Scan(&selfoutstock).Error
+	} else {
+		err = db.Select("x.drug_name,x.drug_name_id,x.drug_spec,Sum(store_number) as count,b.drug_type").Joins("left join xt_base_drug as b on b.id = x.drug_name_id and b.org_id = ? and b.status =1", orgid).Group("x.drug_name_id").Count(&total).Offset(offset).Limit(limit).Scan(&selfoutstock).Error
+	}
+
+	return selfoutstock, total, err
+}
+
+func GetSelfOutStockQuery(startTime int64, endTime int64, orgid int64) (selfoutstock []*models.XtSelfOutStockOne, err error) {
+
+	db := XTReadDB().Table("xt_self_out_stock as x").Where("x.status = 1")
+	if startTime > 0 {
+		db = db.Where("x.storck_time >?", startTime)
+	}
+	if endTime > 0 {
+		db = db.Where("x.storck_time<=?", endTime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	err = db.Select("x.drug_name_id,Sum(x.outstore_number) as count").Group("x.drug_name_id").Scan(&selfoutstock).Error
+	return selfoutstock, err
+}

service/stock_service.go

@@ -2163,3 +2163,9 @@ func GetOutStockTotalCount(wareouttime int64, orgid int64) (autoMatic []*models.
 	return autoMatic, err
 
 }
+
+func GetOutStockTotalCountOne(startime int64, endtime int64, orgid int64) (autoMatic []*models.NewXtAutomaticReduceDetail, err error) {
+	err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time<=? and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error
+
+	return autoMatic, err
+}