医保

controllers/gobal_config_api_controller.go

@@ -124,10 +124,45 @@ func GobalConfigRegistRouters() {
 
 	beego.Router("/api/schedule/config/commit", &GobalConfigApiController{}, "post:PostScheduleConfig")
 	beego.Router("/api/schedule/config/get", &GobalConfigApiController{}, "get:GetScheduleConfig")
+
+	beego.Router("/api/checkremind/config/commit", &GobalConfigApiController{}, "post:PostCheckRemindConfig")
+	beego.Router("/api/checkremind/config/get", &GobalConfigApiController{}, "get:GetCheckRemindConfig")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
 
+func (c *GobalConfigApiController) PostCheckRemindConfig() {
+	is_open, _ := c.GetInt64("is_open", 0)
+	id, _ := c.GetInt64("id", 0)
+
+	config, _ := service.GetCheckRemindConfigByIdTwo(id)
+	var err error
+	if config.ID == 0 {
+		config.UserOrgId = c.GetAdminUserInfo().CurrentOrgId
+		config.Ctime = time.Now().Unix()
+		config.Mtime = time.Now().Unix()
+		config.Status = 1
+		config.IsOpen = is_open
+		err = service.CreateCheckRemindConfig(&config)
+	} else {
+		config.IsOpen = is_open
+		config.Mtime = time.Now().Unix()
+		err = service.SaveCheckRemindConfig(&config)
+	}
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"config": config,
+		})
+	}
+}
+
+func (c *GobalConfigApiController) GetCheckRemindConfig() {
+	config, _ := service.GetCheckRemindConfigById(c.GetAdminUserInfo().CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"config": config,
+	})
+}
+
 func (c *GobalConfigApiController) PostScheduleConfig() {
 	is_show_mode, _ := c.GetInt64("is_show_mode", 0)
 	is_show_machine, _ := c.GetInt64("is_show_machine", 0)

controllers/his_api_controller.go

@@ -6972,7 +6972,7 @@ func (c *HisApiController) GetUploadInfo() {
 			//扣押金
 			errmsg = service.SpendDeposit(c.GetAdminUserInfo().CurrentOrgId, id, c.GetAdminUserInfo().AdminUser.Id, tmpstring, decimal)
 			order.Decimal = decimal
-			service.UpDateOrderTwo(order)
+			service.UpDateOrderTwo(order, tx)
 			if errmsg != nil {
 				c.ServeFailJsonSend(enums.ErrorCodeParamWrong, errmsg.Error())
 				//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateOrderException)

controllers/his_charge_api_controller.go

@@ -21,6 +21,9 @@ func HisChargeApiRegistRouters() {
 	//beego.Router("/api/his/chargestatistics/settle", &HisChargeApiController{}, "get:GetChargeStatisticsSettle")
 
 	beego.Router("/api/his/inspectionlist/get", &HisChargeApiController{}, "get:GetHisInspectionList")
+
+	beego.Router("/api/his/inspectionlisttwo/get", &HisChargeApiController{}, "get:GetHisInspectionListTwo")
+
 	beego.Router("/api/his/inspectioninfo/get", &HisChargeApiController{}, "get:GetHisInspectionInfo")
 
 	//发票
@@ -341,6 +344,44 @@ func (c *HisChargeApiController) GetHisInspectionList() {
 	}
 
 }
+
+func (c *HisChargeApiController) GetHisInspectionListTwo() {
+	record_date := c.GetString("record_date")
+	keyword := c.GetString("keyword")
+	is_print, _ := c.GetInt64("is_print")
+	tube_color, _ := c.GetInt64("tube_color")
+	adminUser := c.GetAdminUserInfo()
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+
+	}
+	record_time := startTime.Unix()
+	var labels []*models.HisLabelPrintInfo
+	//var labels_two []*models.HisLabelPrintInfo
+
+	//var total int64
+	//var total_two int64
+
+	labels, _, err = service.GetLabelPrintListThree(adminUser.CurrentOrgId, record_time, is_print, keyword, tube_color)
+	//labels_two, total_two, err = service.GetLabelPrintListFour(adminUser.CurrentOrgId, record_time, is_print, keyword, tube_color)
+	//total = total + total_two
+	//labels = append(labels, labels_two...)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"labels": labels,
+			//"total":  total,
+		})
+		return
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+}
+
 func (c *HisChargeApiController) GetHisInspectionInfo() {
 	id, _ := c.GetInt64("id")
 	label, err := service.GetLabelPrintInfo(id)

controllers/his_hospital_api_controller.go

@@ -40,6 +40,35 @@ func HisHospitalManagerApiRegistRouters() {
 
 	beego.Router("/api/exportuncharge/get", &HisHospitalApiController{}, "get:GetExportHisHospitalUnChargeData")
 
+	beego.Router("/api/hospital/inhopitalcheck/list", &HisHospitalApiController{}, "get:GetZHInHospitalCheckList")
+
+}
+func (this *HisHospitalApiController) GetZHInHospitalCheckList() {
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	keyword := this.GetString("keyword")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+":00", loc)
+	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+":59", loc)
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	history, total, err := service.GetHisInHospitalHistory(keyword, startTime.Unix(), endTime.Unix(), limit, page, orgId)
+	department, err := service.GetAllDepartMent(orgId)
+	appId := adminUserInfo.CurrentAppId
+	doctor, err := service.GetAllDoctor(orgId, appId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"history":    history,
+		"total":      total,
+		"department": department,
+		"doctor":     doctor,
+	})
 }
 func (c *HisHospitalApiController) RefundDetail() {
 	patient_id, _ := c.GetInt64("patient_id")
@@ -153,56 +182,56 @@ func (c *HisHospitalApiController) GetUploadInfo() {
 		tm := time.Unix(item.PreTime, 0)
 		if item.Type == 1 { //药品
 			for _, subItem := range item.HisDoctorAdviceInfo {
-				if len(subItem.Drug.MedicalInsuranceNumber) > 0 && subItem.Drug.IsUser != 1 {
-					//var randNum int
-					//randNum = rand.Intn(10000) + 1000
-					cus := &models.NewCustom{
-						DetItemFeeSumamt: subItem.Price * subItem.PrescribingNumber,
-						Cut:              subItem.PrescribingNumber,
-						FeedetlSn:        subItem.FeedetlSn,
-						Price:            subItem.Price,
-						MedListCodg:      subItem.Drug.MedicalInsuranceNumber,
-						HospApprFlag:     subItem.Drug.HospApprFlag,
-						FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
-					}
-
-					customs = append(customs, cus)
+				//if subItem.Drug.IsUser != 1 {
+				//var randNum int
+				//randNum = rand.Intn(10000) + 1000
+				cus := &models.NewCustom{
+					DetItemFeeSumamt: subItem.Price * subItem.PrescribingNumber,
+					Cut:              subItem.PrescribingNumber,
+					FeedetlSn:        subItem.FeedetlSn,
+					Price:            subItem.Price,
+					MedListCodg:      subItem.Drug.MedicalInsuranceNumber,
+					HospApprFlag:     subItem.Drug.HospApprFlag,
+					FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
 				}
+
+				customs = append(customs, cus)
+				//}
 			}
 		}
 
 		if item.Type == 2 { //项目
 			for _, subItem := range item.HisPrescriptionProject {
 				if subItem.Type == 2 {
-					if len(subItem.HisProject.MedicalCode) > 0 {
-						cnt, _ := strconv.ParseFloat(subItem.Count, 64)
-						cus := &models.NewCustom{
-							DetItemFeeSumamt: subItem.Price * cnt,
-							Cut:              cnt,
-							FeedetlSn:        subItem.FeedetlSn,
-							Price:            float64(subItem.Price),
-							MedListCodg:      subItem.HisProject.MedicalCode,
-							HospApprFlag:     -1,
-							FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
-						}
-						customs = append(customs, cus)
+					//if len(subItem.HisProject.MedicalCode) > 0 {
+					cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+					cus := &models.NewCustom{
+						DetItemFeeSumamt: subItem.Price * cnt,
+						Cut:              cnt,
+						FeedetlSn:        subItem.FeedetlSn,
+						Price:            float64(subItem.Price),
+						MedListCodg:      subItem.HisProject.MedicalCode,
+						HospApprFlag:     -1,
+						FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
 					}
+					customs = append(customs, cus)
+					//}/* *//**/
 				} else if subItem.Type == 3 {
-					if len(subItem.GoodInfo.MedicalInsuranceNumber) > 0 && subItem.GoodInfo.IsUser != 1 {
-						cnt, _ := strconv.ParseFloat(subItem.Count, 64)
-
-						cus := &models.NewCustom{
-							DetItemFeeSumamt: subItem.Price * cnt,
-							Cut:              cnt,
-							FeedetlSn:        subItem.FeedetlSn,
-							Price:            float64(subItem.Price),
-							MedListCodg:      subItem.GoodInfo.MedicalInsuranceNumber,
-							HospApprFlag:     -1,
-							FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
-						}
-						customs = append(customs, cus)
+					//if subItem.GoodInfo.IsUser != 1 {
+					cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+
+					cus := &models.NewCustom{
+						DetItemFeeSumamt: subItem.Price * cnt,
+						Cut:              cnt,
+						FeedetlSn:        subItem.FeedetlSn,
+						Price:            float64(subItem.Price),
+						MedListCodg:      subItem.GoodInfo.MedicalInsuranceNumber,
+						HospApprFlag:     -1,
+						FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
 					}
+					customs = append(customs, cus)
 				}
+				//}
 			}
 		}
 

controllers/his_print_api_controller.go

@@ -15,8 +15,109 @@ type HisPrintApiController struct {
 
 func HisPrintApiRegistRouters() {
 	beego.Router("/api/his/prescription/print", &HisPrintApiController{}, "get:GetBatchHisPrescriptionData")
+	beego.Router("/api/his/prescription/list", &HisPrintApiController{}, "get:GetUnChargePrescriptionList")
+	beego.Router("/api/his/prescription/summary", &HisPrintApiController{}, "get:GetUnChargePrescriptionSummary")
+	beego.Router("/api/his/label/create", &HisPrintApiController{}, "get:CreateLablePrint")
+	beego.Router("/api/his/label/get", &HisPrintApiController{}, "get:GetLablePrint")
+
+}
+
+func (c *HisPrintApiController) GetLablePrint() {
+	patient_id, _ := c.GetInt64("patient_id")
+	ids := c.GetString("ids")
+	record_date := c.GetString("record_date")
+	labels, _ := service.GetLabelPrint(ids, c.GetAdminUserInfo().CurrentOrgId, record_date, patient_id)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"labels": labels,
+	})
+	return
 }
 
+func (c *HisPrintApiController) CreateLablePrint() {
+	patient_id, _ := c.GetInt64("patient_id")
+	isCombinationPrint, _ := c.GetBool("is_combination_print")
+	team_ids := c.GetString("team_ids")
+	ids := c.GetString("ids")
+	record_date := c.GetString("record_date")
+	doctor_id, _ := c.GetInt64("doctor_id")
+	project_ids := c.GetString("project_ids")
+	is_team, _ := c.GetInt64("is_team")
+
+	var hlpsi models.HisLabelPrintStatusInfo
+	hlpsi.Status = 1
+	hlpsi.UserOrgId = c.GetAdminUserInfo().CurrentOrgId
+	hlpsi.PatientId = patient_id
+	hlpsi.RecordDate = record_date
+	hlpsi.Mtime = time.Now().Unix()
+	hlpsi.Ctime = time.Now().Unix()
+	hlpsi.ItemIds = team_ids
+	hlpsi.ProjectIds = project_ids
+	hlpsi.Ids = ids
+	hlpsi.DoctorId = doctor_id
+	hlpsi.IsTeam = is_team
+	hlpsi.IsPrint = 1
+	if isCombinationPrint == true {
+		hlpsi.IsCombinationPrint = 1
+	} else {
+		hlpsi.IsCombinationPrint = 0
+	}
+	service.CreateLabelPrint(&hlpsi)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg":   "保存成功",
+		"hlpsi": hlpsi,
+	})
+	return
+}
+
+func (c *HisPrintApiController) GetUnChargePrescriptionList() {
+	patient_id, _ := c.GetInt64("patient_id")
+	recordDateTime, _ := c.GetInt64("record_date")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	p_type, _ := c.GetInt64("p_type", 0)
+	admin := c.GetAdminUserInfo()
+	xt_patient_info, _ := service.GetXTPatientInfo(admin.CurrentOrgId, patient_id)
+	record, _ := service.GetLastInHospitalRecord(patient_id, c.GetAdminUserInfo().CurrentOrgId)
+	var prescriptions []*models.HisPrescription
+	prescriptions, _ = service.GetUnChargeHisPrescriptionTen(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
+	admin_info, _ := service.GetAdminUserRole(admin_user_id, c.GetAdminUserInfo().CurrentOrgId)
+	//获取所有科室信息
+	c.ServeSuccessJSON(map[string]interface{}{
+		"xt_info":      xt_patient_info,
+		"prescription": prescriptions,
+		"record":       record,
+		"admin_info":   admin_info,
+	})
+	return
+}
+func (c *HisPrintApiController) GetUnChargePrescriptionSummary() {
+	patient_id, _ := c.GetInt64("patient_id")
+	record_date, _ := c.GetInt64("record_date")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	p_type, _ := c.GetInt64("p_type", 0)
+	//timeLayout := "2006-01-02"
+	//loc, _ := time.LoadLocation("Local")
+	//theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	//if err != nil {
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
+	//recordDateTime := theTime.Unix()
+	admin := c.GetAdminUserInfo()
+	xt_patient_info, _ := service.GetXTPatientInfo(admin.CurrentOrgId, patient_id)
+	record, _ := service.GetLastInHospitalRecord(patient_id, c.GetAdminUserInfo().CurrentOrgId)
+	var prescriptions []*models.HisPrescription
+	prescriptions, _ = service.GetUnChargeHisPrescriptionTen(admin.CurrentOrgId, patient_id, record_date, p_type)
+	//doctors, _ := service.GetHisAdminUserDoctors(admin.CurrentOrgId)
+	service.GetAdminUserRole(admin_user_id, c.GetAdminUserInfo().CurrentOrgId)
+	//获取所有科室信息
+	c.ServeSuccessJSON(map[string]interface{}{
+		"xt_info":      xt_patient_info,
+		"prescription": prescriptions,
+		"record":       record,
+		"admin_info":   admin_user_id,
+	})
+	return
+}
 func (c *HisPrintApiController) GetBatchHisPrescriptionData() {
 	record_date := c.GetString("record_date")
 	patient_ids := c.GetString("patient_ids")

controllers/inspection_api_controller.go

@@ -30,6 +30,92 @@ func InspectionApiRegistRouters() {
 	beego.Router("/api/patient/pic_inspection/create", &InspectionApiController{}, "Post:CreatePatientPicInspection")
 	beego.Router("/api/patient/pic_inspection/edit", &InspectionApiController{}, "Post:EditPatientPicInspection")
 
+	beego.Router("/api/patient/inspection_remind/get", &InspectionApiController{}, "Get:GetInspectionRemind")
+
+	beego.Router("/api/patient/inspection_remind/set", &InspectionApiController{}, "Get:SetInspectionRemind")
+
+}
+func (c *InspectionApiController) SetInspectionRemind() {
+	remind_cycle, _ := c.GetInt64("remind_cycle", 0)
+	patient, _ := c.GetInt64("patient", 0)
+	project_id, _ := c.GetInt64("project_id", 0)
+	is_open, _ := c.GetInt64("is_open", 0)
+
+	if remind_cycle > 0 {
+		infectiousRecord, _ := service.FindLastRecordDate(c.GetAdminUserInfo().CurrentOrgId, patient, project_id)
+		fmt.Println(infectiousRecord.InspectDate)
+		var record_time int64
+		switch remind_cycle {
+		case 1: //1个月
+			ts := time.Unix(infectiousRecord.InspectDate, 0)
+			record_time = ts.AddDate(0, 1, 0).Unix()
+			fmt.Println(record_time)
+			break
+		case 2: //2个月
+			ts := time.Unix(infectiousRecord.InspectDate, 0)
+			record_time = ts.AddDate(0, 2, 0).Unix()
+			fmt.Println(record_time)
+
+			break
+		case 3: //3个月
+			ts := time.Unix(infectiousRecord.InspectDate, 0)
+			record_time = ts.AddDate(0, 3, 0).Unix()
+			fmt.Println(record_time)
+
+			break
+		case 4: //6个月
+			ts := time.Unix(infectiousRecord.InspectDate, 0)
+			record_time = ts.AddDate(0, 6, 0).Unix()
+			fmt.Println(record_time)
+
+			break
+		case 5: //12个月
+			ts := time.Unix(infectiousRecord.InspectDate, 0)
+			record_time = ts.AddDate(0, 12, 0).Unix()
+			fmt.Println(record_time)
+
+			break
+		}
+		var errs error
+
+		if infectiousRecord.ID == 0 {
+			record_time = 0
+		}
+		//根据project_id查找是否存在提醒记录，没有的话新建，有的话更新提醒时间
+		reminds, _ := service.GetCheckRemindRecordTime(c.GetAdminUserInfo().CurrentOrgId, patient, project_id)
+		if reminds.ID == 0 {
+			remind := models.XtCheckRemind{
+				ProjectId:      project_id,
+				UserOrgId:      c.GetAdminUserInfo().CurrentOrgId,
+				Status:         1,
+				LastRemindDate: record_time,
+				PatientId:      patient,
+				RemindCycle:    remind_cycle,
+				IsOpen:         is_open,
+			}
+			errs = service.CreateRemind(remind)
+		} else {
+			errs = service.UpDateCheckRemindRecordTime(c.GetAdminUserInfo().CurrentOrgId, patient, record_time, project_id, remind_cycle)
+		}
+		fmt.Println(errs)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"remind_cycle": remind_cycle,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+
+	}
+
+}
+
+func (c *InspectionApiController) GetInspectionRemind() {
+	patient, _ := c.GetInt64("patient")
+	project_id, _ := c.GetInt64("project_id")
+	remind, _ := service.GetCheckRemindRecordTime(c.GetAdminUserInfo().CurrentOrgId, patient, project_id)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"remind": remind,
+	})
 }
 
 // PatientInspectionReference 请求检验检查大小项目
@@ -182,53 +268,101 @@ func (c *InspectionApiController) CreatePatientInspection() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInspectionAddFail)
 		return
 	}
