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

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9529
+httpport = 9531
 runmode = dev
 
 # 1
@@ -221,16 +221,31 @@ redisport = 6379
 redispasswrod = 123456
 redisdb = 0
 
-niprocart =  83
-jms = 80
-fistula_needle_set = 81
-fistula_needle_set_16 = 82
-hemoperfusion = 85
-dialyser_sterilised = 84
-filtryzer = 79
-dialyzers = 10000
-injector = 10001
-bloodlines = 10002
-tubingHemodialysis = 10003
-package = 10004
-aliquid = 10005
+
+        niprocart =  63
+        jms = 58
+        fistula_needle_set = 65
+        fistula_needle_set_16 = 64
+        hemoperfusion = 55
+        dialyser_sterilised = 12
+        filtryzer = 53
+                dialyzers = 8
+                injector = 81
+                bloodlines = 42
+        tubingHemodialysis = 30
+        package = 82
+        aliquid = 83
+
+#niprocart =  83
+#jms = 80
+#fistula_needle_set = 81
+#fistula_needle_set_16 = 82
+#hemoperfusion = 85
+#dialyser_sterilised = 84
+#filtryzer = 79
+#dialyzers = 10000
+#injector = 10001
+#bloodlines = 10002
+#tubingHemodialysis = 10003
+#package = 10004
+#aliquid = 10005

controllers/base_api_controller.go

@@ -81,7 +81,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 3907
+		subscibe.OrgId = 12
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -91,7 +91,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 3907
+		adminUserInfo.CurrentOrgId = 12
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -326,7 +326,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 3907
+		subscibe.OrgId = 12
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -336,7 +336,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 3907
+		adminUserInfo.CurrentOrgId = 12
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/dialysis_api_controller.go

