交易市场平台（供应商）

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/domain/BizYakHealthSourceRecord.java

@@ -4,7 +4,7 @@ import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
- * 第三方健康源数据 biz_yak_health_source_record。
+ * 第三方健康源数据 biz_yak_health_source_record，字段与 OpenAPI 返回对齐。
  */
 public class BizYakHealthSourceRecord
 {
@@ -24,11 +24,93 @@ public class BizYakHealthSourceRecord
 
     private String farmName;
 
+    private Long enclosureId;
+
+    private String enclosureName;
+
+    private Long cattleId;
+
+    private String earTagNumber;
+
+    /** 展示用编号：优先耳标，否则牛只ID */
     private String yakNo;
 
-    private String resultCode;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date sourceCreateTime;
+
+    private Long quarantineUnitId;
+
+    private String quarantineUnitName;
+
+    private Long quarantinePersonnelId;
+
+    private String quarantinePersonnelName;
+
+    private String quarantineItem;
+
+    private String quarantineResult;
+
+    private String quarantineReport;
+
+    private String certificate;
+
+    private String scenePicture;
+
+    private String age;
+
+    private String etiology;
+
+    private String diagnosisResult;
+
+    private String medicationName;
+
+    private String medicationMethod;
+
+    private String clinic;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date treatmentTime;
+
+    private String treatmentCycle;
+
+    private String treatmentEffect;
+
+    private String conditionChange;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date recoveryTime;
+
+    private String recoveryHealthStatus;
+
+    private String recordNo;
+
+    private String sourceType;
+
+    private Long taskId;
+
+    private String operationType;
+
+    private Long batchId;
+
+    private String cattleIds;
+
+    private Long executorUserId;
 
-    private String resultText;
+    private String executorName;
+
+    private String executeResult;
+
+    private String detailJson;
+
+    private String materialUsageJson;
+
+    private String attachments;
+
+    private String exceptionFlag;
+
+    private String exceptionDesc;
+
+    private String remark;
 
     /** 0未分析 1已分析 */
     private String analyzedFlag;
@@ -112,6 +194,46 @@ public class BizYakHealthSourceRecord
         this.farmName = farmName;
     }
 
+    public Long getEnclosureId()
+    {
+        return enclosureId;
+    }
+
+    public void setEnclosureId(Long enclosureId)
+    {
+        this.enclosureId = enclosureId;
+    }
+
+    public String getEnclosureName()
+    {
+        return enclosureName;
+    }
+
+    public void setEnclosureName(String enclosureName)
+    {
+        this.enclosureName = enclosureName;
+    }
+
+    public Long getCattleId()
+    {
+        return cattleId;
+    }
+
+    public void setCattleId(Long cattleId)
+    {
+        this.cattleId = cattleId;
+    }
+
+    public String getEarTagNumber()
+    {
+        return earTagNumber;
+    }
+
+    public void setEarTagNumber(String earTagNumber)
+    {
+        this.earTagNumber = earTagNumber;
+    }
+
     public String getYakNo()
     {
         return yakNo;
@@ -122,24 +244,374 @@ public class BizYakHealthSourceRecord
         this.yakNo = yakNo;
     }
 
-    public String getResultCode()
+    public Date getSourceCreateTime()
+    {
+        return sourceCreateTime;
+    }
+
+    public void setSourceCreateTime(Date sourceCreateTime)
+    {
+        this.sourceCreateTime = sourceCreateTime;
+    }
+
+    public Long getQuarantineUnitId()
+    {
+        return quarantineUnitId;
+    }
+
+    public void setQuarantineUnitId(Long quarantineUnitId)
+    {
+        this.quarantineUnitId = quarantineUnitId;
+    }
+
+    public String getQuarantineUnitName()
+    {
+        return quarantineUnitName;
+    }
+
+    public void setQuarantineUnitName(String quarantineUnitName)
+    {
+        this.quarantineUnitName = quarantineUnitName;
+    }
+
+    public Long getQuarantinePersonnelId()
+    {
+        return quarantinePersonnelId;
+    }
+
+    public void setQuarantinePersonnelId(Long quarantinePersonnelId)
+    {
+        this.quarantinePersonnelId = quarantinePersonnelId;
+    }
+
+    public String getQuarantinePersonnelName()
+    {
+        return quarantinePersonnelName;
+    }
+
+    public void setQuarantinePersonnelName(String quarantinePersonnelName)
+    {
+        this.quarantinePersonnelName = quarantinePersonnelName;
+    }
+
+    public String getQuarantineItem()
+    {
+        return quarantineItem;
+    }
+
+    public void setQuarantineItem(String quarantineItem)
+    {
+        this.quarantineItem = quarantineItem;
+    }
+
+    public String getQuarantineResult()
+    {
+        return quarantineResult;
+    }
+
+    public void setQuarantineResult(String quarantineResult)
+    {
+        this.quarantineResult = quarantineResult;
+    }
+
+    public String getQuarantineReport()
+    {
+        return quarantineReport;
+    }
+
+    public void setQuarantineReport(String quarantineReport)
+    {
+        this.quarantineReport = quarantineReport;
+    }
+
+    public String getCertificate()
+    {
+        return certificate;
+    }
+
+    public void setCertificate(String certificate)
+    {
+        this.certificate = certificate;
+    }
+
+    public String getScenePicture()
+    {
+        return scenePicture;
+    }
+
+    public void setScenePicture(String scenePicture)
+    {
+        this.scenePicture = scenePicture;
+    }
+
+    public String getAge()
+    {
+        return age;
+    }
+
+    public void setAge(String age)
+    {
+        this.age = age;
+    }
+
+    public String getEtiology()
+    {
+        return etiology;
+    }
+
+    public void setEtiology(String etiology)
+    {
+        this.etiology = etiology;
+    }
+
+    public String getDiagnosisResult()
+    {
+        return diagnosisResult;
+    }
+
+    public void setDiagnosisResult(String diagnosisResult)
+    {
+        this.diagnosisResult = diagnosisResult;
+    }
+
+    public String getMedicationName()
+    {
+        return medicationName;
+    }
+
+    public void setMedicationName(String medicationName)
+    {
+        this.medicationName = medicationName;
+    }
+
+    public String getMedicationMethod()
+    {
+        return medicationMethod;
+    }
+
+    public void setMedicationMethod(String medicationMethod)
+    {
+        this.medicationMethod = medicationMethod;
+    }
+
+    public String getClinic()
+    {
+        return clinic;
+    }
+
+    public void setClinic(String clinic)
+    {
+        this.clinic = clinic;
+    }
+
+    public Date getTreatmentTime()
+    {
+        return treatmentTime;
+    }
+
+    public void setTreatmentTime(Date treatmentTime)
+    {
+        this.treatmentTime = treatmentTime;
+    }
+
+    public String getTreatmentCycle()
+    {
+        return treatmentCycle;
+    }
+
+    public void setTreatmentCycle(String treatmentCycle)
+    {
+        this.treatmentCycle = treatmentCycle;
+    }
+
+    public String getTreatmentEffect()
+    {
+        return treatmentEffect;
+    }
+
+    public void setTreatmentEffect(String treatmentEffect)
+    {
+        this.treatmentEffect = treatmentEffect;
+    }
+
+    public String getConditionChange()
+    {
+        return conditionChange;
+    }
+
+    public void setConditionChange(String conditionChange)
+    {
+        this.conditionChange = conditionChange;
+    }
+
+    public Date getRecoveryTime()
+    {
+        return recoveryTime;
+    }
+
+    public void setRecoveryTime(Date recoveryTime)
+    {
+        this.recoveryTime = recoveryTime;
+    }
+
+    public String getRecoveryHealthStatus()
+    {
+        return recoveryHealthStatus;
+    }
+
+    public void setRecoveryHealthStatus(String recoveryHealthStatus)
+    {
+        this.recoveryHealthStatus = recoveryHealthStatus;
+    }
+
+    public String getRecordNo()
+    {
+        return recordNo;
+    }
+
+    public void setRecordNo(String recordNo)
+    {
+        this.recordNo = recordNo;
+    }
+
+    public String getSourceType()
+    {
+        return sourceType;
+    }
+
+    public void setSourceType(String sourceType)
+    {
+        this.sourceType = sourceType;
+    }
+
+    public Long getTaskId()
+    {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId)
+    {
+        this.taskId = taskId;
+    }
+
+    public String getOperationType()
+    {
+        return operationType;
+    }
+
+    public void setOperationType(String operationType)
+    {
+        this.operationType = operationType;
+    }
+
+    public Long getBatchId()
+    {
+        return batchId;
+    }
+
+    public void setBatchId(Long batchId)
+    {
+        this.batchId = batchId;
+    }
+
+    public String getCattleIds()
+    {
+        return cattleIds;
+    }
+
+    public void setCattleIds(String cattleIds)
+    {
+        this.cattleIds = cattleIds;
+    }
+
+    public Long getExecutorUserId()
+    {
+        return executorUserId;
+    }
+
+    public void setExecutorUserId(Long executorUserId)
+    {
+        this.executorUserId = executorUserId;
+    }
+
+    public String getExecutorName()
+    {
+        return executorName;
+    }
+
+    public void setExecutorName(String executorName)
+    {
+        this.executorName = executorName;
+    }
+
+    public String getExecuteResult()
+    {
+        return executeResult;
+    }
+
+    public void setExecuteResult(String executeResult)
+    {
+        this.executeResult = executeResult;
+    }
+
+    public String getDetailJson()
+    {
+        return detailJson;
+    }
+
+    public void setDetailJson(String detailJson)
+    {
+        this.detailJson = detailJson;
+    }
+
+    public String getMaterialUsageJson()
+    {
+        return materialUsageJson;
+    }
+
+    public void setMaterialUsageJson(String materialUsageJson)
+    {
+        this.materialUsageJson = materialUsageJson;
+    }
+
+    public String getAttachments()
+    {
+        return attachments;
+    }
+
+    public void setAttachments(String attachments)
+    {
+        this.attachments = attachments;
+    }
+
+    public String getExceptionFlag()
+    {
+        return exceptionFlag;
+    }
+
+    public void setExceptionFlag(String exceptionFlag)
+    {
+        this.exceptionFlag = exceptionFlag;
+    }
+
+    public String getExceptionDesc()
     {
-        return resultCode;
+        return exceptionDesc;
     }
 