-
-	if remind_cycle > 0 {
-		infectiousRecord, _ := service.FindLastRecordDate(adminUserInfo.CurrentOrgId, patient, 14)
-		fmt.Println(infectiousRecord.InspectDate)
-		var record_time int64
-		switch remind_cycle {
-		case 1: //1个月
-			ts := time.Unix(infectiousRecord.InspectDate, 0)
-			record_time = ts.AddDate(0, 1, 0).Unix()
-			fmt.Println(record_time)
-			break
-		case 2: //2个月
-			ts := time.Unix(infectiousRecord.InspectDate, 0)
-			record_time = ts.AddDate(0, 2, 0).Unix()
-			fmt.Println(record_time)
-
-			break
-		case 3: //3个月
-			ts := time.Unix(infectiousRecord.InspectDate, 0)
-			record_time = ts.AddDate(0, 3, 0).Unix()
-			fmt.Println(record_time)
-
-			break
-		case 4: //6个月
-			ts := time.Unix(infectiousRecord.InspectDate, 0)
-			record_time = ts.AddDate(0, 6, 0).Unix()
-			fmt.Println(record_time)
-
-			break
-		case 5: //12个月
-			ts := time.Unix(infectiousRecord.InspectDate, 0)
-			record_time = ts.AddDate(0, 12, 0).Unix()
-			fmt.Println(record_time)
-
-			break
+	if inspections[0].ProjectId == 14 {
+		if remind_cycle > 0 {
+			infectiousRecord, _ := service.FindLastRecordDate(adminUserInfo.CurrentOrgId, patient, inspections[0].ProjectId)
+			fmt.Println(infectiousRecord.InspectDate)
+			var record_time int64
+			switch remind_cycle {
+			case 1: //1个月
+				ts := time.Unix(infectiousRecord.InspectDate, 0)
+				record_time = ts.AddDate(0, 1, 0).Unix()
+				fmt.Println(record_time)
+				break
+			case 2: //2个月
+				ts := time.Unix(infectiousRecord.InspectDate, 0)
+				record_time = ts.AddDate(0, 2, 0).Unix()
+				fmt.Println(record_time)
+
+				break
+			case 3: //3个月
+				ts := time.Unix(infectiousRecord.InspectDate, 0)
+				record_time = ts.AddDate(0, 3, 0).Unix()
+				fmt.Println(record_time)
+
+				break
+			case 4: //6个月
+				ts := time.Unix(infectiousRecord.InspectDate, 0)
+				record_time = ts.AddDate(0, 6, 0).Unix()
+				fmt.Println(record_time)
+
+				break
+			case 5: //12个月
+				ts := time.Unix(infectiousRecord.InspectDate, 0)
+				record_time = ts.AddDate(0, 12, 0).Unix()
+				fmt.Println(record_time)
+
+				break
+			}
+			var errs error
+			if inspections[0].ProjectId == 14 {
+				errs = service.UpDateInfectiousRecordTime(adminUserInfo.CurrentOrgId, patient, record_time, remind_cycle)
+			}
+			if errs != nil {
+				utils.ErrorLog("更新日期出错：%v", errs)
+			}
 		}
-
-		errs := service.UpDateInfectiousRecordTime(adminUserInfo.CurrentOrgId, patient, record_time, remind_cycle)
-		if errs != nil {
-			utils.ErrorLog("更新日期出错：%v", errs)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"inspections":  inspections,
+			"remind_cycle": remind_cycle,
+		})
+	} else {
+		//更新提醒时间
+		reminds, _ := service.GetCheckRemindRecordTime(adminUserInfo.CurrentOrgId, patient, inspections[0].ProjectId)
+		if reminds.ID > 0 {
+			infectiousRecord, _ := service.FindLastRecordDate(adminUserInfo.CurrentOrgId, patient, inspections[0].ProjectId)
+			var record_time int64
+			switch reminds.RemindCycle {
+			case 1: //1个月
+				ts := time.Unix(infectiousRecord.InspectDate, 0)
+				record_time = ts.AddDate(0, 1, 0).Unix()
+				fmt.Println(record_time)
+				break
+			case 2: //2个月
+				ts := time.Unix(infectiousRecord.InspectDate, 0)
+				record_time = ts.AddDate(0, 2, 0).Unix()
+				fmt.Println(record_time)
+
+				break
+			case 3: //3个月
+				ts := time.Unix(infectiousRecord.InspectDate, 0)
+				record_time = ts.AddDate(0, 3, 0).Unix()
+				fmt.Println(record_time)
+
+				break
+			case 4: //6个月
+				ts := time.Unix(infectiousRecord.InspectDate, 0)
+				record_time = ts.AddDate(0, 6, 0).Unix()
+				fmt.Println(record_time)
+
+				break
+			case 5: //12个月
+				ts := time.Unix(infectiousRecord.InspectDate, 0)
+				record_time = ts.AddDate(0, 12, 0).Unix()
+				fmt.Println(record_time)
+
+				break
+			}
+			errs := service.UpDateCheckRemindRecordTimeTwo(adminUserInfo.CurrentOrgId, patient, record_time, inspections[0].ProjectId)
+			if errs != nil {
+				utils.ErrorLog("更新日期出错：%v", errs)
+			}
 		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"inspections": inspections,
+		})
 	}
 
