Ver código fonte

友好医院打印预览接口

XMLWAN 4 anos atrás
pai
commit
8ae3687d88

+ 1 - 1
controllers/dialysis_api_controller.go Ver arquivo

3020
 	}
3020
 	}
3021
 
3021
 
3022
 	assessment, _ := service.FindAssessmentAfterDislysisById(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
3022
 	assessment, _ := service.FindAssessmentAfterDislysisById(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
3023
-
3024
 	assessment.DialysisOrderId = data.DialysisOrderId
3023
 	assessment.DialysisOrderId = data.DialysisOrderId
3025
 	assessment.Evaluator = adminUserInfo.AdminUser.Id
3024
 	assessment.Evaluator = adminUserInfo.AdminUser.Id
3026
 	assessment.Status = 1
3025
 	assessment.Status = 1
3080
 	assessment.SettingPressure = data.SettingPressure
3079
 	assessment.SettingPressure = data.SettingPressure
3081
 	assessment.SupineDiastolicBloodPressure = data.SupineDiastolicBloodPressure
3080
 	assessment.SupineDiastolicBloodPressure = data.SupineDiastolicBloodPressure
3082
 	assessment.DiastolicPressure = data.DiastolicPressure
3081
 	assessment.DiastolicPressure = data.DiastolicPressure
3082
+	assessment.AdditionalWeight = data.AdditionalWeight
3083
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
3083
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
3084
 
3084
 
3085
 	if assessment.ID > 0 {
3085
 	if assessment.ID > 0 {

+ 6 - 1
controllers/mobile_api_controllers/patient_api_controller.go Ver arquivo

2102
 		return
2102
 		return
2103
 	}
2103
 	}
2104
 	xttime := theTime.Unix()
2104
 	xttime := theTime.Unix()
2105
-
2105
+	//获取当前日期月份的第一天
2106
+	firstmonth := service.GetFirstDateOfMonth(theTime)
2107
+	firstMonthDate := firstmonth.Unix()
2106
 	operatorIDs := make([]int64, 0)
2108
 	operatorIDs := make([]int64, 0)
2107
 
2109
 
2108
 	adminUserInfo := c.GetMobileAdminUserInfo()
2110
 	adminUserInfo := c.GetMobileAdminUserInfo()
2169
 	operators, err := service.GetAllStarfEs(adminUserInfo.Org.Id)
2171
 	operators, err := service.GetAllStarfEs(adminUserInfo.Org.Id)
2170
 	templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
2172
 	templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
2171
 	check, _ := service.FindDoubleCheckById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
2173
 	check, _ := service.FindDoubleCheckById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
2174
+
2175
+	dialysiscount, err := service.GetDialysisCountByPatientId(firstMonthDate, xttime, patientInfo.ID, adminUserInfo.Org.Id)
2172
 	c.ServeSuccessJSON(map[string]interface{}{
2176
 	c.ServeSuccessJSON(map[string]interface{}{
2173
 		"users":                   adminUser,
2177
 		"users":                   adminUser,
2174
 		"patientInfo":             patientInfo,
2178
 		"patientInfo":             patientInfo,
2183
 		"operators":               operators,
2187
 		"operators":               operators,
2184
 		"org_template_info":       templateInfo,
2188
 		"org_template_info":       templateInfo,
2185
 		"check":                   check,
2189
 		"check":                   check,
2190
+		"dialysiscount":           dialysiscount,
2186
 	})
2191
 	})
2187
 
2192
 
2188
 }
2193
 }

+ 5 - 2
controllers/new_mobile_api_controllers/new_dialysis_api_controller.go Ver arquivo

578
 	id, _ := this.GetInt64("id")
578
 	id, _ := this.GetInt64("id")
579
 	//获取病人详情信息
579
 	//获取病人详情信息
580
 	detail, err := service.GetPatientDetailTwo(id)
580
 	detail, err := service.GetPatientDetailTwo(id)
581
+
581
 	//获取传染病详情
582
 	//获取传染病详情
582
 	diseases := service.GetPatientDiseasesTwo(detail.BloodId)
583
 	diseases := service.GetPatientDiseasesTwo(detail.BloodId)
583
 	//获取慢病传染病
584
 	//获取慢病传染病
1257
 	fmt.Print("透析号", dialysis)
1258
 	fmt.Print("透析号", dialysis)
1258
 	patientsoure := int64(dataBody["patientsoure"].(float64))
1259
 	patientsoure := int64(dataBody["patientsoure"].(float64))
1259
 	fmt.Print("患者来源", patientsoure)
1260
 	fmt.Print("患者来源", patientsoure)
1260
-	//lapseto := int64(dataBody["lapseto"].(float64))
1261
-	//fmt.Print("留置状态", lapseto)
1261
+	lapseto := int64(dataBody["lapseto"].(float64))
1262
+	fmt.Print("留置状态", lapseto)
1262
 	contagions := dataBody["resultTwo"].([]interface{})
1263
 	contagions := dataBody["resultTwo"].([]interface{})
1263
 	fmt.Print("传染病", contagions)
1264
 	fmt.Print("传染病", contagions)
1264
 	ids := make([]int64, 0)
1265
 	ids := make([]int64, 0)
1372
 			Avatar:            avatar,
1373
 			Avatar:            avatar,
1373
 			IdCardNo:          idCard,
1374
 			IdCardNo:          idCard,
1374
 			IsInfectious:      is_infectious,
1375
 			IsInfectious:      is_infectious,
1376
+			Lapseto:           lapseto,
1375
 		}
1377
 		}
1376
 		err = service.UpdatedPatient(patients, patient.BloodId)
1378
 		err = service.UpdatedPatient(patients, patient.BloodId)
1377
 		//patientLapseto := models.PatientLapseto{
1379
 		//patientLapseto := models.PatientLapseto{
1399
 			Avatar:            avatar,
1401
 			Avatar:            avatar,
1400
 			IdCardNo:          idCard,
1402
 			IdCardNo:          idCard,
1401
 			IsInfectious:      is_infectious,
1403
 			IsInfectious:      is_infectious,
1404
+			Lapseto:           lapseto,
1402
 		}
1405
 		}
1403
 		err = service.UpdateXtPatientNew(patientsNew, id)
1406
 		err = service.UpdateXtPatientNew(patientsNew, id)
1404
 		if err != nil {
1407
 		if err != nil {