-    public void setResultCode(String resultCode)
+    public void setExceptionDesc(String exceptionDesc)
     {
-        this.resultCode = resultCode;
+        this.exceptionDesc = exceptionDesc;
     }
 
-    public String getResultText()
+    public String getRemark()
     {
-        return resultText;
+        return remark;
     }
 
-    public void setResultText(String resultText)
+    public void setRemark(String remark)
     {
-        this.resultText = resultText;
+        this.remark = remark;
     }
 
     public String getAnalyzedFlag()

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/domain/dto/OpenBreedingProcessRecordDto.java

@@ -3,36 +3,52 @@ package com.ruoyi.web.modules.industryservice.domain.dto;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 /**
- * 第三方开放接口「查询养殖过程记录列表」单条记录。
- * 接口：{@code GET /open-api/v1/farming/breeding-process-records}
+ * 第三方开放接口「查询养殖过程记录列表」单条记录 OpenFarmingProcessRecordVo。
+ * 接口：{@code GET /open-api/v1/farming/process-records}
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class OpenBreedingProcessRecordDto
 {
     private Long id;
 
+    private String recordNo;
+
+    private String sourceType;
+
+    private Long taskId;
+
+    private String operationType;
+
     private Long farmId;
 
-    private String farmName;
+    private Long enclosureId;
+
+    private Long batchId;
+
+    private String cattleIds;
+
+    private Long executorUserId;
+
+    private String executorName;
 
-    private String county;
+    private String executeTime;
 
-    private String town;
+    private String executeResult;
 
-    private String cattleNo;
+    private String detailJson;
 
-    private String earTagNumber;
+    private String materialUsageJson;
 
-    /** 记录时间 */
-    private String recordTime;
+    private String attachments;
 
-    /** 过程类型/内容摘要 */
-    private String processType;
+    private String exceptionFlag;
 
-    private String processContent;
+    private String exceptionDesc;
 
     private String remark;
 
+    private String createTime;
+
     public Long getId()
     {
         return id;
@@ -43,6 +59,46 @@ public class OpenBreedingProcessRecordDto
         this.id = id;
     }
 
+    public String getRecordNo()
+    {
+        return recordNo;
+    }
+
+    public void setRecordNo(String recordNo)
+    {
+        this.recordNo = recordNo;
+    }
+
+    public String getSourceType()
+    {
+        return sourceType;
+    }
+
+    public void setSourceType(String sourceType)
+    {
+        this.sourceType = sourceType;
+    }
+
+    public Long getTaskId()
+    {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId)
+    {
+        this.taskId = taskId;
+    }
+
+    public String getOperationType()
+    {
+        return operationType;
+    }
+
+    public void setOperationType(String operationType)
+    {
+        this.operationType = operationType;
+    }
+
     public Long getFarmId()
     {
         return farmId;
@@ -53,84 +109,124 @@ public class OpenBreedingProcessRecordDto
         this.farmId = farmId;
     }
 
-    public String getFarmName()
+    public Long getEnclosureId()
+    {
+        return enclosureId;
+    }
+
+    public void setEnclosureId(Long enclosureId)
+    {
+        this.enclosureId = enclosureId;
+    }
+
+    public Long getBatchId()
+    {
+        return batchId;
+    }
+
+    public void setBatchId(Long batchId)
+    {
+        this.batchId = batchId;
+    }
+
+    public String getCattleIds()
+    {
+        return cattleIds;
+    }
+
+    public void setCattleIds(String cattleIds)
     {
-        return farmName;
+        this.cattleIds = cattleIds;
     }
 
-    public void setFarmName(String farmName)
+    public Long getExecutorUserId()
     {
-        this.farmName = farmName;
+        return executorUserId;
     }
 
-    public String getCounty()
+    public void setExecutorUserId(Long executorUserId)
     {
-        return county;
+        this.executorUserId = executorUserId;
     }
 
-    public void setCounty(String county)
+    public String getExecutorName()
     {
-        this.county = county;
+        return executorName;
     }
 
-    public String getTown()
+    public void setExecutorName(String executorName)
     {
-        return town;
+        this.executorName = executorName;
     }
 
-    public void setTown(String town)
+    public String getExecuteTime()
     {
-        this.town = town;
+        return executeTime;
     }
 
-    public String getCattleNo()
+    public void setExecuteTime(String executeTime)
     {
-        return cattleNo;
+        this.executeTime = executeTime;
     }
 
-    public void setCattleNo(String cattleNo)
+    public String getExecuteResult()
     {
-        this.cattleNo = cattleNo;
+        return executeResult;
     }
 
-    public String getEarTagNumber()
+    public void setExecuteResult(String executeResult)
     {
-        return earTagNumber;
+        this.executeResult = executeResult;
     }
 
-    public void setEarTagNumber(String earTagNumber)
+    public String getDetailJson()
     {
-        this.earTagNumber = earTagNumber;
+        return detailJson;
     }
 
-    public String getRecordTime()
+    public void setDetailJson(String detailJson)
     {
-        return recordTime;
+        this.detailJson = detailJson;
     }
 
-    public void setRecordTime(String recordTime)
+    public String getMaterialUsageJson()
     {
-        this.recordTime = recordTime;
+        return materialUsageJson;
     }
 
-    public String getProcessType()
+    public void setMaterialUsageJson(String materialUsageJson)
     {
-        return processType;
+        this.materialUsageJson = materialUsageJson;
     }
 
-    public void setProcessType(String processType)
+    public String getAttachments()
     {
-        this.processType = processType;
+        return attachments;
     }
 
