Merge branch 'release' into 'master'

Release



See merge request !17

server/src/main/java/com/pica/cloud/wechat/yunqueyilian/server/controller/refresh/PatDocPatReal.java

+package com.pica.cloud.wechat.yunqueyilian.server.controller.refresh;
+
+import java.util.Date;
+
+public class PatDocPatReal {
+    private Integer id;
+
+    private Integer doctorId;
+
+    private Integer patientId;
+
+    private Byte type;
+
+    private String validateCode;
+
+    private Byte deleteFlag;
+
+    private Integer createdId;
+
+    private Date createdTime;
+
+    private Integer modifiedId;
+
+    private Date modifiedTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getDoctorId() {
+        return doctorId;
+    }
+
+    public void setDoctorId(Integer doctorId) {
+        this.doctorId = doctorId;
+    }
+
+    public Integer getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(Integer patientId) {
+        this.patientId = patientId;
+    }
+
+    public Byte getType() {
+        return type;
+    }
+
+    public void setType(Byte type) {
+        this.type = type;
+    }
+
+    public String getValidateCode() {
+        return validateCode;
+    }
+
+    public void setValidateCode(String validateCode) {
+        this.validateCode = validateCode == null ? null : validateCode.trim();
+    }
+
+    public Byte getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Byte deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public Integer getCreatedId() {
+        return createdId;
+    }
+
+    public void setCreatedId(Integer createdId) {
+        this.createdId = createdId;
+    }
+
+    public Date getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(Date createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public Integer getModifiedId() {
+        return modifiedId;
+    }
+
+    public void setModifiedId(Integer modifiedId) {
+        this.modifiedId = modifiedId;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+}
\ No newline at end of file

server/src/main/java/com/pica/cloud/wechat/yunqueyilian/server/controller/refresh/PatPatientReal.java

+package com.pica.cloud.wechat.yunqueyilian.server.controller.refresh;
+
+import java.util.Date;
+
+public class PatPatientReal {
+    private Integer id;
+
+    private Integer patientId;
+
+    private String nickname;
+
+    private String mobilePhone;
+
+    private Integer status;
+
+    private Byte validateType;
+
+    private String validateCode;
+
+    private Date validateTime;
+
+    private Integer validateUserType;
+
+    private Integer validateUserId;
+
+    private Byte deleteFlag;
+
+    private Integer createdId;
+
+    private Date createdTime;
+
+    private Integer modifiedId;
+
+    private Date modifiedTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(Integer patientId) {
+        this.patientId = patientId;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname == null ? null : nickname.trim();
+    }
+
+    public String getMobilePhone() {
+        return mobilePhone;
+    }
+
+    public void setMobilePhone(String mobilePhone) {
+        this.mobilePhone = mobilePhone == null ? null : mobilePhone.trim();
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Byte getValidateType() {
+        return validateType;
+    }
+
+    public void setValidateType(Byte validateType) {
+        this.validateType = validateType;
+    }
+
+    public String getValidateCode() {
+        return validateCode;
+    }
+
+    public void setValidateCode(String validateCode) {
+        this.validateCode = validateCode == null ? null : validateCode.trim();
+    }
+
+    public Date getValidateTime() {
+        return validateTime;
+    }
+
+    public void setValidateTime(Date validateTime) {
+        this.validateTime = validateTime;
+    }
+
+    public Integer getValidateUserType() {
+        return validateUserType;
+    }
+
+    public void setValidateUserType(Integer validateUserType) {
+        this.validateUserType = validateUserType;
+    }
+
+    public Integer getValidateUserId() {
+        return validateUserId;
+    }
+
+    public void setValidateUserId(Integer validateUserId) {
+        this.validateUserId = validateUserId;
+    }
+
+    public Byte getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Byte deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public Integer getCreatedId() {
+        return createdId;
+    }
+
+    public void setCreatedId(Integer createdId) {
+        this.createdId = createdId;
+    }
+
+    public Date getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(Date createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public Integer getModifiedId() {
+        return modifiedId;
+    }
+
+    public void setModifiedId(Integer modifiedId) {
+        this.modifiedId = modifiedId;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+}
\ No newline at end of file

server/src/main/java/com/pica/cloud/wechat/yunqueyilian/server/controller/refresh/RealPatient.java

+package com.pica.cloud.wechat.yunqueyilian.server.controller.refresh;
+
+public class RealPatient {
+
+    Integer id;
+
+    Integer patientId;
+
+    String nickname;
+
+    String mobilePhone;
+
+    Byte type;
+
+    String validateCode;
+
+    Byte validateType;
+
+    Integer status;
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public String getMobilePhone() {
+        return mobilePhone;
+    }
+
+    public void setMobilePhone(String mobilePhone) {
+        this.mobilePhone = mobilePhone;
+    }
+
+    public Byte getType() {
+        return type;
+    }
+
+    public void setType(Byte type) {
+        this.type = type;
+    }
+
+    public String getValidateCode() {
+        return validateCode;
+    }
+
+    public void setValidateCode(String validateCode) {
+        this.validateCode = validateCode;
+    }
+
+    public Byte getValidateType() {
+        return validateType;
+    }
+
+    public void setValidateType(Byte validateType) {
+        this.validateType = validateType;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(Integer patientId) {
+        this.patientId = patientId;
+    }
+}

server/src/main/java/com/pica/cloud/wechat/yunqueyilian/server/controller/refresh/RefreshController.java

@@ -67,4 +67,16 @@ public class RefreshController extends BaseController {
 
         return ReturnUtil.getPicaResponse(PicaResultCode.SUCCESS);
     }
+
+    @LoginPermission
+    @PostMapping("/real")
+    public PicaResponse realPat(@RequestParam("id") Integer id) {
+
+        PicaUser picaUser = fetchPicaUser();
+        if (picaUser.getId() == 766) {
+            refreshService.realPat(id);
+        }
+
+        return ReturnUtil.getPicaResponse(PicaResultCode.SUCCESS);
+    }
 }

server/src/main/java/com/pica/cloud/wechat/yunqueyilian/server/controller/refresh/RefreshService.java

 package com.pica.cloud.wechat.yunqueyilian.server.controller.refresh;
 
 
+import io.swagger.models.auth.In;
 
 /**
 * @Description TODO
@@ -19,4 +20,6 @@ public interface RefreshService {
     void patDocMapping1(Integer id);
 
     void patDocMapping2(Integer id);
+
+    void realPat(Integer id);
 }

server/src/main/java/com/pica/cloud/wechat/yunqueyilian/server/controller/refresh/RefreshServiceImpl.java

@@ -113,7 +113,7 @@ public class RefreshServiceImpl implements RefreshService {
                             if (refreshMapper.validateWechat(pat.getId()) > 0 && StringUtil.isNull(pat.getMobilePhone())) {
                                 wechatPats.add(pat);
                             } else {
-                                if(StringUtil.isNull(pat.getMobilePhone())){
+                                if (StringUtil.isNull(pat.getMobilePhone())) {
                                     refreshMapper.deletePat(pat.getId());
                                     refreshMapper.deletePatInfo(pat.getId());
                                     refreshMapper.deleteDocPat(pat.getId());
@@ -135,5 +135,78 @@ public class RefreshServiceImpl implements RefreshService {
             }
         }
     }
+
+    @Override
+    public void realPat(Integer id) {
+        int index = 0;
+        int docIndex = 0;
+        int docLogIndex = 0;
+        long begin = System.currentTimeMillis();
+        while (true) {
+            List<PatPatientReal> list = refreshMapper.queryRealPatientList(id);
+            if (CollectionUtils.isEmpty(list)) {
+                long end = System.currentTimeMillis();
+                logger.info("刷新数据结束：共处理：【" + index + "】条real，【" + docIndex + "】条docPatReal, 【" + docLogIndex + "】条docPatRealLog，消耗：【" + (end - begin) / 1000 + "】s");
+                break;
+            }
+            for (PatPatientReal realPatient : list) {
+                if (refreshMapper.queryRealPatient(realPatient.getPatientId()) == null) {
+
+                    PatPatientReal real = new PatPatientReal();
+                    real.setId(realPatient.getId());
+                    real.setPatientId(realPatient.getPatientId());
+                    real.setNickname(realPatient.getNickname());
+                    real.setMobilePhone(realPatient.getMobilePhone());
+                    real.setStatus(realPatient.getStatus());
+
+                    real.setDeleteFlag(realPatient.getDeleteFlag());
+                    real.setCreatedId(realPatient.getCreatedId());
+                    real.setCreatedTime(realPatient.getCreatedTime());
+                    real.setModifiedId(realPatient.getModifiedId());
+                    real.setModifiedTime(realPatient.getModifiedTime());
+
+                    //验真通过赋值5字段
+                    if (realPatient.getStatus() == 2) {
+                        //验真类型：1、验证码验真 2、短信回复验真 3、小程序验真 4、手机号姓名跟医生一致自动验真
+                        real.setValidateType(realPatient.getValidateType());
+                        //验真的验证码：若验真类型是1和2，则有值
+                        if (real.getValidateType() == 1 || real.getValidateType() == 2) {
+                            real.setValidateCode(realPatient.getValidateCode());
+                        }
+                        //验真时间
+                        real.setValidateTime(realPatient.getModifiedTime());
+                        //验真人类型:1、医生 2、居民 和 验真人id
+                        if (real.getValidateType() == 1 || real.getValidateType() == 4) {
+                            real.setValidateUserType(1);
+                            real.setValidateUserId(realPatient.getModifiedId());
+                        } else {
+                            real.setValidateUserType(2);
+                            real.setValidateUserId(realPatient.getPatientId());
+                        }
+                    }
+
+                    refreshMapper.insertRealPatient(real);
+                    index++;
+
+                    /**新增mapping表*/
+                    List<PatDocPatReal> patDocList = refreshMapper.queryRealPatDocList(realPatient.getPatientId());
+                    if (CollectionUtils.isNotEmpty(patDocList)) {
+                        for (PatDocPatReal docPatReal : patDocList) {
+                            if (refreshMapper.queryRealPatDoc(docPatReal.getPatientId(), docPatReal.getDoctorId()) == null) {
+                                refreshMapper.insertRealDocPat(docPatReal);
+                                docIndex++;
+                            }
+
+                            refreshMapper.insertRealDocPatLog(docPatReal);
+                            docLogIndex++;
+                        }
+                    }
+
+                    logger.info("开始处理数据：第" + index + "条, patientId=" + realPatient.getPatientId() + "，id=" + realPatient.getId());
+                }
+                id = realPatient.getId();
+            }
+        }
+    }
 }
 

