Merge branch 'xt_statistics_branch'

controllers/gobal_config_api_controller.go

@@ -1174,6 +1174,7 @@ func RemoveRepeatedOrgElement(orgs []*models.Org) (newOrgs []*models.Org) {
 }
 
 func (this *GobalConfigApiController) GenerateLog() {
+
 	log_type, _ := this.GetInt64("log_type", 0)
 	logs, err := service.GetExportLogByType(this.GetAdminUserInfo().CurrentOrgId, log_type)
 	if err != nil {

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -116,7 +116,6 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 			} else {
 				roles = strings.Split(role.RoleIds, ",")
 			}
-			fmt.Println(roles)
 
 			//获取该用户下所有角色的权限总集
 			var userRolePurviews string
@@ -132,7 +131,6 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 			}
 			//该用户所拥有角色的权限的总集
 			userRolePurviewsArr = RemoveRepeatedPurviewElement(strings.Split(userRolePurviews, ","))
-			fmt.Println(userRolePurviewsArr)
 			//系统所记录的权限列表
 			allPermission, _ := service.GetAllFunctionPurview()
 
@@ -146,8 +144,6 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 					//获取该角色的所有权限
 					for _, items := range userRolePurviewsArr {
 						id, _ := strconv.ParseInt(items, 10, 64)
-						fmt.Println(id)
-						fmt.Println(item.ID)
 
 						if id == item.ID {
 							isPermission = true

controllers/mobile_api_controllers/patient_api_controller.go

@@ -715,31 +715,23 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 	var ids []string
 	if groupno == 0 {
 		advice_ids := c.GetString("advice_id")
-		ids = strings.Split(advice_ids, ",")
-		if len(ids) <= 0 {
+		if advice_ids == "" {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
+		} else {
+			ids = strings.Split(advice_ids, ",")
+			if len(ids) <= 0 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
 		}
 	}
-
 	if groupno < 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
 
 	adminUserInfo := c.GetMobileAdminUserInfo()
-	//
-	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
-	//if appRole.UserType != 3 {
-	//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-	//	if getPermissionErr != nil {
-	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//		return
-	//	} else if headNursePermission == nil {
-	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-	//		return
-	//	}
-	//}
 
 	var advice models.DoctorAdvice
 
@@ -775,7 +767,6 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeExceAndCheckNotOneUser)
 			return
 		}
-
 	}
 
 	checker := adminUserInfo.AdminUser.Id
@@ -786,13 +777,22 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 		Checker:     checker,
 		UpdatedTime: time.Now().Unix(),
 	}
