提交代码

controllers/inspection_api_controller.go

@@ -645,9 +645,11 @@ func (c *InspectionApiController) EditPatientInspection() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInspectionDateNotExit)
 		return
 	}
-	inspMap := make(map[int64]*models.Inspection)
+	inspMap := make(map[string]models.Inspection)
 	for _, item := range insp {
-		inspMap[item.ID] = item
+		fmt.Println(item.ID)
+		a := strconv.FormatInt(item.ProjectId, 10) + "-" + strconv.FormatInt(item.ItemId, 10)
+		inspMap[a] = item
 	}
 
 	addinsp := make([]models.Inspection, 0)
@@ -657,32 +659,40 @@ func (c *InspectionApiController) EditPatientInspection() {
 
 	for _, item := range from.FormItem {
 		fmt.Println(item.ID)
-		if item.ID == 0 {
-			var inspection models.Inspection
-			inspection.OrgId = adminUserInfo.CurrentOrgId
-			inspection.PatientId = patient
-			inspection.ProjectId = from.ProjectId
-			inspection.ItemId = item.ItemId
-			inspection.ItemName = item.ItemName
-			inspection.ProjectName = item.ProjectName
-			inspection.InspectType = item.RangeType
-			inspection.InspectValue = item.Value
-			inspection.InspectDate = date
-			inspection.Status = 1
-			inspection.CreatedTime = time.Now().Unix()
-			inspection.UpdatedTime = time.Now().Unix()
-			addinsp = append(addinsp, inspection)
-		} else {
-			inspection := *inspMap[item.ID]
-			inspection.InspectValue = item.Value
-			inspection.InspectDate = date
-			inspection.UpdatedTime = time.Now().Unix()
-			editinsp = append(editinsp, inspection)
-			noMap = append(noMap, item.ID)
-		}
 
-	}
+		ref, _ := service.GetInspectionReferenceById(item.ItemId)
+		//if item.ID == 0 {
+		//	var inspection models.Inspection
+		//	inspection.OrgId = adminUserInfo.CurrentOrgId
+		//	inspection.PatientId = patient
+		//	inspection.ProjectId = from.ProjectId
+		//	inspection.ItemId = item.ItemId
+		//	inspection.ItemName = item.ItemName
+		//	inspection.ProjectName = item.ProjectName
+		//	inspection.InspectType = item.RangeType
+		//	inspection.InspectValue = item.Value
+		//	inspection.InspectDate = date
+		//	inspection.Status = 1
+		//	inspection.CreatedTime = time.Now().Unix()
+		//	inspection.UpdatedTime = time.Now().Unix()
+		//	addinsp = append(addinsp, inspection)
+		//} else {
+		//fmt.Println(item.ID)
+		a := strconv.FormatInt(item.ProjectId, 10) + "-" + strconv.FormatInt(ref.ItemId, 10)
+		fmt.Println(a)
+		fmt.Println(inspMap)
+
+		inspection := inspMap[a]
+		inspection.InspectValue = item.Value
+		inspection.InspectDate = date
+		inspection.UpdatedTime = time.Now().Unix()
+		editinsp = append(editinsp, inspection)
+		noMap = append(noMap, item.ID)
+		//}
 
+	}
+	//fmt.Println(editinsp)
+	//return
 	err = service.EditPatientInspection(addinsp, editinsp, noMap, patient, adminUserInfo.CurrentOrgId, from.ProjectId, date)
 	if err != nil {
 		utils.ErrorLog("%v", err)
@@ -894,7 +904,7 @@ func (c *InspectionApiController) GetAllPatientInspection() {
 
 	switch upload_type {
 	case 1:
-		var inspections []*models.Inspection
+		var inspections []models.Inspection
 
 		for _, item := range ids {
 			id, _ := strconv.ParseInt(item, 10, 64)
@@ -933,7 +943,7 @@ func (c *InspectionApiController) GetAllPatientInspection() {
 
 		break
 	case 3:
-		var inspections []*models.Inspection
+		var inspections []models.Inspection
 
 		for _, item := range ids {
 			id, _ := strconv.ParseInt(item, 10, 64)
@@ -992,7 +1002,7 @@ func (c *InspectionApiController) GetAllPatientInspection() {
 
 		break
 	case 6:
-		var inspections []*models.Inspection
+		var inspections []models.Inspection
 
 		for _, item := range ids {
 			id, _ := strconv.ParseInt(item, 10, 64)
@@ -1015,7 +1025,7 @@ func (c *InspectionApiController) GetAllPatientInspection() {
 
 		break
 	case 7:
-		var inspections []*models.Inspection
+		var inspections []models.Inspection
 
 		for _, item := range ids {
 			id, _ := strconv.ParseInt(item, 10, 64)

service/inspection_service.go

@@ -33,7 +33,7 @@ func GetPatientInspectionProjectCount(orgId, patientId int64) (projectCounts []*
 	return
 }
 
-func GetPatientInspectionByDate(orgId, patientId, date, projectId int64) (inspections []*models.Inspection, err error) {
+func GetPatientInspectionByDate(orgId, patientId, date, projectId int64) (inspections []models.Inspection, err error) {
 	err = readDb.Model(&models.Inspection{}).Where("patient_id=? and org_id=? and project_id =? and inspect_date =? and status=1", patientId, orgId, projectId, date).Order("created_time desc").Find(&inspections).Error
 	return
 }
@@ -153,7 +153,7 @@ func DeletePatientInspection(orgId, patientId, projectId, date int64) (err error
 	return
 }
 
-func GetPatientInspections(orgId, patientId, projectId, page int64) (inspections []*models.Inspection, total int64, date int64, err error) {
+func GetPatientInspections(orgId, patientId, projectId, page int64) (inspections []models.Inspection, total int64, date int64, err error) {
 	var projectCount models.UserInspectionProjectCount
 	err = readDb.Model(&models.Inspection{}).Where("patient_id=? and org_id=? and project_id=? and status=1", patientId, orgId, projectId).Select("count(distinct inspect_date) as count, project_id, patient_id").Order("inspect_date desc").Scan(&projectCount).Error
 	if err != nil {
@@ -218,7 +218,7 @@ func GetCheckRemindRecordTime(orgId int64, patientId int64, project_id int64) (r
 	return
 }
 
-func GetAllPatientInspection(orgId, patientId, page int64, projectId int64, start_time int64, end_time int64) (inspections []*models.Inspection, date int64, err error) {
+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
 	//err = readDb.Model(&models.Inspection{}).Where("patient_id=? and org_id=? and project_id in (?)  and status=1", patientId, orgId,projectId).Select("count(distinct inspect_date) as count, project_id, patient_id").Scan(&projectCount).Error
@@ -263,6 +263,12 @@ func GetInspectionReferenceByOrgId(orgid int64) (insepciton []*models.XtInspecti
 	return insepciton, err
 }
 
+func GetInspectionReferenceById(id int64) (insepciton models.XtInspectionReference, err error) {
+
+	err = readDb.Model(&insepciton).Where("id = ?", id).First(&insepciton).Error
+	return insepciton, err
+}
+
 func GetInspectionReferenceTwo(project_id int64) (reference []*models.InspectionReference, err error) {
 	err = readDb.Model(&models.InspectionReference{}).Where("project_id = ? and status = 1", project_id).Order("project_id").Find(&reference).Error
 	return