server/src/main/java/com/pica/cloud/wechat/yunqueyilian/server/mapper/RefreshMapper.java

 package com.pica.cloud.wechat.yunqueyilian.server.mapper;
 
-import com.pica.cloud.wechat.yunqueyilian.server.controller.refresh.PatDocPatMapping;
-import com.pica.cloud.wechat.yunqueyilian.server.controller.refresh.PatPatient;
-import com.pica.cloud.wechat.yunqueyilian.server.controller.refresh.PatPatientRepeat;
+import com.pica.cloud.wechat.yunqueyilian.server.controller.refresh.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
@@ -52,4 +50,17 @@ public interface RefreshMapper {
 
     void updateRepeatById2(@Param("id") Integer id);
 
+    List<PatPatientReal> queryRealPatientList(@Param("id") Integer id);
+
+    RealPatient queryRealPatient(@Param("patientId") Integer patientId);
+
+    void insertRealPatient(PatPatientReal real);
+
+    void insertRealDocPat(PatDocPatReal docPatReal);
+
+    List<PatDocPatReal> queryRealPatDocList(@Param("patientId") Integer patientId);
+
+    RealPatient queryRealPatDoc(@Param("patientId") Integer patientId, @Param("doctorId") Integer doctorId);
+
+    void insertRealDocPatLog(PatDocPatReal docPatReal);
 }