-	fmt.Println()
-
 	var err error
 	if groupno > 0 {
 		err = service.CheckDoctorAdviceByGroupNo(&advices, groupno, adminUserInfo.Org.Id)
 	} else {
-		err = service.BatchCheckOldDoctorAdvice(&advices, ids)
+
+		if len(ids[0]) <= 0 {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateDoctorAdviceFail)
+			return
+		} else {
+			t := time.Now().Format("2006-01-02")
+			timeLayout2 := "2006-01-02"
+			loc, _ := time.LoadLocation("Local")
+			theTime, _ := time.ParseInLocation(timeLayout2, t, loc)
+			err = service.BatchCheckOldDoctorAdvice(&advices, ids, adminUserInfo.Org.Id, theTime.Unix())
+
+		}
 	}
 
 	if err != nil {

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -7,6 +7,8 @@ import (
 	"XT_New/service"
 	"encoding/json"
 	"fmt"
+	"github.com/jinzhu/gorm"
+	"strconv"
 	"time"
 )
 
@@ -28,7 +30,6 @@ func (this *CommonApiController) GetInspectionMajor() {
 
 func (this *CommonApiController) GetInspectionMinor() {
 	id, _ := this.GetInt64("id")
-	fmt.Println("id----------------------------------------", id)
 	minor, err := service.GetInspectionMinor(id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -55,8 +56,6 @@ func (this *CommonApiController) GetInspectionRange() {
 func (this *CommonApiController) SaveConfiguration() {
 	adminInfo := this.GetAdminUserInfo()
 	orgid := adminInfo.CurrentOrgId
-	fmt.Println(orgid)
-	fmt.Println("触发-------------------0")
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
 	fmt.Println("err", err)
@@ -69,13 +68,14 @@ func (this *CommonApiController) SaveConfiguration() {
 	largerange := dataBody["large_range"].(string)
 	fmt.Println("largerange", largerange)
 	sort := dataBody["sort"].(string)
+	sorts, err := strconv.ParseInt(sort, 10, 64)
 	fmt.Println("sort", sort)
 	standard := models.XtQualityControlStandard{
 		InspectionMajor: inspectionmajor,
 		InspectionMinor: inspectionMinor,
 		MinRange:        minrange,
 		LargeRange:      largerange,
-		Sort:            sort,
+		Sort:            sorts,
 		UserOrgId:       orgid,
 		Status:          1,
 		CreatedTime:     time.Now().Unix(),
@@ -92,14 +92,231 @@ func (this *CommonApiController) SaveConfiguration() {
 }
 
 func (this *CommonApiController) GetConfigurationlist() {
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
 	adminUser := this.GetAdminUserInfo()
 	orgid := adminUser.CurrentOrgId
-	configurationlist, err := service.GetConfigurationlist(orgid)
+	configurationlist, total, err := service.GetConfigurationlist(orgid, limit, page)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"configurationlist": configurationlist,
+		"total":             total,
+	})
+}
+
+func (this *CommonApiController) GetConfigurationDetail() {
+	id, _ := this.GetInt64("id")
+	fmt.Println("id是", id)
+	detail, err := service.GetConfigurationDetail(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"configurationdetail": detail,
+	})
+}
+
+func (this *CommonApiController) GetAllInspectionminor() {
+
+	minor, err := service.GetAllInspectionMinor(0)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"minor": minor,
+	})
+}
+
+func (this *CommonApiController) UpdateConfiguration() {
+	id, _ := this.GetInt64("id")
+	fmt.Println("id", id)
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println("err", err)
+	inspectionmajor := int64(dataBody["inspectionMajor"].(float64))
+	fmt.Println("大项", inspectionmajor)
+	inspectionMinor := int64(dataBody["inspectionMinor"].(float64))
+	fmt.Println("小项", inspectionMinor)
+	minrange := dataBody["min_range"].(string)
+	fmt.Println("minragne", minrange)
+	largerange := dataBody["large_range"].(string)
+	fmt.Println("largerange", largerange)
+	sort := int64(dataBody["sort"].(float64))
+
+	standard := models.XtQualityControlStandard{
+		InspectionMajor: inspectionmajor,
+		InspectionMinor: inspectionMinor,
+		MinRange:        minrange,
+		LargeRange:      largerange,
+		Sort:            sort,
+	}
+	err = service.UpdarteConfiguration(&standard, id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"standard": standard,
+	})
+}
+
+func (this *CommonApiController) DeleteConfiguration() {
+	id, _ := this.GetInt64("id")
+	err := service.DeleteConfiguration(id)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "删除失败")
+		return
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *CommonApiController) GetAllInspectiondata() {
+	adminUser := this.GetAdminUserInfo()
+	orgid := adminUser.CurrentOrgId
+
+	//查询该机构是否有数据
+	_, errcode := service.GetAllInspectionData(orgid)
+	if errcode == gorm.ErrRecordNotFound {
+		inspection, err := service.GetAllInspectiondatatwo(0)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"inspection": inspection,
+		})
+	} else if errcode == nil {
+		inspection, err := service.GetAllInspectiondatatwo(orgid)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"inspection": inspection,
+		})
+	}
+
+}
+
+func (this *CommonApiController) SaveCheckConfiguration() {
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println("err", err)
+	adminUser := this.GetAdminUserInfo()
+	orgid := adminUser.CurrentOrgId
+	inspectionmajor := int64(dataBody["inspectionMajor"].(float64))
+	fmt.Println("大项", inspectionmajor)
+	frequency := dataBody["frequency"].(string)
+	fmt.Println("凭次", frequency)
+	sort := dataBody["sort"].(string)
+	sorts, err := strconv.ParseInt(sort, 10, 64)
+	fmt.Println("sort", sort)
+	_, errcode := service.GetInspectionMajorById(inspectionmajor)
+	if errcode == gorm.ErrRecordNotFound {
+		configuration := models.XtCheckConfiguration{
+			InspectionMajor:     inspectionmajor,
+			InspectionFrequency: frequency,
+			Sort:                sorts,
+			UserOrgId:           orgid,
+			Status:              1,
+			CreatedTime:         time.Now().Unix(),
+		}
+		err := service.CreateCheckConfiguration(&configuration)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"configuration": configuration,
+		})
+	} else if errcode == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+}
+
+func (this *CommonApiController) GetAllCheckList() {
+	adminUser := this.GetAdminUserInfo()
+	orgid := adminUser.CurrentOrgId
+	fmt.Println("org", orgid)
+	page, _ := this.GetInt64("page")
+	limit, _ := this.GetInt64("limit")
+	checkList, total, err := service.GetAllCheckList(orgid, page, limit)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"checklist": checkList,
+		"total":     total,
 	})
 }
