修改病历管理

huimv-smart-datacollection/src/main/java/com/huimv/datacollection/service/impl/ClientDataPacketServiceImpl.java

@@ -1532,7 +1532,7 @@ public class ClientDataPacketServiceImpl implements IClientDataPacketService {
         if ((gz.substring(gz.length() - 1)).equals(jy)) {
             gz = XtAppConstant.SOCKET_SJSC_GZBZ_0;
 
-        dbjg = XtAppConstant.SOCKET_SJSC_TLGTB_0;
+            dbjg = XtAppConstant.SOCKET_SJSC_TLGTB_0;
 
         } else {
             gz = XtAppConstant.SOCKET_SJSC_GZBZ_1;

huimv-smart-management/src/main/java/com/huimv/management/controller/HealthMedicalRecordController.java

@@ -5,9 +5,11 @@ import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.huimv.common.exception.RRException;
 import com.huimv.management.entity.YearPigBaseEntity;
+import com.huimv.management.entity.dto.CureResultDto;
 import com.huimv.management.entity.dto.DiseaseDto;
 import com.huimv.management.service.YearPigBaseService;
 import io.swagger.annotations.Api;
@@ -134,4 +136,14 @@ public class HealthMedicalRecordController {
         return R.ok().put("data",map);
     }
 
+    /**
+     * 修改治疗状态
+     */
+    @RequestMapping("/updateCureResult")
+    public R updateCureResult(@RequestBody CureResultDto cureResult){
+        healthMedicalRecordService.updateCureResult(cureResult.getIds(),cureResult.getResult());
+
+        return R.ok();
+    }
+
 }

huimv-smart-management/src/main/java/com/huimv/management/entity/HealthMedicalRecordEntity.java

@@ -64,7 +64,7 @@ public class HealthMedicalRecordEntity implements Serializable {
 	private String treatmentPlan;
 	/**
 	 * 治疗结果
-  1:康复 2：死亡，无害化处理
+  1:康复 2：死亡，无害化处理	3:治疗中
 	 */
 	private Integer result;
 	/**

huimv-smart-management/src/main/java/com/huimv/management/entity/dto/CureResultDto.java

@@ -0,0 +1,21 @@
+package com.huimv.management.entity.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.management.entity.dto
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/7/15 0015 15:17
+ **/
+@Data
+public class CureResultDto {
+
+    List<Integer> ids;
+
+    Integer result;
+
+}

huimv-smart-management/src/main/java/com/huimv/management/entity/vo/PigStyVo.java

@@ -35,4 +35,9 @@ public class PigStyVo {
      * 养殖员名称
      */
     private String feederName;
+
+    /**
+     * 养殖员名称
+     */
+    private Integer feederId;
 }

huimv-smart-management/src/main/java/com/huimv/management/service/HealthMedicalRecordService.java

@@ -20,5 +20,7 @@ public interface HealthMedicalRecordService extends IService<HealthMedicalRecord
     PageUtils queryPage(Map<String, Object> params);
 
     Map<String, Object> diseaseCount(String type, String farmId);
+
+    void updateCureResult(List<Integer> asList,Integer result);
 }
 

huimv-smart-management/src/main/java/com/huimv/management/service/impl/BaseFeedFormulaServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.management.service.impl;
 
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,9 +19,23 @@ public class BaseFeedFormulaServiceImpl extends ServiceImpl<BaseFeedFormulaDao,
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
+
+        String farmId = (String)params.get("formFarmId");
+
+        QueryWrapper<BaseFeedFormulaEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("farm_id",farmId);
+
+        String  ingredients = (String)params.get("ingredients");
+        String  details = (String)params.get("details");
+        String  stage = (String)params.get("stage");
+
+        wrapper.like(StringUtils.isNotBlank(ingredients),"ingredients",ingredients);
+        wrapper.like(StringUtils.isNotBlank(details),"details",details);
+        wrapper.like(StringUtils.isNotBlank(stage),"stage",stage);
+
         IPage<BaseFeedFormulaEntity> page = this.page(
                 new Query<BaseFeedFormulaEntity>().getPage(params),
-                new QueryWrapper<BaseFeedFormulaEntity>()
+                wrapper
         );
         return new PageUtils(page);
     }

huimv-smart-management/src/main/java/com/huimv/management/service/impl/HealthImmuneRecordServiceImpl.java

@@ -40,9 +40,17 @@ public class HealthImmuneRecordServiceImpl extends ServiceImpl<HealthImmuneRecor
         QueryWrapper<HealthImmuneRecordEntity> wrapper = new QueryWrapper<HealthImmuneRecordEntity>();
         wrapper.eq(StringUtils.isNotBlank(farmId),"farm_id",Integer.parseInt(farmId));
         if (StringUtils.isNotBlank(eartag)){
-            wrapper.like(StringUtils.isNotBlank(eartag),"pig_id",eartag);
+            wrapper.like(StringUtils.isNotBlank(eartag),"pig_id",eartag)
+            .or().like("man_name",eartag).or().like("vaccine_name",eartag)
+            .or().like("create_time",eartag);
         }
 
+        String vaccineName = (String)params.get("vaccineName");
+        String manName= (String)params.get("manName");
+        wrapper.eq(StringUtils.isNotBlank(vaccineName),"vaccine_name",vaccineName);
+        wrapper.eq(StringUtils.isNotBlank(manName),"manName",manName);
+
+
         IPage<HealthImmuneRecordEntity> page = this.page(
                 new Query<HealthImmuneRecordEntity>().getPage(params),
                 wrapper
@@ -54,7 +62,7 @@ public class HealthImmuneRecordServiceImpl extends ServiceImpl<HealthImmuneRecor
     @Override
     public void saveAll(String[] eartags, String vaccineName, Integer farmId, String manName, Integer manId) {
 
-        StringJoiner sj = new StringJoiner(",","未找到耳标号为：","的信息，请检查输入的耳标号是否有误！");
+        StringJoiner sj = new StringJoiner(",","未找到耳标号为："," 的信息，请检查输入的耳标号是否有误！");
         int originLength = sj.length();
         for (String eartag : eartags) {
             YearPigBaseEntity yearPigBaseEntity = yearPigBaseDao.selectOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, eartag));

huimv-smart-management/src/main/java/com/huimv/management/service/impl/HealthMedicalRecordServiceImpl.java

@@ -173,4 +173,14 @@ public class HealthMedicalRecordServiceImpl extends ServiceImpl<HealthMedicalRec
 
         return resultMap;
     }
+
+    @Override
+    public void updateCureResult(List<Integer> asList,Integer result) {
+        HealthMedicalRecordEntity recordEntity = new HealthMedicalRecordEntity();
+        for (Integer id : asList) {
+            recordEntity.setId(id);
+            recordEntity.setResult(result);
+            healthMedicalRecordDao.updateById(recordEntity);
+        }
+    }
 }

huimv-smart-management/src/main/resources/mapper/management/PigstyDao.xml

@@ -20,6 +20,7 @@
           pigsty.number,
           pigsty.farm_id,
           employee.name feederName
+          employee.id feederId
         from mgt_pigsty pigsty
          JOIN mgt_farm farm ON pigsty.farm_id = farm.id
          JOIN mgt_employee employee ON pigsty.feeder_id = employee.id