bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/controller/HealthPersonInfoController.java

@@ -70,16 +70,6 @@ public class HealthPersonInfoController extends BaseController {
         return success(healthPersonInfoService.selectHealthPersonInfoById(vo.getUserId()));
     }
 
-    /**
-     * 获取人员健康情况详细信息
-     */
-    @ApiOperation(value = "获取人员健康情况详细信息")
-    //@RequiresPermissions("health:info:query")
-    @PostMapping({"/detail-health-appinfo"})
-    public AjaxResult getAppInfo(@RequestBody HealthPersonInfo vo) {
-        return success(healthPersonInfoService.selectHealthPersonAppInfoById(vo.getUserId()));
-    }
-
     /**
      * 新增人员健康情况
      */

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/mapper/HealthPersonInfoMapper.java

@@ -19,8 +19,6 @@ public interface HealthPersonInfoMapper {
      */
     public HealthPersonInfo selectHealthPersonInfoById(Long id);
 
-    public HealthPersonInfo selectHealthPersonAppInfoById(Long id);
-
     /**
      * 查询人员健康情况列表
      *

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/IHealthPersonInfoService.java

@@ -18,8 +18,6 @@ public interface IHealthPersonInfoService {
      */
     public HealthPersonInfo selectHealthPersonInfoById(Long id);
 
-    public HealthPersonInfo selectHealthPersonAppInfoById(Long id);
-
     /**
      * 查询人员健康情况列表
      *

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonInfoServiceImpl.java

@@ -10,7 +10,6 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
-import com.bonus.common.core.utils.StringUtils;
 import com.bonus.common.houqin.utils.SM4EncryptUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -45,16 +44,6 @@ public class HealthPersonInfoServiceImpl implements IHealthPersonInfoService {
 
     }
 
-
-    @Override
-    public HealthPersonInfo selectHealthPersonAppInfoById(Long id) {
-        HealthPersonInfo vo=healthPersonInfoMapper.selectHealthPersonAppInfoById(id);
-        if(vo!=null){
-            vo.setMobile(SM4EncryptUtils.sm4Decrypt(vo.getMobile()==null?"":vo.getMobile()));
-        }
-        return vo;
-
-    }
     /**
      * 查询人员健康情况列表
      *
@@ -111,12 +100,7 @@ public class HealthPersonInfoServiceImpl implements IHealthPersonInfoService {
             Long userId = content.getUserId();
             HealthPersonInfo chronicVo=new HealthPersonInfo();
             chronicVo.setChronicIds(content.getChronicIds());
-            List<HealthPersonInfo> chronicVos=null;
+            List<HealthPersonInfo> chronicVos=healthPersonInfoMapper.selectHealthChronicList(chronicVo);
-            if(StringUtils.isNull(content.getChronicIds())){
-                chronicVos=healthPersonInfoMapper.selectHealthChronicList(chronicVo);
-            }else{
-                healthPersonInfoMapper.deleteHealthInfoChronic(content);
-            }
             if(chronicVos!=null&&chronicVos.size()>0){
                 /**
                  * 清空疾病信息
@@ -141,11 +125,7 @@ public class HealthPersonInfoServiceImpl implements IHealthPersonInfoService {
              */
             healthPersonInfoMapper.delHealthInfo(content);
             healthPersonInfoMapper.insertHealthInfo(content);
-            try{
+            healthPersonInfoMapper.updateHealthInfo(content);
-                healthPersonInfoMapper.updateHealthInfo(content);
-            }catch (Exception e){
-                e.printStackTrace();
-            }
             /**
              * 重新录入身体信息
              */
@@ -154,11 +134,7 @@ public class HealthPersonInfoServiceImpl implements IHealthPersonInfoService {
                 healthPersonInfoMapper.insertHealthBodyRecord(content);
             }
             content.setBmi(getBMI(content.getWeight(),content.getHeight()));
-            try{
+            healthPersonInfoMapper.updateHealthBodyRecord(content);
-                healthPersonInfoMapper.updateHealthBodyRecord(content);
-            }catch (Exception e){
-                e.printStackTrace();
-            }
             return 1;
         } catch (Exception e) {
             throw new ServiceException(e.getMessage());

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonInfoMapper.xml

@@ -182,86 +182,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  c.blood_pressure,sd.dept_id
     </select>
 
-    <select id="selectHealthPersonAppInfoById" parameterType="Long" resultMap="HealthPersonInfoResult">
-        select a.user_id,
-               a.nick_name,
-               a.phonenumber as mobile,
-               a.sex,
-               a.dept_id as orgId,
-               a.user_type,
-               b.marital_status,
-               b.pregnant_status,
-               b.pregnancy_date,
-               b.doctor_advice,
-               b.if_hospitalized,
-               b.doctor_num,
-               b.hospital_num,
-               b.inpatient_date,
-               b.inpatient_result,
-               b.weight_control,
-               b.allergen,
-               b.labour_intensity,
-               b.health_state,
-               b.blood_type,
-               c.height,
-               c.weight,
-               c.bmi,
-               c.shape,
-               c.bust,
-               c.waistline,
-               c.blood_sugar,
-               c.blood_fat,
-               c.blood_pressure_high,
-               c.blood_pressure_low,
-               c.heart_rate,
-               c.blood_oxygen,
-               c.uric_acid,
-               c.blood_pressure,sd.dept_name,
-               GROUP_CONCAT(d.chronic_name ORDER BY d.chronic_id desc) AS chronic_names,
-               GROUP_CONCAT(d.chronic_id ORDER BY d.chronic_id desc)   AS chronic_ids
-        from sys_user a
-                 left join health_person_info b on a.user_id = b.user_id
-                 left join health_person_body_record c on a.user_id = c.user_id and c.if_latest = 1
-                 left join health_person_info_chronic d on a.user_id = d.user_id
-                 left join health_chronic hc on d.chronic_id=hc.chronic_id
-                 left join sys_dept sd on a.dept_id = sd.dept_id
-        where a.user_id = #{userId}
-        group by a.user_id,
-                 a.user_name,
-                 a.phonenumber,
-                 a.sex,
-                 a.dept_id,
-                 a.user_type,
-                 b.marital_status,
-                 b.pregnant_status,
-                 b.pregnancy_date,
-                 b.doctor_advice,
-                 b.if_hospitalized,
-                 b.doctor_num,
-                 b.hospital_num,
-                 b.inpatient_date,
-                 b.inpatient_result,
-                 b.weight_control,
-                 b.allergen,
-                 b.labour_intensity,
-                 b.health_state,
-                 b.blood_type,
-                 c.height,
-                 c.weight,
-                 c.bmi,
-                 c.shape,
-                 c.bust,
-                 c.waistline,
-                 c.blood_sugar,
-                 c.blood_fat,
-                 c.blood_pressure_high,
-                 c.blood_pressure_low,
-                 c.heart_rate,
-                 c.blood_oxygen,
-                 c.uric_acid,
-                 c.blood_pressure,sd.dept_id
-    </select>
-
     <insert id="insertHealthPersonInfo" parameterType="com.bonus.canteen.core.health.domain.HealthPersonInfo">
         insert into health_person_info
         <trim prefix="(" suffix=")" suffixOverrides=",">