-	c.ServeSuccessJSON(map[string]interface{}{
-		"inspections":  inspections,
-		"remind_cycle": remind_cycle,
-	})
 	return
 }
 func (c *InspectionApiController) CreatePatientPicInspection() {
@@ -305,6 +439,52 @@ func (c *InspectionApiController) CreatePatientPicInspection() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInspectionAddFail)
 		return
 	}
+
+	if inspections[0].ProjectId != 14 {
+		//更新提醒时间
+		reminds, _ := service.GetCheckRemindRecordTime(adminUserInfo.CurrentOrgId, patient, inspections[0].ProjectId)
+		if reminds.ID > 0 {
+			infectiousRecord, _ := service.FindLastRecordDate(adminUserInfo.CurrentOrgId, patient, inspections[0].ProjectId)
+			var record_time int64
+			switch reminds.RemindCycle {
+			case 1: //1个月
+				ts := time.Unix(infectiousRecord.InspectDate, 0)
+				record_time = ts.AddDate(0, 1, 0).Unix()
+				fmt.Println(record_time)
+				break
+			case 2: //2个月
+				ts := time.Unix(infectiousRecord.InspectDate, 0)
+				record_time = ts.AddDate(0, 2, 0).Unix()
+				fmt.Println(record_time)
+
+				break
+			case 3: //3个月
+				ts := time.Unix(infectiousRecord.InspectDate, 0)
+				record_time = ts.AddDate(0, 3, 0).Unix()
+				fmt.Println(record_time)
+
+				break
+			case 4: //6个月
+				ts := time.Unix(infectiousRecord.InspectDate, 0)
+				record_time = ts.AddDate(0, 6, 0).Unix()
+				fmt.Println(record_time)
+
+				break
+			case 5: //12个月
+				ts := time.Unix(infectiousRecord.InspectDate, 0)
+				record_time = ts.AddDate(0, 12, 0).Unix()
+				fmt.Println(record_time)
+
+				break
+			}
+			errs := service.UpDateCheckRemindRecordTimeTwo(adminUserInfo.CurrentOrgId, patient, record_time, inspections[0].ProjectId)
+			if errs != nil {
+				utils.ErrorLog("更新日期出错：%v", errs)
+			}
+		}
+
+	}
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"inspections": inspections,
 	})
