百霖

service/bl_service.go

@@ -243,8 +243,8 @@ func GetResultRecord() (record []CmResult, err error) {
 	return
 }
 
-func GetResultRecordByID(id int64) (record []*CmResult, err error) {
-	err = readDb.Model(&CmResult{}).Where("barcode > ?", id).Order("barcode desc").Find(&record).Error
+func GetResultRecordByID(id int64) (record []CmResult, err error) {
+	err = readDb.Model(&CmResult{}).Where("barcode > ?", id).Order("barcode asc").Find(&record).Error
 	return
 }
 
@@ -532,17 +532,7 @@ func GetResultDataInsertDB(org_id int64) (result []*CmResult) {
 		list, err := GetResultRecord()
 		if err == nil {
 			fmt.Println(list)
-			//插入一条查询检验检查结果记录状态数据
-			var info LisSyncResultStatusInfo
-			info.Ctime = time.Now().Unix()
-			info.Status = 1
-			info.Mtime = time.Now().Unix()
-			info.OrgId = org_id
-			info.IsResult = 1
-			code, _ := strconv.ParseInt(list[0].Barcode, 10, 64)
-			info.LastId = code
-			info.ResultDate = time.Now().Unix()
-			writeMiddleDb.Save(&info)
+
 			//插入到系统检验检查数据
 			for _, item := range list {
 				fmt.Println(item)
@@ -651,18 +641,134 @@ func GetResultDataInsertDB(org_id int64) (result []*CmResult) {
 				tx.Commit()
 
 			}
+			//插入一条查询检验检查结果记录状态数据
+			var info LisSyncResultStatusInfo
+			info.Ctime = time.Now().Unix()
+			info.Status = 1
+			info.Mtime = time.Now().Unix()
+			info.OrgId = org_id
+			info.IsResult = 1
+			code, _ := strconv.ParseInt(list[0].Barcode, 10, 64)
+			info.LastId = code
+			info.ResultDate = time.Now().Unix()
+			writeMiddleDb.Save(&info)
 			//
 		}
 
 	} else {
 		if record.LastId != 0 {
 
-			list, err := GetResultRecordByID(record.LastId)
+			list, err := GetResultRecord()
 			fmt.Println(list)
 			//插入中间库中
 			//插入一条插入中间库记录数据
 			if err == nil {
 
+				//插入到系统检验检查数据
+				for _, item := range list {
+
+					project_id := int64(0)
+					if len("180") > 0 {
+						project_id, _ = GetBljhProjectID(org_id, item.Groupname)
+					} else {
+						continue
+					}
+					printInfo, _ := GetHisLabelPrintInfoById("180")
+
+					item_id, _ := GetBlItemID(org_id, item.Groupname, item.Itemname, project_id)
+
+					tx := writeMiddleDb.Begin()
+					var inspection models.MiddleInspection
+					var inspection_reference models.MiddleInspectionReference
+
+					recordDateStr := ""
+					inspect_date := item.Repdate.Format("2006-01-02 15:04")
+					if item.Repdate.Unix() == 0 {
+						recordDateStr = time.Now().Format("2006-01-02 15:04")
+					} else {
+
+						recordDateStr = inspect_date
+					}
+
+					date, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", recordDateStr)
+					record_date, _ := utils.ParseTimeStringToTime("2006-01-02", date.Format("2006-01-02"))
+					var total int
+					var RangeOptions string
+					var RangeMin string
+					var RangeMax string
+					// 判断检查类型
+					var ItemType int
+					if strings.Contains(item.Refrange, "-") {
+						ItemType = 1
+
+					} else {
+						ItemType = 2
+
+					}
+
+					if ItemType == 1 {
+						Range := strings.Split(item.Refrange, "-")
+						RangeMin = Range[0]
+						RangeMax = Range[1]
+					} else {
+						RangeOptions = item.Refrange
+					}
+
+					err = readMiddleDb.Model(&models.MiddleInspectionReference{}).Where("org_id = ? and project_id = ? and item_id = ? and status = 1", org_id, project_id, item_id).Find(&inspection_reference).Count(&total).Error
+					if inspection_reference.ID > 0 {
+						ItemType = inspection_reference.RangeType
+					}
+					if total <= 0 {
+						inspection_reference.OrgId = org_id
+						inspection_reference.ProjectName = item.Groupname
+						inspection_reference.Project = item.Groupname
+						inspection_reference.ProjectId = project_id
+						inspection_reference.ItemName = item.Itemname
+						inspection_reference.ItemNameAddition = item.Barcode
+						inspection_reference.ItemId = item_id
+						inspection_reference.RangeType = ItemType
+						inspection_reference.RangeMin = RangeMin
+						inspection_reference.RangeMax = RangeMax
+						inspection_reference.RangeOptions = RangeOptions
+						inspection_reference.Unit = item.Unit
+						inspection_reference.Status = 1
+						inspection_reference.CreatedTime = time.Now().Unix()
+						inspection_reference.UpdatedTime = time.Now().Unix()
+						inspection_reference.InspectDate = inspect_date
+						inspection_reference.UTime = inspect_date
+						err = tx.Model(&models.MiddleInspectionReference{}).Create(&inspection_reference).Error
+						if err != nil {
+							tx.Rollback()
+						}
+					}
+
+					var itotal int
+					err = readMiddleDb.Model(&models.MiddleInspection{}).Where("org_id = ? and project_id = ? and item_id = ? and record_date = ? and patient_id = ?  and status = 1", org_id, project_id, item_id, record_date, printInfo.PatientId).Find(&inspection).Count(&itotal).Error
+					if itotal <= 0 {
+						inspection.PatientId = printInfo.PatientId
+						inspection.OrgId = org_id
+						inspection.ProjectId = project_id
+						inspection.ItemName = inspection_reference.ItemName
+						inspection.ProjectName = inspection_reference.ProjectName
+						inspection.InspectType = ItemType
+						inspection.ItemId = item_id
+						inspection.InspectValue = item.Result
+						inspection.InspectDate = inspect_date
+						inspection.RecordDate = record_date.Unix()
+						inspection.Status = 1
+						inspection.CreatedTime = time.Now().Unix()
+						inspection.UpdatedTime = time.Now().Unix()
+						inspection.UTime = inspect_date
+						inspection.HisUserId = strconv.FormatInt(printInfo.PatientId, 10)
+						err = tx.Model(&models.MiddleInspection{}).Create(&inspection).Error
+						if err != nil {
+							tx.Rollback()
+						}
+					}
+
+					tx.Commit()
+
+				}
 				//插入一条查询检验检查结果记录状态数据
 				var info LisSyncResultStatusInfo
 				info.Ctime = time.Now().Unix()
@@ -674,113 +780,6 @@ func GetResultDataInsertDB(org_id int64) (result []*CmResult) {
 				info.LastId = code
 				info.ResultDate = time.Now().Unix()
 				writeMiddleDb.Save(&info)
-				//插入到系统检验检查数据
-				//for _, item := range list {
-				//
-				//	project_id := int64(0)
-				//	if len(item.Barcode) > 0 {
-				//		project_id, _ = GetGzjhProjectID(org_id, item.Groupname)
-				//	} else {
-				//		continue
-				//	}
-				//	printInfo, _ := GetHisLabelPrintInfoById(item.Barcode)
-				//
-				//	item_id, _ := GetItemID(org_id, item.Groupname, item.Itemname, project_id)
-				//
-				//	tx := writeMiddleDb.Begin()
-				//	var inspection models.MiddleInspection
-				//	var inspection_reference models.MiddleInspectionReference
-				//
-				//	recordDateStr := ""
-				//
-				//	if len(item.Repdate) == 0 {
-				//		recordDateStr = time.Now().Format("2006-01-02 15:04")
-				//	}
-				//
-				//	inspect_date := item.Repdate
-				//	date, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", recordDateStr)
-				//	record_date, _ := utils.ParseTimeStringToTime("2006-01-02", date.Format("2006-01-02"))
-				//	var total int
-				//	var RangeOptions string
-				//	var RangeMin string
-				//	var RangeMax string
-				//	// 判断检查类型
-				//	var ItemType int
-				//	if strings.Contains(item.Refrange, "[") && strings.Contains(item.Refrange, "]") {
-				//		ItemType = 1
-				//
-				//	} else {
-				//		ItemType = 2
-				//
-				//	}
-				//
-				//	if ItemType == 1 {
-				//		item.Refrange = strings.Trim(item.Refrange, "[")
-				//		item.Refrange = strings.Trim(item.Refrange, "]")
-				//		Range := strings.Split(item.Refrange, "-")
-				//		RangeMin = Range[0]
-				//		RangeMax = Range[1]
-				//	} else {
-				//		RangeOptions = item.Refrange
-				//	}
-				//
-				//	err = readMiddleDb.Model(&models.MiddleInspectionReference{}).Where("org_id = ? and project_id = ? and item_id = ? and status = 1", org_id, project_id, item_id).Find(&inspection_reference).Count(&total).Error
-				//	if inspection_reference.ID > 0 {
-				//		ItemType = inspection_reference.RangeType
-				//	}
-				//	if total <= 0 {
-				//		inspection_reference.OrgId = org_id
-				//		inspection_reference.ProjectName = item.Groupname
-				//		inspection_reference.Project = item.Groupname
-				//		inspection_reference.ProjectId = project_id
-				//		inspection_reference.ItemName = item.Itemname
-				//		inspection_reference.ItemNameAddition = item.Barcode
-				//		inspection_reference.ItemId = item_id
-				//		inspection_reference.RangeType = ItemType
-				//		inspection_reference.RangeMin = RangeMin
-				//		inspection_reference.RangeMax = RangeMax
-				//		inspection_reference.RangeOptions = RangeOptions
-				//		inspection_reference.Unit = item.Unit
-				//		inspection_reference.Status = 1
-				//		inspection_reference.CreatedTime = time.Now().Unix()
-				//		inspection_reference.UpdatedTime = time.Now().Unix()
-				//		inspection_reference.InspectDate = inspect_date
-				//		inspection_reference.UTime = inspect_date
-				//		err = tx.Model(&models.MiddleInspectionReference{}).Create(&inspection_reference).Error
-				//		if err != nil {
-				//			tx.Rollback()
-				//		}
-				//	}
-				//
-				//	var itotal int
-				//	err = readMiddleDb.Model(&models.MiddleInspection{}).Where("org_id = ? and project_id = ? and item_id = ? and record_date = ? and patient_id = ?  and status = 1", org_id, project_id, item_id, record_date, printInfo.PatientId).Find(&inspection).Count(&itotal).Error
-				//	if itotal <= 0 {
-				//		//item.Result = strings.Replace(item.Result, "&gt;", ">", -1)
-				//		//item.Result = strings.Replace(item.Result, "&lt;", "<", -1)
-				//		inspection.PatientId = printInfo.PatientId
-				//		inspection.OrgId = org_id
-				//		inspection.ProjectId = project_id
-				//		inspection.ItemName = inspection_reference.ItemName
-				//		inspection.ProjectName = inspection_reference.ProjectName
-				//		inspection.InspectType = ItemType
-				//		inspection.ItemId = item_id
-				//		inspection.InspectValue = item.Result
-				//		inspection.InspectDate = inspect_date
-				//		inspection.RecordDate = record_date.Unix()
-				//		inspection.Status = 1
-				//		inspection.CreatedTime = time.Now().Unix()
-				//		inspection.UpdatedTime = time.Now().Unix()
-				//		inspection.UTime = inspect_date
-				//		inspection.HisUserId = strconv.FormatInt(printInfo.PatientId, 10)
-				//		err = tx.Model(&models.MiddleInspection{}).Create(&inspection).Error
-				//		if err != nil {
-				//			tx.Rollback()
-				//		}
-				//	}
-				//
-				//	tx.Commit()
-				//
-				//}
 
 			}