+
+func (this *CommonApiController) GetCheckdetail() {
+
+	id, _ := this.GetInt64("id")
+	detail, err := service.GetCheckDetail(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"checkdetail": detail,
+	})
+}
+
+func (this *CommonApiController) UpdateCheck() {
+	id, _ := this.GetInt64("id")
+	fmt.Println(id)
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+	inspectionmajor := int64(dataBody["inspectionMajor"].(float64))
+	fmt.Println("大项", inspectionmajor)
+	frequency := dataBody["frequency"].(string)
+	fmt.Println("凭次", frequency)
+	sort := int64(dataBody["sort"].(float64))
+	fmt.Println("sort", sort)
+
+	Inspection, err := service.GetInspectionMajorById(inspectionmajor)
+	if Inspection.ID > 0 && Inspection.ID != id {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+	configuration := models.XtCheckConfiguration{
+		InspectionMajor:     inspectionmajor,
+		InspectionFrequency: frequency,
+		Sort:                sort,
+	}
+
+	err = service.UpdateCheck(&configuration, id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"configuration": configuration,
+	})
+}
+
+func (this *CommonApiController) DeleteCheck() {
+	id, _ := this.GetInt64("id")
+	err := service.DeleteCheck(id)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "删除失败")
+		return
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}

controllers/new_mobile_api_controllers/common_api_router.go

@@ -11,4 +11,14 @@ func CommonApiControllersRegisterRouters() {
 	beego.Router("/com/api/getinspectionrange", &CommonApiController{}, "Get:GetInspectionRange")
 	beego.Router("/com/api/saveconfiguration", &CommonApiController{}, "Post:SaveConfiguration")
 	beego.Router("com/api/getconfigurationlist", &CommonApiController{}, "Get:GetConfigurationlist")
+	beego.Router("com/api/getconfigurationdetail", &CommonApiController{}, "Get:GetConfigurationDetail")
+	beego.Router("com/api/getallinspectionminor", &CommonApiController{}, "Get:GetAllInspectionminor")
+	beego.Router("com/api/updateconfiguration", &CommonApiController{}, "Post:UpdateConfiguration")
+	beego.Router("com/api/deleteconfiguration", &CommonApiController{}, "Delete:DeleteConfiguration")
+	beego.Router("com/api/getallinspectiondata", &CommonApiController{}, "Get:GetAllInspectiondata")
+	beego.Router("/com/api/savecheckconfiguration", &CommonApiController{}, "Post:SaveCheckConfiguration")
+	beego.Router("/com/api/getallchecklist", &CommonApiController{}, "Get:GetAllCheckList")
+	beego.Router("/com/api/getcheckdetail", &CommonApiController{}, "Get:GetCheckdetail")
+	beego.Router("/com/api/updatecheck", &CommonApiController{}, "Post:UpdateCheck")
+	beego.Router("/com/api/deletecheck", &CommonApiController{}, "Delete:DeleteCheck")
 }

controllers/patient_api_controller.go

@@ -3560,6 +3560,7 @@ func (c *PatientApiController) ExportPatients() {
 						service.CreateExportErrLog(&err_log)
 						continue
 					}