@@ -595,6 +775,56 @@ func (c *InspectionApiController) DeletePatientInspection() {
 		return
 	}
 
+	//更新提醒时间
+	reminds, _ := service.GetCheckRemindRecordTime(adminUserInfo.CurrentOrgId, patient, ProjectId)
+	if reminds.ID > 0 {
+		infectiousRecord, _ := service.FindLastRecordDate(adminUserInfo.CurrentOrgId, patient, ProjectId)
+		fmt.Println(infectiousRecord)
+		if infectiousRecord.ID > 0 {
+			var record_time int64
+			switch reminds.RemindCycle {
+			case 1: //1个月
+				ts := time.Unix(infectiousRecord.InspectDate, 0)
+				record_time = ts.AddDate(0, 1, 0).Unix()
+				fmt.Println(record_time)
+				break
+			case 2: //2个月
+				ts := time.Unix(infectiousRecord.InspectDate, 0)
+				record_time = ts.AddDate(0, 2, 0).Unix()
+				fmt.Println(record_time)
+
+				break
+			case 3: //3个月
+				ts := time.Unix(infectiousRecord.InspectDate, 0)
+				record_time = ts.AddDate(0, 3, 0).Unix()
+				fmt.Println(record_time)
+
+				break
+			case 4: //6个月
+				ts := time.Unix(infectiousRecord.InspectDate, 0)
+				record_time = ts.AddDate(0, 6, 0).Unix()
+				fmt.Println(record_time)
+
+				break
+			case 5: //12个月
+				ts := time.Unix(infectiousRecord.InspectDate, 0)
+				record_time = ts.AddDate(0, 12, 0).Unix()
+				fmt.Println(record_time)
+
+				break
+			}
+			errs := service.UpDateCheckRemindRecordTimeTwo(adminUserInfo.CurrentOrgId, patient, record_time, ProjectId)
+			if errs != nil {
+				utils.ErrorLog("更新日期出错：%v", errs)
+			}
+		} else {
+			errs := service.UpDateCheckRemindRecordTimeTwo(adminUserInfo.CurrentOrgId, patient, 0, ProjectId)
+			if errs != nil {
+				utils.ErrorLog("更新日期出错：%v", errs)
+			}
+		}
+
+	}
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg": "ok",
 	})
@@ -625,10 +855,17 @@ func (c *InspectionApiController) GetPatientInspections() {
 		date = time.Unix(dateTime, 0).Format("2006-01-02 15:04")
 	}
 
+	remind, _ := service.GetCheckRemindRecordTime(c.GetAdminUserInfo().CurrentOrgId, patient, projectId)
+
+	//remind, _ := service.GetCheckRemindRecordTime(c.GetAdminUserInfo().CurrentOrgId, patient, projectId)
+	config, _ := service.GetCheckRemindConfigById(c.GetAdminUserInfo().CurrentOrgId)
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"inspections": inspections,
 		"total":       total,
 		"date":        date,
+		"remind":      remind,
+		"config":      config,
 	})
 	return
 
