给psy新增farmID

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/controller/ErpDataController.java

@@ -40,13 +40,13 @@ public class ErpDataController {
      * @Time        : 20:57
      */
     @RequestMapping("/getPsy")
-    public Result getPsy(@Param(value="startDate") String startDate,@Param(value="endDate") String endDate,@RequestParam(value = "accessToken",required = true) String accessToken){
+    public Result getPsy(@Param(value="farmID") String farmID,@Param(value="startDate") String startDate,@Param(value="endDate") String endDate,@RequestParam(value = "accessToken",required = true) String accessToken){
         // 验证token
         Result result = tokenUtil.verifyToken(accessToken);
         if(!result.isSuccess()){
             return result;
         }
-        return new Result(ResultCode.SUCCESS,erpDataService.getPsy(startDate,endDate));
+        return new Result(ResultCode.SUCCESS,erpDataService.getPsy(farmID,startDate,endDate));
     }
 
     /**

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/dao/repo/TDeliveryRepo.java

@@ -19,51 +19,182 @@ public interface TDeliveryRepo extends JpaRepository<TDeliveryEntity, String>, J
      * @Date        : 2021/5/15       
      * @Time        : 13:50
      */
-    @Query(nativeQuery = true,value = "select CAST(PJWCHZ*chl*NLYWS AS DEC(8,2)) AS 'PSY' from (select avg(TNewStru7743.FamountLiveInt*1.0) as 'PJWCHZ'" +
-            " from TDelivery left join TNewStru7743 on TNewStru7743.FDeliveryMainStruID=TDelivery.FID " +
-            " where TDelivery.FLogStatee in(3,4,6) and TDelivery.FDateDelivery between ?1 and ?2)PJWCHZ, " +
-            " (SELECT case WHEN zczc = 0 THEN 0 ELSE 1-sw/zczc END  as 'chl' from ( select count(TBornNewStru.Fid) as 'zczc' " +
-            "  from TBorn left join TBornNewStru on TBornNewStru.FBornMainStruID = TBorn.FID " +
-            "  where TBorn.FLOGSTATEE in (3,4,6) " +
-            "  and TBorn.FDATEBORN between  ?1 and ?2)cs,(select sum(isnull(TPigDieChild.FweakpigdieCount,0))+sum(isnull(TPigDieChild.Fpigdiecount,0)) as sw " +
-            " from TPigDie left join TPigDieChild on TPigDieChild.FPigDieMainStruID=TPigDie.FID " +
-            " where TPigDie.FBillState in(3,4,6) and TPigDieChild.FPigSex in(1,2,3) and FPIGSTATE=15 " +
-            " and (TPigDie.FDieDate BETWEEN  ?1 and ?2))sw )chl,(select  CAST(365*1.0/avg(tjj) as dec(7,4)) as 'NLYWS' " +
-            " from " +
-            "  (SELECT " +
-            " case when isnull(TNewStru7743.FtyreDistance,0)!=0 then  TNewStru7743.FtyreDistance  end  as 'tjj' " +
-            " FROM TDelivery " +
-            " LEFT JOIN TNewStru7743  on TNewStru7743.FDeliveryMainStruID = TDelivery.FID " +
-            "  WHERE  TDelivery.FlogStateE in(3,4,6) " +
-            " And ( datediff(dd,?1,TDelivery.FDATEDELIVERY)>=0 ) " +
-            " And (datediff(dd,?2,TDelivery.FDATEDELIVERY)<=0 ) " +
-            " ) tmp_tbl " +
-            " having avg(tjj)>0)ncws ")
-    List<Object[]> getPsy_old(String startDate,String endDate);
-
-
-    @Query(nativeQuery = true,value = "select CAST(PJWCHZ*chl*NLYWS AS DEC(8,2)) AS 'PSY' from (select avg(TNewStru7743.FamountLiveInt*1.0) as 'PJWCHZ' " +
-            "from TDelivery left join TNewStru7743 on TNewStru7743.FDeliveryMainStruID=TDelivery.FID " +
-            "where TDelivery.FLogStatee in(3,4,6) and TDelivery.FDateDelivery between ?1 and ?2)PJWCHZ," +
-            "(SELECT case WHEN zczc = 0 THEN 0 ELSE 1-sw/zczc END  as 'chl' from ( select count(TBornNewStru.Fid) as 'zczc'" +
-            "           from TBorn left join TBornNewStru on TBornNewStru.FBornMainStruID = TBorn.FID " +
-            "           where TBorn.FLOGSTATEE in (3,4,6)" +
-            "     and TBorn.FDATEBORN between  ?1 and ?2)cs,(select sum(isnull(TPigDieChild.FweakpigdieCount,0))+sum(isnull(TPigDieChild.Fpigdiecount,0)) as sw " +
-            " from TPigDie left join TPigDieChild on TPigDieChild.FPigDieMainStruID=TPigDie.FID " +
-            " where TPigDie.FBillState in(3,4,6) and TPigDieChild.FPigSex in(1,2,3) and FPIGSTATE=15" +
-            " and (TPigDie.FDieDate BETWEEN  ?1 and ?2))sw )chl,(select  CAST(365*1.0/avg(tjj) as dec(7,4)) as 'NLYWS'   " +
-            " from " +
-            "  (SELECT" +
-            " case when isnull(TNewStru7743.FtyreDistance,0)!=0 then  TNewStru7743.FtyreDistance  end  as 'tjj' " +
-            " FROM TDelivery     " +
-            " LEFT JOIN TNewStru7743  on TNewStru7743.FDeliveryMainStruID = TDelivery.FID " +
-            "" +
-            "  WHERE  TDelivery.FlogStateE in(3,4,6) " +
-            "And ( datediff(dd,?1,TDelivery.FDATEDELIVERY)>=0 ) " +
-            "And (datediff(dd,?2,TDelivery.FDATEDELIVERY)<=0 )  " +
-            ") tmp_tbl   " +
-            "    having avg(tjj)>0)ncws")
-    List<Object[]> getPsy(String startDate,String endDate);
+    @Query(nativeQuery = true,value = "SELECT CAST " +
+            "( " +
+            "PJWCHZ * chl * NCWS AS DEC ( 8, 2 )) AS 'PSY'  " +
+            "FROM " +
+            "( " +
+            "SELECT " +
+            " CAST " +
+            "( " +
+            " (AVG " +
+            "( TNewStru7743.FamountLiveInt* 1.0 )) AS DEC ( 8, 2 )) AS 'PJWCHZ'  " +
+            "FROM " +
+            "TDelivery " +
+            "LEFT JOIN TNewStru7743 ON TNewStru7743.FDeliveryMainStruID= TDelivery.FID  " +
+            "WHERE " +
+            "TDelivery.FLogStatee IN ( 3, 4, 6 )  " +
+            "AND ( datediff( dd,  ?1, TDelivery.FDATEDELIVERY ) >= 0 )  " +
+            "AND ( datediff( dd,  ?2, TDelivery.FDATEDELIVERY ) <= 0 )  " +
+            "and (TDelivery.hogpenDID in( ?3)) " +
+            ") PJWCHZ, " +
+            "( " +
+            "SELECT " +
+            "CASE " +
+            "WHEN " +
+            "zczc = 0 THEN " +
+            "0 ELSE 1-sw / zczc  " +
+            "END AS 'chl'  " +
+            "FROM " +
+            "( " +
+            "SELECT COUNT " +
+            "( TBornNewStru.Fid ) AS 'zczc'  " +
+            "FROM " +
+            "TBorn " +
+            "LEFT JOIN TBornNewStru ON TBornNewStru.FBornMainStruID = TBorn.FID  " +
+            "WHERE " +
+            "TBorn.FLOGSTATEE IN ( 3, 4, 6 )  " +
+            "AND ( datediff( dd,  ?1, TBorn.FDATEBORN ) >= 0 )  " +
+            "AND ( datediff( dd,  ?2, TBorn.FDATEBORN ) <= 0 ) " +
+            "and TBorn.HOGPENDID in ( ?3)  " +
+            ") cs, " +
+            "( " +
+            "SELECT SUM " +
+            "( " +
+            "isnull( TPigDieChild.FweakpigdieCount, 0 )) + SUM ( " +
+            "isnull( TPigDieChild.Fpigdiecount, 0 )) AS sw  " +
+            "FROM " +
+            "TPigDie " +
+            "LEFT JOIN TPigDieChild ON TPigDieChild.FPigDieMainStruID= TPigDie.FID  " +
+            "WHERE " +
+            "TPigDie.FBillState IN ( 3, 4, 6 )  " +
+            "AND TPigDieChild.FPigSex IN ( 1, 2, 3 )  " +
+            "AND FPIGSTATE = 15  " +
+            "AND ( TPigDie.FDieDate BETWEEN  ?1 AND  ?2 ) " +
+            "and (TPigdie.PIGHOUSEID in ( ?3)) " +
+            ") sw  " +
+            ") chl, " +
+            "( " +
+            "SELECT  " +
+            " " +
+            "CAST " +
+            "( " +
+            "(365/(RSQ+BRQ+dpjj+dnsts+hbpzjj)) AS DEC ( 8, 2 )) AS NCWS " +
+            " FROM ( " +
+            "select 母猪日均存栏 as mucl ,hbsl as hbcl,case  when ts is null then 250 else ts end as tss,RSQ AS RSQ ,BRQ AS BRQ,isnull(CAST " +
+            "( " +
+            "(1.0*dpjjh)/(1.0*母猪日均存栏) AS DEC ( 8, 2 )),0) as dpjj " +
+            ", isnull(CAST " +
+            "( " +
+            "(1.0*ztjgtss)/(1.0*母猪日均存栏) AS DEC ( 8, 2 )),0) as dnsts , " +
+            " " +
+            "isnull(CAST " +
+            "(((case  when ts is null then 250 else ts end-250)*hbsl/母猪日均存栏) as DEC ( 8, 2 ) ),0) as hbpzjj " +
+            "from ( " +
+            "select  " +
+            "isnull(mzrjcl.RJAmount,0) as '母猪日均存栏' " +
+            "from( " +
+            "select tmp_tbl.ZCID, AVG(tmp_tbl.FAmount) 'RJAmount' from (select tppa.HogpendID 'ZCID' " +
+            "           ,tppa.FDay 'FDate',SUM(tppa.FAmount) 'FAmount' from TPigStateAmountForBoar tppa where 1=1  " +
+            "        and tppa.FDay>= ?1 " +
+            "           and tppa.FDay<= ?2 and FPigClass=2 " +
+            "              and tppa.HogpendID in( ?3) " +
+            "           group by tppa.HogpendID,tppa.FDay) tmp_tbl group by tmp_tbl.ZCID )mzrjcl)mzcl, " +
+            "            " +
+            "           (SELECT   " +
+            "count(sow.fnumber) as 'hbsl' " +
+            "FROM TNewStru8094 " +
+            "left join TBreeding on TNewStru8094.FBreedingMainStruID = TBreeding.FID   " +
+            "left join TOrganizeCell on TBreeding.HOGPENDID = TOrganizeCell.FID   " +
+            "left join TPigArchives as sow on TNewStru8094.SOWSTRID= sow.FID   " +
+            "WHERE TBreeding.FlogStateE in (3,4,6)  " +
+            "And (TBreeding.HOGPENDID in( ?3))  " +
+            "And (TBreeding.FDATEBREED>= ?1 or  ?1 is null)  " +
+            "And (TBreeding.FDATEBREED<= ?2 or  ?2 is null)  " +
+            "   and (TNewStru8094.fuponPigStateE =11) " +
+            "   )hbs, " +
+            "   (select avg(hb.ts) as 'ts' from(SELECT TOrganizeCell.FNAME  as '所在猪场', TPigHouse.FName as '所在猪舍',  " +
+            "       TBreeding.FDATEBREED as '配种日期', TNewStru8094.fuponPigStateE as '状态', " +
+            " CAST(DATEDIFF(dd,(select top 1 FDATEOFBIRTH from TPigArchives where fnumber=sow.fnumber),TBreeding.FDATEBREED) AS DECIMAL(10,2)) as 'ts' " +
+            "FROM TNewStru8094 " +
+            "left join TBreeding on TNewStru8094.FBreedingMainStruID = TBreeding.FID   " +
+            "left join TOrganizeCell on TBreeding.HOGPENDID = TOrganizeCell.FID   " +
+            "left join TPigHouse on TBreeding.PIGHOUSEDID = TPigHouse.FID   " +
+            "left join TPigArchives as sow on TNewStru8094.SOWSTRID= sow.FID   " +
+            "left join TPigArchives as boar on  TNewStru8094.BOARONESTRID = boar.FID   " +
+            "left join TPigArchives as boar1 on TNewStru8094.boarTwoIntID = boar1.FID  " +
+            "LEFT JOIN TBreed ON boar.varietyDID = TBreed.FID  " +
+            "left join TEmployee on TEmployee.FID=TNewStru8094.EMPONEBOARDID " +
+            "left join TEmployee emp on emp.FID = TNewStru8094.EMPTWOBOARDID " +
+            "WHERE TBreeding.FlogStateE in (3,4,6) and TNewStru8094.fuponPigStateE=11 " +
+            "And (TBreeding.HOGPENDID in(''))  " +
+            "And (TBreeding.FDATEBREED>= ?1 or  ?1 is null)  " +
+            "And (TBreeding.FDATEBREED<= ?2 or  ?2 is null)  " +
+            ")hb)hbts, " +
+            "(select sum(zh.本次配种至上窝断奶天数) as 'dpjjh' from( SELECT TOrganizeCell.FNAME  as '所在猪场', " +
+            "datediff(day, (select max(TWeaning.FDateWeaning) from TWeaning left join TWeaningNewStru on TWeaningNewStru.FWeaningMainStruID=TWeaning.FID  " +
+            "where TWeaning.FlogStateE in (3,4,6) and TWeaningNewStru.SOWSTRID=TNewStru8094.SOWSTRID  " +
+            "and TWeaningNewStru.FParityInt=TNewStru8094.FParityInt), TBreeding.FDateBreed) as '本次配种至上窝断奶天数'  " +
+            "FROM TNewStru8094 " +
+            "left join TBreeding on TNewStru8094.FBreedingMainStruID = TBreeding.FID   " +
+            "left join TOrganizeCell on TBreeding.HOGPENDID = TOrganizeCell.FID   " +
+            "WHERE TBreeding.FlogStateE in (3,4,6)  " +
+            "And (TBreeding.HOGPENDID in( ?3))  " +
+            "And (TBreeding.FDATEBREED>= ?1 or  ?1 is null)  " +
+            "And (TBreeding.FDATEBREED<= ?2 or  ?2 is null)  " +
+            "group by TOrganizeCell.FNAME,TNewStru8094.SOWSTRID,TNewStru8094.FPARITYINT,TBreeding.FDATEBREED)zh)zhs " +
+            ", " +
+            "( select sum(zh.ztjgts) as 'ztjgtss' from (SELECT  DATEDIFF(dd,TDL.ztbgrq , max(TDL.rq)) as 'ztjgts' " +
+            "  from(   " +
+            "  SELECT  " +
+            "  TPigArchives.FNUMBER as 'zzbh',     " +
+            "  TPigdie.FDIEDATE as 'rq', " +
+            "case    " +
+            "  when TPigdieChild.FPIGSTATE = 3 then (select MAX(TWeaning.FDATEWEANING)  from TWeaning ,TWeaningNewStru  " +
+            "  where TWeaning.FDATEWEANING <=TPigdie.FDIEDATE  " +
+            "  and TWeaning.FID = TWeaningNewStru.FWeaningMainStruID " +
+            "  and TWeaningNewStru.SOWSTRID = TPigdieChild.NUMBERID " +
+            "   )    end as 'ztbgrq'  " +
+            "  FROM TPigdie  " +
+            "  left join TPigdieChild on TPigdie.FID=TPigdieChild.FPigdieMainStruID  " +
+            "  left join TPigArchives on TPigdieChild.NUMBERID = TPigArchives.FID  " +
+            "  WHERE TPigdie.Fbillstate in(3,4,6)  " +
+            "  AND (TPigdie.PIGHOUSEID in( ?3)) " +
+            "And ( datediff(dd, ?1,TPigdie.FDIEDATE)>=0 or  ?1 is null)  " +
+            "And (datediff(dd, ?2,TPigdie.FDIEDATE)<=0 or  ?2 is null)  " +
+            "  AND (TPigdieChild.FPIGSEX =2)  " +
+            "  AND (TPigdieChild.FPIGSTATE =3)  " +
+            "  union all  " +
+            "  SELECT   " +
+            "  TPigArchives.FNumber as 'zzbh',   " +
+            "  TPigLose.FPIGLOSEDATE as 'rq', " +
+            "case   " +
+            "  when TPigLoseChild.FPIGSTATE = 3 then (select MAX(TWeaning.FDATEWEANING)  from TWeaning ,TWeaningNewStru  " +
+            "  where TWeaning.FDATEWEANING <=TPigLose.FPIGLOSEDATE  " +
+            "  and TWeaning.FID = TWeaningNewStru.FWeaningMainStruID " +
+            "  and TWeaningNewStru.SOWSTRID = TPigLoseChild.NUMBERID " +
+            "   )  end as 'ztbgrq'  " +
+            "  FROM TPigLose  " +
+            "  left join TPigLoseChild on TPigLoseChild.FPigLoseMainStruID = TPigLose.FID  " +
+            "  left join TPigArchives on TPigLoseChild.NUMBERID  = TPigArchives.FID " +
+            "  WHERE TPigLose.Fbillstate in(3,4,6)  " +
+            "   AND (TPigLose.PIGHOUSEID in( ?3)) " +
+            "  And ( datediff(dd, ?1,TPigLose.FPIGLOSEDATE)>=0 or  ?1 is null)  " +
+            "And (datediff(dd, ?2,TPigLose.FPIGLOSEDATE)<=0 or  ?2 is null)  " +
+            "  AND (TPigLoseChild.FSEX =2)  " +
+            "  AND (TPigLoseChild.FPIGSTATE =3) ) TDL   " +
+            "  GROUP BY   TDL.zzbh , TDL.ztbgrq)zh)dnst,(select  avg(DATEDIFF(day,TNewStru7743.FDATEBREED,TDelivery.FDATEDELIVERY)) as 'RSQ' " +
+            "from TDelivery  " +
+            "left join TNewStru7743 on TNewStru7743.FDeliveryMainStruID=TDelivery.FID  " +
+            " where FLogStatee in(3,4,6) and isnull(FPREGNANTDAYINT,0)>0 " +
+            "and (TDelivery.hogpendID in( ?3)) and TDelivery.FDateDelivery between  ?1 and  ?2)TRSQ " +
+            ",(select avg(isnull(TWeaningNewStru.FDAYAGE,0)) as 'BRQ'  from TWeaning  " +
+            "left join TWeaningNewStru on TWeaningNewStru.FWeaningMainStruID=TWeaning.FID where FLogStatee in(3,4,6)  " +
+            "and isnull(TWeaningNewStru.FDAYAGE,0)>0 " +
+            "and (TWeaning.hogpendID in( ?3))     " +
+            "and TWeaning.FdateWeaning between  ?1 and  ?2)TBTQ)ZZ " +
+            ") ncws")
+    List<Object[]> getPsy(String startDate,String endDate,String farmID);
 
     /**
      * @Method      : getReEstrusRate
@@ -75,40 +206,69 @@ public interface TDeliveryRepo extends JpaRepository<TDeliveryEntity, String>, J
      * @Date        : 2021/5/15
      * @Time        : 13:50
      */
-    @Query(nativeQuery = true,value =
-            "select TOrganizeCell.FSHORTNAME as 'farm', tmp_tblpz.FBreedD as 'variety'," +
-            "CAST(count(tmp_tblfm.SowStrID)*1.0/(case sum(tmp_tblpz.mate_times) when 0 then null else sum(tmp_tblpz.mate_times) end) as dec(8,5)) as 'reestrus_rate' " +
-            "from (select " +
-            "TBreeding.HogpendID,TNewStru8094.FBreedD,TNewStru8094.SowStrID,TNewStru8094.FParityInt,count(TNewStru8094.FID) as 'mate_times' " +
-            "from TBreeding left join TNewStru8094 on TNewStru8094.FBreedingMainStruID=TBreeding.FID " +
-            "where TBreeding.FLogStatee in(3,4,6)   and datediff(dd, ?1, FDateBreed)>=-121 and datediff(dd, ?2,FDateBreed) <=-121 " +
-            "group by TBreeding.HogpendID,TNewStru8094.FBreedD,TNewStru8094.SowStrID,TNewStru8094.FParityInt " +
-            ") tmp_tblpz " +
-            "left join (select TReturnEstrusewStru.SowStrID,TReturnEstrusewStru.FParityInt from TReturnEstrusewStru " +
-            "left join TReturnEstrus on TReturnEstrusewStru.FReturnEstrusMainStruID=TReturnEstrus.FID " +
-            "where TReturnEstrus.FLogStatee in(3,4,6)  and datediff(dd, ?1, TReturnEstrusewStru.FDateBreed)>=-121 and datediff(dd, ?2,TReturnEstrusewStru.FDateBreed) <=-121 " +
-            ") tmp_tblfm on tmp_tblpz.SowStrID=tmp_tblfm.SowStrID and tmp_tblpz.FParityInt=tmp_tblfm.FParityInt " +
-            "left join TOrganizeCell on tmp_tblpz.HogpendID=TOrganizeCell.FID " +
-            "where TOrganizeCell.FNAME is not null " +
-            "group by TOrganizeCell.FSHORTNAME,tmp_tblpz.FBreedD")
-    List<Object[]> getReEstrusRate_old(String startDate,String endDate);
 
     @Query(nativeQuery = true,value =
-            "select TOrganizeCell.FSHORTNAME as '猪场', " +
-                    "CAST(count(tmp_tblfm.SowStrID)*1.0/(case sum(tmp_tblpz.配种次数) when 0 then null else sum(tmp_tblpz.配种次数) end) as dec(8,5)) as '配种返情率' " +
-                    "from (select " +
-                    "TBreeding.HogpendID,TNewStru8094.FBreedD,TNewStru8094.SowStrID,TNewStru8094.FParityInt,count(TNewStru8094.FID) as '配种次数' " +
-                    "from TBreeding left join TNewStru8094 on TNewStru8094.FBreedingMainStruID=TBreeding.FID " +
-                    "where TBreeding.FLogStatee in(3,4,6)   and datediff(dd,?1, FDateBreed)>=-121 and datediff(dd,?2,FDateBreed) <=-121 " +
-                    "group by TBreeding.HogpendID,TNewStru8094.FBreedD,TNewStru8094.SowStrID,TNewStru8094.FParityInt " +
+            "SELECT " +
+                    "(select TOrganizeCell.FNAME from TOrganizeCell where FID in ( tmp_tblpz.HogpendID)) AS '猪场',    " +
+                    "CAST (  " +
+                    "COUNT ( tmp_tblfm.SowStrID ) * 1.0 /  " +
+                    "( CASE SUM ( tmp_tblpz.配种次数 ) WHEN 0 THEN NULL ELSE SUM ( tmp_tblpz.配种次数 ) END )  " +
+                    "AS DEC ( 8, 5 ) " +
+                    ") AS '配种返情率'  " +
+                    "FROM " +
+                    "( " +
+                    "SELECT " +
+                    "TBreeding.HogpendID,    " +
+                    "TNewStru8094.FBreedD,     " +
+                    "TNewStru8094.SowStrID,     " +
+                    "TNewStru8094.FParityInt,      " +
+                    "COUNT ( TNewStru8094.FID ) AS '配种次数'  " +
+                    "FROM " +
+                    "TBreeding   " +
+                    "LEFT JOIN TNewStru8094    " +
+                    "ON TNewStru8094.FBreedingMainStruID= TBreeding.FID    " +
+                    "WHERE " +
+                    "TBreeding.FLogStatee IN ( 3, 4, 6 )     " +
+                    "AND datediff( dd,?1, FDateBreed ) >=- 121    " +
+                    "AND datediff( dd,?2, FDateBreed ) <=- 121    " +
+                    "AND ( " +
+                    "TBreeding.hogpenDID IN (select FID from TOrganizeCell where FNAME in (?3)))    " +
+                    "GROUP BY " +
+                    "TBreeding.HogpendID,    " +
+                    "TNewStru8094.FBreedD,    " +
+                    "TNewStru8094.SowStrID,     " +
+                    "TNewStru8094.FParityInt     " +
                     ") tmp_tblpz " +
-                    "left join (select TReturnEstrusewStru.SowStrID,TReturnEstrusewStru.FParityInt from TReturnEstrusewStru " +
-                    "left join TReturnEstrus on TReturnEstrusewStru.FReturnEstrusMainStruID=TReturnEstrus.FID " +
-                    "where TReturnEstrus.FLogStatee in(3,4,6)  and datediff(dd,?1, TReturnEstrusewStru.FDateBreed)>=-121 and datediff(dd,?2,TReturnEstrusewStru.FDateBreed) <=-121 " +
-                    ") tmp_tblfm on tmp_tblpz.SowStrID=tmp_tblfm.SowStrID and tmp_tblpz.FParityInt=tmp_tblfm.FParityInt " +
-                    "left join TOrganizeCell on tmp_tblpz.HogpendID=TOrganizeCell.FID " +
-                    "where TOrganizeCell.FNAME in(?3) " +
-                    "group by TOrganizeCell.FSHORTNAME")
+                    "LEFT JOIN ( " +
+                    "SELECT " +
+                    "TReturnEstrusewStru.SowStrID,    " +
+                    "TReturnEstrusewStru.FParityInt    " +
+                    "FROM " +
+                    "TReturnEstrusewStru    " +
+                    "LEFT JOIN TReturnEstrus  " +
+                    "ON TReturnEstrusewStru.FReturnEstrusMainStruID= TReturnEstrus.FID   " +
+                    "WHERE " +
+                    "TReturnEstrus.FLogStatee IN ( 3, 4, 6 )     " +
+                    "AND datediff( dd,?1, TReturnEstrusewStru.FDateBreed ) >=- 121    " +
+                    "AND datediff( dd,?2, TReturnEstrusewStru.FDateBreed ) <=- 121    " +
+                    "AND ( TReturnEstrus.hogpenDID IN (select FID from TOrganizeCell where FNAME in (?3))    " +
+                    ") UNION ALL " +
+                    "SELECT " +
+                    "TNullPregnantNewStru.SowStrID,  " +
+                    "TNullPregnantNewStru.FParityInt   " +
+                    "FROM " +
+                    "TNullPregnantNewStru   " +
+                    "LEFT JOIN TNullPregnant  " +
+                    "ON TNullPregnantNewStru.FNullPregnantMainStruID= TNullPregnant.FID  " +
+                    "WHERE " +
+                    "TNullPregnant.FLogStatee IN ( 3, 4, 6 )   " +
+                    "AND datediff( dd,?1, TNullPregnantNewStru.FDateBreed ) >=- 121   " +
+                    "AND datediff( dd,?2, TNullPregnantNewStru.FDateBreed ) <=- 121     " +
+                    "AND ( TNullPregnant.hogpenDID IN (select FID from TOrganizeCell where FNAME in (?3)) )    " +
+                    ") tmp_tblfm ON tmp_tblpz.SowStrID= tmp_tblfm.SowStrID  " +
+                    "AND tmp_tblpz.FParityInt= tmp_tblfm.FParityInt  " +
+                    "GROUP BY " +
+                    "tmp_tblpz.HogpendID ")
     List<Object[]> getReEstrusRate(String startDate,String endDate,String farmName);
 
     /**
@@ -139,22 +299,49 @@ public interface TDeliveryRepo extends JpaRepository<TDeliveryEntity, String>, J
             "group by TOrganizeCell.FSHORTNAME,tmp_tblpz.FBreedD")
     List<Object[]> getParturitionRate_old(String startDate, String endDate);
 
-    @Query(nativeQuery = true,value ="select TOrganizeCell.FSHORTNAME as '猪场', " +
-            "CAST(count(tmp_tblfm.SowStrID)*1.0/(case sum(tmp_tblpz.配种次数) when 0 then null else sum(tmp_tblpz.配种次数) end) as dec(8,5)) as '配种分娩率' " +
-            "from (select " +
-            "TBreeding.HogpendID,TNewStru8094.FBreedD,TNewStru8094.SowStrID,TNewStru8094.FParityInt,count(TNewStru8094.FID) as '配种次数' " +
-            "from TBreeding left join TNewStru8094 on TNewStru8094.FBreedingMainStruID=TBreeding.FID " +
-            "where TBreeding.FLogStatee in(3,4,6) and datediff(dd,?1, FDateBreed)>=-121 and datediff(dd,?2,FDateBreed) <=-121 " +
-            "group by TBreeding.HogpendID,TNewStru8094.FBreedD,TNewStru8094.SowStrID,TNewStru8094.FParityInt " +
+    @Query(nativeQuery = true,value ="SELECT " +
+            "(select TOrganizeCell.FNAME from TOrganizeCell where FID in (  tmp_tblpz.HogpendID)) AS '猪场', " +
+            "CAST ( " +
+            "COUNT ( tmp_tblfm.SowStrID ) * 1.0 / ( CASE SUM ( tmp_tblpz.配种次数 ) WHEN 0 THEN NULL ELSE SUM ( tmp_tblpz.配种次数 ) END ) AS DEC ( 8, 5 )) AS '分娩率'  " +
+            "FROM " +
+            "( " +
+            "SELECT " +
+            "TBreeding.HogpendID, " +
+            "TNewStru8094.FBreedD, " +
+            "TNewStru8094.SowStrID, " +
+            "TNewStru8094.FParityInt, " +
+            "COUNT ( TNewStru8094.FID ) AS '配种次数'  " +
+            "FROM " +
+            "TBreeding " +
+            "LEFT JOIN TNewStru8094 ON TNewStru8094.FBreedingMainStruID= TBreeding.FID  " +
+            "WHERE " +
+            "TBreeding.FLogStatee IN ( 3, 4, 6 )  " +
+            "AND datediff( dd,?1, FDateBreed ) >=- 121  " +
+            "AND datediff( dd,?2, FDateBreed ) <=- 121  " +
+            "AND ( " +
+            "TBreeding.hogpenDID IN (select FID from TOrganizeCell where FNAME in (?3)))  " +
+            "GROUP BY " +
+            "TBreeding.HogpendID, " +
+            "TNewStru8094.FBreedD, " +
+            "TNewStru8094.SowStrID, " +
+            "TNewStru8094.FParityInt  " +
             ") tmp_tblpz " +
-            "left join (select TNewStru7743.SowStrID,TNewStru7743.FParityInt from TNewStru7743 " +
-            "left join TDelivery on TNewStru7743.FDeliveryMainStruID=TDelivery.FID " +
-            "where TDelivery.FLogStatee in(3,4,6)  and datediff(dd,?1, TNewStru7743.FDateBreed )>=-121 " +
-            " and datediff(dd,?2,TNewStru7743.FDateBreed ) <=-121 " +
-            ") tmp_tblfm on tmp_tblpz.SowStrID=tmp_tblfm.SowStrID and tmp_tblpz.FParityInt=tmp_tblfm.FParityInt " +
-            "left join TOrganizeCell on tmp_tblpz.HogpendID=TOrganizeCell.FID " +
-            "where TOrganizeCell.FNAME in(?3) " +
-            "group by TOrganizeCell.FSHORTNAME")
+            "LEFT JOIN ( " +
+            "SELECT " +
+            "TNewStru7743.SowStrID, " +
+            "TNewStru7743.FParityInt  " +
+            "FROM " +
+            "TNewStru7743 " +
+            "LEFT JOIN TDelivery ON TNewStru7743.FDeliveryMainStruID= TDelivery.FID  " +
+            "WHERE " +
+            "TDelivery.FLogStatee IN ( 3, 4, 6 )  " +
+            "AND datediff( dd,?1, TNewStru7743.FDateBreed ) >=- 121  " +
+            "AND datediff( dd,?2, TNewStru7743.FDateBreed ) <=- 121  " +
+            "AND ( TDelivery.hogpenDID IN (select FID from TOrganizeCell where FNAME in (?3)) )  " +
+            ") tmp_tblfm ON tmp_tblpz.SowStrID= tmp_tblfm.SowStrID  " +
+            "AND tmp_tblpz.FParityInt= tmp_tblfm.FParityInt  " +
+            "GROUP BY " +
+            "tmp_tblpz.HogpendID ")
     List<Object[]> getParturitionRate(String startDate, String endDate,String farmName);
     
     /**
@@ -172,9 +359,15 @@ public interface TDeliveryRepo extends JpaRepository<TDeliveryEntity, String>, J
             "RIGHT JOIN TBreed tb ON tb.FID = tp.VARIETYDID GROUP BY oc.FSHORTNAME,tb.FNAME ")
     List<Object[]> getStorage_old();
 
-    @Query(nativeQuery = true,value ="SELECT oc.FSHORTNAME,tb.FNAME,COUNT(tp.FID) FROM (select TOrganizeCell.FID,TOrganizeCell.FSHORTNAME from  TOrganizeCell where FNAME in (?1)) oc left " +
-            "JOIN TPigArchives tp ON tp.HOGPENWHEREDID = oc.FID " +
-            "left JOIN TBreed tb ON tb.FID = tp.VARIETYDID GROUP BY oc.FSHORTNAME,tb.FNAME")
+    @Query(nativeQuery = true,value ="select  " +
+            "TOrganizeCell.FNAME as 猪场, " +
+            "TBreed.FName as 'PZID',  " +
+            "sum(FamountChangeInt) as 'ZZNUM'  " +
+            "from TStockHistory  " +
+            "left join TBreed on TStockHistory.breedDid=TBreed.FID  " +
+            "left join TOrganizeCell on HogpendID=TOrganizeCell.FID  " +
+            "where FpigClassE in(1,2)  and breedDid is not null and HogpendID in(select FID from TOrganizeCell where FNAME in (?1))  " +
+            "group by TBreed.FName,TOrganizeCell.FNAME")
     List<Object[]> getStorage(String farmName);
 
     /**
@@ -275,19 +468,39 @@ public interface TDeliveryRepo extends JpaRepository<TDeliveryEntity, String>, J
     List<Object[]> getMateQuantity_old(String startDate, String endDate);
 
 
-    @Query(nativeQuery = true,value ="select TOrganizeCell.FSHORTNAME as '猪场', tmp_tblpzts.FBREEDD AS '品种', sum(tmp_tblpzts.配种次数) as '配种头数' from (select " +
-            "TBreeding.HogpendID,TNewStru8094.FBreedD,TNewStru8094.SowStrID,TNewStru8094.FParityInt,count(TNewStru8094.FID) as '配种次数' " +
-            "from TBreeding left join TNewStru8094 on TNewStru8094.FBreedingMainStruID=TBreeding.FID " +
-            "where TBreeding.FLogStatee in(3,4,6)  and datediff(dd,?1, FDateBreed)>=0 and datediff(dd,?2,FDateBreed) <=0 " +
-            "group by TBreeding.HogpendID,TNewStru8094.FBreedD,TNewStru8094.SowStrID,TNewStru8094.FParityInt " +
-            ") tmp_tblpzts  left join TOrganizeCell on tmp_tblpzts.HogpendID=TOrganizeCell.FID " +
-            "where  TOrganizeCell.FNAME in(?3) " +
-            "group by TOrganizeCell.FSHORTNAME,tmp_tblpzts.FBREEDD")
+    @Query(nativeQuery = true,value ="SELECT  " +
+            "  (SELECT TOrganizeCell.FNAME FROM TOrganizeCell WHERE FID IN( tmp_tblpzts.HogpendID)) AS '猪场',  " +
+            "  SUM ( tmp_tblpzts.配种次数 ) AS '配种头数'   " +
+            " FROM  " +
+            "  (  " +
+            "  SELECT  " +
+            "   TBreeding.HogpendID,  " +
+            "   TNewStru8094.FBreedD,  " +
+            "   TNewStru8094.SowStrID,  " +
+            "   TNewStru8094.FParityInt,  " +
+            "   COUNT ( TNewStru8094.FID ) AS '配种次数'   " +
+            "  FROM  " +
+            "   TBreeding  " +
+            "   LEFT JOIN TNewStru8094 ON TNewStru8094.FBreedingMainStruID= TBreeding.FID   " +
+            "  WHERE  " +
+            "   TBreeding.FLogStatee IN ( 3, 4, 6 )   " +
+            "   AND datediff( dd,?1, FDateBreed ) >= 0   " +
+            "   AND datediff( dd,?2, FDateBreed ) <= 0   " +
+            "   AND (  " +
+            "   TBreeding.hogpenDID IN (select FID from TOrganizeCell where FNAME in (?3)))   " +
+            "  GROUP BY  " +
+            "   TBreeding.HogpendID,  " +
+            "   TNewStru8094.FBreedD,  " +
+            "   TNewStru8094.SowStrID,  " +
+            "   TNewStru8094.FParityInt   " +
+            "  ) tmp_tblpzts   " +
+            " GROUP BY  " +
+            "  tmp_tblpzts.HogpendID ")
     List<Object[]> getMateQuantity(String startDate, String endDate,String farmName);
 
     /**
      * @Method      : getConceptionRate
-     * @Description : 
+     * @Description : 受胎率
      * @Params      : [startDate, endDate]
      * @Return      : java.util.List<java.lang.Object[]>
      * 
@@ -295,39 +508,6 @@ public interface TDeliveryRepo extends JpaRepository<TDeliveryEntity, String>, J
      * @Date        : 2021/5/15       
      * @Time        : 16:15
      */
-    @Query(nativeQuery = true,value ="select  " +
-            "TOrganizeCell.FshortName as 'farm', " +
-            "CAST((tmp_tblpz.fmts+isnull(tmp_tblpzlc.lcts,0))*1.0/tmp_tblpz.pzts*100 as dec(8,2)) as 'conception_rate' " +
-            "from " +
-            "(select tmp_tblpz.HogpendID as 'ZCID',sum(tmp_tblpz.mate_times) as 'PZTS', count(tmp_tblfm.SowStrID) as 'fmts', " +
-            "CAST(count(tmp_tblfm.SowStrID)*1.0/(case sum(tmp_tblpz.mate_times) when 0 then null else sum(tmp_tblpz.mate_times) end)*100 as dec(8,2)) as 'PZFML' " +
-            "from (select  " +
-            "TBreeding.HogpendID,TNewStru8094.FBreedD,TNewStru8094.SowStrID,TNewStru8094.FParityInt,count(TNewStru8094.FID) as 'mate_times'  " +
-            "from TBreeding left join TNewStru8094 on TNewStru8094.FBreedingMainStruID=TBreeding.FID  " +
-            "where TBreeding.FLogStatee in(3,4,6)  and FDateBreed>=DATEADD(DAY,-121,?1) and FDateBreed<=DATEADD(DAY,-121,?2)  " +
-            "group by TBreeding.HogpendID,TNewStru8094.FBreedD,TNewStru8094.SowStrID,TNewStru8094.FParityInt  " +
-            ") tmp_tblpz  " +
-            "left join (select TNewStru7743.SowStrID,TNewStru7743.FParityInt from TNewStru7743  " +
-            "left join TDelivery on TNewStru7743.FDeliveryMainStruID=TDelivery.FID  " +
-            "where TDelivery.FLogStatee in(3,4,6)  and TNewStru7743.FDateBreed>=DATEADD(DAY,-121,?1) and TNewStru7743.FDateBreed<=DATEADD(DAY,-121,?2)   " +
-            ") tmp_tblfm on tmp_tblpz.SowStrID=tmp_tblfm.SowStrID and tmp_tblpz.FParityInt=tmp_tblfm.FParityInt  " +
-            "group by tmp_tblpz.HogpendID) tmp_tblpz   " +
-            "left join (select tmp_tblpz.HogpendID as 'ZCID', sum(tmp_tblpz.mate_times) as 'PZTS', count(tmp_tblfm.SowStrID) as 'lcts', " +
-            "CAST(count(tmp_tblfm.SowStrID)*1.0/(case sum(tmp_tblpz.mate_times) when 0 then null else sum(tmp_tblpz.mate_times) end)*100 as dec(8,2)) as 'PZFML'  " +
-            "from (select  " +
-            "TBreeding.HogpendID,TNewStru8094.FBreedD,TNewStru8094.SowStrID,TNewStru8094.FParityInt,count(TNewStru8094.FID) as 'mate_times'  " +
-            "from TBreeding left join TNewStru8094 on TNewStru8094.FBreedingMainStruID=TBreeding.FID  " +
-            "where TBreeding.FLogStatee in(3,4,6)  and FDateBreed>=DATEADD(DAY,-121,?1) and FDateBreed<=DATEADD(DAY,-121,?2)  " +
-            "group by TBreeding.HogpendID,TNewStru8094.FBreedD,TNewStru8094.SowStrID,TNewStru8094.FParityInt  " +
-            ") tmp_tblpz  " +
-            "left join (select TAbortionNewStru.SowStrID,TAbortionNewStru.FParityInt from TAbortionNewStru  " +
-            "left join TAbortion on TAbortionNewStru.FAbortionMainStruID=TAbortion.FID  " +
-            "where TAbortion.FLogStatee in(3,4,6)  and TAbortionNewStru.FDateBreed>=DATEADD(DAY,-121,?1) and TAbortionNewStru.FDateBreed<=DATEADD(DAY,-121,?2)   " +
-            ") tmp_tblfm on tmp_tblpz.SowStrID=tmp_tblfm.SowStrID and tmp_tblpz.FParityInt=tmp_tblfm.FParityInt  " +
-            "group by tmp_tblpz.HogpendID) tmp_tblpzlc on tmp_tblpzlc.ZCID=tmp_tblpz.ZCID " +
-            "left join TOrganizeCell on tmp_tblpz.ZCID=TOrganizeCell.FID")
-    List<Object[]> getConceptionRate_old(String startDate, String endDate);
-
     @Query(nativeQuery = true,value =" select " +
             " TOrganizeCell.FshortName as '猪场', " +
             "  CAST((tmp_tblpz.fmts+isnull(tmp_tblpzlc.lcts,0))*1.0/tmp_tblpz.pzts*100 as dec(8,2)) as '受胎率' " +
@@ -362,6 +542,59 @@ public interface TDeliveryRepo extends JpaRepository<TDeliveryEntity, String>, J
             " where TOrganizeCell.FNAME in(?3)")
     List<Object[]> getConceptionRate(String startDate, String endDate,String farmName);
 
+    @Query(nativeQuery = true,value =" select   " +
+            "  TOrganizeCell.FshortName 'ZCNAME',  " +
+            "  CAST((tmp_tblpz.fmts+isnull(tmp_tblpzlc.lcts,0))*1.0/tmp_tblpz.pzts*100 as dec(8,2)) as 受胎率  " +
+            "   from  " +
+            "    (select tmp_tblpz.HogpendID as 'ZCID', sum(tmp_tblpz.配种次数) as 'PZTS', count(tmp_tblfm.SowStrID) as 'fmts',  " +
+            "  CAST(count(tmp_tblfm.SowStrID)*1.0/(case sum(tmp_tblpz.配种次数) when 0 then null else sum(tmp_tblpz.配种次数) end)*100 as dec(8,2)) as 'PZFML'   " +
+            "  from (select   " +
+            " TBreeding.HogpendID,TNewStru8094.FBreedD,TNewStru8094.SowStrID,TNewStru8094.FParityInt,count(TNewStru8094.FID) as '配种次数'   " +
+            " from TBreeding left join TNewStru8094 on TNewStru8094.FBreedingMainStruID=TBreeding.FID   " +
+            "  where TBreeding.FLogStatee in(3,4,6)  and FDateBreed>=DATEADD(DAY,-121,?1) and FDateBreed<=DATEADD(DAY,-121,?2)   " +
+            " and (TBreeding.hogpenDID  in(select FID from TOrganizeCell where FNAME in (?3)))   " +
+            "  group by TBreeding.HogpendID,TNewStru8094.FBreedD,TNewStru8094.SowStrID,TNewStru8094.FParityInt   " +
+            " ) tmp_tblpz   " +
+            " left join (select TNewStru7743.SowStrID,TNewStru7743.FParityInt from TNewStru7743   " +
+            "  left join TDelivery on TNewStru7743.FDeliveryMainStruID=TDelivery.FID   " +
+            "  where TDelivery.FLogStatee in(3,4,6)  and TNewStru7743.FDateBreed>=DATEADD(DAY,-121,?1) and TNewStru7743.FDateBreed<=DATEADD(DAY,-121,?2)  and (TDelivery.hogpenDID  in('EFB8649C-ED89-4174-A1E7-D6BA4B238992') )   " +
+            "  ) tmp_tblfm on tmp_tblpz.SowStrID=tmp_tblfm.SowStrID and tmp_tblpz.FParityInt=tmp_tblfm.FParityInt   " +
+            "  group by tmp_tblpz.HogpendID ) tmp_tblpz    " +
+            " left join (select tmp_tblpz.HogpendID as 'ZCID', sum(tmp_tblpz.配种次数) as 'PZTS', count(tmp_tblfm.SowStrID) as 'fqts',  " +
+            " CAST(count(tmp_tblfm.SowStrID)*1.0/(case sum(tmp_tblpz.配种次数) when 0 then null else sum(tmp_tblpz.配种次数) end)*100 as dec(8,2)) as 'PZFML'   " +
+            " from (select   " +
+            " TBreeding.HogpendID,TNewStru8094.FBreedD,TNewStru8094.SowStrID,TNewStru8094.FParityInt,count(TNewStru8094.FID) as '配种次数'   " +
+            "  from TBreeding left join TNewStru8094 on TNewStru8094.FBreedingMainStruID=TBreeding.FID   " +
+            " where TBreeding.FLogStatee in(3,4,6)  and FDateBreed>=DATEADD(DAY,-121,?1) and FDateBreed<=DATEADD(DAY,-121,?2)   " +
+            "  and (TBreeding.hogpenDID  in(select FID from TOrganizeCell where FNAME in (?3)))   " +
+            "  group by TBreeding.HogpendID,TNewStru8094.FBreedD,TNewStru8094.SowStrID,TNewStru8094.FParityInt   " +
+            "  ) tmp_tblpz   " +
+            " left join (select TReturnEstrusewStru.SowStrID,TReturnEstrusewStru.FParityInt from TReturnEstrusewStru   " +
+            " left join TReturnEstrus on TReturnEstrusewStru.FReturnEstrusMainStruID=TReturnEstrus.FID   " +
+            " where TReturnEstrus.FLogStatee in(3,4,6)  and TReturnEstrusewStru.FDateBreed>=DATEADD(DAY,-121,?1) and TReturnEstrusewStru.FDateBreed<=DATEADD(DAY,-121,?2)    " +
+            "  and (TReturnEstrus.hogpenDID  in('EFB8649C-ED89-4174-A1E7-D6BA4B238992') )   " +
+            ") tmp_tblfm on tmp_tblpz.SowStrID=tmp_tblfm.SowStrID and tmp_tblpz.FParityInt=tmp_tblfm.FParityInt   " +
+            " group by tmp_tblpz.HogpendID ) tmp_tblpzfq on tmp_tblpzfq.ZCID=tmp_tblpz.ZCID  " +
+            " left join (select tmp_tblpz.HogpendID as 'ZCID', sum(tmp_tblpz.配种次数) as 'PZTS', count(tmp_tblfm.SowStrID) as 'lcts',  " +
+            " CAST(count(tmp_tblfm.SowStrID)*1.0/(case sum(tmp_tblpz.配种次数) when 0 then null else sum(tmp_tblpz.配种次数) end)*100 as dec(8,2)) as 'PZFML'   " +
+            " from (select   " +
+            "  TBreeding.HogpendID,TNewStru8094.FBreedD,TNewStru8094.SowStrID,TNewStru8094.FParityInt,count(TNewStru8094.FID) as '配种次数'   " +
+            "  from TBreeding left join TNewStru8094 on TNewStru8094.FBreedingMainStruID=TBreeding.FID   " +
+            "  where TBreeding.FLogStatee in(3,4,6)  and FDateBreed>=DATEADD(DAY,-121,?1) and FDateBreed<=DATEADD(DAY,-121,?2)   " +
+            " and (TBreeding.hogpenDID  in(select FID from TOrganizeCell where FNAME in (?3)))   " +
+            "  group by TBreeding.HogpendID,TNewStru8094.FBreedD,TNewStru8094.SowStrID,TNewStru8094.FParityInt   " +
+            "  ) tmp_tblpz   " +
+            "  left join (select TAbortionNewStru.SowStrID,TAbortionNewStru.FParityInt from TAbortionNewStru   " +
+            " left join TAbortion on TAbortionNewStru.FAbortionMainStruID=TAbortion.FID   " +
+            "where TAbortion.FLogStatee in(3,4,6)  and TAbortionNewStru.FDateBreed>=DATEADD(DAY,-121,?1) and TAbortionNewStru.FDateBreed<=DATEADD(DAY,-121,?2)    " +
+            "  and (TAbortion.hogpenDID  in(select FID from TOrganizeCell where FNAME in (?3)) )   " +
+            " ) tmp_tblfm on tmp_tblpz.SowStrID=tmp_tblfm.SowStrID and tmp_tblpz.FParityInt=tmp_tblfm.FParityInt   " +
+            "  group by tmp_tblpz.HogpendID ) tmp_tblpzlc on tmp_tblpzlc.ZCID=tmp_tblpz.ZCID  " +
+            "   " +
+            " left join TOrganizeCell on tmp_tblpz.ZCID=TOrganizeCell.FID")
+    // --0.83
+    List<Object[]> getConceptionRate_new(String startDate, String endDate,String farmName);
+
 
     /**
      * @Method      : getAllStorage

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/service/IErpDataService.java

@@ -2,7 +2,7 @@ package com.huimv.production.datasource.service;
 
 public interface IErpDataService {
 
-    String getPsy(String startDate,String endDate);
+    String getPsy(String farmID,String startDate,String endDate);
 
     String getReEstrusRate(String startDate,String endDate,String farmName);
 

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/service/impl/ErpDataServiceImpl.java

@@ -38,10 +38,10 @@ public class ErpDataServiceImpl implements IErpDataService {
      * @Time        : 11:40
      */
     @Override
-    public String getPsy(String startDate,String endDate) {
+    public String getPsy(String farmID,String startDate,String endDate) {
         log.info(" 开始日期（PSY） startDate:"+startDate);
         log.info(" 结束日期（PSY） endDate:"+endDate);
-        List<Object[]> psyFieldList = tDeliveryRepo.getPsy(startDate,endDate);
+        List<Object[]> psyFieldList = tDeliveryRepo.getPsy(startDate,endDate,farmID);
         log.info(" 返情率查询数量:"+psyFieldList.size());
         String psy = "";
         for (Object[] goodsObj : psyFieldList) {
@@ -216,11 +216,11 @@ public class ErpDataServiceImpl implements IErpDataService {
         JSONArray resultJa = new JSONArray();
         for (Object[] fieldObj : fieldList) {
             String farm = fieldObj[0].toString();
-            String variety = fieldObj[1].toString();
-            String mate_quantity = fieldObj[2].toString();
+//            String variety = fieldObj[1].toString();
+            String mate_quantity = fieldObj[1].toString();
             JSONObject dataJo = new JSONObject();
             dataJo.put("farm",farm);
-            dataJo.put("variety",variety);
+//            dataJo.put("variety",variety);
             dataJo.put("mate_quantity",mate_quantity);
             resultJa.add(dataJo);
         }