代码修改

business/base-service/src/main/java/com/yihu/jw/hospital/disease/service/BaseDiseaseHospitalService.java

@@ -159,6 +159,8 @@ public class BaseDiseaseHospitalService extends BaseJpaService<BaseDiseaseHospit
                "\tdiagnosis,\n" +
                "\tdiagnosis_name AS diagnosisName,\n" +
                "\tis_disease AS isDisease,\n" +
                "\tplan_doctor AS planDoctor,\n" +
                "\tplan_doctor_name AS planDoctorName,\n" +
                "\tarticle_relation as articleRelation,\n" +
                "\tarticle_relation_name as articleRelationName,\n" +
                "\tis_family as isFamily,\n" +

business/base-service/src/main/java/com/yihu/jw/patient/service/BasePatientService.java

@@ -855,39 +855,27 @@ public class BasePatientService<T, R extends CrudRepository> extends BaseJpaServ
     * @param idcard
     * @return
     */
    public BasePatientDO addPaitentByIdcard(String idcard) {
    public BasePatientDO addPaitentByIdcard(String idcard,String name,String ssc,String mobile,Integer sex) {
        try {
            org.json.JSONArray jsonArray = jwArchivesService.getSickArchiveRecord(idcard);
            if (jsonArray.length() > 0) {
                org.json.JSONObject json = jsonArray.getJSONObject(0);
                BasePatientDO patient = new BasePatientDO();
//                patient.setCode(getCode());
                patient.setName(json.getString("sickName"));
                patient.setIdcard(idcard);
                patient.setBirthday(IdCardUtil.getBirthdayForIdcard(idcard));
                patient.setSsc(json.getString("ssc"));
                String salt = UUID.randomUUID().toString().replace("-", "");
                String password = idcard.substring(idcard.length() - 6, idcard.length());
                password = MD5.GetMD5Code("a" + password + "*" + salt);
                patient.setSalt(salt);
                patient.setPassword(password);
                //统一身份认证状态
//                patient.setIsCertified(0);
//                patient.setStatus(1);
//                patient.setCzrq(new Date());
//                patient.setSicardStatus(0);
                patientDao.save(patient);
                //同步居民签约记录
//                try {
//                    jwSignService.LoadSignFamilyByIdcard(idcard);
//                } catch (ServiceException se){
//                    se.printStackTrace();
//                } catch (Exception e){
//                    e.printStackTrace();
//                }
                return patient;
            }
            BasePatientDO patient = new BasePatientDO();
            String salt = UUID.randomUUID().toString().substring(0,5);
            String pw = idcard.substring(idcard.length()-6);
            patient.setIdcard(idcard);
            patient.setCardType("01");
            patient.setName(name);
            patient.setPassword(MD5.md5Hex(pw + "{" + salt + "}"));
            patient.setSalt(salt);
            patient.setMobile(mobile);
            patient.setDel("1");
            patient.setEnabled(1);
            patient.setLocked(0);
            patient.setCreateTime(new Date());
            patient.setUpdateTime(new Date());
            patient.setSsc(ssc);
            patient.setBirthday(IdCardUtil.getBirthdayForIdcard(idcard));
            patient.setSex(sex);
            patient = patientDao.save(patient);
            return patient;
        } catch (Exception e) {
            e.printStackTrace();
        }

business/base-service/src/main/java/com/yihu/jw/wlyy/service/WlyyBusinessService.java

@@ -1,5 +1,6 @@
package com.yihu.jw.wlyy.service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.dict.dao.DictHospitalDeptDao;
@@ -15,6 +16,7 @@ import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.patient.PatientMedicareCardDO;
import com.yihu.jw.entity.hospital.mapping.DoctorMappingDO;
import com.yihu.jw.entity.hospital.prescription.WlyyOutpatientDO;
import com.yihu.jw.entity.specialist.rehabilitation.RehabilitationPatientInfoDO;
import com.yihu.jw.hospital.httplog.service.BaseOperateLogService;
import com.yihu.jw.hospital.mapping.dao.DoctorMappingDao;
import com.yihu.jw.hospital.prescription.dao.OutpatientDao;
@@ -828,6 +830,13 @@ public class WlyyBusinessService {
        return rs;
    }
    //推送i健康 康复下转居民
    public JSONObject pushPatientInfos(RehabilitationPatientInfoDO infoDO){
        Map<String,String> params = new HashMap<>();
        params.put("jsondata", JSON.toJSONString(infoDO));
        JSONObject rs = wlyyHttpService.sendWlyyMes("pushPatientInfos",null,params);
        return rs;
    }
    /**
     * 获取ijk十大专病信息

business/base-service/src/main/java/com/yihu/jw/wlyy/wlyyhttp/WlyyHttpService.java

@@ -66,16 +66,12 @@ public class WlyyHttpService {
                if(param != null){
                    p.add(new BasicNameValuePair("param", param.toJSONString()));
                }
                //组装map形式的传参
                if(mapParams!= null && !mapParams.keySet().isEmpty()){
                    for (String paramkey:mapParams.keySet()){
                        p.add(new BasicNameValuePair(paramkey, mapParams.get(paramkey)));
                    }
                }
                //设置头部
                token = rsjson.getJSONObject("result").getString("accesstoken");
                Map<String,Object> headerMap = new HashedMap();