checkreport

controllers/api_base_controller.go

@@ -51,6 +51,7 @@ func ApiControllersRegisterRouters() {
 	beego.Router("/xcx/api/checkrecord/getcheckrecorditembyid", &CheckRecordApiController{}, "Get:GetCheckRecordItemById")
 	beego.Router("/xcx/api/checkrecord/getcheckrecordlist", &CheckRecordApiController{}, "Get:GetCheckRecordList")
 	beego.Router("/xcx/api/checkrecord/qrcodecheckrecord", &CheckRecordApiController{}, "Get:QrCodeCheckRecord")
+	beego.Router("/xcx/api/checkrecord/getcheckrecorditemreport", &CheckRecordApiController{}, "Get:GetCheckRecordItemReport")
 
 }
 

controllers/check_record_api_controller.go

@@ -42,18 +42,31 @@ func (c *CheckRecordApiController) GetCheckRecordList() {
 
 }
 
-/**********
 // @Title GetCheckRecordItemReport
 // @Description 获取检测报告
-// @Param   itemid query int true "项目ID"
+// @Param   itemnum query int true "项目编号"
 // @Param   daymun query int true "最近几天"
-// @Success 200 {object} models.AppCheckRecordItemReportVO success
+// @Success 200 {array} models.AppCheckRecordItemReportVO success
 // @Failure 500 error
 // @Security token
 // @router /getcheckrecorditemreport [get]
 func (c *CheckRecordApiController) GetCheckRecordItemReport() {
+	itemNum, err := c.GetInt("itemnum")
+	if err != nil {
+		c.ServeDynamicFailJsonSend(err.Error())
+		return
+	}
+	dataNum, _ := c.GetInt("dataNum", 7)
 
-}**/
+	report, err := service.NewCheckRecordService().GetCheckRecordItemReport(dataNum, itemNum, c.CurrentUser.Id)
+	if err != nil {
+		c.ServeDynamicFailJsonSend(err.Error())
+		return
+	}
+
+	c.ServeSuccessJSON(report)
+
+}
 
 // @Title GetCheckRecordItemById
 // @Description 通过检测ID查看检测结果
@@ -92,7 +105,7 @@ func (c *CheckRecordApiController) GetCheckRecordItemById() {
 		c.ServeDynamicFailJsonSend(fmt.Sprintf("analyzeCheckRecord err：%v", err))
 		return
 	}
-	checkRecordItem.CheckDate = record.Ctime
+	checkRecordItem.CheckDate = models.Time(record.Ctime)
 	checkRecordItem.UserID = int64(record.UserId)
 	checkRecordItem.Bind = checkRecordItem.UserID > 0
 	checkRecordItem.CheckRecordID = record.Id
@@ -291,7 +304,7 @@ func (c *CheckRecordApiController) QrCodeCheckRecord() {
 			return
 		}
 		checkRecordItem.Status = status
-		checkRecordItem.CheckDate = record.Ctime
+		checkRecordItem.CheckDate = models.Time(record.Ctime)
 		checkRecordItem.UserID = int64(record.UserId)
 		checkRecordItem.Bind = checkRecordItem.UserID > 0
 		checkRecordItem.CheckRecordID = record.Id

controllers/message_api_controllor.go

@@ -165,7 +165,7 @@ func createCheckRecordItem(items []*models.CheckItem, crId int64, alerts *[]stri
 	}
 
 	cri.CheckValue = scope.Value
