Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/etl/model/LogModel.java

@@ -1,5 +1,6 @@
package com.yihu.wlyy.statistics.etl.model;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -14,10 +15,25 @@ public class LogModel {
    private Integer allNum;//所有总数
    private String excuteSql;//执行的sql
    private Date endTime;//结束时间
    private List<ErrorModel> modelList=new ArrayList<>();//错误列表
    private List<ErrorModel> modelList = new ArrayList<>();//错误列表
    private String date;//統計的時間
    private boolean success;//是否出现异常
    @Override
    public String toString() {
        return "LogModel{" +
                "id='" + id + '\'' +
                ", successNum=" + successNum +
                ", errorNum=" + errorNum +
                ", allNum=" + allNum +
                ", excuteSql='" + excuteSql + '\'' +
                ", endTime=" + endTime +
                ", modelList=" + modelList +
                ", date='" + date + '\'' +
                ", success=" + success +
                '}';
    }
    public boolean isSuccess() {
        return success;
    }
@@ -66,8 +82,9 @@ public class LogModel {
        this.excuteSql = excuteSql;
    }
    public Date getEndTime() {
        return endTime;
    public String getEndTime() {
        SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        return simpleDateFormat.format(endTime);
    }
    public void setEndTime(Date endTime) {

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/util/JsonUtil.java

@@ -1,7 +1,7 @@
package com.yihu.wlyy.statistics.util;
import net.sf.json.JSONObject;
import net.sf.json.JsonConfig;
import com.yihu.wlyy.statistics.etl.model.LogModel;
import org.json.JSONObject;
import java.util.Date;
@@ -9,11 +9,8 @@ import java.util.Date;
 * Created by Administrator on 2016.10.20.
 */
public class JsonUtil {
    public static String objToStr(Object obj){
        JsonConfig jsonConfig = new JsonConfig();
        jsonConfig.registerJsonValueProcessor(Date.class, new JsonDateValueProcessor());
        JSONObject json = new JSONObject();
        json.fromObject(obj, jsonConfig);
        return json.toString();
    public static String objToStr(LogModel logModel){
        JSONObject jsonObject=new JSONObject(logModel);
        return jsonObject.toString();
    }
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/doctor/DoctorDao.java

@@ -134,4 +134,8 @@ public interface DoctorDao extends PagingAndSortingRepository<Doctor, Long>, Jpa
    @Query("select p from Doctor p where p.idcard = ?1")
    Doctor findbyIdCard(String idcard);
    @Query("select d from Doctor d where d.del = 1 and d.password is null")
    List<Doctor> findAllNoPasswordDoctors();
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/patient/PatientDao.java

@@ -52,6 +52,6 @@ public interface PatientDao extends PagingAndSortingRepository<Patient, Long> {
	@Query(" select p from Patient p,SignFamily s where p.code=s.patient and s.status > 0 ")
	List<Patient> findAllSignPatient();
	@Query(" select p from Patient p ")
	@Query(" select p from Patient p where password is null ")
	List<Patient> findAllIdCardPatientAndNoPassword();
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/family/FamilyService.java

@@ -426,4 +426,11 @@ public class FamilyService {
            patientInvitationLog.setWxPushTime(new Date());
        }
    }
    public static void main(String[] args) {
        String idcard="350221195001210022";
        String password=idcard.substring(idcard.length()-6);
        String salt= "c89233bd15994b68ab3708ce79d5c2c4";
        System.out.println(MD5.GetMD5Code(password+salt));
    }
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/data/DataHandingService.java

@@ -26,32 +26,38 @@ public class DataHandingService {
    @Transactional
    public String producePatientAndDoctorPassword() {
        int patientCount=0;
        int patientErrorCount=0;
        int doctorCount=0;
        int doctorErrorCount=0;
        List<Patient> patients= patientDao.findAllIdCardPatientAndNoPassword();
        for (Patient patient:patients){
            if(!StringUtils.isEmpty(patient.getPassword())){
            String idcard=patient.getIdcard();
            if(!StringUtils.isEmpty(patient.getPassword())||StringUtils.isEmpty(idcard)||(idcard.length()!=15&&idcard.length()!=18)){
                patientErrorCount++;
                continue;
            }
            String phone= patient.getPhone();
            String password=phone.substring(5);
            String password=idcard.substring(idcard.length()-6);
            String salt= UUID.randomUUID().toString().replace("-","");
            patient.setSalt(salt);
            patient.setPassword(MD5.GetMD5Code(password+salt));
            patientCount++;
        }
        patientDao.save(patients);
        List<Doctor> doctors= doctorDao.findAllDoctors();
        for (Doctor doctor:doctors){
            if(!StringUtils.isEmpty(doctor.getPassword())){
            String phone= doctor.getMobile();
            if(!StringUtils.isEmpty(doctor.getPassword())||StringUtils.isEmpty(phone)||phone.length()!=11){
                doctorErrorCount++;
                continue;
            }
            String phone= doctor.getMobile();
            String password=phone.substring(5);
            String salt= UUID.randomUUID().toString().replace("-","");
            doctor.setSalt(salt);
            doctor.setPassword(MD5.GetMD5Code(password+salt));
            doctorCount++;
        }
        return "更新患者:"+patientCount+",更新医生:"+doctorCount;
        doctorDao.save(doctors);
        return "更新患者(默认身份证后六位):"+patientCount+",有身份证异常的患者:"+patientErrorCount+",更新医生(默认电话后六位):"+doctorCount+",有电话号码异常的医生:"+doctorErrorCount;
    }
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/account/PatientController.java

@@ -684,15 +684,13 @@ public class PatientController extends WeixinBaseController {
     * @param newPassword1 新密码1
     * @param newPassword2 新密码2
     * @param oldPassword 旧密码
     * @param patientCode 患者code
     * @return
     */
    @RequestMapping(value = "/updatePassword",method = RequestMethod.POST)
    @ResponseBody
    public String updatePassword(String newPassword1,
                                 String newPassword2,
                                 String oldPassword,
                                 String patientCode) {
                                 String oldPassword) {
        try {
            newPassword1= RSAUtils.getInstance(doctorService).decryptString(newPassword1);
            newPassword2=RSAUtils.getInstance(doctorService).decryptString(newPassword2);
@@ -700,7 +698,7 @@ public class PatientController extends WeixinBaseController {
            newPassword1=StringUtils.reverse(newPassword1);
            newPassword2=StringUtils.reverse(newPassword2);
            oldPassword=StringUtils.reverse(oldPassword);
            patientInfoService.updatePassword(newPassword1, newPassword2, oldPassword,patientCode);
            patientInfoService.updatePassword(newPassword1, newPassword2, oldPassword,getUID());
            return write(200, "更新成功");
        } catch (Exception e) {
            e.printStackTrace();