-    public String getProcessContent()
+    public void setAttachments(String attachments)
     {
-        return processContent;
+        this.attachments = attachments;
     }
 
-    public void setProcessContent(String processContent)
+    public String getExceptionFlag()
     {
-        this.processContent = processContent;
+        return exceptionFlag;
+    }
+
+    public void setExceptionFlag(String exceptionFlag)
+    {
+        this.exceptionFlag = exceptionFlag;
+    }
+
+    public String getExceptionDesc()
+    {
+        return exceptionDesc;
+    }
+
+    public void setExceptionDesc(String exceptionDesc)
+    {
+        this.exceptionDesc = exceptionDesc;
     }
 
     public String getRemark()
@@ -142,4 +238,14 @@ public class OpenBreedingProcessRecordDto
     {
         this.remark = remark;
     }
+
+    public String getCreateTime()
+    {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime)
+    {
+        this.createTime = createTime;
+    }
 }

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/domain/dto/OpenDiagnosisRecordDto.java

@@ -3,7 +3,7 @@ package com.ruoyi.web.modules.industryservice.domain.dto;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 /**
- * 第三方开放接口「查询诊疗记录列表」单条记录。
+ * 第三方开放接口「查询诊疗记录列表」单条记录 OpenHealthVo。
  * 接口：{@code GET /open-api/v1/farming/diagnosis-records}
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -13,25 +13,37 @@ public class OpenDiagnosisRecordDto
 
     private Long farmId;
 
-    private String farmName;
+    private Long farmEnclosureId;
 
-    private String county;
+    private Long cattleId;
 
-    private String town;
+    private String age;
 
-    private String cattleNo;
+    private String etiology;
 
-    private String earTagNumber;
-
-    /** 诊疗时间 */
     private String diagnosisTime;
 
-    /** 病种/诊断结果 */
-    private String diseaseName;
-
     private String diagnosisResult;
 
-    private String remark;
+    private String medicationName;
+
+    private String medicationMethod;
+
+    private String clinic;
+
+    private String treatmentTime;
+
+    private String treatmentCycle;
+
+    private String treatmentEffect;
+
+    private String conditionChange;
+
+    private String recoveryTime;
+
+    private String recoveryHealthStatus;
+
+    private String createTime;
 
     public Long getId()
     {
@@ -53,93 +65,163 @@ public class OpenDiagnosisRecordDto
         this.farmId = farmId;
     }
 
-    public String getFarmName()
+    public Long getFarmEnclosureId()
     {
-        return farmName;
+        return farmEnclosureId;
     }
 
-    public void setFarmName(String farmName)
+    public void setFarmEnclosureId(Long farmEnclosureId)
     {
-        this.farmName = farmName;
+        this.farmEnclosureId = farmEnclosureId;
     }
 
-    public String getCounty()
+    public Long getCattleId()
     {
-        return county;
+        return cattleId;
     }
 
-    public void setCounty(String county)
+    public void setCattleId(Long cattleId)
     {
-        this.county = county;
+        this.cattleId = cattleId;
     }
 
-    public String getTown()
+    public String getAge()
     {
-        return town;
+        return age;
     }
 
-    public void setTown(String town)
+    public void setAge(String age)
     {
-        this.town = town;
+        this.age = age;
     }
 
-    public String getCattleNo()
+    public String getEtiology()
     {
-        return cattleNo;
+        return etiology;
     }
 
-    public void setCattleNo(String cattleNo)
+    public void setEtiology(String etiology)
     {
-        this.cattleNo = cattleNo;
+        this.etiology = etiology;
     }
 
-    public String getEarTagNumber()
+    public String getDiagnosisTime()
     {
-        return earTagNumber;
+        return diagnosisTime;
     }
 
-    public void setEarTagNumber(String earTagNumber)
+    public void setDiagnosisTime(String diagnosisTime)
     {
-        this.earTagNumber = earTagNumber;
+        this.diagnosisTime = diagnosisTime;
     }
 
-    public String getDiagnosisTime()
+    public String getDiagnosisResult()
     {
-        return diagnosisTime;
+        return diagnosisResult;
     }
 
-    public void setDiagnosisTime(String diagnosisTime)
+    public void setDiagnosisResult(String diagnosisResult)
     {
-        this.diagnosisTime = diagnosisTime;
+        this.diagnosisResult = diagnosisResult;
     }
 
-    public String getDiseaseName()
+    public String getMedicationName()
     {
-        return diseaseName;
+        return medicationName;
     }
 
-    public void setDiseaseName(String diseaseName)
+    public void setMedicationName(String medicationName)
     {
-        this.diseaseName = diseaseName;
+        this.medicationName = medicationName;
     }
 
-    public String getDiagnosisResult()
+    public String getMedicationMethod()
     {
-        return diagnosisResult;
+        return medicationMethod;
     }
 
-    public void setDiagnosisResult(String diagnosisResult)
+    public void setMedicationMethod(String medicationMethod)
     {
-        this.diagnosisResult = diagnosisResult;
+        this.medicationMethod = medicationMethod;
+    }
+
+    public String getClinic()
+    {
+        return clinic;
+    }
+
+    public void setClinic(String clinic)
+    {
+        this.clinic = clinic;
+    }
+
+    public String getTreatmentTime()
+    {
+        return treatmentTime;
+    }
+
+    public void setTreatmentTime(String treatmentTime)
+    {
+        this.treatmentTime = treatmentTime;
+    }
+
+    public String getTreatmentCycle()
+    {
+        return treatmentCycle;
+    }
+
+    public void setTreatmentCycle(String treatmentCycle)
+    {
+        this.treatmentCycle = treatmentCycle;
+    }
+
+    public String getTreatmentEffect()
+    {
+        return treatmentEffect;
+    }
+
+    public void setTreatmentEffect(String treatmentEffect)
+    {
+        this.treatmentEffect = treatmentEffect;
+    }
+
+    public String getConditionChange()
+    {
+        return conditionChange;
+    }
+
+    public void setConditionChange(String conditionChange)
+    {
+        this.conditionChange = conditionChange;
+    }
+
+    public String getRecoveryTime()
+    {
+        return recoveryTime;
+    }
+
+    public void setRecoveryTime(String recoveryTime)
+    {
+        this.recoveryTime = recoveryTime;
+    }
+
+    public String getRecoveryHealthStatus()
+    {
+        return recoveryHealthStatus;
+    }
+
+    public void setRecoveryHealthStatus(String recoveryHealthStatus)
+    {
+        this.recoveryHealthStatus = recoveryHealthStatus;
     }
 
-    public String getRemark()
+    public String getCreateTime()
     {
-        return remark;
+        return createTime;
     }
 
-    public void setRemark(String remark)
+    public void setCreateTime(String createTime)
     {
-        this.remark = remark;
+        this.createTime = createTime;
     }
 }

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/domain/dto/OpenQuarantineRecordDto.java

@@ -3,7 +3,7 @@ package com.ruoyi.web.modules.industryservice.domain.dto;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 /**
- * 第三方开放接口「查询检疫记录列表」单条记录。
+ * 第三方开放接口「查询检疫记录列表」单条记录 OpenQuarantineRecordVo。
  * 接口：{@code GET /open-api/v1/farming/quarantine-records}
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -15,21 +15,35 @@ public class OpenQuarantineRecordDto
 
     private String farmName;
 
-    private String county;
+    private Long farmEnclosureId;
 
-    private String town;
+    private String farmEnclosureName;
 
-    private String cattleNo;
+    private Long cattleId;
 
     private String earTagNumber;
 
-    /** 检疫时间 */
-    private String quarantineTime;
+    private Long quarantineUnitId;
+
+    private String quarantineUnitName;
+
+    private Long quarantinePersonnelId;
+
+    private String quarantinePersonnelName;
+
+    private String quarantineItem;
 
-    /** 检疫结果（正常/异常/阳性等） */
     private String quarantineResult;
 