@@ -661,11 +898,12 @@ func (c *InspectionApiController) GetAllPatientInspection() {
 		for _, item := range ids {
 			id, _ := strconv.ParseInt(item, 10, 64)
 			inspection, _, _ := service.GetAllPatientInspection(adminUserInfo.CurrentOrgId, patient, page, id, start_time, end_time)
-			//fmt.Println(err)
-			//if err != nil {
-			//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			//	return
-			//}
+			// fmt.Println(err)
+			//
+			//	if err != nil {
+			//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			//		return
+			//	}
 			for _, inspection_item := range inspection {
 				inspections = append(inspections, inspection_item)
 			}
@@ -699,11 +937,12 @@ func (c *InspectionApiController) GetAllPatientInspection() {
 		for _, item := range ids {
 			id, _ := strconv.ParseInt(item, 10, 64)
 			inspection, _, _ := service.GetAllPatientInspection(adminUserInfo.CurrentOrgId, patient, page, id, start_time, end_time)
-			//fmt.Println(err)
-			//if err != nil {
-			//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			//	return
-			//}
+			// fmt.Println(err)
+			//
+			//	if err != nil {
+			//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			//		return
+			//	}
 			for _, inspection_item := range inspection {
 				inspections = append(inspections, inspection_item)
 			}
@@ -757,11 +996,12 @@ func (c *InspectionApiController) GetAllPatientInspection() {
 		for _, item := range ids {
 			id, _ := strconv.ParseInt(item, 10, 64)
 			inspection, _, _ := service.GetAllPatientInspection(adminUserInfo.CurrentOrgId, patient, page, id, start_time, end_time)
-			//fmt.Println(err)
-			//if err != nil {
-			//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			//	return
-			//}
+			// fmt.Println(err)
+			//
+			//	if err != nil {
+			//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			//		return
+			//	}
 			for _, inspection_item := range inspection {
 				inspections = append(inspections, inspection_item)
 			}
@@ -779,11 +1019,12 @@ func (c *InspectionApiController) GetAllPatientInspection() {
 		for _, item := range ids {
 			id, _ := strconv.ParseInt(item, 10, 64)
 			inspection, _, _ := service.GetAllPatientInspection(adminUserInfo.CurrentOrgId, patient, page, id, start_time, end_time)
-			//fmt.Println(err)
-			//if err != nil {
-			//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			//	return
-			//}
+			// fmt.Println(err)
+			//
+			//	if err != nil {
+			//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			//		return
+			//	}
 			for _, inspection_item := range inspection {
 				inspections = append(inspections, inspection_item)
 			}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -575,6 +575,11 @@ func (this *DialysisAPIController) DialysisRecord() {
 	}
 
 	lastOrder, _ := service.GetLastDilysisOrder(adminInfo.Org.Id, patientID, date.Unix())
+	remind_config, _ := service.GetCheckRemindConfigById(adminInfo.Org.Id)
+	var remind_lists []models.XtCheckRemind
+	if remind_config.ID > 0 && remind_config.IsOpen == 1 {
+		remind_lists, _ = service.GetAllInspectionRemind(adminInfo.Org.Id, patientID)
+	}
 	returnData := map[string]interface{}{
 		"patient":                        patient,
 		"schedual":                       schedual,
@@ -608,7 +613,9 @@ func (this *DialysisAPIController) DialysisRecord() {
 		"is_advice_open":                 is_advice_open,
 		"prescription_open":              prescriptionConfig.IsOpen,
 		"lastOrder":                      lastOrder,
+		"remind_lists":                   remind_lists,
 	}
+
 	this.ServeSuccessJSON(returnData)
 }
 

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -2895,3 +2895,19 @@ func (this *NewDialysisApiController) CommitDialysisOrder() {
 	}
 
 }
+
+func (this *NewDialysisApiController) GetAllInspectionReminds() {
+	org_id := this.GetMobileAdminUserInfo().Org.Id
+	patient_id, _ := this.GetInt64("patient_id")
+	reminds, err := service.GetAllInspectionRemind(org_id, patient_id)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"reminds": reminds,
+		})
+		return
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -183,4 +183,6 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/getpatientplan", &MobileHisApiController{}, "Get:GetPatientPlan")
 	beego.Router("/m/api/patient/togetpatient", &MobileHisApiController{}, "Get:ToGetPatient")
 
+	beego.Router("m/api/patient/inspection_reminds", &NewDialysisApiController{}, "Get:GetAllInspectionReminds")
+
 }

controllers/statistics_api_controller.go

@@ -1,8 +1,12 @@
 package controllers
 
 import (
+	"XT_New/enums"
 	"XT_New/service"
+	"XT_New/utils"
+	"fmt"
 	"github.com/astaxie/beego"
+	"strconv"
 	"time"
 )
 
@@ -13,7 +17,174 @@ type StatisticsApiController struct {
 func StatisticsApiRegistRouters() {
 
 	beego.Router("/api/statistisc/index", &StatisticsApiController{}, "get:GetStatistics")
+	beego.Router("/api/qc/statistiscall/get", &StatisticsApiController{}, "get:GetAllInspectionStatistisc")
+	beego.Router("/api/qc/statistiscperson/get", &StatisticsApiController{}, "get:GetPersonInspectionStatistisc")
 
+	beego.Router("/api/qc/patientstatistiscall/get", &StatisticsApiController{}, "get:GetPatientInspectionStatistisc")
+
+	//beego.Router("/api/qc/statistiscperson/export", &StatisticsApiController{}, "get:ExportPersonInspectionStatistisc")
+
+}
+func (c *StatisticsApiController) GetPatientInspectionStatistisc() {
+	start_date := c.GetString("start_date")
+	end_date := c.GetString("end_date")
+	project_id, _ := c.GetInt64("project_id")
+	item_id, _ := c.GetInt64("item_id")
+	item_type, _ := c.GetInt64("item_type")
+	order_type, _ := c.GetInt64("order_type")
+	keyword := c.GetString("key_word")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_date+" 00:00:00", loc)
+		fmt.Println("err-----------", err)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_date+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	//获取配置
+	reference, _ := service.GetInspectionReferenceThree(project_id, item_id)
+	//获取数值在正常范围内的总数
+
+	max, _ := strconv.ParseFloat(reference.RangeMax, 64)
+	min, _ := strconv.ParseFloat(reference.RangeMin, 64)
+
+	switch item_type {
+	case 0:
+
+		break
+	case 1:
+		list, _ := service.GetUnusualInspectionPatientList(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, reference.SystemProjectId, reference.ID, max, min, order_type, keyword)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list":      list,
+			"reference": reference,
+		})
+		break
+	case 2:
+		list, _ := service.GetPatientNotInspectionPatientList(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, reference.SystemProjectId, reference.ID, keyword)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list":      list,
+			"reference": reference,
+		})
+		break
+	case 3:
+		list, _ := service.GetNormalInspectionPatientList(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, reference.SystemProjectId, reference.ID, max, min, order_type, keyword)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list":      list,
+			"reference": reference,
+		})
+		break
+	}
+}
+
+func (c *StatisticsApiController) GetAllInspectionStatistisc() {
+	start_date := c.GetString("start_date")
+	end_date := c.GetString("end_date")
+	project_id, _ := c.GetInt64("project_id")
+	item_id, _ := c.GetInt64("item_id")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_date+" 00:00:00", loc)
+		fmt.Println("err-----------", err)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_date+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	//患者总数
+	patientCount := service.GetPatientCount(c.GetAdminUserInfo().CurrentOrgId)
+	//获取配置
+	reference, _ := service.GetInspectionReferenceThree(project_id, item_id)
+	//获取数值在正常范围内的总数
+
+	max, _ := strconv.ParseFloat(reference.RangeMax, 64)
+	min, _ := strconv.ParseFloat(reference.RangeMin, 64)
+
+	normalTotal, _ := service.GetNormalInspectionTotalByID(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, reference.SystemProjectId, reference.ID, max, min)
+	//获取数值异常的总数
+	unusualTotal, _ := service.GetUnusualInspectionTotalByID(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, reference.SystemProjectId, reference.ID, max, min)
+	//获取没有检查的患者总数
+	noCheckTotal, _ := service.GetPatientNotInspectionTotal(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, reference.SystemProjectId, reference.ID)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"patient_count":  patientCount,
+		"normal_total":   normalTotal,
+		"unusual_total":  unusualTotal,
+		"no_check_total": noCheckTotal,
+		"reference":      reference,
+	})
+}
+func (c *StatisticsApiController) GetPersonInspectionStatistisc() {
+	start_date := c.GetString("start_time")
+	end_date := c.GetString("end_time")
+	project_id, _ := c.GetInt64("project_id")
+	item_id, _ := c.GetInt64("item_id")
+	patient_id, _ := c.GetInt64("patient_id")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_date+" 00:00:00", loc)
+		fmt.Println("err-----------", err)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_date+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	patient, _ := service.GetPatientByID(c.GetAdminUserInfo().CurrentOrgId, patient_id)
+	//获取配置
+	reference, _ := service.GetInspectionReferenceThree(project_id, item_id)
+	//获取数值在正常范围内的总数
+	inspections, _ := service.GetPatientInspectionByID(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, reference.SystemProjectId, reference.SysItemId, patient_id)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"patient":     patient,
+		"reference":   reference,
+		"inspections": inspections,
+	})
 }
 
 func (c *StatisticsApiController) GetStatistics() {
@@ -34,10 +205,8 @@ func (c *StatisticsApiController) GetStatistics() {
 	weekStart := weekEnd - 6
 	// endDay := todayTime.AddDate(0, 0, weekEnd)
 	startDay := todayTime.AddDate(0, 0, weekStart)
-
 	//患者总数
 	patientCount := service.GetPatientCount(adminUserInfo.CurrentOrgId)
-
 	//今日透析
 	todayDialysisCount := service.GetDayDialysisCount(adminUserInfo.CurrentOrgId, todayTime.Unix())
 

models/his_charge_models.go

@@ -53,6 +53,10 @@ type HisChargeOrderInfo struct {
 	UserOrgId                    int64                        `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	ProjectId                    int64                        `gorm:"column:project_id" json:"project_id" form:"project_id"`
 	Type                         int64                        `gorm:"column:type" json:"type" form:"type"`
+	FulamtOwnpayAmt              float64                      `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtAmt                   float64                      `gorm:"column:overlmt_amt" json:"overlmt_amt" form:"overlmt_amt"`
+	PreselfpayAmt                float64                      `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	PricUplmtAmt                 float64                      `gorm:"column:pric_uplmt_amt" json:"pric_uplmt_amt" form:"pric_uplmt_amt"`
 	HisChargePrescriptionProject HisChargePrescriptionProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
 	HisChargeDoctorAdviceInfo    HisChargeDoctorAdviceInfo    `gorm:"ForeignKey:AdviceId;AssociationForeignKey:ID" json:"advice"`
 }
@@ -216,20 +220,21 @@ func (HisChargeGoodInfo) TableName() string {
 }
 
 type HisLabelPrintInfo struct {
-	ID          int64  `gorm:"column:id" json:"id" form:"id"`
-	PatientId   int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Number      string `gorm:"column:number" json:"number" form:"number"`
-	Ctime       int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime       int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	DoctorId    int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
-	Status      int64  `gorm:"column:status" json:"status" form:"status"`
-	ProjectName string `gorm:"column:project_name" json:"project_name" form:"project_name"`
-	ProjectId   int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	IsPrint     int64  `gorm:"column:is_print" json:"is_print" form:"is_print"`
-	RecordDate  int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	ItemId      int64  `gorm:"column:item_id" json:"item_id" form:"item_id"`
-	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PProjectId  int64  `gorm:"column:p_project_id" json:"p_project_id" form:"p_project_id"`
+	ID             int64          `gorm:"column:id" json:"id" form:"id"`
+	PatientId      int64          `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Number         string         `gorm:"column:number" json:"number" form:"number"`
+	Ctime          int64          `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime          int64          `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	DoctorId       int64          `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	Status         int64          `gorm:"column:status" json:"status" form:"status"`
+	ProjectName    string         `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	ProjectId      int64          `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	IsPrint        int64          `gorm:"column:is_print" json:"is_print" form:"is_print"`
+	RecordDate     int64          `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	ItemId         int64          `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	HisProjectTeam HisProjectTeam `gorm:"ForeignKey:ID;AssociationForeignKey:ItemId" json:"team"`
+	UserOrgId      int64          `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PProjectId     int64          `gorm:"column:p_project_id" json:"p_project_id" form:"p_project_id"`
 
 	FeedetlSn   string `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
 	DoctorName  string `gorm:"column:doctor_name" json:"doctor_name" form:"doctor_name"`

models/his_models.go

@@ -921,6 +921,7 @@ type XtHisProjectList struct {
 	Type         int64        `gorm:"column:type" json:"type" form:"type"`
 	XtHisProject XtHisProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
 	GoodInfo     GoodInfo     `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"good_info"`
+	PN           string       `gorm:"-" json:"pn" form:"pn"`
 }
 
 func (XtHisProjectList) TableName() string {

models/his_print_models.go

@@ -123,3 +123,24 @@ type HisPrescriptionInfoTwo struct {
 func (HisPrescriptionInfoTwo) TableName() string {
 	return "his_prescription_info"
 }
+
+type HisLabelPrintStatusInfo struct {
+	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Ctime              int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status             int64  `gorm:"column:status" json:"status" form:"status"`
+	IsCombinationPrint int64  `gorm:"column:is_combination_print" json:"is_combination_print" form:"is_combination_print"`
+	RecordDate         string `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	ItemIds            string `gorm:"column:item_ids" json:"item_ids" form:"item_ids"`
+	UserOrgId          int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ProjectIds         string `gorm:"column:project_ids" json:"project_ids" form:"project_ids"`
+	Ids                string `gorm:"column:ids" json:"ids" form:"ids"`
+	DoctorId           int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	IsTeam             int64  `gorm:"column:is_team" json:"is_team" form:"is_team"`
+	IsPrint            int64  `gorm:"column:is_print" json:"is_print" form:"is_print"`
+}
+
+func (HisLabelPrintStatusInfo) TableName() string {
+	return "his_label_print_status_info"
+}

models/inspection_models.go

@@ -64,6 +64,9 @@ type InspectionReference struct {
 	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"`
+	SystemProjectId  int64  `gorm:"column:system_project_id" json:"system_project_id" form:"system_project_id"`
+	SystemItemId     int64  `gorm:"column:system_item_id" json:"system_item_id" form:"system_item_id"`
+	//remind 	 XtCheckRemind   `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ProjectId" json:"good_info"`
 }
 
 func (InspectionReference) TableName() string {
@@ -162,3 +165,32 @@ type XtPatientFeedback struct {
 func (XtPatientFeedback) TableName() string {
 	return "xt_patient_feedback"
 }
+
+type XtCheckRemind struct {
+	ID                  int64               `gorm:"column:id" json:"id" form:"id"`
+	ProjectId           int64               `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	UserOrgId           int64               `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status              int64               `gorm:"column:status" json:"status" form:"status"`
+	LastRemindDate      int64               `gorm:"column:last_remind_date" json:"last_remind_date" form:"last_remind_date"`
+	PatientId           int64               `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RemindCycle         int64               `gorm:"column:remind_cycle" json:"remind_cycle" form:"remind_cycle"`
+	IsOpen              int64               `gorm:"column:is_open" json:"is_open" form:"is_open"`
+	InspectionReference InspectionReference `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ProjectId" json:"re"`
+}
+
+func (XtCheckRemind) TableName() string {
+	return "xt_check_remind"
+}
+
+type XtCheckRemindCinfig 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"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+}
+
+func (XtCheckRemindCinfig) TableName() string {
+	return "xt_check_remind_config"
+}

service/gobal_config_service.go

@@ -1030,6 +1030,26 @@ func GetScheduleConfigById(id int64) (config models.ScheduleConfig, err error) {
 	return config, err
 }
 
+func CreateCheckRemindConfig(config *models.XtCheckRemindCinfig) (err error) {
+	err = XTWriteDB().Create(&config).Error
+	return err
+}
+
+func GetCheckRemindConfigById(user_org_id int64) (config models.XtCheckRemindCinfig, err error) {
+	err = XTReadDB().Model(&models.XtCheckRemindCinfig{}).Where("user_org_id = ?", user_org_id).First(&config).Error
+	return config, err
+}
+
+func GetCheckRemindConfigByIdTwo(id int64) (config models.XtCheckRemindCinfig, err error) {
+	err = XTReadDB().Model(&models.XtCheckRemindCinfig{}).Where("id = ?", id).First(&config).Error
+	return config, err
+}
+
+func SaveCheckRemindConfig(config *models.XtCheckRemindCinfig) (err error) {
+	err = XTWriteDB().Save(&config).Error
+	return err
+}
+
 //func Get(id int64)(config models.ScheduleConfig, err error){
 //	err = XTReadDB().Model(&models.ScheduleConfig{}).Where("id = ?", id).First(&config).Error
 //	return config, err

service/his_charge_service.go

@@ -243,6 +243,8 @@ func GetAllPatientChargeSettle(org_id int64, start_time int64, end_time int64, k
 func GetLabelPrintList(page int64, limit int64, user_org_id int64, record_time int64, is_print int64, keywors string, tube_color int64) (labels []*models.HisLabelPrintInfo, total int64, err error) {
 	offset := (page - 1) * limit
 	db := readDb.Model(&models.HisLabelPrintInfo{})
+	db = db.Preload("HisProjectTeam", "status = 1")
+
 	if is_print > 0 {
 		db = db.Where("is_print = ?", is_print)
 	}
@@ -262,6 +264,7 @@ func GetLabelPrintList(page int64, limit int64, user_org_id int64, record_time i
 func GetLabelPrintListTwo(page int64, limit int64, user_org_id int64, record_time int64, is_print int64, keywors string, tube_color int64) (labels []*models.HisLabelPrintInfo, total int64, err error) {
 	offset := (page - 1) * limit
 	db := readDb.Model(&models.HisLabelPrintInfo{})
+	db = db.Preload("HisProjectTeam", "status = 1")
 	if is_print > 0 {
 		db = db.Where("is_print = ?", is_print)
 	}
@@ -279,6 +282,47 @@ func GetLabelPrintListTwo(page int64, limit int64, user_org_id int64, record_tim
 	return
 }
 
+func GetLabelPrintListThree(user_org_id int64, record_time int64, is_print int64, keywors string, tube_color int64) (labels []*models.HisLabelPrintInfo, total int64, err error) {
+	db := readDb.Model(&models.HisLabelPrintInfo{})
+
+	db = db.Preload("HisProjectTeam", "status = 1")
+	if is_print > 0 {
+		db = db.Where("is_print = ?", is_print)
+	}
+	if len(keywors) > 0 {
+		keywors = "%" + keywors + "%"
+		db = db.Where("patient_name Like ?", keywors)
+
+	}
+	//if tube_color > 0 {
+	//	db = db.Joins("Right join xt_his_project_team as team on team.id = his_label_print_info.item_id AND his_label_print_info.item_id <> 0 and team.status = 1 and team.tube_color = ?", tube_color)
+	//}
+
+	err = db.Where("his_label_print_info.user_org_id = ? AND his_label_print_info.record_date = ? AND his_label_print_info.status = 1 ", user_org_id, record_time).Count(&total).Find(&labels).Error
+	return
+}
+
+//func GetLabelPrintListFour(user_org_id int64, record_time int64, is_print int64, keywors string, tube_color int64) (labels []*models.HisLabelPrintInfo, total int64, err error) {
+//	db := readDb.Model(&models.HisLabelPrintInfo{})
+//	db = db.Preload("HisProjectTeam", "status = 1")
+//
+//	if is_print > 0 {
+//		db = db.Where("is_print = ?", is_print)
+//	}
+//	if len(keywors) > 0 {
+//		keywors = "%" + keywors + "%"
+//		db = db.Where("patient_name Like ?", keywors)
+//
+//	}
+//	//if tube_color > 0 {
+//	//	//db = db.Joins("Right join xt_his_project_team as team on team.id = his_label_print_info.item_id AND his_label_print_info.item_id <> 0 and team.status = 1 and team.tube_color = ?",tube_color)
+//	//	db = db.Joins("Right join xt_his_project as pro on pro.id = his_label_print_info.project_id AND his_label_print_info.item_id = 0 and  his_label_print_info.project_id > 0 and pro.status = 1 and pro.tube_color = ?", tube_color)
+//	//}
+//
+//	err = db.Where("his_label_print_info.user_org_id = ? AND his_label_print_info.record_date = ? AND his_label_print_info.status = 1 ", user_org_id, record_time).Count(&total).Find(&labels).Error
+//	return
+//}
+
 func GetLabelPrintInfo(id int64) (labels models.HisLabelPrintInfo, err error) {
 	db := readDb.Model(&models.HisLabelPrintInfo{})
 	err = db.Where("id = ?", id).First(&labels).Error

service/his_deposit_service.go

@@ -397,19 +397,19 @@ func SpendDeposit(orgid, his_user_id, create_id int64, code string, deposit inte
 	if err != nil {
 		return
 	}
-	//开事务
-	tx := XTWriteDB().Begin()
-	defer func() {
-		if err != nil {
-			utils.ErrorLog("事务失败,原因为: %v", err.Error())
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
-	}()
+	////开事务
+	//tx := XTWriteDB().Begin()
+	//defer func() {
+	//	if err != nil {
+	//		utils.ErrorLog("事务失败,原因为: %v", err.Error())
+	//		tx.Rollback()
+	//	} else {
+	//		tx.Commit()
+	//	}
+	//}()
 	//查询患者押金
 	tmp := models.Deposit{}
-	err = tx.Model(&models.Deposit{}).Where("his_patient_id = ? and user_org_id = ? and status = 1", his_user_id, orgid).Find(&tmp).Error
+	err = readDb.Model(&models.Deposit{}).Where("his_patient_id = ? and user_org_id = ? and status = 1", his_user_id, orgid).Find(&tmp).Error
 	if err != nil {
 		err = fmt.Errorf("押金余额不足")
 		return
@@ -420,7 +420,7 @@ func SpendDeposit(orgid, his_user_id, create_id int64, code string, deposit inte
 		return
 	}
 	//扣除患者押金
-	err = tx.Model(&models.Deposit{}).Where("id = ? and status = 1", tmp.ID).Updates(map[string]interface{}{
+	err = readDb.Model(&models.Deposit{}).Where("id = ? and status = 1", tmp.ID).Updates(map[string]interface{}{
 		"mtime":   time.Now().Unix(),
 		"deposit": tmp.Deposit.Sub(tmp_deposit),
 	}).Error
@@ -441,7 +441,7 @@ func SpendDeposit(orgid, his_user_id, create_id int64, code string, deposit inte
 		Mtime:          time.Now().Unix(),
 		TrialStatus:    1,
 	}
-	err = tx.Create(&dehistory).Error
+	err = readDb.Create(&dehistory).Error
 	return
 }
 

service/his_hospital_service.go

@@ -580,3 +580,28 @@ func GetUnChargeHisHospitalPrescription(org_id int64, start_time int64, end_time
 		Find(&prescription).Error
 	return
 }
+
+func GetLastInHospitalRecord(patient_id int64, user_org_id int64) (record models.HisHospitalCheckRecord, err error) {
+	err = readDb.Model(&models.HisHospitalCheckRecord{}).Where("patient_id = ? AND status = 1 AND user_org_id = ? AND in_hospital_status = 1 AND out_hospital_status = 0", patient_id, user_org_id).Last(&record).Error
+	return
+}
+
+func GetHisInHospitalHistory(keyword string, startime int64, endtime int64, limit int64, page int64, orgid int64) (hisPatient []*models.HisHospitalCheckRecord, total int64, err error) {
+	offset := (page - 1) * limit
+	likeKey := "%" + keyword + "%"
+	db := XTReadDB().Model(&models.HisHospitalCheckRecord{})
+	if len(keyword) > 0 {
+		db = db.Where("name like ?", likeKey)
+	}
+	if startime > 0 {
+		db = db.Where("record_date >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("record_date<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("id desc").Find(&hisPatient).Error
+	return hisPatient, total, err
+}

service/his_print_service.go

@@ -135,3 +135,31 @@ func GetBatchInspectionProjectHisPrescription(ids []string, record_time int64, u
 	return
 
 }
+
+func GetUnChargeHisPrescriptionTen(org_id int64, patient_id int64, record_date int64, p_type int64) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
+		}).
+		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("Drug", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
+		}).Preload("TempHisOrder", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ? AND order_status <> 3  AND order_status <> 2  ", org_id)
+	}).
+		Where("(user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND order_status <> 3 AND p_type = ?)", org_id, record_date, patient_id, p_type).
+		Find(&prescription).Error
+	return
+}
+
+func CreateLabelPrint(label *models.HisLabelPrintStatusInfo) (err error) {
+	err = writeDb.Save(&label).Error
+	return
+}
+
+func GetLabelPrint(ids string, org_id int64, record_date string, patient_id int64) (label models.HisLabelPrintStatusInfo, err error) {
+	err = readDb.Model(&models.HisLabelPrintStatusInfo{}).Where("ids = ? and user_org_id = ? and record_date = ? and patient_id = ?", ids, org_id, record_date, patient_id).First(&label).Error
+	return
+}

service/his_service.go

@@ -2592,8 +2592,8 @@ func UpdataOrderStatusThree(number string, user_org_id int64) (err error) {
 	return
 }
 
-func UpDateOrderTwo(order *models.HisOrder) (err error) {
-	err = writeDb.Save(&order).Error
+func UpDateOrderTwo(order *models.HisOrder, tx *gorm.DB) (err error) {
+	err = tx.Save(&order).Error
 	return
 }
 
@@ -2752,3 +2752,29 @@ func GetHisOrderByIDTenOne(order_id string) (order models.HisOrder, err error) {
 	err = readDb.Model(&models.HisOrder{}).Where("id = ? AND status = 1", order_id).First(&order).Error
 	return
 }
+
+func GetHisDoctorAdviceInfotwo(id int64) (models.HisDoctorAdviceInfo, error) {
+	info := models.HisDoctorAdviceInfo{}
+	err := readDb.Model(&info).Where("id = ? and status = 1", id).Find(&info).Error
+	return info, err
+}
+
+func GetHisDoctorAdviceInfothree(org_id int64, record_date int64) (info []*models.HisDoctorAdviceInfo, err error) {
+	err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("user_org_id  = ? and status = 1 and record_date = ?", org_id, record_date).Find(&info).Error
+	return
+}
+
+func GetHisPrescriptionProjectByIDFour(org_id int64, record_date int64) (projects []*models.HisPrescriptionProject, err error) {
+	err = readDb.Model(&models.HisPrescriptionProject{}).Where("user_org_id  = ? and status = 1 and record_date = ?", org_id, record_date).Find(&projects).Error
+	return
+}
+
+func GetHisPrescriptionProjectByIDThree(id int64) (projects models.HisPrescriptionProject, err error) {
+	err = readDb.Model(&models.HisPrescriptionProject{}).Where("id = ? AND status = 1", id).First(&projects).Error
+	return
+}
+
+func GetHisPrescriptionProjectByIDTwoone(id int64) (projects models.HisPrescriptionProject, err error) {
+	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("GoodInfo", "status = 1").Preload("HisProject", "status = 1").Where("id = ? AND status = 1", id).First(&projects).Error
+	return
+}

service/his_summary_service.go

@@ -11,7 +11,7 @@ func GetHisSummaryDetailList(keyword string, item_type int64, patient_id int64,
 	err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and orders.patient_id = ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
 		return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id,psn_cash_pay,acct_pay,fund_pay_sumamt,is_medicine_insurance,medfee_sumamt,maf_pay,hifes_pay").
 			Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
-				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("status = 1").
+				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type,fulamt_ownpay_amt,overlmt_amt,preselfpay_amt,pric_uplmt_amt").Where("status = 1").
 					Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
 						return db.Preload("Drug", "status = 1").Where("status = 1 ")
 					}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {

service/inspection_service.go

@@ -215,6 +215,26 @@ func UpDateInfectiousRecordTime(orgId int64, patientId int64, time int64, remind
 	return
 }
 
+func CreateRemind(remind models.XtCheckRemind) (err error) {
+	err = writeDb.Create(&remind).Error
+	return
+}
+
+func UpDateCheckRemindRecordTime(orgId int64, patientId int64, time int64, project_id int64, remind_cycle int64) (err error) {
+	err = writeDb.Model(&models.XtCheckRemind{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? and project_id = ?", orgId, patientId, project_id).Updates(map[string]interface{}{"last_remind_date": time, "remind_cycle": remind_cycle}).Error
+	return
+}
+
+func UpDateCheckRemindRecordTimeTwo(orgId int64, patientId int64, time int64, project_id int64) (err error) {
+	err = writeDb.Model(&models.XtCheckRemind{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? and project_id = ?", orgId, patientId, project_id).Updates(map[string]interface{}{"last_remind_date": time}).Error
+	return
+}
+
+func GetCheckRemindRecordTime(orgId int64, patientId int64, project_id int64) (remind models.XtCheckRemind, err error) {
+	err = writeDb.Model(&models.XtCheckRemind{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? and project_id = ?", orgId, patientId, project_id).First(&remind).Error
+	return
+}
+
 func GetAllPatientInspection(orgId, patientId, page int64, projectId int64, start_time int64, end_time int64) (inspections []*models.Inspection, date int64, err error) {
 
 	//var projectCount models.UserInspectionProjectCount
@@ -264,3 +284,34 @@ func GetInspectionReferenceTwo(project_id int64) (reference []*models.Inspection
 	err = readDb.Model(&models.InspectionReference{}).Where("project_id = ? and status = 1", project_id).Order("project_id").Find(&reference).Error
 	return
 }
+
+func GetInspectionReferenceThree(project_id int64, item_id int64) (reference models.InspectionReference, err error) {
+	err = readDb.Model(&models.InspectionReference{}).Where("project_id = ? and id = ? and status = 1  and org_id = 0", project_id, item_id).Order("project_id").Find(&reference).Error
+	return
+}
+
+func GetInspectionTwo(startime int64, endtime int64, orgid int64, projectid int64, itemid int64) (inspection []*models.Inspection, total int64, err error) {
+	db := XTReadDB().Table("xt_inspection as x").Where("x.status = 1")
+	db = db.Where("project_id = ? and item_id = ?", projectid, itemid)
+	if startime > 0 {
+		db = db.Where("x.inspect_date >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.inspect_date<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if projectid > 0 {
+		db = db.Where("x.project_id = ?", projectid)
+	}
+	err = db.Count(&total).Order("x.inspect_date desc").Group("x.id").
+		Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,x.created_time").Find(&inspection).Error
+	return inspection, total, err
+}
+
+// 查出日期差小于3天的数据
+func GetAllInspectionRemind(org_id int64, patient_id int64) (check []models.XtCheckRemind, err error) {
+	err = readDb.Model(&models.XtCheckRemind{}).Preload("InspectionReference", "status = 1").Where("patient_id = ? and status = 1  and user_org_id = ? and DATEDIFF(FROM_UNIXTIME(last_remind_date),NOW()) < 3 and last_remind_date <> 0", patient_id, org_id).Find(&check).Error
+	return
+}

service/patientmanage_service.go

@@ -1000,9 +1000,7 @@ func GetInspectionByOrgId(orgid int64) (*models.XtInspectionReference, error) {
 }
 
 func GetAllProjectName(date int64, orgid int64, patientid int64) (inspection []*models.XtInspection, err error) {
-
 	err = XTReadDB().Model(&inspection).Where("inspect_date = ? and org_id = ? and patient_id = ? and status = 1", date, orgid, patientid).Order("inspect_date desc").Group("project_name").Find(&inspection).Error
-
 	return inspection, err
 }
 
@@ -1956,3 +1954,67 @@ func DeleteFirstDisease(id []string) error {
 	err := XTWriteDB().Model(models.XtPatientFirstDisease{}).Where("id in (?) and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
+
+type InspectionCount struct {
+	Count int64
+}
+
+func GetNormalInspectionTotalByID(startime int64, endtime int64, orgid int64, projectid int64, item_id int64, max_value float64, min_value float64) (total int64, err error) {
+	var count []*InspectionCount
+	err2 := XTReadDB().Table("xt_inspection as xti ").Select("count(*) as count").Joins("join (SELECT max(inspect_date) as ind, patient_id as pid  FROM xt_inspection as x  WHERE (x.status = 1) AND (x.org_id = ? and x.reference_project_id = ? and x.reference_item_id = ?  and x.inspect_date >= ? and x.inspect_date <= ?) group by patient_id) as ta on ta.ind = xti.`inspect_date` and xti.patient_id = ta.pid  WHERE (xti.status = 1) AND (xti.org_id = ? and xti.reference_project_id = ? and xti.reference_item_id = ?  and xti.inspect_date >= ? and xti.inspect_date<= ? and xti.`inspect_value` < ? and xti.inspect_value > ? ) Group by xti.patient_id", orgid, projectid, item_id, startime, endtime, orgid, projectid, item_id, startime, endtime, max_value, min_value).Scan(&count).Error
+	for _, items := range count {
+		total = total + items.Count
+	}
+	return total, err2
+}
+func GetUnusualInspectionTotalByID(startime int64, endtime int64, orgid int64, projectid int64, item_id int64, max_value float64, min_value float64) (total int64, err error) {
+	var count []*InspectionCount
+	err2 := XTReadDB().Table("xt_inspection as xti ").Select("count(*) as count").Joins("join (SELECT max(inspect_date) as ind, patient_id as pid  FROM xt_inspection as x  WHERE (x.status = 1) AND (x.org_id = ? and x.reference_project_id = ? and x.reference_item_id = ?  and x.inspect_date >= ? and x.inspect_date <= ?) group by patient_id) as ta on ta.ind = xti.`inspect_date` and xti.patient_id = ta.pid  WHERE   (xti.status = 1 AND xti.org_id = ? and xti.reference_project_id = ? and xti.reference_item_id = ?  and xti.inspect_date >= ? and xti.inspect_date <= ? and xti.inspect_value > ?) OR (xti.status = 1 AND xti.org_id = ? and xti.reference_project_id = ? and xti.reference_item_id = ?  and xti.inspect_date >= ? and xti.inspect_date <= ? and xti.inspect_value < ?) Group by xti.patient_id", orgid, projectid, item_id, startime, endtime, orgid, projectid, item_id, startime, endtime, max_value, orgid, projectid, item_id, startime, endtime, min_value).Scan(&count).Error
+	for _, items := range count {
+		total = total + items.Count
+	}
+	return total, err2
+}
+
+func GetPatientNotInspectionTotal(startime int64, endtime int64, orgid int64, projectid int64, item_id int64) (total int64, err error) {
+	err = XTReadDB().Model(models.XtPatients{}).Joins("LEFT JOIN xt_inspection pd ON xt_patients.id = pd.patient_id and pd.org_id = ? and pd.reference_project_id = ? and pd.reference_item_id = ? and pd.inspect_date >= ? and pd.inspect_date<=? ", orgid, projectid, item_id, startime, endtime).Where("xt_patients.user_org_id = ? and xt_patients.status = 1 and pd.patient_id IS NULL", orgid).Count(&total).Error
+	return total, err
+}
+
+func GetPatientInspectionByID(startime int64, endtime int64, orgid int64, projectid int64, item_id int64, patient_id int64) (inspections []*models.Inspection, err error) {
+	db := XTReadDB().Table("xt_inspection as x").Select("patient_id,inspect_date,inspect_value").Where("x.status = 1")
+	if startime > 0 {
+		db = db.Where("x.inspect_date >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.inspect_date<=?", endtime)
+	}
+
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if projectid > 0 {
+		db = db.Where("x.reference_project_id = ?", projectid)
+	}
+	if item_id > 0 {
+		db = db.Where("x.reference_item_id = ?", item_id)
+	}
+	if patient_id > 0 {
+		db = db.Where("x.patient_id = ?", patient_id)
+	}
+	err = db.Find(&inspections).Error
+	return inspections, err
+}
+
+func GetNormalInspectionPatientList(startime int64, endtime int64, orgid int64, projectid int64, item_id int64, max_value float64, min_value float64, order_type int64, keyword string) (xti []*models.Inspection, err error) {
+	err2 := XTReadDB().Table("xt_inspection as xti ").Select("xti.patient_id as patient_id,xti.inspect_date as inspect_date,xti.inspect_value as value").Joins("join (SELECT max(inspect_date) as ind, patient_id as pid  FROM xt_inspection as x  WHERE (x.status = 1) AND (x.org_id = ? and x.reference_project_id = ? and x.reference_item_id = ?  and x.inspect_date >= ? and x.inspect_date <= ?) group by patient_id) as ta on ta.ind = xti.`inspect_date` and xti.patient_id = ta.pid  WHERE (xti.status = 1) AND (xti.org_id = ? and xti.reference_project_id = ? and xti.reference_item_id = ?  and xti.inspect_date >= ? and xti.inspect_date<= ? and xti.`inspect_value` < ? and xti.inspect_value > ? ) Group by xti.patient_id", orgid, projectid, item_id, startime, endtime, orgid, projectid, item_id, startime, endtime, max_value, min_value).Scan(&xti).Error
+	return xti, err2
+}
+func GetUnusualInspectionPatientList(startime int64, endtime int64, orgid int64, projectid int64, item_id int64, max_value float64, min_value float64, order_type int64, keyword string) (xti []*models.Inspection, err error) {
+	err2 := XTReadDB().Table("xt_inspection as xti ").Select("xti.patient_id as patient_id,xti.inspect_date as inspect_date,xti.inspect_value as value").Joins("join (SELECT max(inspect_date) as ind, patient_id as pid  FROM xt_inspection as x  WHERE (x.status = 1) AND (x.org_id = ? and x.reference_project_id = ? and x.reference_item_id = ?  and x.inspect_date >= ? and x.inspect_date <= ?) group by patient_id) as ta on ta.ind = xti.`inspect_date` and xti.patient_id = ta.pid  WHERE   (xti.status = 1 AND xti.org_id = ? and xti.reference_project_id = ? and xti.reference_item_id = ?  and xti.inspect_date >= ? and xti.inspect_date <= ? and xti.inspect_value > ?) OR (xti.status = 1 AND xti.org_id = ? and xti.reference_project_id = ? and xti.reference_item_id = ?  and xti.inspect_date >= ? and xti.inspect_date <= ? and xti.inspect_value < ?) Group by xti.patient_id", orgid, projectid, item_id, startime, endtime, orgid, projectid, item_id, startime, endtime, max_value, orgid, projectid, item_id, startime, endtime, min_value).Scan(&xti).Error
+	return xti, err2
+}
+func GetPatientNotInspectionPatientList(startime int64, endtime int64, orgid int64, projectid int64, item_id int64, keyword string) (patient models.XtPatients, err error) {
+	err = XTReadDB().Model(models.XtPatients{}).Joins("LEFT JOIN xt_inspection pd ON xt_patients.id = pd.patient_id and pd.org_id = ? and pd.reference_project_id = ? and pd.reference_item_id = ? and pd.inspect_date >= ? and pd.inspect_date<=? ", orgid, projectid, item_id, startime, endtime).Where("xt_patients.user_org_id = ? and xt_patients.status = 1 and pd.patient_id IS NULL", orgid).Find(&patient).Error
+	return patient, err
+}