Merge branch 'master' of http://git.shengws.com/csx/XT_New into 20200710_xt_api_new_branch

controllers/dialysis_api_controller.go

@@ -3295,11 +3295,15 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		//
 
 		//新增逻辑
+		templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
 		var dewater_amount float64
 		dewater_amount = 0
 		if evaluation.DryWeight > 0 {
 			dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
+			if templateInfo.TemplateId == 17 {
+				dewater_amount = dewater_amount * 1000
+			}
 			if dewater_amount <= 0 {
 				dewater_amount = 0
 			}
@@ -4850,15 +4854,17 @@ func (this *DialysisApiController) GetTodayMonitor() {
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
 			if template.TemplateId == 6 { //adminInfo.CurrentOrgId == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
+				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 			// 只针对方济医院
 			if template.TemplateId == 1 {
 				value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)
 				ultrafiltration_rate = value
+				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 		}
 	}
-	record.UltrafiltrationRate = ultrafiltration_rate
+	// record.UltrafiltrationRate = ultrafiltration_rate
 	record.UltrafiltrationVolume = 0
 	if template.TemplateId == 1 {
 		if ultrafiltration_rate > 0 {

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -679,6 +679,24 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 	}
 }
 
+func (c *CheckWeightApiController) GetPatientList() {
+	syncTime, _ := c.GetInt64("synctime", 0)
+	force, _ := c.GetInt64("force", 0)
+	adminUserInfo := c.GetMobileAdminUserInfo()
+	patientList, total, error := service.GetPatientListByUpdateTime(adminUserInfo.Org.Id, syncTime, force)
+	if error != nil {
+		c.ErrorLog("获取病人列表失败:%v", error)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	serviceTime := time.Now().Unix()
+	c.ServeSuccessJSON(map[string]interface{}{
+		"patientlist": patientList,
+		"total":       total,
+		"servicetime": serviceTime,
+	})
+}
+
 func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 	id, _ := c.GetInt64("patient", 0)
 	if id <= 0 {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -5534,15 +5534,17 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
 			if template.TemplateId == 6 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
+				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 			// 只针对方济医院
 			if template.TemplateId == 1 {
 				value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)
 				ultrafiltration_rate = value
+				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 		}
 	}
-	record.UltrafiltrationRate = ultrafiltration_rate
+	// record.UltrafiltrationRate = ultrafiltration_rate
 	record.UltrafiltrationVolume = 0
 	if template.TemplateId == 1 { //adminInfo.Org.Id == 3907 || adminInfo.Org.Id == 4 || adminInfo.Org.Id == 12 || adminInfo.Org.Id == 13 || adminInfo.Org.Id == 9535adminInfo.Org.Id == 3907 || adminInfo.Org.Id == 4 || adminInfo.Org.Id == 12 || adminInfo.Org.Id == 13 || adminInfo.Org.Id == 9535
 		if ultrafiltration_rate > 0 {

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -11,6 +11,7 @@ func MobileAPIControllersRegisterRouters() {
 	// beego.Router("/m/api/test", &DialysisTestAPIController{}, "get:Test")
 	beego.Router("/m/api/savebloodpressure", &CheckWeightApiController{}, "Post:SaveBloodPressure")
 	beego.Router("/m/api/checkbeforedialysis", &CheckWeightApiController{}, "get:GetPatientInfoBeforeDialysis")
+	beego.Router("/m/api/getpatientlist", &CheckWeightApiController{}, "get:GetPatientList")
 	beego.Router("/m/api/checkdialysis", &CheckWeightApiController{}, "get:GetPatientInfoDialysis")
 	beego.Router("/m/api/savecheckdialysis", &CheckWeightApiController{}, "Post:SavePatientInfoDialysis")
 	beego.Router("/m/api/scheduals", &DialysisAPIController{}, "get:Scheduals")

controllers/mobile_api_controllers/patient_api_controller.go

@@ -843,6 +843,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
+	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 	//templateInfo,_ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 	var evaluation models.PredialysisEvaluation
@@ -889,6 +890,9 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	dewater_amount = 0
 	if evaluation.DryWeight > 0 {
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
+		if template.TemplateId == 17 {
+			dewater_amount = dewater_amount * 1000
+		}
 		if dewater_amount <= 0 {
 			dewater_amount = 0
 		}

models/patient_models.go

@@ -1,5 +1,22 @@
 package models
 
+type PatientListForFace struct {
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Avatar      string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	DialysisNo  string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	IdCardNo    string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	Birthday    int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	Phone       string `gorm:"column:phone" json:"phone" form:"phone"`
+	Age         int64  `gorm:"column:age" json:"age"`
+	CreatedTime int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+}
+
+func (PatientListForFace) TableName() string {
+	return "xt_patients"
+}
+
 type Patients struct {
 	ID                           int64                `gorm:"column:id" json:"id" form:"id"`
 	UserOrgId                    int64                `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`

service/patient_service.go

@@ -80,6 +80,15 @@ func GetAllPatientList(orgID int64) (patients []*models.Patients, total int64, e
 	return
 }
 
+func GetPatientListByUpdateTime(orgID int64, syncTime int64, force int64) (patients []*models.PatientListForFace, total int64, err error) {
+	db := readDb.Model(&models.PatientListForFace{}).Where("user_org_id=? and status=1", orgID)
+	if force == 0 {
+		db = db.Where("updated_time >= ?", syncTime)
+	}
+	err = db.Count(&total).Find(&patients).Error
+	return
+}
+
 func GetPatientCount(orgID int64) (total int64) {
 	readDb.Model(&models.Patients{}).Where("user_org_id=? and status=1", orgID).Count(&total)
 	return