diff --git a/zhyc-module/src/main/java/com/zhyc/module/frozen/controller/DdFeController.java b/zhyc-module/src/main/java/com/zhyc/module/frozen/controller/DdFeController.java index 3c8c9c4..e0bdc66 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/frozen/controller/DdFeController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/frozen/controller/DdFeController.java @@ -134,12 +134,6 @@ public class DdFeController extends BaseController { case "D": qty = (Integer) flush.getOrDefault("gradeD", 0); break; - case "囊胚": - qty = (Integer) flush.getOrDefault("cell24", 0); - break; - case "桑椹胚": - qty = (Integer) flush.getOrDefault("cell8", 0); - break; default: qty = 0; } diff --git a/zhyc-module/src/main/java/com/zhyc/module/frozen/service/impl/DdFeServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/frozen/service/impl/DdFeServiceImpl.java index 70dc496..f936cb8 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/frozen/service/impl/DdFeServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/frozen/service/impl/DdFeServiceImpl.java @@ -109,7 +109,7 @@ public class DdFeServiceImpl implements IDdFeService @Override public Map getLastFlushInfoByEwe(String eweNo) { - // 1. 冲胚数据(冻胚自己的 SQL) + // 1. 冲胚数据 Map flush = ddFeMapper.selectFlushByEwe(eweNo); if (flush == null) return null; @@ -118,10 +118,16 @@ public class DdFeServiceImpl implements IDdFeService // 2. 公羊品种 Map ram = scEmbryoFlushMapper.selectSheepInfoByManageTag(ramId); + if (ram == null) { + throw new ServiceException("供体公羊耳号在羊只档案中未找到"); + } String ramBreed = (String) ram.get("variety"); // 3. 母羊品种 Map ewe = scEmbryoFlushMapper.selectSheepInfoByManageTag(eweNo); + if (ewe == null) { + throw new ServiceException("供体母羊耳在羊只档案中未找到"); + } String eweBreed = (String) ewe.get("variety"); // 4. 胚胎品种 @@ -133,7 +139,6 @@ public class DdFeServiceImpl implements IDdFeService rsp.put("drBreed", ramBreed); rsp.put("deBreed", eweBreed); rsp.put("embBreed", embryoBreed); - // 如果以后需要等级数量,也从这个 flush map 里取 rsp.put("gradeA", flush.get("gradeA")); rsp.put("gradeB", flush.get("gradeB")); rsp.put("gradeC", flush.get("gradeC")); diff --git a/zhyc-module/src/main/resources/mapper/frozen/DdFeMapper.xml b/zhyc-module/src/main/resources/mapper/frozen/DdFeMapper.xml index 682d1f3..83264bd 100644 --- a/zhyc-module/src/main/resources/mapper/frozen/DdFeMapper.xml +++ b/zhyc-module/src/main/resources/mapper/frozen/DdFeMapper.xml @@ -170,8 +170,6 @@ grade_b gradeB, grade_c gradeC, grade_d gradeD, - cell_2_4 cell24, - cell_8 cell8, donor_male_no ramId FROM sc_embryo_flush WHERE donor_female_no = #{eweNo}