Merge branch 'test'

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/impl/MobileBenefitPackageServiceImpl.java

@@ -171,17 +171,19 @@ public class MobileBenefitPackageServiceImpl implements MobileBenefitPackageServ
                 patientEntity.setGender(Integer.valueOf(data.getGender()));
                 patientEntity.setBirthDates(data.getBirth());
                 patientEntity.setCredNo(data.getCredNo());
-                patientEntity.setUserId(entity.getUserId());
+                patientEntity.setUserId(patientId);
                 log.info("数据库不存在添加患者: {}", JSON.toJSONString(patientEntity));
                 patientMapper.insert(patientEntity);
             } else {
                 if (!map.get("mobile").equals(patientEntity.getPhone())) {
                     patientEntity.setPhone(map.get("mobile"));
+                    patientEntity.setUserId(patientId);
                     patientMapper.updateById(patientEntity);
                 }
             }
             //保存就诊人id
-            entity.setUserId(map.get("patient_id"));
+            entity.setUserId(patientId);
+            log.info("MobileBenefitPackageEntity={}", entity);
             mobileBenefitPackageMapper.update(entity);
         }
 

family-doctor-server/src/main/resources/mapper/MobileBenefitPackageMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.ebaiyihui.family.doctor.server.mapper.MobileBenefitPackageMapper">
     <sql id="base_columns">
-        x_id,productId,phone,userId,orderId,timeLimit,used
+        x_id,productId,phone,userId,orderId,timeLimit,used,activateOrderId
     </sql>
     <insert id="insert">
         INSERT INTO mobile_benefit_package (