From 896d12b9b1de9d996b1c49c299e2bcdf71bbb984 Mon Sep 17 00:00:00 2001 From: piaobo <1913856125@qq.com> Date: Wed, 23 Jul 2025 18:33:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A9=B1=E8=99=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DewormController.java | 3 +- .../zhyc/module/biosafety/domain/Deworm.java | 165 +++--------------- .../zhyc/module/biosafety/domain/Health.java | 147 +--------------- .../module/biosafety/domain/Immunity.java | 147 +--------------- .../zhyc/module/biosafety/domain/SwUnit.java | 2 +- .../zhyc/module/biosafety/domain/SwUsage.java | 2 +- .../module/biosafety/mapper/DewormMapper.java | 2 +- .../service/impl/DewormServiceImpl.java | 63 ++++++- .../service/impl/TreatmentServiceImpl.java | 1 + .../mapper/biosafety/DewormMapper.xml | 53 ++---- .../mapper/biosafety/HealthMapper.xml | 10 +- .../mapper/biosafety/ImmunityMapper.xml | 10 +- 12 files changed, 123 insertions(+), 482 deletions(-) diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DewormController.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DewormController.java index 6b88da7..6fb5fba 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DewormController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DewormController.java @@ -78,6 +78,7 @@ public class DewormController extends BaseController @PostMapping public AjaxResult add(@RequestBody Deworm deworm) { + System.out.println(deworm); return toAjax(dewormService.insertDeworm(deworm)); } @@ -97,7 +98,7 @@ public class DewormController extends BaseController */ @PreAuthorize("@ss.hasPermi('biosafety:deworm:remove')") @Log(title = "驱虫", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") + @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(dewormService.deleteDewormByIds(ids)); diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java index 89896da..12cb640 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java @@ -1,7 +1,10 @@ package com.zhyc.module.biosafety.domain; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +16,7 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-15 */ +@Data public class Deworm extends BaseEntity { private static final long serialVersionUID = 1L; @@ -20,34 +24,37 @@ public class Deworm extends BaseEntity /** $column.columnComment */ private Long id; - /** 羊只id */ - @Excel(name = "羊只id") private Long sheepId; - /** 药品使用记录 */ - @Excel(name = "药品使用记录") - private Long usageId; + private Integer[] sheepIds; - /** 品种 */ + /** 羊只id */ + @Excel(name = "羊只耳号") + private String sheepNo; @Excel(name = "品种") private String variety; - - /** 羊只类别 */ @Excel(name = "羊只类别") private String sheepType; - - /** 性别 */ - @Excel(name = "性别") + @Excel(name = "羊只性别") private String gender; - - /** 月龄 */ @Excel(name = "月龄") private Long monthAge; - + @Excel(name = "繁殖状态") + private String breed; /** 胎次 */ @Excel(name = "胎次") private Long parity; + + + /** 药品使用记录 */ + @Excel(name = "药品使用记录") + private Integer usageId; + + + // 药品使用 + private List usageDetails; + /** 驱虫日期 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "驱虫日期", width = 30, dateFormat = "yyyy-MM-dd") @@ -61,134 +68,4 @@ public class Deworm extends BaseEntity @Excel(name = "备注") private String comment; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setSheepId(Long sheepId) - { - this.sheepId = sheepId; - } - - public Long getSheepId() - { - return sheepId; - } - - public void setUsageId(Long usageId) - { - this.usageId = usageId; - } - - public Long getUsageId() - { - return usageId; - } - - public void setVariety(String variety) - { - this.variety = variety; - } - - public String getVariety() - { - return variety; - } - - public void setSheepType(String sheepType) - { - this.sheepType = sheepType; - } - - public String getSheepType() - { - return sheepType; - } - - public void setGender(String gender) - { - this.gender = gender; - } - - public String getGender() - { - return gender; - } - - public void setMonthAge(Long monthAge) - { - this.monthAge = monthAge; - } - - public Long getMonthAge() - { - return monthAge; - } - - public void setParity(Long parity) - { - this.parity = parity; - } - - public Long getParity() - { - return parity; - } - - public void setDatetime(Date datetime) - { - this.datetime = datetime; - } - - public Date getDatetime() - { - return datetime; - } - - public void setTechnical(String technical) - { - this.technical = technical; - } - - public String getTechnical() - { - return technical; - } - - public void setComment(String comment) - { - this.comment = comment; - } - - public String getComment() - { - return comment; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("sheepId", getSheepId()) - .append("usageId", getUsageId()) - .append("variety", getVariety()) - .append("sheepType", getSheepType()) - .append("gender", getGender()) - .append("monthAge", getMonthAge()) - .append("parity", getParity()) - .append("datetime", getDatetime()) - .append("technical", getTechnical()) - .append("comment", getComment()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java index 2cd9347..ddd2ac1 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java @@ -2,6 +2,7 @@ package com.zhyc.module.biosafety.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +14,7 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-15 */ +@Data public class Health extends BaseEntity { private static final long serialVersionUID = 1L; @@ -54,8 +56,8 @@ public class Health extends BaseEntity private Long parity; /** 羊舍id */ - @Excel(name = "羊舍id") - private Long sheepfoldId; + @Excel(name = "繁殖状态") + private String breed; /** 技术员 */ @Excel(name = "技术员") @@ -65,145 +67,4 @@ public class Health extends BaseEntity @Excel(name = "备注") private String comment; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setDatetime(Date datetime) - { - this.datetime = datetime; - } - - public Date getDatetime() - { - return datetime; - } - - public void setSheepId(Long sheepId) - { - this.sheepId = sheepId; - } - - public Long getSheepId() - { - return sheepId; - } - - public void setUsageId(Long usageId) - { - this.usageId = usageId; - } - - public Long getUsageId() - { - return usageId; - } - - public void setVariety(String variety) - { - this.variety = variety; - } - - public String getVariety() - { - return variety; - } - - public void setSheepType(String sheepType) - { - this.sheepType = sheepType; - } - - public String getSheepType() - { - return sheepType; - } - - public void setGender(String gender) - { - this.gender = gender; - } - - public String getGender() - { - return gender; - } - - public void setMonthAge(String monthAge) - { - this.monthAge = monthAge; - } - - public String getMonthAge() - { - return monthAge; - } - - public void setParity(Long parity) - { - this.parity = parity; - } - - public Long getParity() - { - return parity; - } - - public void setSheepfoldId(Long sheepfoldId) - { - this.sheepfoldId = sheepfoldId; - } - - public Long getSheepfoldId() - { - return sheepfoldId; - } - - public void setTechnical(String technical) - { - this.technical = technical; - } - - public String getTechnical() - { - return technical; - } - - public void setComment(String comment) - { - this.comment = comment; - } - - public String getComment() - { - return comment; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("datetime", getDatetime()) - .append("sheepId", getSheepId()) - .append("usageId", getUsageId()) - .append("variety", getVariety()) - .append("sheepType", getSheepType()) - .append("gender", getGender()) - .append("monthAge", getMonthAge()) - .append("parity", getParity()) - .append("sheepfoldId", getSheepfoldId()) - .append("technical", getTechnical()) - .append("comment", getComment()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java index 6dda5ac..6e48483 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java @@ -2,6 +2,7 @@ package com.zhyc.module.biosafety.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -13,6 +14,7 @@ import com.zhyc.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-07-15 */ +@Data public class Immunity extends BaseEntity { private static final long serialVersionUID = 1L; @@ -49,8 +51,8 @@ public class Immunity extends BaseEntity private Long parity; /** 羊舍id */ - @Excel(name = "羊舍id") - private Long sheepfoldId; + @Excel(name = "繁殖状态") + private String breed; /** 免疫日期 */ @JsonFormat(pattern = "yyyy-MM-dd") @@ -65,145 +67,4 @@ public class Immunity extends BaseEntity @Excel(name = "备注") private String comment; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setSheepId(Long sheepId) - { - this.sheepId = sheepId; - } - - public Long getSheepId() - { - return sheepId; - } - - public void setUsageId(Long usageId) - { - this.usageId = usageId; - } - - public Long getUsageId() - { - return usageId; - } - - public void setVariety(String variety) - { - this.variety = variety; - } - - public String getVariety() - { - return variety; - } - - public void setSheepType(Long sheepType) - { - this.sheepType = sheepType; - } - - public Long getSheepType() - { - return sheepType; - } - - public void setGender(String gender) - { - this.gender = gender; - } - - public String getGender() - { - return gender; - } - - public void setMonthAge(Long monthAge) - { - this.monthAge = monthAge; - } - - public Long getMonthAge() - { - return monthAge; - } - - public void setParity(Long parity) - { - this.parity = parity; - } - - public Long getParity() - { - return parity; - } - - public void setSheepfoldId(Long sheepfoldId) - { - this.sheepfoldId = sheepfoldId; - } - - public Long getSheepfoldId() - { - return sheepfoldId; - } - - public void setDatetime(Date datetime) - { - this.datetime = datetime; - } - - public Date getDatetime() - { - return datetime; - } - - public void setTechnical(String technical) - { - this.technical = technical; - } - - public String getTechnical() - { - return technical; - } - - public void setComment(String comment) - { - this.comment = comment; - } - - public String getComment() - { - return comment; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("sheepId", getSheepId()) - .append("usageId", getUsageId()) - .append("variety", getVariety()) - .append("sheepType", getSheepType()) - .append("gender", getGender()) - .append("monthAge", getMonthAge()) - .append("parity", getParity()) - .append("sheepfoldId", getSheepfoldId()) - .append("datetime", getDatetime()) - .append("technical", getTechnical()) - .append("comment", getComment()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .toString(); - } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUnit.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUnit.java index 3bb3fdf..c4452b1 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUnit.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUnit.java @@ -18,7 +18,7 @@ public class SwUnit extends BaseEntity private static final long serialVersionUID = 1L; /** 编号 */ - private String id; + private Integer id; /** 单位 */ @Excel(name = "单位") diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUsage.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUsage.java index 90accf1..c52907f 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUsage.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwUsage.java @@ -18,7 +18,7 @@ public class SwUsage extends BaseEntity private static final long serialVersionUID = 1L; /** 编号 */ - private String id; + private Integer id; /** 使用方法 */ @Excel(name = "使用方法") diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DewormMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DewormMapper.java index ffeb206..8ce542c 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DewormMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DewormMapper.java @@ -36,7 +36,7 @@ public interface DewormMapper * @param deworm 驱虫 * @return 结果 */ - public int insertDeworm(Deworm deworm); + public int insertDeworm(List deworm); /** * 修改驱虫 diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java index d0afd0e..bb407fc 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java @@ -1,12 +1,21 @@ package com.zhyc.module.biosafety.service.impl; +import java.util.ArrayList; import java.util.List; import com.zhyc.common.utils.DateUtils; +import com.zhyc.common.utils.bean.BeanUtils; +import com.zhyc.module.base.domain.SheepFile; +import com.zhyc.module.base.mapper.SheepFileMapper; import com.zhyc.module.biosafety.domain.Deworm; +import com.zhyc.module.biosafety.domain.SwMedicineUsage; +import com.zhyc.module.biosafety.domain.SwMedicineUsageDetails; +import com.zhyc.module.biosafety.domain.Treatment; +import com.zhyc.module.biosafety.mapper.SwMedicineUsageMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zhyc.module.biosafety.mapper.DewormMapper; import com.zhyc.module.biosafety.service.IDewormService; +import org.springframework.transaction.annotation.Transactional; /** * 驱虫Service业务层处理 @@ -19,6 +28,12 @@ public class DewormServiceImpl implements IDewormService { @Autowired private DewormMapper dewormMapper; + @Autowired + private SwMedicineUsageServiceImpl medicineUsageService; + @Autowired + private SwMedicineUsageMapper medicineUsageMapper; + @Autowired + private SheepFileMapper sheepFileMapper; /** * 查询驱虫 @@ -29,7 +44,10 @@ public class DewormServiceImpl implements IDewormService @Override public Deworm selectDewormById(Long id) { - return dewormMapper.selectDewormById(id); + Deworm deworm = dewormMapper.selectDewormById(id); + SwMedicineUsage swMedicineUsage = medicineUsageMapper.selectSwMedicineUsageById(deworm.getUsageId()); + deworm.setUsageDetails(swMedicineUsage.getSwMedicineUsageDetailsList()); + return deworm; } /** @@ -51,10 +69,43 @@ public class DewormServiceImpl implements IDewormService * @return 结果 */ @Override + @Transactional public int insertDeworm(Deworm deworm) { - deworm.setCreateTime(DateUtils.getNowDate()); - return dewormMapper.insertDeworm(deworm); + + // 使用记录的文件 + SwMedicineUsage medicineUsage = new SwMedicineUsage(); + medicineUsage.setSwMedicineUsageDetailsList(deworm.getUsageDetails()); + medicineUsage.setName("羊只驱虫"); + medicineUsage.setUseType("1"); + + + List deworms = new ArrayList<>(); + deworm.setCreateTime(DateUtils.getNowDate()); + for (Integer sheepId : deworm.getSheepIds()) { + SheepFile sheepFile = sheepFileMapper.selectSheepFileById(Long.valueOf(sheepId)); + + System.out.println(sheepFile); + + Deworm dew = new Deworm(); + BeanUtils.copyProperties(deworm, dew); + dew.setSheepId(Long.valueOf(sheepId)); + dew.setVariety(sheepFile.getVariety()); + dew.setSheepType(sheepFile.getName()); + dew.setMonthAge(sheepFile.getMonthAge()); + dew.setGender(String.valueOf(sheepFile.getGender())); + dew.setBreed(sheepFile.getBreed()); + dew.setParity(sheepFile.getParity()); +// 获取药品使用记录的id + Integer usageId = medicineUsageService.insertSwMedicineUsage(medicineUsage); + + dew.setUsageId(usageId); + deworms.add(dew); + } +// 药品使用记录 + medicineUsage.setSwMedicineUsageDetailsList(deworm.getUsageDetails()); + + return dewormMapper.insertDeworm(deworms); } /** @@ -66,6 +117,12 @@ public class DewormServiceImpl implements IDewormService @Override public int updateDeworm(Deworm deworm) { + + for (SwMedicineUsageDetails usageDetail : deworm.getUsageDetails()) { + usageDetail.setMediUsage(deworm.getUsageId()); + } + medicineUsageMapper.deleteSwMedicineUsageDetailsByMediUsage(deworm.getUsageId()); + medicineUsageMapper.batchSwMedicineUsageDetails(deworm.getUsageDetails()); deworm.setUpdateTime(DateUtils.getNowDate()); return dewormMapper.updateDeworm(deworm); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java index 9ab2ac5..4573bd1 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java @@ -129,6 +129,7 @@ public class TreatmentServiceImpl implements ITreatmentService * @return 结果 */ @Override + @Transactional public int updateTreatment(Treatment treatment) { for (SwMedicineUsageDetails usageDetail : treatment.getUsageDetails()) { diff --git a/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml index 91cc932..174f8f3 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml @@ -7,12 +7,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -23,7 +25,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, sheep_id, usage_id, variety, sheep_type, gender, month_age, parity, datetime, technical, comment, update_by, update_time, create_by, create_time from sw_deworm + select s.id, sheep_id, usage_id, variety, sheep_type, s.gender, month_age, s.parity,breed, datetime, technical, s.comment, s.update_by, s.update_time, s.create_by, s.create_time, + bs.manage_tags sheep_no + from sw_deworm s + left join bas_sheep bs on s.sheep_id = bs.id - where id = #{id} + where s.id = #{id} - + insert into sw_deworm - - sheep_id, - usage_id, - variety, - sheep_type, - gender, - month_age, - parity, - datetime, - technical, - comment, - update_by, - update_time, - create_by, - create_time, - - - #{sheepId}, - #{usageId}, - #{variety}, - #{sheepType}, - #{gender}, - #{monthAge}, - #{parity}, - #{datetime}, - #{technical}, - #{comment}, - #{updateBy}, - #{updateTime}, - #{createBy}, - #{createTime}, - + (sheep_id, usage_id, variety, sheep_type, gender, month_age, + parity, breed,datetime, technical, comment, + update_by, update_time, create_by, create_time) + values + + (#{d.sheepId}, #{d.usageId}, #{d.variety}, #{d.sheepType}, + #{d.gender}, #{d.monthAge}, #{d.parity},#{d.breed}, #{d.datetime}, + #{d.technical}, #{d.comment}, + #{d.updateBy}, #{d.updateTime}, #{d.createBy}, #{d.createTime}) + diff --git a/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml index 6c5610d..9ccaf73 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml @@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, datetime, sheep_id, usage_id, variety, sheep_type, gender, month_age, parity, sheepfold_id, technical, comment, update_by, update_time, create_by, create_time from sw_health + select id, datetime, sheep_id, usage_id, variety, sheep_type, gender, month_age, parity, breed, technical, comment, update_by, update_time, create_by, create_time from sw_health @@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" gender, month_age, parity, - sheepfold_id, + breed, datetime, technical, comment, @@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{gender}, #{monthAge}, #{parity}, - #{sheepfoldId}, + #{breed}, #{datetime}, #{technical}, #{comment}, @@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" gender = #{gender}, month_age = #{monthAge}, parity = #{parity}, - sheepfold_id = #{sheepfoldId}, + breed = #{breed}, datetime = #{datetime}, technical = #{technical}, comment = #{comment},