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

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -89,20 +89,20 @@ func (this *CommonApiController) SaveConfiguration() {
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
 	fmt.Println("err", err)
 	inspectionmajor := int64(dataBody["inspectionMajor"].(float64))
-	fmt.Println("大项", inspectionmajor)
+	//fmt.Println("大项", inspectionmajor)
 	inspectionMinor := int64(dataBody["inspectionMinor"].(float64))
-	fmt.Println("小项", inspectionMinor)
+	//fmt.Println("小项", inspectionMinor)
 	minrange := dataBody["min_range"].(string)
-	fmt.Println("minragne", minrange)
+	//fmt.Println("minragne", minrange)
 	largerange := dataBody["large_range"].(string)
 	fmt.Println("largerange", largerange)
 	sort := dataBody["sort"].(string)
 	sorts, err := strconv.ParseInt(sort, 10, 64)
-	fmt.Println("sort", sort)
+	//fmt.Println("sort", sort)
 	checktype := int64(dataBody["check_type"].(float64))
-	fmt.Println("检查类型", checktype)
+	//fmt.Println("检查类型", checktype)
 	rangvalue := dataBody["range_value"].(string)
-	fmt.Println("rangvalue", rangvalue)
+	//fmt.Println("rangvalue", rangvalue)
 	if rangvalue == "0" {
 		rangvalue = ""
 	}
@@ -154,7 +154,7 @@ func (this *CommonApiController) GetConfigurationlist() {
 
 func (this *CommonApiController) GetConfigurationDetail() {
 	id, _ := this.GetInt64("id")
-	fmt.Println("id是", id)
+	//fmt.Println("id是", id)
 	detail, err := service.GetConfigurationDetail(id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -179,22 +179,22 @@ func (this *CommonApiController) GetAllInspectionminor() {
 
 func (this *CommonApiController) UpdateConfiguration() {
 	id, _ := this.GetInt64("id")
-	fmt.Println("id", id)
+	//fmt.Println("id", id)
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
-	fmt.Println("err", err)
+	//fmt.Println("err", err)
 	inspectionmajor := int64(dataBody["inspectionMajor"].(float64))
-	fmt.Println("大项", inspectionmajor)
+	//fmt.Println("大项", inspectionmajor)
 	inspectionMinor := int64(dataBody["inspectionMinor"].(float64))
-	fmt.Println("小项", inspectionMinor)
+	//fmt.Println("小项", inspectionMinor)
 	minrange := dataBody["min_range"].(string)
-	fmt.Println("minragne", minrange)
+	//fmt.Println("minragne", minrange)
 	largerange := dataBody["large_range"].(string)
-	fmt.Println("largerange", largerange)
+	//fmt.Println("largerange", largerange)
 	sort := int64(dataBody["sort"].(float64))
-	fmt.Println("排序", sort)
+	//fmt.Println("排序", sort)
 	rangvalue := dataBody["range_value"].(string)
-	fmt.Println("范围", rangvalue)
+	//fmt.Println("范围", rangvalue)
 	if rangvalue == "0" {
 		rangvalue = ""
 	}
@@ -279,12 +279,12 @@ func (this *CommonApiController) SaveCheckConfiguration() {
 	adminUser := this.GetAdminUserInfo()
 	orgid := adminUser.CurrentOrgId
 	inspectionmajor := int64(dataBody["inspectionMajor"].(float64))
-	fmt.Println("大项", inspectionmajor)
+	//fmt.Println("大项", inspectionmajor)
 	frequency := dataBody["frequency"].(string)
-	fmt.Println("凭次", frequency)
+	//fmt.Println("凭次", frequency)
 	sort := dataBody["sort"].(string)
 	sorts, err := strconv.ParseInt(sort, 10, 64)
-	fmt.Println("sort", sort)
+	//fmt.Println("sort", sort)
 	_, errcode := service.GetInspectionMajorById(inspectionmajor, orgid)
 	if errcode == gorm.ErrRecordNotFound {
 		configuration := models.XtCheckConfiguration{
@@ -312,7 +312,7 @@ func (this *CommonApiController) SaveCheckConfiguration() {
 func (this *CommonApiController) GetAllCheckList() {
 	adminUser := this.GetAdminUserInfo()
 	orgid := adminUser.CurrentOrgId
-	fmt.Println("org", orgid)
+	//fmt.Println("org", orgid)
 	page, _ := this.GetInt64("page")
 	limit, _ := this.GetInt64("limit")
 	checkList, total, err := service.GetAllCheckList(orgid, page, limit)
@@ -346,11 +346,11 @@ func (this *CommonApiController) UpdateCheck() {
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
 	fmt.Println(err)
 	inspectionmajor := int64(dataBody["inspectionMajor"].(float64))
-	fmt.Println("大项", inspectionmajor)
+	//fmt.Println("大项", inspectionmajor)
 	frequency := dataBody["frequency"].(string)
-	fmt.Println("凭次", frequency)
+	//fmt.Println("凭次", frequency)
 	sort := int64(dataBody["sort"].(float64))
-	fmt.Println("sort", sort)
+	//fmt.Println("sort", sort)
 	adminInfo := this.GetAdminUserInfo()
 	orgId := adminInfo.CurrentOrgId
 	Inspection, err := service.GetInspectionMajorByIdTwo(inspectionmajor, orgId)
@@ -393,7 +393,7 @@ func (this *CommonApiController) GetDialysisModeType() {
 	loc, _ := time.LoadLocation("Local")
 	startime := this.GetString("startime")
 	endtime := this.GetString("endtime")
-	fmt.Println("endtime", endtime)
+	//fmt.Println("endtime", endtime)
 	startTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", startime+" 00:00:00", loc)
 	startimes := startTimes.Unix()
 	// fmt.Println("startime",startimes)
@@ -424,19 +424,15 @@ func (this *CommonApiController) GetTotalLapseCount() {
 	startime := this.GetString("startime")
 	startTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", startime+" 00:00:00", loc)
 	startnunix := startTimes.Unix()
-	//fmt.Println("开始时间==========",startnunix)
+	fmt.Println("开始时间---------------", startnunix)
 	endtime := this.GetString("endtime")
 	endtimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", endtime+" 23:59:59", loc)
 	endunix := endtimes.Unix()
-	//fmt.Println("结束日期========",endunix)
-	//统计一个月内转出的病人
-	//patients, total, err := service.GetTotalRollOut(startime, endtime, orgid)
+	fmt.Println("endunix==========", endunix)
 	//统计该机构的转出人数
 	patients, err := service.GetTotalRollOutPatients(orgid, startnunix, endunix)
 	//统计该机构转出病人
 	patienttwo, err := service.GetTotalRollOutPatientsTwo(orgid, startnunix, endunix)
-	//统计总共病人
-	//	_, count, _ := service.GetPatientTotalCountTwo(orgid, startime, endtime)
 	count := service.GetPatientTotalCount(orgid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -682,12 +678,12 @@ func (this *CommonApiController) GetPrescritionByName() {
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
 
 	entime := endDate.Unix()
-	fmt.Println("开始时间", statime)
-	fmt.Println(endtime)
+	//fmt.Println("开始时间", statime)
+	//fmt.Println(endtime)
 	limit, _ := this.GetInt64("limit")
-	fmt.Println("limit", limit)
+	//fmt.Println("limit", limit)
 	page, _ := this.GetInt64("page")
-	fmt.Println("page", page)
+	//fmt.Println("page", page)
 	patient, total, err := service.GetPrescritionByName(orgId, patientid, statime, entime, limit, page)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -702,23 +698,23 @@ func (this *CommonApiController) GetPrescritionByName() {
 func (this *CommonApiController) GetStatistics() {
 	adminUser := this.GetAdminUserInfo()
 	orgId := adminUser.CurrentOrgId
-	fmt.Println("orgid", orgId)
+	//fmt.Println("orgid", orgId)
 	startime := this.GetString("start_time")
-	fmt.Println(startime)
+	//fmt.Println(startime)
 	endtime := this.GetString("end_time")
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
 	fmt.Println("parseDateErr", parseDateErr)
 	statime := startDate.Unix()
-	fmt.Println("开始时间", statime)
+	//fmt.Println("开始时间", statime)
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
 	entime := endDate.Unix()
-	fmt.Println("结束日期", entime)
+	//fmt.Println("结束日期", entime)
 	value, _ := this.GetInt64("value")
-	fmt.Println("value", value)
+	//fmt.Println("value", value)
 	limit, _ := this.GetInt64("limit")
-	fmt.Println("limit", limit)
+	//fmt.Println("limit", limit)
 	page, _ := this.GetInt64("page")
-	fmt.Println("page", page)
+	//fmt.Println("page", page)
 	modeId, _ := this.GetInt64("mode_id")
 	treatinfo, total, err := service.GetTreateInfo(orgId, statime, entime, value, limit, page)
 	statistics, ttd, _ := service.GetStatistics(orgId, statime, entime, modeId)

service/common_service.go

@@ -188,14 +188,14 @@ func GetTotalRollOut(starttime int64, endtime int64, orgid int64) (counts []*mod
 func GetTotalRollOutPatients(orgid int64, startime int64, endtime int64) (patients []*models.XtPatients, err error) {
 
 	db := XTReadDB().Table("x.patients as x")
-	err = db.Raw("select x.id,x.`name`,s.lapseto_type,s.lapseto_time from xt_patients as x left join xt_patient_lapseto AS s ON s.patient_id = x.id where s.lapseto_time >=? and s.lapseto_time <=? and x.user_org_id = ? and s.lapseto_type = 1 and x.status = 1 group by s.patient_id", startime, endtime, orgid).Scan(&patients).Error
+	err = db.Raw("select x.id,x.`name`,s.lapseto_type,s.lapseto_time from xt_patients as x left join xt_patient_lapseto AS s ON s.patient_id = x.id where s.lapseto_time >=? and s.lapseto_time <=? and x.user_org_id = ? and s.lapseto_type = 1 and x.status = 1", startime, endtime, orgid).Scan(&patients).Error
 	return patients, err
 }
 
 func GetTotalRollOutPatientsTwo(orgid int64, startime int64, endtime int64) (patients []*models.XtPatients, err error) {
 
 	db := XTReadDB().Table("x.patients as x")
-	err = db.Raw("select x.id,x.`name`,s.lapseto_type,s.lapseto_time from xt_patients as x left join xt_patient_lapseto AS s ON s.patient_id = x.id where s.lapseto_time >=? and s.lapseto_time <=? and x.user_org_id = ? and s.lapseto_type = 2 and x.status = 1 group by s.patient_id", startime, endtime, orgid).Scan(&patients).Error
+	err = db.Raw("select x.id,x.`name`,s.lapseto_type,s.lapseto_time from xt_patients as x left join xt_patient_lapseto AS s ON s.patient_id = x.id where s.lapseto_time >=? and s.lapseto_time <=? and x.user_org_id = ? and s.lapseto_type = 2 and x.status = 1", startime, endtime, orgid).Scan(&patients).Error
 	return patients, err
 }
 
@@ -233,7 +233,7 @@ func GetManPatientTotal(orgid int64) (patients []*models.XtPatients, total int64
 
 func GetPatientInfectiousCount(orgid int64, startime int64, endtime int64) (counts []*models.PatientContagionsCountStruct, err error) {
 
-	err = readDb.Table("xt_patients_infectious_diseases as x").Joins("join xt_patients as s on s.id = x.patient_id").Where("s.user_org_id = ? and s.status = 1 and s.is_infectious = 2 and s.created_time>=? and s.created_time<=?", orgid, startime, endtime).Select("x.disease_id,count(x.disease_id) as count").Group("x.disease_id").Scan(&counts).Error
+	err = readDb.Table("xt_patients_infectious_diseases as x").Joins("join xt_patients as s on s.id = x.patient_id").Where("s.user_org_id = ? and s.status = 1 and x.status = 1 and x.updated_time>=? and x.updated_time<=?", orgid, startime, endtime).Select("x.disease_id,count(x.disease_id) as count").Group("x.disease_id").Scan(&counts).Error
 	return counts, err
 }
 
@@ -1159,7 +1159,7 @@ func GetProjectStandListOne(orgid int64, lapseto int64, modetype int64, startime
 			" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value = r.range_value THEN '第三季度'" +
 			" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value = r.range_value THEN '第四季度'" +
 			" ELSE '其他'" +
-			"END AS nnd FROM xt_inspection as x  left join xt_quality_control_standard as  r on (r.inspection_minor = x.item_id AND r.user_org_id > 0) OR ( x.item_id = r.inspection_minor AND r.user_org_id = 0) left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 1 or s.lapseto = 2) and (x.inspect_value = r.range_value)"
+			"END AS nnd FROM xt_inspection as x  left join xt_quality_control_standard as  r on (r.inspection_minor = x.item_id AND r.user_org_id > 0) OR ( x.item_id = r.inspection_minor AND r.user_org_id = 0) left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 1 or s.lapseto = 2) and (x.inspect_value = r.range_value) and r.status = 1"
 		countParams := make([]interface{}, 0)
 		countParams = append(countParams, firststart)
 		countParams = append(countParams, firstend)
@@ -1217,7 +1217,7 @@ func GetProjectStandListOne(orgid int64, lapseto int64, modetype int64, startime
 			" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value = r.range_value THEN '第三季度'" +
 			" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value = r.range_value THEN '第四季度'" +
 			" ELSE '其他'" +
-			"END AS nnd FROM xt_inspection as x  left join xt_quality_control_standard as  r on (r.inspection_minor = x.item_id AND r.user_org_id > 0) OR ( x.item_id = r.inspection_minor AND r.user_org_id = 0) left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 2) and (x.inspect_value = r.range_value)"
+			"END AS nnd FROM xt_inspection as x  left join xt_quality_control_standard as  r on (r.inspection_minor = x.item_id AND r.user_org_id > 0) OR ( x.item_id = r.inspection_minor AND r.user_org_id = 0) left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 2) and (x.inspect_value = r.range_value) and r.status = 1"
 		countParams := make([]interface{}, 0)
 		countParams = append(countParams, firststart)
 		countParams = append(countParams, firstend)