+					//}
 					patient.IdCardNo = id_card_no
 					//patient.Birthday = GetBirthDay(id_card_no).Unix()
 					if GetBirthDay(id_card_no) == nil {
@@ -3873,15 +3874,20 @@ func VerifyMobileFormat(mobileNum string) bool {
 func IsIdCard(id string) (res bool) {
 	id = strings.ToUpper(id)
 	if len(id) != 15 && len(id) != 18 {
+		fmt.Println("1111111")
 		return false
 	}
 	r := regexp.MustCompile("(\\d{15})|(\\d{17}([0-9]|X))")
 	if !r.MatchString(id) {
+		fmt.Println("222222")
+
 		return false
 	}
 	if len(id) == 15 {
 		tm2, _ := time.Parse("01/02/2006", string([]byte(id)[8:10])+"/"+string([]byte(id)[10:12])+"/"+"19"+string([]byte(id)[6:8]))
-		if tm2.Unix() <= 0 {
+		if tm2.Unix() == 0 {
+			fmt.Println("44444443333")
+
 			return false
 		}
 		return true

controllers/schedule_api_controller.go

@@ -715,12 +715,18 @@ func (this *ScheduleApiController) ExportSchedule() {
 	utils.ErrorLog("%v", dataBody)
 	export_time := time.Now().Unix()
 	var schedules []*models.Schedule
+	var failed_total int
 	var total_schedule []interface{}
-
 	var patients []*models.Patients
 
 	patients, _, _ = service.GetAllPatientList(this.GetAdminUserInfo().CurrentOrgId)
 
+	if dataBody["failed_schedule"] != nil || reflect.TypeOf(dataBody["failed_schedule"]).String() == "[]interface {}" {
+		tempSchedule := dataBody["failed_schedule"].([]interface{})
+		failed_total = len(tempSchedule)
+
+	}
+
 	if dataBody["schedule"] != nil || reflect.TypeOf(dataBody["schedule"]).String() == "[]interface {}" {
 		tempSchedule := dataBody["schedule"].([]interface{})
 		total_schedule = tempSchedule
@@ -771,7 +777,7 @@ func (this *ScheduleApiController) ExportSchedule() {
 				} else if len(patient) == 1 { //
 					sch.PatientId = patient[0].ID
 
-				} else if len(patient) > 2 { //出现同名的情况
+				} else if len(patient) > 1 { //出现同名的情况
 
 					err_log := models.ExportErrLog{
 						LogType:    2,
@@ -798,8 +804,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 				log := models.ExportLog{
 					LogType:    2,
 					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					TotalNum:   int64(len(total_schedule)),
-					FailNum:    1,
+					TotalNum:   int64(len(total_schedule) + failed_total),
+					FailNum:    1 + int64(failed_total),
 					SuccessNum: int64(len(schedules)),
 					CreateTime: time.Now().Unix(),
 					UpdateTime: time.Now().Unix(),
@@ -835,8 +841,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 				log := models.ExportLog{
 					LogType:    2,
 					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					TotalNum:   int64(len(total_schedule)),
-					FailNum:    1,
+					TotalNum:   int64(len(total_schedule) + failed_total),
+					FailNum:    1 + int64(failed_total),
 					SuccessNum: int64(len(schedules)),
 					CreateTime: time.Now().Unix(),
 					UpdateTime: time.Now().Unix(),
@@ -868,8 +874,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 					log := models.ExportLog{
 						LogType:    2,
 						UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-						TotalNum:   int64(len(total_schedule)),
-						FailNum:    1,
+						TotalNum:   int64(len(total_schedule) + failed_total),
+						FailNum:    1 + int64(failed_total),
 						SuccessNum: int64(len(schedules)),
 						CreateTime: time.Now().Unix(),
 						UpdateTime: time.Now().Unix(),
@@ -907,8 +913,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 				log := models.ExportLog{
 					LogType:    2,
 					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					TotalNum:   int64(len(total_schedule)),
-					FailNum:    1,
+					TotalNum:   int64(len(total_schedule) + failed_total),
+					FailNum:    1 + int64(failed_total),
 					SuccessNum: int64(len(schedules)),
 					CreateTime: time.Now().Unix(),
 					UpdateTime: time.Now().Unix(),
@@ -940,8 +946,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 						log := models.ExportLog{
 							LogType:    2,
 							UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-							TotalNum:   int64(len(total_schedule)),
-							FailNum:    1,
+							TotalNum:   int64(len(total_schedule) + failed_total),
+							FailNum:    1 + int64(failed_total),
 							SuccessNum: int64(len(schedules)),
 							CreateTime: time.Now().Unix(),
 							UpdateTime: time.Now().Unix(),
@@ -971,8 +977,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 						log := models.ExportLog{
 							LogType:    2,
 							UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-							TotalNum:   int64(len(total_schedule)),
-							FailNum:    1,
+							TotalNum:   int64(len(total_schedule) + failed_total),
+							FailNum:    1 + int64(failed_total),
 							SuccessNum: int64(len(schedules)),
 							CreateTime: time.Now().Unix(),
 							UpdateTime: time.Now().Unix(),
@@ -1008,8 +1014,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 				log := models.ExportLog{
 					LogType:    2,
 					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					TotalNum:   int64(len(total_schedule)),
-					FailNum:    1,
+					TotalNum:   int64(len(total_schedule) + failed_total),
+					FailNum:    1 + int64(failed_total),
 					SuccessNum: int64(len(schedules)),
 					CreateTime: time.Now().Unix(),
 					UpdateTime: time.Now().Unix(),
@@ -1038,8 +1044,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 				log := models.ExportLog{
 					LogType:    2,
 					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					TotalNum:   int64(len(total_schedule)),
-					FailNum:    1,
+					TotalNum:   int64(len(total_schedule) + failed_total),
+					FailNum:    1 + int64(failed_total),
 					SuccessNum: int64(len(schedules)),
 					CreateTime: time.Now().Unix(),
 					UpdateTime: time.Now().Unix(),
@@ -1078,8 +1084,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 				log := models.ExportLog{
 					LogType:    2,
 					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					TotalNum:   int64(len(total_schedule)),
-					FailNum:    1,
+					TotalNum:   int64(len(total_schedule) + failed_total),
+					FailNum:    1 + int64(failed_total),
 					SuccessNum: int64(len(schedules)),
 					CreateTime: time.Now().Unix(),
 					UpdateTime: time.Now().Unix(),
@@ -1106,8 +1112,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 				log := models.ExportLog{
 					LogType:    2,
 					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					TotalNum:   int64(len(total_schedule)),
-					FailNum:    1,
+					TotalNum:   int64(len(total_schedule) + failed_total),
+					FailNum:    1 + int64(failed_total),
 					SuccessNum: int64(len(schedules)),
 					CreateTime: time.Now().Unix(),
 					UpdateTime: time.Now().Unix(),
@@ -1157,8 +1163,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 				log := models.ExportLog{
 					LogType:    2,
 					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					TotalNum:   int64(len(total_schedule)),
-					FailNum:    int64(len(errLogs)),
+					TotalNum:   int64(len(total_schedule) + failed_total),
+					FailNum:    int64(len(errLogs) + failed_total),
 					SuccessNum: int64(len(schedules)),
 					CreateTime: time.Now().Unix(),
 					UpdateTime: time.Now().Unix(),
@@ -1167,9 +1173,23 @@ func (this *ScheduleApiController) ExportSchedule() {
 				}
 				service.CreateExportLog(&log)
 
+				if failed_total > 0 {
+					err_log := models.ExportErrLog{
+						LogType:   2,
+						UserOrgId: this.GetAdminUserInfo().CurrentOrgId,
+						ErrMsg: "当前日期(" + this.GetString("date") + " " + GetWeekString(time.Now().Weekday().String()) +
+							")及以前的排班数据" + strconv.FormatInt(int64(failed_total), 10) + "条，不执行导入",
+						Status:     1,
+						CreateTime: time.Now().Unix(),
+						UpdateTime: time.Now().Unix(),
+						ExportTime: export_time,
+					}
+					service.CreateExportErrLog(&err_log)
+				}
+
 				this.ServeSuccessJSON(map[string]interface{}{
 					"msg":         "导入成功",
-					"total_num":   len(total_schedule),
+					"total_num":   len(total_schedule) + failed_total,
 					"success_num": len(schedules),
 					"fail_num":    int64(len(errLogs)),
 				})
@@ -1177,8 +1197,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 				log := models.ExportLog{
 					LogType:    2,
 					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					TotalNum:   int64(len(total_schedule)),
-					FailNum:    int64(len(errLogs)),
+					TotalNum:   int64(len(total_schedule) + failed_total),
+					FailNum:    int64(len(errLogs) + failed_total),
 					SuccessNum: int64(len(schedules)),
 					CreateTime: time.Now().Unix(),
 					UpdateTime: time.Now().Unix(),
@@ -1187,6 +1207,20 @@ func (this *ScheduleApiController) ExportSchedule() {
 				}
 				service.CreateExportLog(&log)
 
+				if failed_total > 0 {
+					err_log := models.ExportErrLog{
+						LogType:   2,
+						UserOrgId: this.GetAdminUserInfo().CurrentOrgId,
+						ErrMsg: "当前日期(" + this.GetString("date") + " " + GetWeekString(time.Now().Weekday().String()) +
+							")及以前的排班数据" + strconv.FormatInt(int64(failed_total), 10) + "条，不执行导入",
+						Status:     1,
+						CreateTime: time.Now().Unix(),
+						UpdateTime: time.Now().Unix(),
+						ExportTime: export_time,
+					}
+					service.CreateExportErrLog(&err_log)
+				}
+
 				this.ServeSuccessJSON(map[string]interface{}{
 					"msg":         "导入成功",
 					"total_num":   len(total_schedule),
@@ -1198,8 +1232,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 			log := models.ExportLog{
 				LogType:    2,
 				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-				TotalNum:   int64(len(total_schedule)),
-				FailNum:    int64(len(errLogs)),
+				TotalNum:   int64(len(total_schedule) + failed_total),
+				FailNum:    int64(len(errLogs) + failed_total),
 				SuccessNum: int64(len(schedules)),
 				CreateTime: time.Now().Unix(),
 				UpdateTime: time.Now().Unix(),
@@ -1208,6 +1242,20 @@ func (this *ScheduleApiController) ExportSchedule() {
 			}
 			service.CreateExportLog(&log)
 
+			if failed_total > 0 {
+				err_log := models.ExportErrLog{
+					LogType:   2,
+					UserOrgId: this.GetAdminUserInfo().CurrentOrgId,
+					ErrMsg: "当前日期(" + this.GetString("date") + " " + GetWeekString(time.Now().Weekday().String()) +
+						")及以前的排班数据" + strconv.FormatInt(int64(failed_total), 10) + "条，不执行导入",
+					Status:     1,
+					CreateTime: time.Now().Unix(),
+					UpdateTime: time.Now().Unix(),
+					ExportTime: export_time,
+				}
+				service.CreateExportErrLog(&err_log)
+			}
+
 			this.ServeSuccessJSON(map[string]interface{}{
 				"msg":         "导入成功",
 				"total_num":   len(total_schedule),
@@ -1283,7 +1331,7 @@ func (this *ScheduleApiController) ExportScheduleTemplate() {
 				} else if len(patient) == 1 { //
 					sch.PatientID = patient[0].ID
 
-				} else if len(patient) > 2 { //出现同名的情况
+				} else if len(patient) > 1 { //出现同名的情况
 
 					err_log := models.ExportErrLog{
 						LogType:    3,
@@ -1645,3 +1693,37 @@ func (c *ScheduleApiController) GetInitExcelInitDate() {
 	})
 	return
 }
+
+func GetWeekString(week string) string {
+	var weekStr string
+	switch week {
+	case "Sunday":
+		weekStr = "周日"
+		break
+	case "Monday":
+		weekStr = "周一"
+		break
+	case "Tuesday":
+		weekStr = "周二"
+		break
+	case "Wednesday":
+		weekStr = "周三"
+		break
+	case "Thursday":
+		weekStr = "周四"
+
+		break
+	case "Friday":
+		weekStr = "周五"
+
+		break
+	case "Saturday":
+		weekStr = "周六"
+		break
+	default:
+		weekStr = ""
+		break
+
+	}
+	return weekStr
+}

models/common_models.go

@@ -5,7 +5,7 @@ type QualityControlStandard struct {
 	InspectionMajor int64  `gorm:"column:inspection_major" json:"inspection_major" form:"inspection_major"`
 	InspectionMinor int64  `gorm:"column:inspection_minor" json:"inspection_minor" form:"inspection_minor"`
 	MinRange        string `gorm:"column:min_range" json:"min_range" form:"min_range"`
-	Sort            string `gorm:"column:sort" json:"sort" form:"sort"`
+	Sort            int64  `gorm:"column:sort" json:"sort" form:"sort"`
 	UserOrgId       int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	Status          int64  `gorm:"column:status" json:"status" form:"status"`
 	CreatedTime     int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
@@ -21,7 +21,7 @@ type XtQualityControlStandard struct {
 	InspectionMajor int64  `gorm:"column:inspection_major" json:"inspection_major" form:"inspection_major"`
 	InspectionMinor int64  `gorm:"column:inspection_minor" json:"inspection_minor" form:"inspection_minor"`
 	MinRange        string `gorm:"column:min_range" json:"min_range" form:"min_range"`
-	Sort            string `gorm:"column:sort" json:"sort" form:"sort"`
+	Sort            int64  `gorm:"column:sort" json:"sort" form:"sort"`
 	UserOrgId       int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	Status          int64  `gorm:"column:status" json:"status" form:"status"`
 	CreatedTime     int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
@@ -32,3 +32,30 @@ type XtQualityControlStandard struct {
 func (XtQualityControlStandard) TableName() string {
 	return "xt_quality_control_standard"
 }
+
+type CheckConfiguration struct {
+	ID                  int64  `gorm:"column:id" json:"id" form:"id"`
+	InspectionMajor     int64  `gorm:"column:inspection_major" json:"inspection_major" form:"inspection_major"`
+	InspectionFrequency string `gorm:"column:inspection_frequency" json:"inspection_frequency" form:"inspection_frequency"`
+	Sort                int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	UserOrgId           int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status              int64  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime         int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime         int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	ProjectName         string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+}
+
+type XtCheckConfiguration struct {
+	ID                  int64  `gorm:"column:id" json:"id" form:"id"`
+	InspectionMajor     int64  `gorm:"column:inspection_major" json:"inspection_major" form:"inspection_major"`
+	InspectionFrequency string `gorm:"column:inspection_frequency" json:"inspection_frequency" form:"inspection_frequency"`
+	Sort                int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	UserOrgId           int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status              int64  `gorm:"column:status" json:"status" form:"status"`
+	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 (XtCheckConfiguration) TableName() string {
+	return "xt_check_configuration"
+}

service/common_service.go

@@ -3,6 +3,8 @@ package service
 import (
 	"XT_New/models"
 	"fmt"
+	"github.com/jinzhu/gorm"
+	"time"
 )
 
 func GetInspectionMajor(orgid int64) (inspection []*models.XtInspectionReference, err error) {
@@ -29,10 +31,7 @@ func SaveInspection(standard *models.XtQualityControlStandard) error {
 	return err
 }
 
-func GetConfigurationlist(orgid int64) (standard []*models.QualityControlStandard, err error) {
-
-	//err = XTReadDB().Model(&standard).Where("user_org_id = ? and status =1", orgid).Order("sort asc,created_time desc").Find(&standard).Error
-	//return standard,err
+func GetConfigurationlist(orgid int64, limit int64, page int64) (standard []*models.QualityControlStandard, total int64, err error) {
 
 	db := XTReadDB().Table("xt_quality_control_standard as x").Where("x.status =1")
 	if orgid > 0 {
@@ -40,7 +39,100 @@ func GetConfigurationlist(orgid int64) (standard []*models.QualityControlStandar
 	}
 	table := XTReadDB().Table("xt_inspection_reference as s")
 	fmt.Println(table)
-	err = db.Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,s.unit,s.project_name,s.item_name").
-		Joins("left join xt_inspection_reference as s on s.id = x.inspection_minor").Order("x.sort asc,x.created_time desc").Scan(&standard).Error
+	offset := (page - 1) * limit
+	err = db.Order("x.sort asc,x.created_time desc").Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,s.unit,s.project_name,s.item_name").Count(&total).
+		Joins("left join xt_inspection_reference as s on s.id = x.inspection_minor").Offset(offset).Limit(limit).Scan(&standard).Error
+	return standard, total, err
+}
+
+func GetConfigurationDetail(id int64) (models.XtQualityControlStandard, error) {
+	standard := models.XtQualityControlStandard{}
+	err := XTReadDB().Model(&standard).Where("id=? and status = 1", id).Find(&standard).Error
+	return standard, err
+}
+
+func GetAllInspectionMinor(orgid int64) (standard []*models.XtInspectionReference, err error) {
+
+	err = XTReadDB().Model(&standard).Where("org_id = ? and status = 1", orgid).Find(&standard).Error
 	return standard, err
 }
+
+func UpdarteConfiguration(st *models.XtQualityControlStandard, id int64) error {
+
+	err := XTWriteDB().Model(&st).Where("id = ?", id).Updates(map[string]interface{}{"inspection_major": st.InspectionMajor, "inspection_minor": st.InspectionMinor, "min_range": st.MinRange, "large_range": st.LargeRange, "sort": st.Sort, "updated_time": time.Now().Unix()}).Error
+	return err
+}
+
+func DeleteConfiguration(id int64) (err error) {
+
+	err = XTWriteDB().Model(models.XtQualityControlStandard{}).Where("id=?", id).Updates(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
+	return err
+}
+
+func GetAllInspectionData(orgid int64) (*models.XtInspectionReference, error) {
+	diseases := models.XtInspectionReference{}
+	err := XTReadDB().Model(&diseases).Where("org_id = ? and status = 1", orgid).Find(&diseases).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &diseases, nil
+}
+
+func GetAllInspectiondatatwo(orgid int64) (reference []*models.XtInspectionReference, err error) {
+
+	err = XTReadDB().Model(&reference).Where("org_id = ? and status = 1", orgid).Group("project_name").Find(&reference).Error
+	return reference, err
+}
+
+func GetInspectionMajorById(marjor int64) (*models.XtCheckConfiguration, error) {
+	configuration := models.XtCheckConfiguration{}
+	err := XTReadDB().Model(&configuration).Where("inspection_major = ? and status =1", marjor).Find(&configuration).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &configuration, nil
+}
+
+func CreateCheckConfiguration(configuration *models.XtCheckConfiguration) error {
+	err := XTWriteDB().Create(&configuration).Error
+	return err
+}
+
+func GetAllCheckList(orgid int64, page int64, limit int64) (check []*models.CheckConfiguration, total int64, err error) {
+
+	db := XTReadDB().Table("xt_check_configuration as x").Where("x.status =1")
+	table := XTReadDB().Table("xt_inspection_reference as r")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	offset := (page - 1) * limit
+	err = db.Group("x.id").Order("x.sort asc,x.created_time desc").Select("x.id,x.inspection_major,x.inspection_frequency,x.sort,x.user_org_id,r.project_name").Count(&total).
+		Joins("left join xt_inspection_reference as r on r.project_id = x.inspection_major").Offset(offset).Limit(limit).Scan(&check).Error
+	return check, total, err
+}
+
+func GetCheckDetail(id int64) (models.XtCheckConfiguration, error) {
+
+	configuration := models.XtCheckConfiguration{}
+	err := XTReadDB().Model(&configuration).Where("id=? and status =1", id).Find(&configuration).Error
+	return configuration, err
+}
+
+func UpdateCheck(con *models.XtCheckConfiguration, id int64) error {
+
+	err := XTWriteDB().Model(&con).Where("id=?", id).Updates(map[string]interface{}{"inspection_major": con.InspectionMajor, "inspection_frequency": con.InspectionFrequency, "sort": con.Sort, "updated_time": time.Now().Unix()}).Error
+	return err
+}
+
+func DeleteCheck(id int64) error {
+
+	err := XTWriteDB().Model(models.XtCheckConfiguration{}).Where("id=?", id).Updates(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
+	return err
+}

service/dialysis_service.go

@@ -884,15 +884,16 @@ func BatchExceOldDoctorAdvice(m *models.DoctorAdvice, ids []string) (err error)
 	return err
 }
 
-func BatchCheckOldDoctorAdvice(m *models.DoctorAdvice, ids []string) (err error) {
+func BatchCheckOldDoctorAdvice(m *models.DoctorAdvice, ids []string, org_id int64, date int64) (err error) {
 
 	ut := writeDb.Begin()
-	err = writeDb.Model(&models.DoctorAdvice{}).Where("status = 1   AND id IN (?)", ids).Updates(map[string]interface{}{"check_time": m.CheckTime, "checker": m.Checker, "check_state": 1}).Error
+	err = writeDb.Model(&models.DoctorAdvice{}).Where("status = 1   AND id IN (?) AND user_org_id = ? AND advice_date = ?", ids, org_id, date).Updates(map[string]interface{}{"check_time": m.CheckTime, "checker": m.Checker, "check_state": 1}).Error
 	if err != nil {
 		ut.Rollback()
 		return
 	}
-	err = writeDb.Model(&models.DoctorAdvice{}).Where("status = 1   AND parent_id IN (?)", ids).Updates(map[string]interface{}{"check_time": m.CheckTime, "checker": m.Checker, "check_state": 1}).Error
+
+	err = writeDb.Model(&models.DoctorAdvice{}).Where("status = 1   AND parent_id IN (?) AND user_org_id = ? AND advice_date = ?", ids, org_id, date).Updates(map[string]interface{}{"check_time": m.CheckTime, "checker": m.Checker, "check_state": 1}).Error
 	if err != nil {
 		ut.Rollback()
 		return

service/gobal_config_service.go

@@ -160,6 +160,6 @@ func GetPrint(ids []int64, orgid int64) (doctor []*models.DoctorAdvice, err erro
 
 func GetExportLogByType(org_id int64, log_type int64) (log []*models.ExportLog, err error) {
 	err = readDb.Model(&models.ExportLog{}).Where("user_org_id = ? AND status = 1 AND log_type = ?", org_id, log_type).
-		Preload("ExportErrLog", "status = 1").Find(&log).Error
+		Preload("ExportErrLog", "status = 1").Order("export_time desc").Find(&log).Error
 	return
 }

service/patient_service.go

@@ -1267,6 +1267,32 @@ func CreateExportPatient(patient *models.Patients, contagions []int64, org_creat
 			return
 		}
 	}
+	patientsNew := models.XtPatientsNew{
+		Name:              patient.Name,
+		Gender:            patient.Gender,
+		Phone:             patient.Phone,
+		IdCardNo:          patient.IdCardNo,
+		FirstDialysisDate: patient.FirstDialysisDate,
+		Source:            patient.Source,
+		Lapseto:           patient.Lapseto,
+		IsInfectious:      patient.IsInfectious,
+		DialysisNo:        patient.DialysisNo,
+		Height:            patient.Height,
+		HomeAddress:       patient.HomeAddress,
+		IsExcelExport:     1,
+		BloodPatients:     1,
+		Status:            1,
+		CreatedTime:       time.Now().Unix(),
+		UserOrgId:         patient.UserOrgId,
+		BloodId:           patient.ID,
+		Avatar:            "https://images.shengws.com/201809182128111.png",
+	}
+	err = utx.Create(&patientsNew).Error
+	if err != nil {
+		utx.Rollback()
+		btx.Rollback()
+		return
+	}
 	utx.Commit()
 	btx.Commit()
 

service/schedule_service.go

@@ -356,7 +356,7 @@ func FindSchPatientNameByName(name string, user_org_id int64) (patient []*models
 }
 
 func UpdateScheduleStatus(date int64, org_id int64) (err error) {
-	err = readDb.Model(&models.Schedule{}).Where("user_org_id = ? AND schedule_date >= ? AND status = 1", org_id, date).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	err = readDb.Model(&models.Schedule{}).Where("user_org_id = ? AND schedule_date > ? AND status = 1", org_id, date).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
 	return
 }