-    private String remark;
+    private String quarantineTime;
+
+    private String quarantineReport;
+
+    private String certificate;
+
+    private String scenePicture;
+
+    private String createTime;
 
     public Long getId()
     {
@@ -61,34 +75,34 @@ public class OpenQuarantineRecordDto
         this.farmName = farmName;
     }
 
-    public String getCounty()
+    public Long getFarmEnclosureId()
     {
-        return county;
+        return farmEnclosureId;
     }
 
-    public void setCounty(String county)
+    public void setFarmEnclosureId(Long farmEnclosureId)
     {
-        this.county = county;
+        this.farmEnclosureId = farmEnclosureId;
     }
 
-    public String getTown()
+    public String getFarmEnclosureName()
     {
-        return town;
+        return farmEnclosureName;
     }
 
-    public void setTown(String town)
+    public void setFarmEnclosureName(String farmEnclosureName)
     {
-        this.town = town;
+        this.farmEnclosureName = farmEnclosureName;
     }
 
-    public String getCattleNo()
+    public Long getCattleId()
     {
-        return cattleNo;
+        return cattleId;
     }
 
-    public void setCattleNo(String cattleNo)
+    public void setCattleId(Long cattleId)
     {
-        this.cattleNo = cattleNo;
+        this.cattleId = cattleId;
     }
 
     public String getEarTagNumber()
@@ -101,14 +115,54 @@ public class OpenQuarantineRecordDto
         this.earTagNumber = earTagNumber;
     }
 
-    public String getQuarantineTime()
+    public Long getQuarantineUnitId()
     {
-        return quarantineTime;
+        return quarantineUnitId;
     }
 
-    public void setQuarantineTime(String quarantineTime)
+    public void setQuarantineUnitId(Long quarantineUnitId)
     {
-        this.quarantineTime = quarantineTime;
+        this.quarantineUnitId = quarantineUnitId;
+    }
+
+    public String getQuarantineUnitName()
+    {
+        return quarantineUnitName;
+    }
+
+    public void setQuarantineUnitName(String quarantineUnitName)
+    {
+        this.quarantineUnitName = quarantineUnitName;
+    }
+
+    public Long getQuarantinePersonnelId()
+    {
+        return quarantinePersonnelId;
+    }
+
+    public void setQuarantinePersonnelId(Long quarantinePersonnelId)
+    {
+        this.quarantinePersonnelId = quarantinePersonnelId;
+    }
+
+    public String getQuarantinePersonnelName()
+    {
+        return quarantinePersonnelName;
+    }
+
+    public void setQuarantinePersonnelName(String quarantinePersonnelName)
+    {
+        this.quarantinePersonnelName = quarantinePersonnelName;
+    }
+
+    public String getQuarantineItem()
+    {
+        return quarantineItem;
+    }
+
+    public void setQuarantineItem(String quarantineItem)
+    {
+        this.quarantineItem = quarantineItem;
     }
 
     public String getQuarantineResult()
@@ -121,13 +175,53 @@ public class OpenQuarantineRecordDto
         this.quarantineResult = quarantineResult;
     }
 
-    public String getRemark()
+    public String getQuarantineTime()
+    {
+        return quarantineTime;
+    }
+
+    public void setQuarantineTime(String quarantineTime)
+    {
+        this.quarantineTime = quarantineTime;
+    }
+
+    public String getQuarantineReport()
+    {
+        return quarantineReport;
+    }
+
+    public void setQuarantineReport(String quarantineReport)
+    {
+        this.quarantineReport = quarantineReport;
+    }
+
+    public String getCertificate()
+    {
+        return certificate;
+    }
+
+    public void setCertificate(String certificate)
+    {
+        this.certificate = certificate;
+    }
+
+    public String getScenePicture()
+    {
+        return scenePicture;
+    }
+
+    public void setScenePicture(String scenePicture)
+    {
+        this.scenePicture = scenePicture;
+    }
+
+    public String getCreateTime()
     {
-        return remark;
+        return createTime;
     }
 
-    public void setRemark(String remark)
+    public void setCreateTime(String createTime)
     {
-        this.remark = remark;
+        this.createTime = createTime;
     }
 }

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/service/YakDiseaseWarningAnalyzer.java

@@ -70,7 +70,7 @@ public class YakDiseaseWarningAnalyzer
             {
                 for (BizYakHealthSourceRecord row : group)
                 {
-                    if (YakDiseaseWarningAnalysisRules.isAbnormalQuarantineResult(row.getResultCode()))
+                    if (YakDiseaseWarningAnalysisRules.isAbnormalQuarantineResult(row.getQuarantineResult()))
                     {
                         hits.add(row);
                     }

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/support/HealthRecordOpenApiMapper.java

@@ -28,11 +28,23 @@ public final class HealthRecordOpenApiMapper
     {
         requireId(dto != null ? dto.getId() : null, "检疫记录");
         BizYakHealthSourceRecord row = baseRow(YakDiseaseWarningAnalysisRules.RECORD_TYPE_QUARANTINE,
-                "Q:" + dto.getId(), dto.getFarmId(), dto.getFarmName(), dto.getCounty(), dto.getTown());
-        row.setYakNo(resolveYakNo(dto.getEarTagNumber(), dto.getCattleNo()));
-        row.setRecordTime(parseDateTime(dto.getQuarantineTime()));
-        row.setResultCode(StringUtils.trim(dto.getQuarantineResult()));
-        row.setResultText(StringUtils.trim(dto.getRemark()));
+                "Q:" + dto.getId(), dto.getFarmId(), dto.getFarmName());
+        row.setEnclosureId(dto.getFarmEnclosureId());
+        row.setEnclosureName(StringUtils.trim(dto.getFarmEnclosureName()));
+        row.setCattleId(dto.getCattleId());
+        row.setEarTagNumber(StringUtils.trim(dto.getEarTagNumber()));
+        row.setYakNo(resolveYakNo(dto.getEarTagNumber(), dto.getCattleId()));
+        row.setRecordTime(parseDateTimeRequired(dto.getQuarantineTime(), "检疫时间"));
+        row.setSourceCreateTime(parseDateTimeOptional(dto.getCreateTime()));
+        row.setQuarantineUnitId(dto.getQuarantineUnitId());
+        row.setQuarantineUnitName(StringUtils.trim(dto.getQuarantineUnitName()));
+        row.setQuarantinePersonnelId(dto.getQuarantinePersonnelId());
+        row.setQuarantinePersonnelName(StringUtils.trim(dto.getQuarantinePersonnelName()));
+        row.setQuarantineItem(StringUtils.trim(dto.getQuarantineItem()));
+        row.setQuarantineResult(StringUtils.trim(dto.getQuarantineResult()));
+        row.setQuarantineReport(StringUtils.trim(dto.getQuarantineReport()));
+        row.setCertificate(StringUtils.trim(dto.getCertificate()));
+        row.setScenePicture(StringUtils.trim(dto.getScenePicture()));
         return row;
     }
 
@@ -40,12 +52,24 @@ public final class HealthRecordOpenApiMapper
     {
         requireId(dto != null ? dto.getId() : null, "诊疗记录");
         BizYakHealthSourceRecord row = baseRow(YakDiseaseWarningAnalysisRules.RECORD_TYPE_DIAGNOSIS,
-                "D:" + dto.getId(), dto.getFarmId(), dto.getFarmName(), dto.getCounty(), dto.getTown());
-        row.setYakNo(resolveYakNo(dto.getEarTagNumber(), dto.getCattleNo()));
-        row.setRecordTime(parseDateTime(dto.getDiagnosisTime()));
-        String disease = StringUtils.isNotEmpty(dto.getDiseaseName()) ? dto.getDiseaseName() : dto.getDiagnosisResult();
-        row.setResultCode(StringUtils.trim(disease));
-        row.setResultText(StringUtils.trim(dto.getRemark()));
+                "D:" + dto.getId(), dto.getFarmId(), null);
+        row.setEnclosureId(dto.getFarmEnclosureId());
+        row.setCattleId(dto.getCattleId());
+        row.setYakNo(resolveYakNo(null, dto.getCattleId()));
+        row.setRecordTime(parseDateTimeRequired(dto.getDiagnosisTime(), "诊疗时间"));
+        row.setSourceCreateTime(parseDateTimeOptional(dto.getCreateTime()));
+        row.setAge(StringUtils.trim(dto.getAge()));
+        row.setEtiology(StringUtils.trim(dto.getEtiology()));
+        row.setDiagnosisResult(StringUtils.trim(dto.getDiagnosisResult()));
+        row.setMedicationName(StringUtils.trim(dto.getMedicationName()));
+        row.setMedicationMethod(StringUtils.trim(dto.getMedicationMethod()));
+        row.setClinic(StringUtils.trim(dto.getClinic()));
+        row.setTreatmentTime(parseDateTimeOptional(dto.getTreatmentTime()));
+        row.setTreatmentCycle(StringUtils.trim(dto.getTreatmentCycle()));
+        row.setTreatmentEffect(StringUtils.trim(dto.getTreatmentEffect()));
+        row.setConditionChange(StringUtils.trim(dto.getConditionChange()));
+        row.setRecoveryTime(parseDateTimeOptional(dto.getRecoveryTime()));
+        row.setRecoveryHealthStatus(StringUtils.trim(dto.getRecoveryHealthStatus()));
         return row;
     }
 