\ No newline at end of file

server/src/main/resources/mybatis/RefreshMapper.xml

@@ -200,5 +200,129 @@
         where  id = #{id}
     </update>
 
+    <select id="queryRealPatientList"
+            resultType="com.pica.cloud.wechat.yunqueyilian.server.controller.refresh.PatPatientReal">
+        select id as id,
+             patient_id as patientId,
+             nickname as nickname,
+             mobile_phone as mobilePhone,
+             status as status,
+
+             type as type,
+             validate_code as validateCode,
+             validate_type as validateType,
+
+             delete_flag AS deleteFlag,
+             created_id as createdId,
+             created_time as createdTime,
+             modified_id as modifiedId,
+             modified_time as modifiedTime
+        from pica_trade.trade_mobile_phone_real
+        where id > #{id}
+        order by id
+        limit 0, 10000
+    </select>
+    <select id="queryRealPatient"
+            resultType="com.pica.cloud.wechat.yunqueyilian.server.controller.refresh.RealPatient">
+        select id as id,
+             patient_id as patientId
+        from pat_patient_real
+        where patient_id = #{patientId}
+        and delete_flag = 1
+    </select>
+
+    <insert id="insertRealPatient">
+    insert into pat_patient_real (id, patient_id, nickname,
+      mobile_phone, status, validate_type,
+      validate_code, validate_time, validate_user_type,
+      validate_user_id, delete_flag, created_id,
+      created_time, modified_id, modified_time
+      )
+    values (#{id,jdbcType=INTEGER}, #{patientId,jdbcType=INTEGER}, #{nickname,jdbcType=VARCHAR},
+      #{mobilePhone,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{validateType,jdbcType=TINYINT},
+      #{validateCode,jdbcType=VARCHAR}, #{validateTime,jdbcType=TIMESTAMP}, #{validateUserType,jdbcType=INTEGER},
+      #{validateUserId,jdbcType=INTEGER}, #{deleteFlag,jdbcType=TINYINT}, #{createdId,jdbcType=INTEGER},
+      #{createdTime,jdbcType=TIMESTAMP}, #{modifiedId,jdbcType=INTEGER}, #{modifiedTime,jdbcType=TIMESTAMP}
+      )
+
+    </insert>
+
+    <insert id="insertRealDocPat" parameterType="com.pica.cloud.wechat.yunqueyilian.server.controller.refresh.PatDocPatReal" >
+     insert into pat_doc_pat_real (doctor_id, patient_id,
+      type, validate_code, delete_flag,
+      created_id, created_time, modified_id,
+      modified_time)
+     values (#{doctorId,jdbcType=INTEGER}, #{patientId,jdbcType=INTEGER},
+      #{type,jdbcType=TINYINT}, #{validateCode,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=TINYINT},
+      #{createdId,jdbcType=INTEGER}, #{createdTime,jdbcType=TIMESTAMP}, #{modifiedId,jdbcType=INTEGER},
+      #{modifiedTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+
+    <select id="queryRealPatDocList"
+            resultType="com.pica.cloud.wechat.yunqueyilian.server.controller.refresh.PatDocPatReal">
+        select
+             tmp.patient_id as patientId,
+             tor.prescriber_id as doctorId,
+             tor.user_type as type,
+             case when tor.user_type = 1 then tmp.validate_code else '' end as validateCode,
+             tmp.delete_flag AS deleteFlag,
+             tor.prescriber_id as createdId,
+             toa.created_time as createdTime,
+             tor.prescriber_id as modifiedId,
+             toa.created_time as modifiedTime
+        from
+            pica_trade.trade_mobile_phone_real tmp,
+            pica_trade.trade_order_address toa,
+            pica_trade.trade_order tor
+            where toa.order_no = tor.id
+            and tmp.patient_id = toa.patient_id
+            and tmp.delete_flag = 1
+            and toa.delete_flag = 1
+            and tor.delete_flag = 1
+            and tmp.patient_id =  #{patientId}
+
+            union all
+
+        select
+             tmp.patient_id as patientId,
+             fpor.doctor_id as doctorId,
+             3 as type,
+             '' as validateCode,
+             tmp.delete_flag AS deleteFlag,
+             fpor.doctor_id as createdId,
+             fpor.created_time as createdTime,
+             fpor.doctor_id as modifiedId,
+             fpor.created_time as modifiedTime
+        from
+            pica_trade.trade_mobile_phone_real tmp,
+            pica_follow_up.fu_plan_order_scales fpor
+            where tmp.patient_id = fpor.patient_id
+            and tmp.delete_flag = 1
+            and fpor.delete_flag = 1
+            and tmp.patient_id = #{patientId}
+    </select>
+
+    <select id="queryRealPatDoc"
+            resultType="com.pica.cloud.wechat.yunqueyilian.server.controller.refresh.RealPatient">
+         select id as id,
+             patient_id as patientId
+        from pat_doc_pat_real
+        where patient_id = #{patientId}
+        and doctor_id = #{doctorId}
+        and delete_flag = 1
+    </select>
+
+    <insert id="insertRealDocPatLog" parameterType="com.pica.cloud.wechat.yunqueyilian.server.controller.refresh.PatDocPatReal" >
+     insert into pat_doc_pat_real_log (doctor_id, patient_id,
+      type, validate_code, delete_flag,
+      created_id, created_time, modified_id,
+      modified_time)
+     values (#{doctorId,jdbcType=INTEGER}, #{patientId,jdbcType=INTEGER},
+      #{type,jdbcType=TINYINT}, #{validateCode,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=TINYINT},
+      #{createdId,jdbcType=INTEGER}, #{createdTime,jdbcType=TIMESTAMP}, #{modifiedId,jdbcType=INTEGER},
+      #{modifiedTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
 
 </mapper>
\ No newline at end of file