@@ -3303,7 +3303,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		dewater_amount = 0
 		if evaluation.DryWeight > 0 {
 			dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
-			if templateInfo.TemplateId == 17 {
+			if templateInfo.TemplateId == 17 && templateInfo.TemplateId == 22 {
 				dewater_amount = dewater_amount * 1000
 			}
 			if dewater_amount <= 0 {
@@ -4863,13 +4863,13 @@ func (this *DialysisApiController) GetTodayMonitor() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if template.TemplateId == 20 { //adminInfo.CurrentOrgId == 9538
+			if template.TemplateId == 20 || template.TemplateId == 22 { //adminInfo.CurrentOrgId == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
 			// 只针对方济医院
-			if template.TemplateId == 1 {
+			if template.TemplateId == 1 && adminInfo.CurrentOrgId != 9849 {
 				value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)
 				ultrafiltration_rate = value
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -4878,14 +4878,14 @@ func (this *DialysisApiController) GetTodayMonitor() {
 	}
 	// record.UltrafiltrationRate = ultrafiltration_rate
 	record.UltrafiltrationVolume = 0
-	if template.TemplateId == 1 {
+	if template.TemplateId == 1 && adminInfo.CurrentOrgId != 9849 {
 		if ultrafiltration_rate > 0 {
 			value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", float64(record.OperateTime+3600-fristrecord.OperateTime)/3600*ultrafiltration_rate), 6)
 			record.UltrafiltrationVolume = value
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 20 {
+	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 {
 		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

@@ -741,9 +741,11 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 						}
 						//查出入库记录中最后一条记录
 						stockInInfo, _ := service.FindLastStockInInfoRecord(prescription.Niprocart, adminUserInfo.CurrentOrgId)
+
 						warehouseOutInfo.Price = stockInInfo.Price
 						warehouseOutInfo.GoodId = prescription.Niprocart
 						warehouseOutInfo.GoodTypeId = niprocart
+
 						err := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
 
 						if err == nil {
@@ -762,6 +764,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 							service.AddSigleAutoReduceRecordInfo(details)
 						}
 					}
+
 					if prescription.Jms > 0 {
 						warehouseOutInfo := &models.WarehouseOutInfo{
 							WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -1711,7 +1714,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 								Status:                  1,
 								RecordTime:              startDate.Unix(),
 								OrgId:                   adminUserInfo.CurrentOrgId,
-								GoodId:                  prescription.Dialyzer,
+								GoodId:                  prescription.Dialyzers,
 								GoodTypeId:              dialyzers,
 							}
 							service.AddSigleAutoReduceRecordInfo(details)
@@ -2155,11 +2158,11 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 			if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 				totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-				if template.TemplateId == 6 || template.TemplateId == 20 {
+				if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 {
 					ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				}
 				// 只针对方济医院
-				if template.TemplateId == 1 {
+				if template.TemplateId == 1 && adminUserInfo.CurrentOrgId != 9849 {
 					value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)
 					ultrafiltration_rate = value
 				}

controllers/gobal_config_api_controller.go

@@ -1027,12 +1027,19 @@ func (this *GobalConfigApiController) ChangeOrg() {
 			}
 		}
 
+		//产寻该机构是否有收缩压和舒张压
+		pressure, err := service.GetDefaultSystolicPressure(tempOrg.Id)
+		fmt.Println(err)
+		if len(pressure) == 0 {
+			err = service.BathInsertQualityControlTwo(tempOrg.Id)
+		} else {
+			utils.ErrorLog("字段批量插入失败：%v", err)
+		}
 		major, err := service.GetInspectionMajor(tempOrg.Id)
 		if len(major) == 0 {
 			QualityeList, err := service.FindQualityByOrgId(tempOrg.Id)
 			if len(QualityeList) == 0 {
 				err = service.BatchInsertQualityControl(tempOrg.Id)
-				err = service.BathInsertQualityControlTwo(tempOrg.Id)
 			} else {
 				utils.ErrorLog("字段批量插入失败：%v", err)
 			}

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -330,6 +330,12 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 	// 	return
 	// }
 
+	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
+
+	if template.TemplateId == 22 {
+		dewater_amount = dewater_amount * 1000
+	}
+
 	if dialysistype == 1 {
 		// 保存透前相关数据
 		// 获取透析处方

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -99,7 +99,7 @@ func (this *DialysisAPIController) Scheduals() {
 				//缓存数据
 				scheduals_json, err := json.Marshal(scheduals)
 				if err == nil {
-					redis.Set(key, scheduals_json, time.Minute*1)
+					redis.Set(key, scheduals_json, time.Second*30)
 				}
 			}
 
@@ -111,6 +111,7 @@ func (this *DialysisAPIController) Scheduals() {
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
 
 		var dat []map[string]interface{}
+
 		if err := json.Unmarshal([]byte(scheduals_json_str), &dat); err == nil {
 
 		} else {
@@ -161,7 +162,7 @@ func (this *DialysisAPIController) WaitingScheduals() {
 				//缓存数据
 				wait_scheduals_json, err := json.Marshal(scheduals)
 				if err == nil {
-					redis.Set(key, wait_scheduals_json, time.Minute*2)
+					redis.Set(key, wait_scheduals_json, time.Second*30)
 				}
 			}
 
@@ -286,7 +287,6 @@ func (this *DialysisAPIController) DialysisRecord() {
 	}
 
 	dialysisOrder, getDialysisOrderErr := service.MobileGetSchedualDialysisRecord(adminInfo.Org.Id, patientID, date.Unix())
-	fmt.Println("----------------------------", getDialysisOrderErr)
 	if getDialysisOrderErr != nil {
 		this.ErrorLog("获取透析记录失败:%v", getDialysisOrderErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -383,7 +383,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 		return
 	}
 
-	headNurses, _ := service.GetAllSpecialPermissionAdminUsersWithoutStatus(adminInfo.Org.Id, adminInfo.App.Id, models.SpecialPermissionTypeHeadNurse)
+	//headNurses, _ := service.GetAllSpecialPermissionAdminUsersWithoutStatus(adminInfo.Org.Id, adminInfo.App.Id, models.SpecialPermissionTypeHeadNurse)
 
 	_, gobalConfig := service.FindAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
 	goodTypes, _ := service.FindAllGoodTypeByType(1)          //查出所有库存配置的系统类型
@@ -410,12 +410,12 @@ func (this *DialysisAPIController) DialysisRecord() {
 		"last_predialysis_evaluation":    lastPredialysisEvaluation,
 		"last_assessment_after_dislysis": lastAssessmentAfterDislysis,
 		"last_monitor_record":            lastMonitorRecord,
-		"special_premission":             headNurses,
-		"config":                         gobalConfig,
-		"types":                          goodTypes,
-		"goodInfos":                      goodInfos,
-		"dry_weight":                     lastDryWeightDislysis,
-		"system_prescription":            systemDialysisPrescribe,
+		//"special_premission":             headNurses,
+		"config":              gobalConfig,
+		"types":               goodTypes,
+		"goodInfos":           goodInfos,
+		"dry_weight":          lastDryWeightDislysis,
+		"system_prescription": systemDialysisPrescribe,
 	}
 	this.ServeSuccessJSON(returnData)
 }
@@ -2751,12 +2751,12 @@ func (this *DialysisAPIController) StartDialysis() {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 			}
 
-			if template.TemplateId == 20 { //adminUserInfo.Org.Id == 9538
+			if template.TemplateId == 20 || template.TemplateId == 22 { //adminUserInfo.Org.Id == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
 			}
 
 			// 只针对方济医院
-			if template.TemplateId == 1 {
+			if template.TemplateId == 1 && adminUserInfo.Org.Id != 9849 {
 				value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)
 				ultrafiltration_rate = value
 			}
@@ -3827,7 +3827,7 @@ func (this *DialysisAPIController) StartDialysis() {
 								Status:                  1,
 								RecordTime:              startDate.Unix(),
 								OrgId:                   adminUserInfo.Org.Id,
-								GoodId:                  prescription.Dialyzer,
+								GoodId:                  prescription.Dialyzers,
 								GoodTypeId:              dialyzers,
 							}
 							service.AddSigleAutoReduceRecordInfo(details)
@@ -5594,26 +5594,29 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	fristrecord, _ := service.FindFirstMonitorRecordToday(patientID, adminInfo.Org.Id, monitorDate)
 
 	template, _ := service.GetOrgInfoTemplate(adminInfo.Org.Id)
-	fmt.Println("1122233333")
 
 	var ultrafiltration_rate float64
 	_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, theAssessmentDateTime, adminInfo.Org.Id)
 	if prescription.ID > 0 {
+		fmt.Println("444444444")
+
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
+			fmt.Println("4444444445555")
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
 			if template.TemplateId == 6 {
+				fmt.Println("12222222")
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if template.TemplateId == 20 {
+			if template.TemplateId == 20 || template.TemplateId == 22 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
 			// 只针对方济医院
-			if template.TemplateId == 1 {
+			if template.TemplateId == 1 && adminInfo.Org.Id != 9849 {
 				value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)
 				ultrafiltration_rate = value
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -5622,16 +5625,15 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	}
 	// 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 template.TemplateId == 1 && adminInfo.Org.Id != 9849 { //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 {
 			value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", float64(record.OperateTime+3600-fristrecord.OperateTime)/3600*ultrafiltration_rate), 6)
 			record.UltrafiltrationVolume = value
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 20 { //adminInfo.Org.Id == 9538
+	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 { //adminInfo.Org.Id == 9538
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
-			fmt.Println("11222344444444443333")
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume
 		}

controllers/mobile_api_controllers/login_api_controller.go

@@ -6,6 +6,7 @@ import (
 	"XT_New/service"
 	"XT_New/utils"
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -168,6 +169,14 @@ func (this *LoginAPIController) LoginByPwd() {
 				FiledList = make([]*models.FiledConfig, 0)
 			}
 		}
+		//产寻该机构是否有收缩压和舒张压
+		pressure, err := service.GetDefaultSystolicPressure(org.Id)
+		fmt.Println(err)
+		if len(pressure) == 0 {
+			err = service.BathInsertQualityControlTwo(org.Id)
+		} else {
+			utils.ErrorLog("字段批量插入失败：%v", err)
+		}
 
 		//批量插入质控达标统计配置
 		major, requestErr := service.GetInspectionMajor(org.Id)
@@ -175,7 +184,6 @@ func (this *LoginAPIController) LoginByPwd() {
 			QualityeList, err := service.FindQualityByOrgId(org.Id)
 			if len(QualityeList) == 0 {
 				err = service.BatchInsertQualityControl(org.Id)
-				err = service.BathInsertQualityControlTwo(org.Id)
 			} else {
 				utils.ErrorLog("字段批量插入失败：%v", err)
 			}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -885,9 +885,12 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	dewater_amount = 0
 	if evaluation.DryWeight > 0 {
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
-		if template.TemplateId == 17 {
+
+		if template.TemplateId == 17 || template.TemplateId == 22 {
 			dewater_amount = dewater_amount * 1000
+
 		}
+
 		if dewater_amount <= 0 {
 			dewater_amount = 0
 		}

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -219,7 +219,7 @@ func (this *CommonApiController) GetConfigurationDetail() {
 		}
 		this.ServeSuccessJSON(map[string]interface{}{
 			"configurationdetail": detail,
-			"vid":                 vid,
+			"vid": vid,
 		})
 	} else {
 		itemId, err := service.GetIdByItemId(detail.InspectionMinor, orgId)
@@ -229,7 +229,7 @@ func (this *CommonApiController) GetConfigurationDetail() {
 		}
 		this.ServeSuccessJSON(map[string]interface{}{
 			"configurationdetail": detail,
-			"vid":                 itemId.ID,
+			"vid": itemId.ID,
 		})
 	}
 
@@ -1092,29 +1092,27 @@ func (this *CommonApiController) GetFirstQuarter() {
 	countwo, _ := service.GetQuarterTotalCountTwo(orgid, statime, entime, lapseto)
 
 	//获取收缩压数据
-	_, systolicTotal, parseDateErr := service.GetSystolicBloodPressure(orgid, statime, entime)
+	systolic, systolicTotal, parseDateErr := service.GetSystolicBloodPressure(orgid, statime, entime)
 	//统计收缩压合格的数据
-	systolic, sysstandTotal, parseDateErr := service.GetStandSystolicBloodPressure(orgid, statime, entime)
+	//systolic, sysstandTotal, parseDateErr := service.GetStandSystolicBloodPressure(orgid, statime, entime)
 
 	//获取舒张压数据
-	_, diastotal, parseDateErr := service.GetDiastolicBloodPressure(orgid, statime, entime)
+	diastolic, diastotal, parseDateErr := service.GetDiastolicBloodPressure(orgid, statime, entime)
 	//获取合格舒张压数据
-	diastolic, diasstandtotal, parseDateErr := service.GetDiastolicStandPressure(orgid, statime, entime)
+	//diastolic, diasstandtotal, parseDateErr := service.GetDiastolicStandPressure(orgid, statime, entime)
 	normData, _ := service.GetNormData(orgid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"count":          count,
-		"countwo":        countwo,
-		"systolic":       systolic,
-		"systolicTotal":  systolicTotal,
-		"sysstandTotal":  sysstandTotal,
-		"diastolic":      diastolic,
-		"diastotal":      diastotal,
-		"diasstandtotal": diasstandtotal,
-		"normData":       normData,
+		"count":         count,
+		"countwo":       countwo,
+		"systolic":      systolic,
+		"systolicTotal": systolicTotal,
+		"diastolic":     diastolic,
+		"diastotal":     diastotal,
+		"normData":      normData,
 	})
 }
 
@@ -1676,48 +1674,48 @@ func (this *CommonApiController) GetBloodPressureList() {
 	fmt.Println("第四季度", fourQuarterEndStrUnix)
 	if bloodType == -1 {
 		//统计收缩压第一季度的总数
-		_, firstTotal, err := service.GetSystolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
+		firstList, firstTotal, err := service.GetSystolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
 		//统计收缩压第一季合格的总数
-		_, firstStandTotal, err := service.GetStandSystolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
+		//_, firstStandTotal, err := service.GetStandSystolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
 		//统计第二季收缩压总数
-		_, secondeTotal, err := service.GetSystolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
+		secondelist, secondeTotal, err := service.GetSystolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
 		//第二季度合格总数
-		_, secondeStandTotal, err := service.GetStandSystolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
+		//_, secondeStandTotal, err := service.GetStandSystolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
 		//统计第三季收缩压总数
-		_, threeTotal, err := service.GetSystolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
+		threelist, threeTotal, err := service.GetSystolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
 		//第三季度合格数
-		_, threeStandTotal, err := service.GetStandSystolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
+		//_, threeStandTotal, err := service.GetStandSystolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
 		//第四季度总数
-		_, fourTotal, err := service.GetSystolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
+		fourlist, fourTotal, err := service.GetSystolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
 		//第四季度合格总数
-		_, fourStandTotal, err := service.GetStandSystolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
+		//_, fourStandTotal, err := service.GetStandSystolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
 		}
 
 		this.ServeSuccessJSON(map[string]interface{}{
-			"firstTotal":        firstTotal,
-			"firstStandTotal":   firstStandTotal,
-			"secondeTotal":      secondeTotal,
-			"secondeStandTotal": secondeStandTotal,
-			"threeTotal":        threeTotal,
-			"threeStandTotal":   threeStandTotal,
-			"fourTotal":         fourTotal,
-			"fourStandTotal":    fourStandTotal,
+			"firstTotal":   firstTotal,
+			"firstList":    firstList,
+			"secondelist":  secondelist,
+			"secondeTotal": secondeTotal,
+			"threelist":    threelist,
+			"threeTotal":   threeTotal,
+			"fourTotal":    fourTotal,
+			"fourlist":     fourlist,
 		})
 	}
 
 	if bloodType == -2 {
 		//统计舒张压第一季度的总数
-		_, firstTotal, err := service.GetDiastolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
-		_, firstStandTotal, err := service.GetDiastolicStandPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
-		_, secondeTotal, err := service.GetDiastolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
-		_, secondeStandTotal, err := service.GetDiastolicStandPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
-		_, threeTotal, err := service.GetDiastolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
-		_, threeStandTotal, err := service.GetDiastolicStandPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
-		_, fourTotal, err := service.GetDiastolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
-		_, fourStandTotal, err := service.GetDiastolicStandPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
+		firstList, firstTotal, err := service.GetDiastolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
+		//_, firstStandTotal, err := service.GetDiastolicStandPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
+		secondelist, secondeTotal, err := service.GetDiastolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
+		//_, secondeStandTotal, err := service.GetDiastolicStandPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
+		threelist, threeTotal, err := service.GetDiastolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
+		//_, threeStandTotal, err := service.GetDiastolicStandPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
+		fourlist, fourTotal, err := service.GetDiastolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
+		//_, fourStandTotal, err := service.GetDiastolicStandPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
 
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -1725,14 +1723,14 @@ func (this *CommonApiController) GetBloodPressureList() {
 		}
 
 		this.ServeSuccessJSON(map[string]interface{}{
-			"firstTotal":        firstTotal,
-			"firstStandTotal":   firstStandTotal,
-			"secondeTotal":      secondeTotal,
-			"secondeStandTotal": secondeStandTotal,
-			"threeTotal":        threeTotal,
-			"threeStandTotal":   threeStandTotal,
-			"fourTotal":         fourTotal,
-			"fourStandTotal":    fourStandTotal,
+			"firstTotal":   firstTotal,
+			"firstList":    firstList,
+			"secondelist":  secondelist,
+			"secondeTotal": secondeTotal,
+			"threelist":    threelist,
+			"threeTotal":   threeTotal,
+			"fourTotal":    fourTotal,
+			"fourlist":     fourlist,
 		})
 	}
 }
@@ -2032,3 +2030,28 @@ func (this *CommonApiController) GetMonthBloodList() {
 		})
 	}
 }
+
+func (this *CommonApiController) GetIdsListTwo() {
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+	adminInfo := this.GetAdminUserInfo()
+	orgId := adminInfo.CurrentOrgId
+	patientid, _ := this.GetInt64("patientid")
+	idlist := dataBody["ids"].([]interface{})
+
+	var vlist []interface{}
+	for _, contagion := range idlist {
+		id := int64(contagion.(float64))
+		list, _ := service.GetInspectionMoninList(id, orgId, patientid)
+		vlist = append(vlist, list)
+	}
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"vlist": vlist,
+	})
+
+}

controllers/new_mobile_api_controllers/common_api_router.go

@@ -55,4 +55,5 @@ func CommonApiControllersRegisterRouters() {
 	beego.Router("/com/api/updatebloodprussre", &CommonApiController{}, "Post:UpdateBloodPrussre")
 	beego.Router("/com/api/getbloodpressurelist", &CommonApiController{}, "Get:GetBloodPressureList")
 	beego.Router("/com/api/getmonthbloodlist", &CommonApiController{}, "Get:GetMonthBloodList")
+	beego.Router("/com/api/getidslist", &CommonApiController{}, "Post:GetIdsListTwo")
 }

controllers/new_mobile_api_controllers/forget_password_controller.go

@@ -7,6 +7,7 @@ import (
 	"XT_New/service"
 	"XT_New/utils"
 	"encoding/json"
+	"fmt"
 	"github.com/astaxie/beego"
 	"io/ioutil"
 	"net/http"
@@ -180,12 +181,19 @@ func (this *ForgetPwdController) ModifyPassword() {
 			}
 
 			if org.Id > 0 {
+				//产寻该机构是否有收缩压和舒张压
+				pressure, err := service.GetDefaultSystolicPressure(org.Id)
+				fmt.Println(err)
+				if len(pressure) == 0 {
+					err = service.BathInsertQualityControlTwo(org.Id)
+				} else {
+					utils.ErrorLog("字段批量插入失败：%v", err)
+				}
 				major, requestErr := service.GetInspectionMajor(org.Id)
 				if len(major) == 0 {
 					QualityeList, err := service.FindQualityByOrgId(org.Id)
 					if len(QualityeList) == 0 {
 						err = service.BatchInsertQualityControl(org.Id)
-						err = service.BathInsertQualityControlTwo(org.Id)
 					} else {
 						utils.ErrorLog("字段批量插入失败：%v", err)
 					}

controllers/new_mobile_api_controllers/home_api_controller.go

@@ -7,6 +7,7 @@ import (
 	"XT_New/service"
 	"XT_New/utils"
 	"encoding/json"
+	"fmt"
 	"github.com/astaxie/beego"
 	"io/ioutil"
 	"net/http"
@@ -233,12 +234,19 @@ func (this *HomeController) ChangeOrg() {
 			}
 
 			if org.Id > 0 {
+				//产寻该机构是否有收缩压和舒张压
+				pressure, err := service.GetDefaultSystolicPressure(org.Id)
+				fmt.Println(err)
+				if len(pressure) == 0 {
+					err = service.BathInsertQualityControlTwo(org.Id)
+				} else {
+					utils.ErrorLog("字段批量插入失败：%v", err)
+				}
 				major, err := service.GetInspectionMajor(org.Id)
 				if len(major) == 0 {
 					QualityeList, err := service.FindQualityByOrgId(org.Id)
 					if len(QualityeList) == 0 {
 						err = service.BatchInsertQualityControl(org.Id)
-						err = service.BathInsertQualityControlTwo(org.Id)
 					} else {
 						utils.ErrorLog("字段批量插入失败：%v", err)
 					}

controllers/new_mobile_api_controllers/index_evaluation_api_controller.go

@@ -2,6 +2,7 @@ package new_mobile_api_controllers
 
 import (
 	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service/statistics_service"
 	"XT_New/utils"
 	"fmt"
@@ -24,11 +25,35 @@ func (this *IndexEvaluationApiController) GetAdminUser() {
 //初始化数据
 func (this *IndexEvaluationApiController) GetLaboratoryIndexInitData() {
 	adminUserInfo := this.GetMobileAdminUserInfo()
-	references, _ := statistics_service.FindOrgQualityControlStandardInspectionReference(adminUserInfo.Org.Id)
+	var references []*models.InspectionReference
+	count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.Org.Id)
+	if count <= 0 {
+		references, _ = statistics_service.FindOrgInspectionReference(0, 1)
+		references2, _ := statistics_service.FindOrgInspectionReference(0, 2)
+		references = append(references, references2...)
+
+	} else {
+		references, _ = statistics_service.FindOrgInspectionReference(adminUserInfo.Org.Id, 1)
+		references2, _ := statistics_service.FindOrgInspectionReference(adminUserInfo.Org.Id, 2)
+		references = append(references, references2...)
+
+	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"references": references,
 	})
 
+	//adminUserInfo := this.GetMobileAdminUserInfo()
+	//
+	//
+	//
+	//references, _ := statistics_service.FindOrgInspectionReference(adminUserInfo.Org.Id,1)
+	//references2, _ := statistics_service.FindOrgInspectionReference(adminUserInfo.Org.Id,2)
+	//references = append(references, references2...)
+	//this.ServeSuccessJSON(map[string]interface{}{
+	//	"references": references,
+	//})
+
 }
 
 //获取取值范围
@@ -38,10 +63,20 @@ func (this *IndexEvaluationApiController) GetLaboratoryIndexProjectRangeValueDat
 	item_id, _ := this.GetInt64("item_id")
 	adminUserInfo := this.GetMobileAdminUserInfo()
 	var range_vaule []string
+	var qcs models.InspectionReference
+
 	if range_type == 1 {
-		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
-		range_vaule = append(range_vaule, qcs.MinRange)
-		range_vaule = append(range_vaule, qcs.LargeRange)
+		count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.Org.Id)
+
+		if count <= 0 {
+			qcs, _ = statistics_service.FindOrgConfigRangeTypeValue(0, project_id, item_id)
+		} else {
+			qcs, _ = statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+
+		}
+		//qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+		range_vaule = append(range_vaule, qcs.RangeMin)
+		range_vaule = append(range_vaule, qcs.RangeMax)
 	} else {
 		inspection, _ := statistics_service.FindOrgInspectionReferenceRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
 		for _, item := range inspection {
@@ -82,9 +117,33 @@ func (this *IndexEvaluationApiController) GetInspectionChartData() {
 	}
 
 	var range_value string
+	//if range_type == 1 {
+	//	qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+	//	range_value = qcs.RangeMin + "," + qcs.RangeMax
+	//
+	//} else {
+	//
+	//	inspection, _ := statistics_service.FindOrgInspectionReferenceRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+	//	for _, item := range inspection {
+	//		if len(range_value) == 0 {
+	//			range_value = item.InspectValue
+	//		} else {
+	//			range_value = range_value + "," + item.InspectValue
+	//		}
+	//	}
+	//}
+
 	if range_type == 1 {
-		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
-		range_value = qcs.MinRange + "," + qcs.LargeRange
+		count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.Org.Id)
+
+		if count <= 0 {
+			qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(0, project_id, item_id)
+			range_value = qcs.RangeMin + "," + qcs.RangeMax
+
+		} else {
+			qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+			range_value = qcs.RangeMin + "," + qcs.RangeMax
+		}
 
 	} else {
 
@@ -96,6 +155,7 @@ func (this *IndexEvaluationApiController) GetInspectionChartData() {
 				range_value = range_value + "," + item.InspectValue
 			}
 		}
+
 	}
 
 	data, _ := statistics_service.GetInspectionChartData(adminUserInfo.Org.Id, theStartTIme, theEndtTIme, project_id, item_id, range_type, range_value)
@@ -216,9 +276,16 @@ func (this *IndexEvaluationApiController) GetPatientInspectionBarChartData() {
 
 	var range_value string
 	if range_type == 1 {
-		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+		count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.Org.Id)
 
-		range_value = qcs.MinRange + "," + qcs.LargeRange
+		if count <= 0 {
+			qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(0, project_id, item_id)
+			range_value = qcs.RangeMin + "," + qcs.RangeMax
+
+		} else {
+			qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+			range_value = qcs.RangeMin + "," + qcs.RangeMax
+		}
 
 	} else {
 
@@ -230,6 +297,7 @@ func (this *IndexEvaluationApiController) GetPatientInspectionBarChartData() {
 				range_value = range_value + "," + item.InspectValue
 			}
 		}
+
 	}
 
 	data, _ := statistics_service.GetPatientInspectionBarChartData(adminUserInfo.Org.Id, theStartTIme, theEndtTIme, project_id, item_id, range_type, range_value, patient_id)

controllers/new_mobile_api_controllers/management_analyse_api_controller.go

@@ -82,10 +82,13 @@ func (this *ManagementAnalyseApiController) StatisticsPatientChart() {
 	data, total_one, _ := management_service.GetPatientChartData(adminUserInfo.Org.Id, startTime, endTime, statistics_type)
 	total, _ := management_service.GetLapsetoPatientTotal(adminUserInfo.Org.Id, statistics_type)
 
+	total_three, _ := management_service.GetLapsetoPatientTotal(adminUserInfo.Org.Id, 2)
+
 	this.ServeSuccessJSON(map[string]interface{}{
-		"chart_data": data,
-		"total_one":  total_one,
-		"total":      total,
+		"chart_data":  data,
+		"total_one":   total_one,
+		"total":       total,
+		"total_three": total + total_three,
 	})
 
 }

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -5,6 +5,7 @@ import (
 	"XT_New/enums"
 	"XT_New/service"
 	"XT_New/utils"
+	"encoding/json"
 	"fmt"
 	"time"
 )
@@ -1956,3 +1957,27 @@ func (this *NewCommonApiController) GetSystolicBloodStand() {
 		"bloodPressure": bloodPressure,
 	})
 }
+
+func (this *NewCommonApiController) GetMobileIdsList() {
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+	admin := this.GetMobileAdminUserInfo()
+	orgId := admin.Org.Id
+	patientid, _ := this.GetInt64("patientid")
+	idlist := dataBody["ids"].([]interface{})
+
+	var vlist []interface{}
+	for _, contagion := range idlist {
+		id := int64(contagion.(float64))
+		list, _ := service.GetInspectionMoninList(id, orgId, patientid)
+		vlist = append(vlist, list)
+	}
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"vlist": vlist,
+	})
+}

controllers/new_mobile_api_controllers/new_common_api_router.go

@@ -40,4 +40,5 @@ func NewCommonApiControllersRegisterRouters() {
 	beego.Router("/m/api/gettargetnostanddetail", &NewCommonApiController{}, "Get:GetTargetNoStandDetail")
 	beego.Router("/m/api/gettargestanddetail", &NewCommonApiController{}, "Get:GetTargetStandDetail")
 	beego.Router("/m/api/getsystolicbloodstand", &NewCommonApiController{}, "Get:GetSystolicBloodStand")
+	beego.Router("/m/api/getmobileidslist", &NewCommonApiController{}, "post:GetMobileIdsList")
 }

controllers/new_mobile_api_controllers/new_login_api_controller.go

@@ -296,12 +296,20 @@ func (this *NewLoginApiController) LoginByCs() {
 			}
 
 			if org.Id > 0 {
+				//产寻该机构是否有收缩压和舒张压
+				pressure, err := service.GetDefaultSystolicPressure(org.Id)
+				fmt.Println(err)
+				if len(pressure) == 0 {
+					err = service.BathInsertQualityControlTwo(org.Id)
+				} else {
+					utils.ErrorLog("字段批量插入失败：%v", err)
+				}
 				major, requestErr := service.GetInspectionMajor(org.Id)
 				if len(major) == 0 {
 					QualityeList, err := service.FindQualityByOrgId(org.Id)
 					if len(QualityeList) == 0 {
 						err = service.BatchInsertQualityControl(org.Id)
-						err = service.BathInsertQualityControlTwo(org.Id)
+
 					} else {
 						utils.ErrorLog("字段批量插入失败0：%v", err)
 					}

controllers/pc_index_evaluation_api_controller.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service/statistics_service"
 	"XT_New/utils"
 	"github.com/astaxie/beego"
@@ -51,7 +52,20 @@ type PCIndexEvaluationApiController struct {
 //初始化数据
 func (this *PCIndexEvaluationApiController) GetLaboratoryIndexInitData() {
 	adminUserInfo := this.GetAdminUserInfo()
-	references, _ := statistics_service.FindOrgQualityControlStandardInspectionReference(adminUserInfo.CurrentOrgId)
+
+	var references []*models.InspectionReference
+	count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.CurrentOrgId)
+	if count <= 0 {
+		references, _ = statistics_service.FindOrgInspectionReference(0, 1)
+		references2, _ := statistics_service.FindOrgInspectionReference(0, 2)
+		references = append(references, references2...)
+
+	} else {
+		references, _ = statistics_service.FindOrgInspectionReference(adminUserInfo.CurrentOrgId, 1)
+		references2, _ := statistics_service.FindOrgInspectionReference(adminUserInfo.CurrentOrgId, 2)
+		references = append(references, references2...)
+
+	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"references": references,
 	})
@@ -64,10 +78,19 @@ func (this *PCIndexEvaluationApiController) GetLaboratoryIndexProjectRangeValueD
 	item_id, _ := this.GetInt64("item_id")
 	adminUserInfo := this.GetAdminUserInfo()
 	var range_vaule []string
+	var qcs models.InspectionReference
 	if range_type == 1 {
-		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
-		range_vaule = append(range_vaule, qcs.MinRange)
-		range_vaule = append(range_vaule, qcs.LargeRange)
+		count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.CurrentOrgId)
+
+		if count <= 0 {
+			qcs, _ = statistics_service.FindOrgConfigRangeTypeValue(0, project_id, item_id)
+		} else {
+			qcs, _ = statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
+
+		}
+
+		range_vaule = append(range_vaule, qcs.RangeMin)
+		range_vaule = append(range_vaule, qcs.RangeMax)
 
 	} else {
 
@@ -111,11 +134,21 @@ func (this *PCIndexEvaluationApiController) GetInspectionChartData() {
 	}
 
 	var range_value string
+
 	if range_type == 1 {
-		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
-		range_value = qcs.MinRange + "," + qcs.LargeRange
+		count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.CurrentOrgId)
+
+		if count <= 0 {
+			qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(0, project_id, item_id)
+			range_value = qcs.RangeMin + "," + qcs.RangeMax
+
+		} else {
+			qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
+			range_value = qcs.RangeMin + "," + qcs.RangeMax
+		}
 
 	} else {
+
 		inspection, _ := statistics_service.FindOrgInspectionReferenceRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
 		for _, item := range inspection {
 			if len(range_value) == 0 {
@@ -245,10 +278,19 @@ func (this *PCIndexEvaluationApiController) GetPatientInspectionBarChartData() {
 
 	var range_value string
 	if range_type == 1 {
-		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
-		range_value = qcs.MinRange + "," + qcs.LargeRange
+		count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.CurrentOrgId)
+
+		if count <= 0 {
+			qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(0, project_id, item_id)
+			range_value = qcs.RangeMin + "," + qcs.RangeMax
+
+		} else {
+			qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
+			range_value = qcs.RangeMin + "," + qcs.RangeMax
+		}
 
 	} else {
+
 		inspection, _ := statistics_service.FindOrgInspectionReferenceRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
 		for _, item := range inspection {
 			if len(range_value) == 0 {
@@ -259,7 +301,6 @@ func (this *PCIndexEvaluationApiController) GetPatientInspectionBarChartData() {
 		}
 
 	}
-
 	data, _ := statistics_service.GetPatientInspectionBarChartData(adminUserInfo.CurrentOrgId, theStartTIme, theEndtTIme, project_id, item_id, range_type, range_value, patient_id)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"data": data,

controllers/schedule_api_controller.go

@@ -547,6 +547,8 @@ func (c *ScheduleApiController) ChangeSchedule() {
 // @param date:string yyyy-MM-dd 要打印的那一周中的任一天
 func (this *ScheduleApiController) PrintInitData() {
 	dateStr := this.GetString("date")
+	//week_type, _ := this.GetInt64("type", 0)
+
 	var date *time.Time
 	if len(dateStr) == 0 {
 		now := time.Now()
@@ -562,7 +564,21 @@ func (this *ScheduleApiController) PrintInitData() {
 
 	adminUserInfo := this.GetAdminUserInfo()
 	// 获取本周的排班
-	monday, sunday := utils.GetMondayAndSundayOfWeekDate(date)
+	var monday time.Time
+	var sunday time.Time
+	//switch week_type {
+	//case 1:
+	monday, sunday = utils.GetMondayAndSundayOfWeekDate(date)
+
+	//	break
+	//case 2:
+	//	monday, sunday = utils.GetMondayAndSundayOfNextWeekDate(date)
+	//
+	//	break
+	//case 3:
+	//	monday, sunday = utils.GetMondayAndSundayOfNextNextWeekDate(date)
+	//	break
+	//}
 	schedules, getScheduleErr := service.GetPrinitWeekSchedules(adminUserInfo.CurrentOrgId, monday.Unix(), sunday.Unix())
 	if getScheduleErr != nil {
 		this.ErrorLog("获取周排班失败：%v", getScheduleErr)
@@ -570,9 +586,24 @@ func (this *ScheduleApiController) PrintInitData() {
 		return
 	}
 
+	thisTime := date
+
+	weekDay := int(thisTime.Weekday())
+	if weekDay == 0 {
+		weekDay = 7
+	}
+	weekEnd := 7 - weekDay
+	weekStart := weekEnd - 6
+	days := make([]string, 0)
+	for index := weekStart; index <= weekEnd; index++ {
+		theDay := thisTime.AddDate(0, 0, index)
+		days = append(days, theDay.Format("2006-01-02"))
+	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"schedules": schedules,
 		"monday":    monday.Unix(),
+		"days":      days,
 	})
 }
 

controllers/verify_login_controller.go

@@ -157,13 +157,19 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 					utils.ErrorLog("字段批量插入失败：%v", err)
 				}
 			}
-
+			//产寻该机构是否有收缩压和舒张压
+			pressure, err := service.GetDefaultSystolicPressure(curOrg.Id)
+			fmt.Println(err)
+			if len(pressure) == 0 {
+				err = service.BathInsertQualityControlTwo(curOrg.Id)
+			} else {
+				utils.ErrorLog("字段批量插入失败：%v", err)
+			}
 			major, err := service.GetInspectionMajor(curOrg.Id)
 			if len(major) == 0 {
 				QualityeList, err := service.FindQualityByOrgId(curOrg.Id)
 				if len(QualityeList) == 0 {
 					err = service.BatchInsertQualityControl(curOrg.Id)
-					err = service.BathInsertQualityControlTwo(curOrg.Id)
 				} else {
 					utils.ErrorLog("字段批量插入失败：%v", err)
 				}

models/dialysis.go

@@ -274,22 +274,14 @@ func (PredialysisEvaluation) TableName() string {
 }
 
 type PredialysisEvaluationList 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"`
-	AssessmentDate              int64   `gorm:"column:assessment_date" json:"assessment_date"`
-	DialysisOrderId             int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
-	DryWeight                   float64 `gorm:"column:dry_weight" json:"dry_weight"`
-	SystolicBloodPressure       float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
-	DiastolicBloodPressure      float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
-	WeightAfterLastTransparency float64 `gorm:"column:weight_after_last_transparency" json:"weight_after_last_transparency"`
-	WeighingWay                 string  `gorm:"column:weighing_way" json:"weighing_way"`
-	WeighingBefore              float64 `gorm:"column:weighing_before" json:"weighing_before"`
-	AdditionalWeight            float64 `gorm:"column:additional_weight" json:"additional_weight"`
-	WeightBefore                float64 `gorm:"column:weight_before" json:"weight_before"`
-	Evaluator                   int64   `gorm:"column:evaluator" json:"evaluator"`
-	Creater                     int64   `gorm:"column:creater" json:"creater"`
-	CreatedTime                 int64   `gorm:"column:created_time" json:"created_time"`
+	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"`
+	AssessmentDate         int64   `gorm:"column:assessment_date" json:"assessment_date"`
+	WeightBefore           float64 `gorm:"column:weight_before" json:"weight_before"`
+	CreatedTime            int64   `gorm:"column:created_time" json:"created_time"`
+	SystolicBloodPressure  float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
+	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
 }
 
 func (PredialysisEvaluationList) TableName() string {

models/patient_models.go

@@ -230,11 +230,9 @@ 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"`
-	ModeId     int64 `gorm:"column:mode_id" json:"mode_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"`
-	Modifier   int64 `gorm:"column:modifier" json:"modifier"`
 }
 
 func (DialysisPrescriptionList) TableName() string {
@@ -746,6 +744,19 @@ func (XtInspection) TableName() string {
 	return "xt_inspection"
 }
 
+type BloodXtPatients 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"`
+	DialysisNo string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	Name       string `gorm:"column:name" json:"name" form:"name"`
+	IdCardNo   string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+}
+
+func (BloodXtPatients) TableName() string {
+
+	return "xt_patients"
+}
+
 type XtPatients 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"`

routers/router.go

@@ -35,7 +35,7 @@ func init() {
 	controllers.ScheduleApiRegistRouters()
 	controllers.SignWeighAPIControllerRegistRouters()
 	controllers.InvoiceApiRegistRouters()
-	controllers.StockApiRegistRouters()
+	//controllers.StockApiRegistRouters()
 	controllers.StockGoodApiRegistRouters()
 	controllers.StockManagerApiRegistRouters()
 	controllers.PatientScheduleTemplateAPIControllerRegistRouters()

service/common_service.go

@@ -334,7 +334,7 @@ func GetDialysisAgeData(orgID int64) (counts []*models.DialysisAgePieDataStruct,
 
 }
 
-func GetCurentOrgPatients(orgid int64) (patients []*models.XtPatients, err error) {
+func GetCurentOrgPatients(orgid int64) (patients []*models.BloodXtPatients, err error) {
 
 	err = XTReadDB().Where("user_org_id = ? and status =1", orgid).Order("created_time desc").Find(&patients).Error
 	return patients, err
@@ -2723,10 +2723,10 @@ func UpdateBloodPressure(st *models.XtQualityControlStandard, id int64) error {
 
 }
 
-func GetSystolicBloodPressure(orgid int64, startime int64, endtime int64) (record []*models.XTMonitoringRecord, total int64, err error) {
+func GetSystolicBloodPressure(orgid int64, startime int64, endtime int64) (record []*models.VmMonitoringRecord, total int64, err error) {
 
 	db := XTReadDB().Table("xt_monitoring_record as x")
-	err = db.Select("x.id").Where("x.user_org_id = ? and x.monitoring_date >=? and x.monitoring_date<=? and x.status = 1 and x.systolic_blood_pressure <> 0", orgid, startime, endtime).Group("x.monitoring_date,x.patient_id").Count(&total).Scan(&record).Error
+	err = db.Select("x.id,x.systolic_blood_pressure").Where("x.user_org_id = ? and x.monitoring_date >=? and x.monitoring_date<=? and x.status = 1 and x.systolic_blood_pressure <> 0", orgid, startime, endtime).Group("x.monitoring_date,x.patient_id").Count(&total).Scan(&record).Error
 	return record, total, err
 }
 
@@ -2737,10 +2737,10 @@ func GetStandSystolicBloodPressure(orgid int64, startime int64, endtime int64) (
 	return record, total, err
 }
 
-func GetDiastolicBloodPressure(orgid int64, startime int64, endtime int64) (record []*models.XTMonitoringRecord, total int64, err error) {
+func GetDiastolicBloodPressure(orgid int64, startime int64, endtime int64) (record []*models.VmMonitoringRecord, total int64, err error) {
 
 	db := XTReadDB().Table("xt_monitoring_record as x")
-	err = db.Select("x.id").Where("x.user_org_id = ? and x.monitoring_date >=? and x.monitoring_date<=? and x.status = 1 and x.diastolic_blood_pressure <> 0", orgid, startime, endtime).Group("x.monitoring_date,x.patient_id").Count(&total).Scan(&record).Error
+	err = db.Select("x.id,x.diastolic_blood_pressure").Where("x.user_org_id = ? and x.monitoring_date >=? and x.monitoring_date<=? and x.status = 1 and x.diastolic_blood_pressure <> 0", orgid, startime, endtime).Group("x.monitoring_date,x.patient_id").Count(&total).Scan(&record).Error
 	return record, total, err
 }
 
@@ -3220,3 +3220,9 @@ func GetDiastolicStand(orgid int64, startime int64, endtime int64) (record []*mo
 	err = db.Select("x.id,x.systolic_blood_pressure,x.diastolic_blood_pressure,x.patient_id,x.monitoring_date,s.name").Joins("left join xt_patients as s on s.id = x.patient_id").Where("x.user_org_id = ? and x.monitoring_date >=? and x.monitoring_date<=? and x.status = 1 and (x.systolic_blood_pressure <> 0 or x.diastolic_blood_pressure)", orgid, startime, endtime).Group("x.monitoring_date,x.patient_id").Scan(&record).Error
 	return record, err
 }
+
+func GetInspectionMoninList(id int64, orgid int64, patientid int64) (models.XtInspection, error) {
+	inspection := models.XtInspection{}
+	err = XTReadDB().Model(&inspection).Where("item_id=? and org_id = ? and status = 1 and patient_id = ?", id, orgid, patientid).Last(&inspection).Error
+	return inspection, err
+}

service/data.go

@@ -12,7 +12,7 @@ import (
 func GetConfigList(orgID int64) (dataconfig interface{}, err error) {
 	var configList []*models.Dataconfig
 
-	err = readDb.Model(&models.Dataconfig{}).Where("(org_id in (0,?) and status = 1) or (status = 0 and delete_id_system > 0 and org_id = ?)", orgID, orgID).Order("orders desc, id asc").Find(&configList).Error
+	err = readDb.Model(&models.Dataconfig{}).Where("(org_id in (0,?) and status = 1) or (status = 0 and delete_id_system > 0 and org_id = ?)", orgID, orgID).Order("orders asc, id asc").Find(&configList).Error
 	if err != nil {
 		return nil, err
 	}
@@ -173,7 +173,13 @@ func FindFiledByOrgId(org_id int64) (filedConfig []*models.FiledConfig, err erro
 
 func FindQualityByOrgId(orgid int64) (xtquality []*models.XtQualityControlStandard, err error) {
 
-	err = readDb.Model(&models.XtQualityControlStandard{}).Where("user_org_id =? and status =1", orgid).Find(&xtquality).Error
+	err = readDb.Model(&models.XtQualityControlStandard{}).Where("user_org_id =? and status =1 and is_status = 1", orgid).Find(&xtquality).Error
+	return
+}
+
+func GetDefaultSystolicPressure(orgid int64) (xtquality []*models.XtQualityControlStandard, err error) {
+
+	err = readDb.Model(&models.XtQualityControlStandard{}).Where("user_org_id = ? and status = 1 and is_status =0", orgid).Find(&xtquality).Error
 	return
 }
 

service/dialysis_service.go

@@ -608,7 +608,6 @@ func GetDialysisScheduals(orgID int64, scheduleDate int64) ([]*MDialysisSchedule
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 		// Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
-		Preload("TreatmentMode", "status = 1").
 		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
 		Preload("AssessmentBeforeDislysis", "status = 1 AND user_org_id = ?", orgID).
 		Preload("Prescription", "status = 1 AND user_org_id = ?", orgID).
@@ -639,7 +638,7 @@ func GetDialysisWatch(orgID int64, schedulDate int64, schedulType int64, partiti
 		Preload("AssessmentBeforeDislysis", "status = 1 AND  user_org_id = ?", orgID).
 		Preload("AssessmentAfterDislysis", "status = 1 AND  user_org_id = ?", orgID).
 		Preload("MonitoringRecord", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", orgID).Order("operate_time desc")
+			return db.Where("status = 1 AND user_org_id = ?", orgID).Order("operate_time asc")
 		}).
 		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
 		Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)

service/management_service/management_analyse_service.go

@@ -12,12 +12,13 @@ func GetPatientChartData(user_org_id int64, start_time int64, end_time int64, st
 	db := service.XTReadDB()
 	switch statistics_type {
 	case 1:
-		err = db.Raw("select from_unixtime(lapseto_time,'%m-%d') as date, count(distinct patient_id) as value  from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = 1 AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ?   Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
+		err = db.Raw("select from_unixtime(created_time,'%m-%d') as date, count(distinct id) as value  from xt_patients patient   Where  patient.user_org_id = ? AND patient.created_time >=? AND patient.created_time <=? AND patient.status = 1   AND patient.lapseto = 1  Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
 
 		break
 	case 2:
 		//err = db.Raw("select from_unixtime(assessment_date,'%Y-%m-%d') as date, weight_after as value from xt_assessment_after_dislysis  Where status = 1 AND user_org_id = ? AND patient_id = ?  AND assessment_date <= ? AND  assessment_date >= ? ", user_org_id, patient_id, end_time, start_time).Scan(&datas).Error
 		err = db.Raw("select from_unixtime(lapseto_time,'%m-%d') as date, count(distinct patient_id) as value  from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = 2 AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ?   Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
+		//err = db.Raw("select from_unixtime(updated_time,'%m-%d') as date, count(distinct id) as value  from xt_patients patient   Where  patient.user_org_id = ? AND patient.updated_time >=? AND patient.updated_time <=? AND patient.status = 1   AND patient.lapseto = 2  Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
 
 		break
 	}
@@ -44,14 +45,25 @@ func GetPatientTableData(orgID int64, page, limit, start, end int64, statistics_
 	var err error
 	var patients []*PatientTableStruct
 	readDb := service.XTReadDB()
-	db := readDb.Raw("select from_unixtime(lapseto.`lapseto_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender  from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = ? AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ?  ", orgID, statistics_type, start, end)
-	err = db.Order("lapseto.lapseto_time desc").Scan(&patients).Error
-	//.Offset(offset).Limit(limit)
+	if statistics_type == 1 {
+		db := readDb.Raw("select from_unixtime(patient.`created_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender  from `xt_patients` patient Where patient.user_org_id = ? AND patient.status = 1 AND patient.lapseto = ?  AND patient.created_time >= ? AND patient.created_time <= ?  ", orgID, statistics_type, start, end)
+		err = db.Order("patient.created_time desc").Scan(&patients).Error
+
+	} else {
+
+		db := readDb.Raw("select from_unixtime(lapseto.`lapseto_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender  from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = ? AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ?  ", orgID, statistics_type, start, end)
+		//db := readDb.Raw("select from_unixtime(patient.`updated_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender  from `xt_patients` patient Where patient.user_org_id = ? AND patient.status = 1 AND patient.lapseto = ?  AND patient.updated_time >= ? AND patient.updated_time <= ?  ", orgID, statistics_type, start, end)
+		err = db.Group("lapseto.`patient_id`").Order("lapseto.lapseto_time desc").Scan(&patients).Error
+
+	}
+
 	return patients, total, err
 }
 
 func GetLapsetoPatientTotal(orgID int64, statistics_type int) (Total int64, err error) {
 	readDb := service.XTReadDB()
-	err = readDb.Raw("select count(*) as total from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type =?", orgID, statistics_type).Count(&Total).Error
+	//err = readDb.Raw("select count(*) as total from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type =?", orgID, statistics_type).Count(&Total).Error
+	err = readDb.Raw("select count(*) as total from `xt_patients` patient Where patient.user_org_id = ? AND patient.status = 1 AND patient.lapseto = ?", orgID, statistics_type).Count(&Total).Error
+
 	return Total, err
 }

service/mobile_dialysis_service.go

@@ -30,12 +30,12 @@ func MobileGetDialysisScheduals(orgID int64, scheduleDate int64, scheduleType in
 		Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-		Preload("TreatmentMode", "status = 1").
 		Preload("Advices", "status = 1 AND user_org_id = ? AND advice_type = 2", orgID).
 		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 		Preload("AssessmentBeforeDislysis", "status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).
 		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
 		Preload("DialysisOrder.DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		Preload("TreatmentSummary", "status = 1  AND user_org_id = ?", orgID).
 		// Preload("DialysisOrder.MonitoringRecords", func(rdb *gorm.DB) *gorm.DB {
 		// 	return rdb.Where("status = 1 AND user_org_id = ?", orgID).Order("operate_time DESC")
 		// }).
@@ -59,11 +59,12 @@ func MobileGetWaitingScheduals(orgID int64, scheduleDate int64) ([]*MDialysisSch
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 		// Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
-		Preload("TreatmentMode", "status = 1").
 		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 		Preload("AssessmentBeforeDislysis", "status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).
 		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
 		Preload("Advices", "status = 1 AND user_org_id = ? AND advice_type = 2 ", orgID).
+		Preload("TreatmentMode", "status = 1").
+		Preload("TreatmentSummary", "status = 1  AND user_org_id = ?", orgID).
 		Where("sch.status = 1 AND sch.user_org_id = ?", orgID)
 	if scheduleDate != 0 {
 		db = db.Where("schedule_date = ?", scheduleDate)
@@ -73,6 +74,18 @@ func MobileGetWaitingScheduals(orgID int64, scheduleDate int64) ([]*MDialysisSch
 	return vms, err
 }
 
+type VMTreatmentSummary 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"`
+	AssessmentDate  int64  `gorm:"column:assessment_date" json:"assessment_date"`
+	DialysisSummary string `gorm:"column:dialysis_summary" json:"dialysis_summary" form:"dialysis_summary"`
+}
+
+func (VMTreatmentSummary) TableName() string {
+	return "xt_treatment_summary"
+}
+
 type MDialysisScheduleVM struct {
 	ID           int64 `gorm:"column:id" json:"id"`
 	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id"`
@@ -86,13 +99,11 @@ type MDialysisScheduleVM struct {
 
 	SchedualPatient          *MSchedualPatientVMList           `gorm:"ForeignKey:PatientId" json:"patient"`
 	DeviceNumber             *MDeviceNumberVM                  `gorm:"ForeignKey:BedId" json:"device_number"`
-	DeviceZone               *models.DeviceZone                `gorm:"ForeignKey:PartitionId" json:"device_zone"`
-	TreatmentMode            *models.TreatmentMode             `gorm:"ForeignKey:ModeId" json:"treatment_mode"`
 	DialysisOrder            *MDialysisOrderVMList             `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
 	Prescription             *models.DialysisPrescriptionList  `gorm:"ForeignKey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"prescription"`
 	AssessmentBeforeDislysis *models.PredialysisEvaluationList `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"assessment_before_dislysis"`
-	TreatmentSummary         *models.TreatmentSummary          `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"treatment_summary"`
-	Advices                  []*models.DoctorAdvice            `gorm:"ForeignKey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"doctor_advice"`
+	Advices                  []*VMDoctorAdvice                 `gorm:"ForeignKey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"doctor_advice"`
+	TreatmentSummary         *VMTreatmentSummary               `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"treatment_summary"`
 }
 
 func (MDialysisScheduleVM) TableName() string {
@@ -239,23 +250,32 @@ type MDialysisOrderVMList struct {
 	// PrescriptionId int64  `gorm:"column:prescription_id" json:"prescription_id"`
 	Stage int64 `gorm:"column:stage" json:"stage"`
 	// Remark         string `gorm:"column:remark" json:"remark"`
-	BedID          int64            `gorm:"column:bed_id" json:"bed_id"`
-	StartNurse     int64            `gorm:"column:start_nurse" json:"start_nurse"`
-	FinishNurse    int64            `gorm:"column:finish_nurse" json:"finish_nurse"`
-	Status         int64            `gorm:"column:status" json:"status"`
-	PunctureNurse  int64            `gorm:"column:puncture_nurse" json:"puncture_nurse"`
-	DeviceNumber   *MDeviceNumberVM `gorm:"ForeignKey:BedID" json:"device_number"`
-	Creator        int64            `gorm:"column:creator" json:"creator"`
-	Modifier       int64            `gorm:"column:modifier" json:"modifier"`
-	FinishCreator  int64            `gorm:"column:finish_creator" json:"finish_creator"`
-	FinishModifier int64            `gorm:"column:finish_modifier" json:"finish_modifier"`
-	SchedualType   int64            `gorm:"column:schedual_type" json:"schedual_type"`
+	BedID        int64            `gorm:"column:bed_id" json:"bed_id"`
+	StartNurse   int64            `gorm:"column:start_nurse" json:"start_nurse"`
+	Status       int64            `gorm:"column:status" json:"status"`
+	DeviceNumber *MDeviceNumberVM `gorm:"ForeignKey:BedID" json:"device_number"`
+	Creator      int64            `gorm:"column:creator" json:"creator"`
 }
 
 func (MDialysisOrderVMList) TableName() string {
 	return "xt_dialysis_order"
 }
 
+type VMDoctorAdvice struct {
+	ID             int64 `gorm:"column:id" json:"id" form:"id"`
+	GroupNo        int64 `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	UserOrgId      int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId      int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AdviceDate     int64 `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	Status         int64 `gorm:"column:status" json:"status" form:"status"`
+	ExecutionState int64 `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	RecordDate     int64 `gorm:"column:record_date" json:"record_date"`
+}
+
+func (VMDoctorAdvice) TableName() string {
+	return "xt_doctor_advice"
+}
+
 // 获取透析记录
 func MobileGetDialysisRecord(orgID int64, patientID int64, recordDate int64) (*models.DialysisOrder, error) {
 	var record models.DialysisOrder

service/statistics_service/index_evaluation_service.go

@@ -1431,9 +1431,9 @@ func FindOrgInspectionReferenceRangeTypeValue(user_org_id int64, project_id int6
 	return
 }
 
-func FindOrgConfigRangeTypeValue(user_org_id int64, project_id int64, item_id int64) (qcs QualityControlStandard, err error) {
+func FindOrgConfigRangeTypeValue(user_org_id int64, project_id int64, item_id int64) (qcs models.InspectionReference, err error) {
 	db := service.XTReadDB()
-	err = db.Model(&QualityControlStandard{}).Where("status = 1 AND user_org_id = ? AND inspection_major = ? AND inspection_minor = ?", user_org_id, project_id, item_id).First(&qcs).Error
+	err = db.Model(&models.InspectionReference{}).Where("status = 1 AND org_id = ? AND project_id = ? AND id = ?", user_org_id, project_id, item_id).First(&qcs).Error
 	return
 }
 
@@ -1448,6 +1448,7 @@ func GetInspectionChartData(user_org_id int64, start_time int64, end_time int64,
 	db.Table("xt_inspection").Where("org_id=? and status=1 and  inspect_date >= ? and inspect_date <= ? AND project_id = ? AND item_id = ? AND inspect_value <> '' ", user_org_id, start_time, end_time, project_id, item_id).Count(&Total)
 
 	if range_type == 1 {
+
 		tempErr = db.Table("xt_inspection").Where("org_id=? and status=1 and  inspect_date >= ? and inspect_date <= ? AND project_id = ? AND item_id = ? AND inspect_value <> ''", user_org_id, start_time, end_time, project_id, item_id).
 			Select("CASE WHEN inspect_value < " + range_value_arr[0] + " THEN " + "'" + "小于" + range_value_arr[0] + "'" +
 				" WHEN inspect_value >= " + range_value_arr[0] + " AND  inspect_value <= " + range_value_arr[1] + " THEN " + "'" + range_value_arr[0] + "~" + range_value_arr[1] + "'" +
@@ -1769,3 +1770,9 @@ func FindOrgQualityControlStandardInspectionReferenceById(user_org_id int64, pro
 	err = db.Raw("Select reference.project_name as project_name,qcs.inspection_major as project_id, qcs.inspection_minor as id,reference.item_name as item_name,qcs.range_type as range_type,reference.range_min as range_min, reference.range_max as range_max,reference.unit as  unit,qcs.range_value as range_value   from xt_quality_control_standard qcs Left JOIN xt_inspection_reference reference ON  qcs.inspection_major = reference.project_id and qcs.inspection_minor = reference.id and  (reference.org_id = ? OR org_id = 0)  Where qcs.user_org_id = ?  AND qcs.status = 1 AND qcs.inspection_major = ? AND qcs.inspection_minor = ?", user_org_id, user_org_id, project_id, item_id).Scan(&references).Error
 	return
 }
+
+func FindOrgInspectionCount(user_org_id int64) (count int64, err error) {
+	db := service.XTReadDB()
+	err = db.Model(&models.InspectionReference{}).Where("status = 1 AND org_id = ?", user_org_id).Count(&count).Error
+	return
+}

service/stock_service.go

@@ -1186,7 +1186,7 @@ func FindAllGoodTypeByType(types int64) (goodType []*models.GoodsType, err error
 }
 
 func FindWarehouseInfoByGoodType(good_type_id int64, org_id int64) (info []*models.WarehousingInfo, err error) {
-	err = readDb.Model(&models.WarehousingInfo{}).Preload("GoodInfo", "status = 1 AND org_id = ?", org_id).Where("good_type_id = ? AND status = 1 AND org_id = ?", good_type_id, org_id).Find(&info).Error
+	err = readDb.Model(&models.WarehousingInfo{}).Preload("GoodInfo", " org_id = ? AND good_type_id = ? AND status = 1 AND specification_name <> '' ", org_id, good_type_id).Where(" org_id = ? AND good_type_id = ?  AND status = 1 ", org_id, good_type_id).Find(&info).Error
 	return info, err
 
 }

utils/tools.go

@@ -229,3 +229,33 @@ func GetMondayAndSundayOfWeekDate(date *time.Time) (time.Time, time.Time) {
 	sunday, _ := time.ParseInLocation("2006-01-02 15:04:05", date.AddDate(0, 0, 7-weekday).Format("2006-01-02")+" 23:59:59", loc)
 	return monday, sunday
 }
+
+func GetMondayAndSundayOfNextWeekDate(date *time.Time) (time.Time, time.Time) {
+	if date == nil {
+		now := time.Now()
+		date = &now
+	}
+	weekday := int(date.Weekday())
+	if weekday == 0 {
+		weekday = 7
+	}
+	loc, _ := time.LoadLocation("Local")
+	monday, _ := time.ParseInLocation("2006-01-02 15:04:05", date.AddDate(0, 0, 8-weekday).Format("2006-01-02")+" 00:00:00", loc)
+	sunday, _ := time.ParseInLocation("2006-01-02 15:04:05", date.AddDate(0, 0, 14-weekday).Format("2006-01-02")+" 23:59:59", loc)
+	return monday, sunday
+}
+
+func GetMondayAndSundayOfNextNextWeekDate(date *time.Time) (time.Time, time.Time) {
+	if date == nil {
+		now := time.Now()
+		date = &now
+	}
+	weekday := int(date.Weekday())
+	if weekday == 0 {
+		weekday = 7
+	}
+	loc, _ := time.LoadLocation("Local")
+	monday, _ := time.ParseInLocation("2006-01-02 15:04:05", date.AddDate(0, 0, 15-weekday).Format("2006-01-02")+" 00:00:00", loc)
+	sunday, _ := time.ParseInLocation("2006-01-02 15:04:05", date.AddDate(0, 0, 21-weekday).Format("2006-01-02")+" 23:59:59", loc)
+	return monday, sunday
+}