@@ -53,40 +77,65 @@ public final class HealthRecordOpenApiMapper
     {
         requireId(dto != null ? dto.getId() : null, "养殖过程记录");
         BizYakHealthSourceRecord row = baseRow(YakDiseaseWarningAnalysisRules.RECORD_TYPE_BREEDING,
-                "B:" + dto.getId(), dto.getFarmId(), dto.getFarmName(), dto.getCounty(), dto.getTown());
-        row.setYakNo(resolveYakNo(dto.getEarTagNumber(), dto.getCattleNo()));
-        row.setRecordTime(parseDateTime(dto.getRecordTime()));
-        row.setResultCode(StringUtils.trim(dto.getProcessType()));
-        row.setResultText(StringUtils.trim(dto.getProcessContent()));
+                "B:" + dto.getId(), dto.getFarmId(), null);
+        row.setRecordNo(StringUtils.trim(dto.getRecordNo()));
+        row.setSourceType(StringUtils.trim(dto.getSourceType()));
+        row.setTaskId(dto.getTaskId());
+        row.setOperationType(StringUtils.trim(dto.getOperationType()));
+        row.setEnclosureId(dto.getEnclosureId());
+        row.setBatchId(dto.getBatchId());
+        row.setCattleIds(StringUtils.trim(dto.getCattleIds()));
+        row.setYakNo(resolveProcessYakNo(dto.getCattleIds()));
+        row.setRecordTime(parseDateTimeRequired(dto.getExecuteTime(), "执行时间"));
+        row.setSourceCreateTime(parseDateTimeOptional(dto.getCreateTime()));
+        row.setExecutorUserId(dto.getExecutorUserId());
+        row.setExecutorName(StringUtils.trim(dto.getExecutorName()));
+        row.setExecuteResult(StringUtils.trim(dto.getExecuteResult()));
+        row.setDetailJson(StringUtils.trim(dto.getDetailJson()));
+        row.setMaterialUsageJson(StringUtils.trim(dto.getMaterialUsageJson()));
+        row.setAttachments(StringUtils.trim(dto.getAttachments()));
+        row.setExceptionFlag(StringUtils.trim(dto.getExceptionFlag()));
+        row.setExceptionDesc(StringUtils.trim(dto.getExceptionDesc()));
+        row.setRemark(StringUtils.trim(dto.getRemark()));
         return row;
     }
 
-    private static BizYakHealthSourceRecord baseRow(int recordType, String externalId, Long farmId, String farmName,
-            String county, String town)
+    private static BizYakHealthSourceRecord baseRow(int recordType, String externalId, Long farmId, String farmName)
     {
         BizYakHealthSourceRecord row = new BizYakHealthSourceRecord();
         row.setRecordType(recordType);
         row.setExternalId(externalId);
         row.setFarmId(farmId);
         row.setFarmName(StringUtils.trim(farmName));
-        row.setRegionKey(HealthRecordRegionSupport.buildRegionKey(county, town, farmId, farmName));
+        row.setRegionKey(HealthRecordRegionSupport.buildRegionKey(farmId, farmName));
         row.setAnalyzedFlag(YakDiseaseWarningAnalysisRules.ANALYZED_NO);
         return row;
     }
 
-    private static String resolveYakNo(String earTag, String cattleNo)
+    private static String resolveYakNo(String earTag, Long cattleId)
     {
         if (StringUtils.isNotEmpty(earTag))
         {
             return earTag.trim();
         }
-        if (StringUtils.isNotEmpty(cattleNo))
+        if (cattleId != null)
         {
-            return cattleNo.trim();
+            return String.valueOf(cattleId);
         }
         return null;
     }
 
+    private static String resolveProcessYakNo(String cattleIds)
+    {
+        if (StringUtils.isEmpty(cattleIds))
+        {
+            return null;
+        }
+        String text = cattleIds.trim();
+        int comma = text.indexOf(',');
+        return comma > 0 ? text.substring(0, comma).trim() : text;
+    }
+
     private static void requireId(Long id, String label)
     {
         if (id == null)
@@ -95,13 +144,26 @@ public final class HealthRecordOpenApiMapper
         }
     }
 