-	if scope.Type == 1 {
+	if scope.Type != 1 {
 		*alerts = append(*alerts, strconv.Itoa(n))
 	}
 	return crs.CreateCheckRecordItem(&cri)

models/httpmodels.go

@@ -213,7 +213,7 @@ type AppCheckRecordItemVO struct {
 	AlertCount    int                           `json:"alert_count" description:"异常数量"`
 	NormalCount   int                           `json:"normal_count" description:"正常数量"`
 	Describe      string                        `json:"describe" description:"描述"`
-	CheckDate     time.Time                     `json:"check_date" description:"检测日期"`
+	CheckDate     Time                          `json:"check_date" description:"检测日期"`
 	CheckRecordID int64                         `json:"check_record_id" description:"检测记录id"`
 	UserID        int64                         `json:"user_id" description:"绑定用户id 默认自己"`
 	AlertGrade    int                           `json:"alert_grade" description:"风险等级 1 低  2 中 3 高"`

service/checkitemservice.go

@@ -28,3 +28,19 @@ func (s *CheckItemService) GetCheckItems(lang, t string) ([]*models.CheckItem, e
 	err := db.Order("check_item_number").Find(&items).Error
 	return items, err
 }
+
+func (s *CheckItemService) GetCheckItemById(id int64) (item models.CheckItem, err error) {
+	err = s.rdb.Where("id = ?", id).First(&item).Error
+	if err == gorm.ErrRecordNotFound {
+		err = nil
+	}
+	return
+}
+
+func (s *CheckItemService) GetCheckItemByNumber(number int, lang, deviceType string) (item models.CheckItem, err error) {
+	err = s.rdb.Where("check_item_number = ? and language= ? and device_type= ? ", number, lang, deviceType).First(&item).Error
+	if err == gorm.ErrRecordNotFound {
+		err = nil
+	}
+	return
+}

service/checkrecordservice.go

@@ -1,6 +1,8 @@
 package service
 
 import (
+	"encoding/json"
+	"fmt"
 	"strconv"
 	"strings"
 	"sws_xcx/models"
@@ -34,7 +36,7 @@ func (s *CheckRecordService) GetCheckRecordByAcc(deviceId uint64, acc int) (reco
 func (s *CheckRecordService) GetCheckRecordList(pageNum, pageSize int, userid uint64) (vos []models.AppCheckRecordVO, total int, err error) {
 	offset := (pageNum - 1) * pageSize
 	records := make([]*models.CheckRecord, pageSize)
-	err = s.rdb.Model(&models.CheckRecord{}).Where("user_id= ? and delete_flag = ?", 0).Count(&total).Order("id desc").Offset(offset).Limit(pageSize).Find(&records).Error
+	err = s.rdb.Model(&models.CheckRecord{}).Where("user_id= ? and delete_flag = ?", userid, 0).Count(&total).Order("id desc").Offset(offset).Limit(pageSize).Find(&records).Error
 	if len(records) > 0 {
 		is := NewCheckItemService()
 		cnItems, err1 := is.GetCheckItems("cn", "1")
@@ -83,6 +85,47 @@ func (s *CheckRecordService) GetCheckRecordList(pageNum, pageSize int, userid ui
 	return
 }
 
+func (s *CheckRecordService) GetCheckRecordItemReport(dataNum, itemNum int, userid uint64) (reports []*models.AppCheckRecordItemReportVO, err error) {
+
+	item, err := NewCheckItemService().GetCheckItemByNumber(itemNum, "cn", "1")
+	if err != nil {
+		return
+	}
+	if item.Id == 0 {
+		err = fmt.Errorf("系统无此检查项目 num:%v", itemNum)
+		return
+	}
+
+	var items []*models.CheckRecordItem
+
+	err = s.rdb.Raw("select i.* from  check_record_item as i inner join check_record as c on i.check_id=c.id where i.check_item_id = ? and c.user_id = ? and c.delete_flag=0", item.Id, userid).Order("id desc").Limit(dataNum).Scan(&items).Error
+
+	if len(items) > 0 {
+		var scopes []*models.CheckItemScopeVO
+		json.Unmarshal([]byte(item.ScopeList), &scopes)
+		reports = make([]*models.AppCheckRecordItemReportVO, len(items))
+		for i, ci := range items {
+			report := models.AppCheckRecordItemReportVO{}
+			report.ID = item.CheckItemNumber
+			report.CheckValueIndex = ci.CheckValueIndex
+			report.Unit = item.Unit
+			report.Date = models.Time(ci.Ctime)
+			for _, scope := range scopes {
+				if scope.Index == ci.CheckValueIndex {
+					if scope.Num != "" {
+						report.Value = scope.Num
+					} else {
+						report.Value = scope.Value
+					}
+				}
+			}
+			reports[i] = &report
+		}
+	}
+
+	return
+}
+
 func (s *CheckRecordService) CreateCheckRecord(checkRecord *models.CheckRecord) error {
 	return s.wdb.Model(checkRecord).Create(checkRecord).Error
 }

service/deviceservice.go

@@ -22,7 +22,7 @@ func NewDeviceService() *DeviceService {
 func (s *DeviceService) GetDeviceInfo(id int) (models.Device, error) {
 	var device models.Device
 	err := s.rdb.Model(&device).First(&device, id).Error
-	if err == nil || err == gorm.ErrRecordNotFound {
+	if err == gorm.ErrRecordNotFound {
 		err = nil
 	}
 	return device, err
@@ -38,7 +38,7 @@ func (s *DeviceService) GetDeviceInfo(id int) (models.Device, error) {
 // 		db = db.Where("user_id = ?", userId)
 // 	}
 // 	err := db.First(&device_relate).Error
-// 	if err == nil || err == gorm.ErrRecordNotFound {
+// 	if err == gorm.ErrRecordNotFound {
 // 		err = nil
 // 	}
 // 	return device_relate, err
@@ -47,7 +47,7 @@ func (s *DeviceService) GetDeviceInfo(id int) (models.Device, error) {
 func (s *DeviceService) GetDeviceByNo(serialno string) (models.Device, error) {
 	var device models.Device
 	err := s.rdb.Model(&device).Where("serialno = ?", serialno).First(&device).Error
-	if err == nil || err == gorm.ErrRecordNotFound {
+	if err == gorm.ErrRecordNotFound {
 		err = nil
 	}
 	return device, err

service/userhealthprofileservice.go

@@ -25,7 +25,7 @@ func NewUserHealthProfileService() *HealthProfileService {
 func (s *HealthProfileService) GetUserHealthProfileByUserId(userId uint64) (*models.UserHealthProfile, error) {
 	p := &models.UserHealthProfile{}
 	err := s.rdb.Find(p, "user_id = ?", userId).Error
-	if err == nil || err == gorm.ErrRecordNotFound {
+	if err == gorm.ErrRecordNotFound {
 		err = nil
 	}
 	return p, err
@@ -34,7 +34,7 @@ func (s *HealthProfileService) GetUserHealthProfileByUserId(userId uint64) (*mod
 func (s *HealthProfileService) Get(id uint64) (models.UserHealthProfile, error) {
 	p := &models.UserHealthProfile{}
 	err := s.rdb.First(p, id).Error
-	if err == nil || err == gorm.ErrRecordNotFound {
+	if err == gorm.ErrRecordNotFound {
 		err = nil
 	}
 	return *p, err

swagger/swagger.json

@@ -46,6 +46,52 @@
                 ]
             }
         },
+        "/api/checkrecord/getcheckrecorditemreport": {
+            "get": {
+                "tags": [
+                    "api/checkrecord"
+                ],
+                "description": "获取检测报告\n\u003cbr\u003e",
+                "operationId": "CheckRecordApiController.GetCheckRecordItemReport",
+                "parameters": [
+                    {
+                        "in": "query",
+                        "name": "itemnum",
+                        "description": "项目编号",
+                        "required": true,
+                        "type": "integer",
+                        "format": "int64"
+                    },
+                    {
+                        "in": "query",
+                        "name": "daymun",
+                        "description": "最近几天",
+                        "required": true,
+                        "type": "integer",
+                        "format": "int64"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "success",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.AppCheckRecordItemReportVO"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "error"
+                    }
+                },
+                "security": [
+                    {
+                        "token": []
+                    }
+                ]
+            }
+        },
         "/api/checkrecord/getcheckrecordlist": {
             "get": {
                 "tags": [
@@ -611,6 +657,38 @@
                 }
             }
         },
+        "models.AppCheckRecordItemReportVO": {
+            "title": "AppCheckRecordItemReportVO",
+            "type": "object",
+            "properties": {
+                "check_value_index": {
+                    "description": "检测值下标",
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "date": {
+                    "$ref": "#/definitions/models.Time",
+                    "description": "检测时间"
+                },
+                "describe": {
+                    "description": "描述",
+                    "type": "string"
+                },
+                "id": {
+                    "description": "id",
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "unit": {
+                    "description": "单位",
+                    "type": "string"
+                },
+                "value": {
+                    "description": "检测值",
+                    "type": "string"
+                }
+            }
+        },
         "models.AppCheckRecordItemVO": {
             "title": "AppCheckRecordItemVO",
             "type": "object",

swagger/swagger.yml

@@ -32,6 +32,38 @@ paths:
           description: error
       security:
       - token: []
+  /api/checkrecord/getcheckrecorditemreport:
+    get:
+      tags:
+      - api/checkrecord
+      description: |-
+        获取检测报告
+        <br>
+      operationId: CheckRecordApiController.GetCheckRecordItemReport
+      parameters:
+      - in: query
+        name: itemnum
+        description: 项目编号
+        required: true
+        type: integer
+        format: int64
+      - in: query
+        name: daymun
+        description: 最近几天
+        required: true
+        type: integer
+        format: int64
+      responses:
+        "200":
+          description: success
+          schema:
+            type: array
+            items:
+              $ref: '#/definitions/models.AppCheckRecordItemReportVO'
+        "500":
+          description: error
+      security:
+      - token: []
   /api/checkrecord/getcheckrecordlist:
     get:
       tags:
@@ -425,6 +457,30 @@ definitions:
       value_index:
         description: 检测值索引
         type: string
+  models.AppCheckRecordItemReportVO:
+    title: AppCheckRecordItemReportVO
+    type: object
+    properties:
+      check_value_index:
+        description: 检测值下标
+        type: integer
+        format: int64
+      date:
+        $ref: '#/definitions/models.Time'
+        description: 检测时间
+      describe:
+        description: 描述
+        type: string
+      id:
+        description: id
+        type: integer
+        format: int64
+      unit:
+        description: 单位
+        type: string
+      value:
+        description: 检测值
+        type: string
   models.AppCheckRecordItemVO:
     title: AppCheckRecordItemVO
     type: object

tests/default_test.go

@@ -404,7 +404,7 @@ func TestHandleQrCode(t *testing.T) {
 			return
 		}
 		checkRecordItem.Status = status
-		checkRecordItem.CheckDate = record.Ctime
+		checkRecordItem.CheckDate = models.Time(record.Ctime)
 		checkRecordItem.UserID = int64(record.UserId)
 		checkRecordItem.Bind = checkRecordItem.UserID > 0
 		checkRecordItem.CheckRecordID = record.Id