Compare commits

..

No commits in common. 'a9552be73a690ce032ea29204b01588487968b5b' and 'ad0f2c7e929b6f33094f002bd98a8e8c1b8694db' have entirely different histories.

  1. 1
      lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/WayAndBasis.java
  2. 2
      lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineItemController.java

@ -28,7 +28,6 @@ public class WayAndBasis {
*/ */
private String examineBasisId; private String examineBasisId;
private String examineBasisName; private String examineBasisName;
private String animalSpecies; //添加动物种类
} }

@ -114,7 +114,6 @@ public class ExamineItemController extends BladeController {
ExamineWay examineWay = examineWayService.getById(wayAndBase.getExamineWayId()); ExamineWay examineWay = examineWayService.getById(wayAndBase.getExamineWayId());
if (examineWay != null) { if (examineWay != null) {
wayAndBase.setExamineWayName(examineWay.getName()); wayAndBase.setExamineWayName(examineWay.getName());
wayAndBase.setAnimalSpecies(examineWay.getAnimalSpecies());//添加动物种类
} }
ExamineBasis examineBasis = examineBasisService.getById(wayAndBase.getExamineBasisId()); ExamineBasis examineBasis = examineBasisService.getById(wayAndBase.getExamineBasisId());
if (examineBasis != null) { if (examineBasis != null) {
@ -146,7 +145,6 @@ public class ExamineItemController extends BladeController {
ExamineWay examineWay = examineWayService.getById(wayAndBase.getExamineWayId()); ExamineWay examineWay = examineWayService.getById(wayAndBase.getExamineWayId());
if (examineWay != null) { if (examineWay != null) {
wayAndBase.setExamineWayName(examineWay.getName()); wayAndBase.setExamineWayName(examineWay.getName());
wayAndBase.setAnimalSpecies(examineWay.getAnimalSpecies());//添加动物种类
} }
ExamineBasis examineBasis = examineBasisService.getById(wayAndBase.getExamineBasisId()); ExamineBasis examineBasis = examineBasisService.getById(wayAndBase.getExamineBasisId());
if (examineBasis != null) { if (examineBasis != null) {

Loading…
Cancel
Save