-    private static Date parseDateTime(String value)
+    private static Date parseDateTimeRequired(String value, String label)
+    {
+        if (StringUtils.isEmpty(value))
+        {
+            throw new ServiceException(label + "不能为空");
+        }
+        return parseDateTime(value.trim());
+    }
+
+    private static Date parseDateTimeOptional(String value)
     {
         if (StringUtils.isEmpty(value))
         {
-            throw new ServiceException("记录时间不能为空");
+            return null;
         }
-        String text = value.trim();
+        return parseDateTime(value.trim());
+    }
+
+    private static Date parseDateTime(String text)
+    {
         try
         {
             synchronized (DATE_TIME)

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/support/HealthRecordRegionSupport.java

@@ -3,7 +3,7 @@ package com.ruoyi.web.modules.industryservice.support;
 import com.ruoyi.common.utils.StringUtils;
 
 /**
- * 健康源数据地区键构建。
+ * 健康源数据地区键构建（按牧场维度集中判断）。
  */
 public final class HealthRecordRegionSupport
 {
@@ -11,14 +11,8 @@ public final class HealthRecordRegionSupport
     {
     }
 
-    public static String buildRegionKey(String county, String town, Long farmId, String farmName)
+    public static String buildRegionKey(Long farmId, String farmName)
     {
-        String countyPart = trimOrEmpty(county);
-        String townPart = trimOrEmpty(town);
-        if (StringUtils.isNotEmpty(countyPart) || StringUtils.isNotEmpty(townPart))
-        {
-            return countyPart + "|" + townPart;
-        }
         if (farmId != null)
         {
             return "F:" + farmId;

baqing-admin/src/main/resources/mapper/industryservice/BizYakHealthSourceRecordMapper.xml

@@ -3,25 +3,72 @@
 <mapper namespace="com.ruoyi.web.modules.industryservice.mapper.BizYakHealthSourceRecordMapper">
 
     <resultMap type="com.ruoyi.web.modules.industryservice.domain.BizYakHealthSourceRecord" id="BizYakHealthSourceRecordResult">
-        <id     property="id"            column="id"/>
-        <result property="externalId"    column="external_id"/>
-        <result property="recordType"    column="record_type"/>
-        <result property="recordTime"    column="record_time"/>
-        <result property="regionKey"     column="region_key"/>
-        <result property="farmId"        column="farm_id"/>
-        <result property="farmName"      column="farm_name"/>
-        <result property="yakNo"         column="yak_no"/>
-        <result property="resultCode"    column="result_code"/>
-        <result property="resultText"    column="result_text"/>
-        <result property="analyzedFlag"  column="analyzed_flag"/>
-        <result property="lastSyncTime"  column="last_sync_time"/>
-        <result property="createTime"    column="create_time"/>
-        <result property="updateTime"    column="update_time"/>
+        <id     property="id"                      column="id"/>
+        <result property="externalId"              column="external_id"/>
+        <result property="recordType"              column="record_type"/>
+        <result property="recordTime"              column="record_time"/>
+        <result property="regionKey"               column="region_key"/>
+        <result property="farmId"                  column="farm_id"/>
+        <result property="farmName"                column="farm_name"/>
+        <result property="enclosureId"             column="enclosure_id"/>
+        <result property="enclosureName"           column="enclosure_name"/>
+        <result property="cattleId"                column="cattle_id"/>
+        <result property="earTagNumber"            column="ear_tag_number"/>
+        <result property="yakNo"                   column="yak_no"/>
+        <result property="sourceCreateTime"        column="source_create_time"/>
+        <result property="quarantineUnitId"        column="quarantine_unit_id"/>
+        <result property="quarantineUnitName"      column="quarantine_unit_name"/>
+        <result property="quarantinePersonnelId"   column="quarantine_personnel_id"/>
+        <result property="quarantinePersonnelName" column="quarantine_personnel_name"/>
+        <result property="quarantineItem"          column="quarantine_item"/>
+        <result property="quarantineResult"        column="quarantine_result"/>
+        <result property="quarantineReport"        column="quarantine_report"/>
+        <result property="certificate"             column="certificate"/>
+        <result property="scenePicture"            column="scene_picture"/>
+        <result property="age"                     column="age"/>
+        <result property="etiology"                column="etiology"/>
+        <result property="diagnosisResult"         column="diagnosis_result"/>
+        <result property="medicationName"          column="medication_name"/>
+        <result property="medicationMethod"        column="medication_method"/>
+        <result property="clinic"                  column="clinic"/>
+        <result property="treatmentTime"           column="treatment_time"/>
+        <result property="treatmentCycle"          column="treatment_cycle"/>
+        <result property="treatmentEffect"         column="treatment_effect"/>
+        <result property="conditionChange"         column="condition_change"/>
+        <result property="recoveryTime"            column="recovery_time"/>
+        <result property="recoveryHealthStatus"    column="recovery_health_status"/>
+        <result property="recordNo"                column="record_no"/>
+        <result property="sourceType"              column="source_type"/>
+        <result property="taskId"                  column="task_id"/>
+        <result property="operationType"           column="operation_type"/>
+        <result property="batchId"                 column="batch_id"/>
+        <result property="cattleIds"               column="cattle_ids"/>
+        <result property="executorUserId"          column="executor_user_id"/>
+        <result property="executorName"            column="executor_name"/>
+        <result property="executeResult"           column="execute_result"/>
+        <result property="detailJson"              column="detail_json"/>
+        <result property="materialUsageJson"       column="material_usage_json"/>
+        <result property="attachments"             column="attachments"/>
+        <result property="exceptionFlag"           column="exception_flag"/>
+        <result property="exceptionDesc"           column="exception_desc"/>
+        <result property="remark"                  column="remark"/>
+        <result property="analyzedFlag"            column="analyzed_flag"/>
+        <result property="lastSyncTime"            column="last_sync_time"/>
+        <result property="createTime"              column="create_time"/>
+        <result property="updateTime"              column="update_time"/>
     </resultMap>
 
     <sql id="selectVo">
         select id, external_id, record_type, record_time, region_key, farm_id, farm_name,
-               yak_no, result_code, result_text, analyzed_flag, last_sync_time, create_time, update_time
+               enclosure_id, enclosure_name, cattle_id, ear_tag_number, yak_no, source_create_time,
+               quarantine_unit_id, quarantine_unit_name, quarantine_personnel_id, quarantine_personnel_name,
+               quarantine_item, quarantine_result, quarantine_report, certificate, scene_picture,
+               age, etiology, diagnosis_result, medication_name, medication_method, clinic,
+               treatment_time, treatment_cycle, treatment_effect, condition_change, recovery_time, recovery_health_status,
+               record_no, source_type, task_id, operation_type, batch_id, cattle_ids,
+               executor_user_id, executor_name, execute_result, detail_json, material_usage_json, attachments,
+               exception_flag, exception_desc, remark,
+               analyzed_flag, last_sync_time, create_time, update_time
         from biz_yak_health_source_record
     </sql>
 
@@ -40,10 +87,26 @@
             useGeneratedKeys="true" keyProperty="id">
         insert into biz_yak_health_source_record (
             external_id, record_type, record_time, region_key, farm_id, farm_name,
-            yak_no, result_code, result_text, analyzed_flag, last_sync_time, create_time
+            enclosure_id, enclosure_name, cattle_id, ear_tag_number, yak_no, source_create_time,
+            quarantine_unit_id, quarantine_unit_name, quarantine_personnel_id, quarantine_personnel_name,
+            quarantine_item, quarantine_result, quarantine_report, certificate, scene_picture,
+            age, etiology, diagnosis_result, medication_name, medication_method, clinic,
+            treatment_time, treatment_cycle, treatment_effect, condition_change, recovery_time, recovery_health_status,
+            record_no, source_type, task_id, operation_type, batch_id, cattle_ids,
+            executor_user_id, executor_name, execute_result, detail_json, material_usage_json, attachments,
+            exception_flag, exception_desc, remark,
+            analyzed_flag, last_sync_time, create_time
         ) values (
             #{externalId}, #{recordType}, #{recordTime}, #{regionKey}, #{farmId}, #{farmName},
-            #{yakNo}, #{resultCode}, #{resultText}, #{analyzedFlag}, #{lastSyncTime}, sysdate()
+            #{enclosureId}, #{enclosureName}, #{cattleId}, #{earTagNumber}, #{yakNo}, #{sourceCreateTime},
+            #{quarantineUnitId}, #{quarantineUnitName}, #{quarantinePersonnelId}, #{quarantinePersonnelName},
+            #{quarantineItem}, #{quarantineResult}, #{quarantineReport}, #{certificate}, #{scenePicture},
+            #{age}, #{etiology}, #{diagnosisResult}, #{medicationName}, #{medicationMethod}, #{clinic},
+            #{treatmentTime}, #{treatmentCycle}, #{treatmentEffect}, #{conditionChange}, #{recoveryTime}, #{recoveryHealthStatus},
+            #{recordNo}, #{sourceType}, #{taskId}, #{operationType}, #{batchId}, #{cattleIds},
+            #{executorUserId}, #{executorName}, #{executeResult}, #{detailJson}, #{materialUsageJson}, #{attachments},
+            #{exceptionFlag}, #{exceptionDesc}, #{remark},
+            #{analyzedFlag}, #{lastSyncTime}, sysdate()
         )
     </insert>
 
@@ -53,9 +116,48 @@
             region_key = #{regionKey},
             farm_id = #{farmId},
             farm_name = #{farmName},
+            enclosure_id = #{enclosureId},
+            enclosure_name = #{enclosureName},
+            cattle_id = #{cattleId},
+            ear_tag_number = #{earTagNumber},
             yak_no = #{yakNo},
-            result_code = #{resultCode},
-            result_text = #{resultText},
+            source_create_time = #{sourceCreateTime},
+            quarantine_unit_id = #{quarantineUnitId},
+            quarantine_unit_name = #{quarantineUnitName},
+            quarantine_personnel_id = #{quarantinePersonnelId},
+            quarantine_personnel_name = #{quarantinePersonnelName},
+            quarantine_item = #{quarantineItem},
+            quarantine_result = #{quarantineResult},
+            quarantine_report = #{quarantineReport},
+            certificate = #{certificate},
+            scene_picture = #{scenePicture},
+            age = #{age},
+            etiology = #{etiology},
+            diagnosis_result = #{diagnosisResult},
+            medication_name = #{medicationName},
+            medication_method = #{medicationMethod},
+            clinic = #{clinic},
+            treatment_time = #{treatmentTime},
+            treatment_cycle = #{treatmentCycle},
+            treatment_effect = #{treatmentEffect},
+            condition_change = #{conditionChange},
+            recovery_time = #{recoveryTime},
+            recovery_health_status = #{recoveryHealthStatus},
+            record_no = #{recordNo},
+            source_type = #{sourceType},
+            task_id = #{taskId},
+            operation_type = #{operationType},
+            batch_id = #{batchId},
+            cattle_ids = #{cattleIds},
+            executor_user_id = #{executorUserId},
+            executor_name = #{executorName},
+            execute_result = #{executeResult},
+            detail_json = #{detailJson},
+            material_usage_json = #{materialUsageJson},
+            attachments = #{attachments},
+            exception_flag = #{exceptionFlag},
+            exception_desc = #{exceptionDesc},
+            remark = #{remark},
             last_sync_time = #{lastSyncTime},
             update_time = sysdate()
         where id = #{id}

baqing-admin/src/main/resources/thirdparty/stub-diagnosis-records.json

@@ -2,31 +2,31 @@
   {
     "id": 3001,
     "farmId": 1,
-    "farmName": "示范牧场",
-    "county": "巴青县",
-    "town": "拉西镇",
-    "earTagNumber": "YAK-D-001",
+    "farmEnclosureId": 101,
+    "cattleId": 6001,
+    "age": "3岁",
+    "etiology": "疑似接触感染",
     "diagnosisTime": "2026-05-18 09:00:00",
-    "diseaseName": "口蹄疫疑似"
+    "diagnosisResult": "口蹄疫疑似",
+    "medicationName": "抗病毒注射液",
+    "clinic": "县兽医站",
+    "createTime": "2026-05-18 09:30:00"
   },
   {
     "id": 3002,
     "farmId": 1,
-    "farmName": "示范牧场",
-    "county": "巴青县",
-    "town": "拉西镇",
-    "earTagNumber": "YAK-D-002",
+    "farmEnclosureId": 101,
+    "cattleId": 6002,
     "diagnosisTime": "2026-05-18 10:30:00",
-    "diseaseName": "腹泻"
+    "diagnosisResult": "腹泻",
+    "createTime": "2026-05-18 11:00:00"
   },
   {
     "id": 3003,
     "farmId": 1,
-    "farmName": "示范牧场",
-    "county": "巴青县",
-    "town": "拉西镇",
-    "earTagNumber": "YAK-D-003",
+    "cattleId": 6003,
     "diagnosisTime": "2026-05-18 14:00:00",
-    "diseaseName": "发热"
+    "diagnosisResult": "发热",
+    "createTime": "2026-05-18 14:30:00"
   }
 ]

baqing-admin/src/main/resources/thirdparty/stub-process-records.json

@@ -1,13 +1,20 @@
 [
   {
     "id": 4001,
+    "recordNo": "PR-20260517-001",
+    "sourceType": "task",
+    "taskId": 8001,
+    "operationType": "免疫",
     "farmId": 1,
-    "farmName": "示范牧场",
-    "county": "巴青县",
-    "town": "拉西镇",
-    "earTagNumber": "YAK-B-001",
-    "recordTime": "2026-05-17 08:00:00",
-    "processType": "免疫",
-    "processContent": "口蹄疫疫苗接种"
+    "enclosureId": 101,
+    "batchId": 9001,
+    "cattleIds": "7001,7002",
+    "executorUserId": 30,
+    "executorName": "李四",
+    "executeTime": "2026-05-17 08:00:00",
+    "executeResult": "已完成",
+    "detailJson": "{\"vaccine\":\"口蹄疫疫苗\"}",
+    "exceptionFlag": "0",
+    "createTime": "2026-05-17 08:30:00"
   }
 ]

baqing-admin/src/main/resources/thirdparty/stub-quarantine-records.json

@@ -3,40 +3,49 @@
     "id": 2001,
     "farmId": 1,
     "farmName": "示范牧场",
-    "county": "巴青县",
-    "town": "拉西镇",
+    "farmEnclosureId": 101,
+    "farmEnclosureName": "一号圈舍",
+    "cattleId": 5001,
     "earTagNumber": "YAK-Q-001",
+    "quarantineUnitId": 10,
+    "quarantineUnitName": "县动物检疫站",
+    "quarantinePersonnelId": 20,
+    "quarantinePersonnelName": "张三",
+    "quarantineItem": "口蹄疫抗体检测",
     "quarantineTime": "2026-05-19 10:00:00",
-    "quarantineResult": "阳性"
+    "quarantineResult": "阳性",
+    "createTime": "2026-05-19 10:05:00"
   },
   {
     "id": 2002,
     "farmId": 1,
     "farmName": "示范牧场",
-    "county": "巴青县",
-    "town": "拉西镇",
+    "farmEnclosureId": 101,
+    "cattleId": 5002,
     "earTagNumber": "YAK-Q-002",
+    "quarantineItem": "布鲁氏菌病检测",
     "quarantineTime": "2026-05-19 11:00:00",
-    "quarantineResult": "异常"
+    "quarantineResult": "异常",
+    "createTime": "2026-05-19 11:05:00"
   },
   {
     "id": 2003,
     "farmId": 1,
     "farmName": "示范牧场",
-    "county": "巴青县",
-    "town": "拉西镇",
+    "cattleId": 5003,
     "earTagNumber": "YAK-Q-003",
     "quarantineTime": "2026-05-19 12:00:00",
-    "quarantineResult": "阳性"
+    "quarantineResult": "阳性",
+    "createTime": "2026-05-19 12:05:00"
   },
   {
     "id": 2004,
     "farmId": 1,
     "farmName": "示范牧场",
-    "county": "巴青县",
-    "town": "拉西镇",
+    "cattleId": 5004,
     "earTagNumber": "YAK-Q-004",
     "quarantineTime": "2026-05-19 13:00:00",
-    "quarantineResult": "正常"
+    "quarantineResult": "正常",
+    "createTime": "2026-05-19 13:05:00"
   }
 ]

baqing-admin/src/test/java/com/ruoyi/web/modules/industryservice/service/YakDiseaseWarningAnalyzerTest.java

@@ -65,11 +65,11 @@ class YakDiseaseWarningAnalyzerTest
         BizYakHealthSourceRecord row = new BizYakHealthSourceRecord();
         row.setId(id);
         row.setRecordType(YakDiseaseWarningAnalysisRules.RECORD_TYPE_QUARANTINE);
-        row.setRegionKey("巴青县|拉西镇|1");
+        row.setRegionKey("F:1");
         row.setFarmName("示范牧场");
         row.setYakNo("YAK-Q-" + id);
         row.setRecordTime(recordTime);
-        row.setResultCode(result);
+        row.setQuarantineResult(result);
         return row;
     }
 

baqing-admin/src/test/java/com/ruoyi/web/modules/industryservice/service/YakDiseaseWarningSyncServiceTest.java

@@ -88,8 +88,8 @@ class YakDiseaseWarningSyncServiceTest
         dto.setId(id);
         dto.setFarmId(1L);
         dto.setFarmName("示范牧场");
-        dto.setCounty("巴青县");
-        dto.setTown("拉西镇");
+        dto.setFarmEnclosureId(101L);
+        dto.setCattleId(5001L);
         dto.setEarTagNumber("YAK-Q-TEST");
         dto.setQuarantineTime("2026-05-19 10:00:00");
         dto.setQuarantineResult("阳性");

baqing-admin/src/test/java/com/ruoyi/web/modules/industryservice/support/HealthRecordOpenApiMapperTest.java

@@ -6,21 +6,22 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import com.ruoyi.web.modules.industryservice.domain.BizYakHealthSourceRecord;
+import com.ruoyi.web.modules.industryservice.domain.dto.OpenDiagnosisRecordDto;
 import com.ruoyi.web.modules.industryservice.domain.dto.OpenQuarantineRecordDto;
 
 @DisplayName("HealthRecordOpenApiMapper")
 class HealthRecordOpenApiMapperTest
 {
     @Test
-    @DisplayName("检疫记录映射 external_id 与地区键")
+    @DisplayName("检疫记录映射 external_id 与牧场地区键")
     void fromQuarantine()
     {
         OpenQuarantineRecordDto dto = new OpenQuarantineRecordDto();
         dto.setId(100L);
         dto.setFarmId(1L);
         dto.setFarmName("示范牧场");
-        dto.setCounty("巴青县");
-        dto.setTown("拉西镇");
+        dto.setFarmEnclosureId(101L);
+        dto.setCattleId(5001L);
         dto.setEarTagNumber("YAK-001");
         dto.setQuarantineTime("2026-05-19 10:00:00");
         dto.setQuarantineResult("阳性");
@@ -29,8 +30,27 @@ class HealthRecordOpenApiMapperTest
         assertEquals("Q:100", row.getExternalId());
         assertEquals(YakDiseaseWarningAnalysisRules.RECORD_TYPE_QUARANTINE, row.getRecordType().intValue());
         assertEquals("YAK-001", row.getYakNo());
-        assertEquals("阳性", row.getResultCode());
-        assertNotNull(row.getRegionKey());
+        assertEquals("阳性", row.getQuarantineResult());
+        assertEquals("F:1", row.getRegionKey());
         assertEquals(YakDiseaseWarningAnalysisRules.ANALYZED_NO, row.getAnalyzedFlag());
     }
+
+    @Test
+    @DisplayName("诊疗记录映射 cattleId 为 yak_no")
+    void fromDiagnosis()
+    {
+        OpenDiagnosisRecordDto dto = new OpenDiagnosisRecordDto();
+        dto.setId(200L);
+        dto.setFarmId(2L);
+        dto.setCattleId(6001L);
+        dto.setDiagnosisTime("2026-05-18 09:00:00");
+        dto.setDiagnosisResult("发热");
+
+        BizYakHealthSourceRecord row = HealthRecordOpenApiMapper.fromDiagnosis(dto);
+        assertEquals("D:200", row.getExternalId());
+        assertEquals("6001", row.getYakNo());
+        assertEquals("发热", row.getDiagnosisResult());
+        assertEquals("F:2", row.getRegionKey());
+        assertNotNull(row.getRecordTime());
+    }
 }

sql/biz_yak_health_source_record.sql

@@ -1,15 +1,54 @@
+-- 牦牛疾病预警：第三方健康源数据（检疫/诊疗/养殖过程），字段与 OpenAPI 返回对齐
 CREATE TABLE IF NOT EXISTS `biz_yak_health_source_record` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
   `external_id` varchar(64) NOT NULL COMMENT '第三方记录ID（类型前缀+主键）',
   `record_type` tinyint(4) NOT NULL COMMENT '1检疫 2诊疗 3养殖过程',
-  `record_time` datetime NOT NULL COMMENT '业务时间（检疫/诊疗/记录时间）',
-  `region_key` varchar(128) DEFAULT NULL COMMENT '地区键（县+乡镇或牧场，用于集中判断）',
-  `farm_id` bigint(20) DEFAULT NULL COMMENT '第三方农场ID',
-  `farm_name` varchar(128) DEFAULT NULL COMMENT '农场/牧场名称',
-  `yak_no` varchar(64) DEFAULT NULL COMMENT '牦牛编号（耳标/场内编号）',
-  `result_code` varchar(64) DEFAULT NULL COMMENT '结果码或病种摘要',
-  `result_text` varchar(512) DEFAULT NULL COMMENT '结果/诊断/过程描述',
+  `record_time` datetime NOT NULL COMMENT '业务时间（检疫/诊疗/执行时间）',
+  `region_key` varchar(128) DEFAULT NULL COMMENT '地区键（牧场维度，用于集中判断）',
+  `farm_id` bigint(20) DEFAULT NULL COMMENT '第三方养殖场ID',
+  `farm_name` varchar(128) DEFAULT NULL COMMENT '养殖场名称',
+  `enclosure_id` bigint(20) DEFAULT NULL COMMENT '圈舍ID',
+  `enclosure_name` varchar(128) DEFAULT NULL COMMENT '圈舍名称',
+  `cattle_id` bigint(20) DEFAULT NULL COMMENT '牛只ID',
+  `ear_tag_number` varchar(64) DEFAULT NULL COMMENT '耳标编号',
+  `yak_no` varchar(64) DEFAULT NULL COMMENT '展示编号（耳标或牛只ID）',
+  `source_create_time` datetime DEFAULT NULL COMMENT '第三方创建时间',
+  `quarantine_unit_id` bigint(20) DEFAULT NULL COMMENT '检疫单位ID',
+  `quarantine_unit_name` varchar(128) DEFAULT NULL COMMENT '检疫单位名称',
+  `quarantine_personnel_id` bigint(20) DEFAULT NULL COMMENT '检疫人员ID',
+  `quarantine_personnel_name` varchar(64) DEFAULT NULL COMMENT '检疫人员名称',
+  `quarantine_item` varchar(128) DEFAULT NULL COMMENT '检疫项目',
+  `quarantine_result` varchar(64) DEFAULT NULL COMMENT '检疫结果',
+  `quarantine_report` varchar(512) DEFAULT NULL COMMENT '检疫报告',
+  `certificate` varchar(128) DEFAULT NULL COMMENT '证书编号',
+  `scene_picture` varchar(512) DEFAULT NULL COMMENT '现场图片',
+  `age` varchar(32) DEFAULT NULL COMMENT '年龄',
+  `etiology` varchar(256) DEFAULT NULL COMMENT '病因',
+  `diagnosis_result` varchar(256) DEFAULT NULL COMMENT '诊断结果',
+  `medication_name` varchar(128) DEFAULT NULL COMMENT '用药名称',
+  `medication_method` varchar(128) DEFAULT NULL COMMENT '用药方式',
+  `clinic` varchar(128) DEFAULT NULL COMMENT '诊疗机构',
+  `treatment_time` datetime DEFAULT NULL COMMENT '治疗时间',
+  `treatment_cycle` varchar(64) DEFAULT NULL COMMENT '治疗周期',
+  `treatment_effect` varchar(128) DEFAULT NULL COMMENT '治疗效果',
+  `condition_change` varchar(256) DEFAULT NULL COMMENT '病情变化',
+  `recovery_time` datetime DEFAULT NULL COMMENT '康复时间',
+  `recovery_health_status` varchar(64) DEFAULT NULL COMMENT '康复健康状态',
+  `record_no` varchar(64) DEFAULT NULL COMMENT '过程记录编号',
+  `source_type` varchar(32) DEFAULT NULL COMMENT '来源类型',
+  `task_id` bigint(20) DEFAULT NULL COMMENT '任务ID',
+  `operation_type` varchar(64) DEFAULT NULL COMMENT '操作类型',
+  `batch_id` bigint(20) DEFAULT NULL COMMENT '批次ID',
+  `cattle_ids` varchar(512) DEFAULT NULL COMMENT '牛只ID列表',
+  `executor_user_id` bigint(20) DEFAULT NULL COMMENT '执行人用户ID',
+  `executor_name` varchar(64) DEFAULT NULL COMMENT '执行人',
+  `execute_result` varchar(256) DEFAULT NULL COMMENT '执行结果',
+  `detail_json` text COMMENT '执行明细JSON',
+  `material_usage_json` text COMMENT '物资使用JSON',
+  `attachments` varchar(512) DEFAULT NULL COMMENT '现场照片',
+  `exception_flag` char(1) DEFAULT NULL COMMENT '是否异常',
+  `exception_desc` varchar(256) DEFAULT NULL COMMENT '异常说明',
+  `remark` varchar(512) DEFAULT NULL COMMENT '备注',
   `analyzed_flag` char(1) NOT NULL DEFAULT '0' COMMENT '0未分析 1已分析',
   `last_sync_time` datetime DEFAULT NULL COMMENT '最近同步时间',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',