Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -41,6 +41,7 @@ import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.patient.dao.BasePatientMedicareCardDao;
import com.yihu.jw.restmodel.base.dict.DictHospitalDeptVO;
import com.yihu.jw.restmodel.base.org.BaseOrgVO;
import com.yihu.jw.restmodel.hospital.archive.ArchiveVO;
import com.yihu.jw.restmodel.hospital.consult.WlyyHospitalSysDictVO;
import com.yihu.jw.restmodel.hospital.doctor.WlyyDoctorWorkTimeVO;
import com.yihu.jw.restmodel.hospital.prescription.*;
@@ -577,6 +578,10 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        outpatientDO.setOutpatientType("1");
        outpatientDO.setCreateTime(new Date());
        if(outpatientDO.getRegisterDate()==null){
            outpatientDO.setRegisterDate(new Date());
        }
        WlyyOutpatientDO outpatient = outpatientDao.save(outpatientDO);
        WlyyPatientRegisterTimeDO registerTimeDO = null;
@@ -3487,6 +3492,10 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        outpatientDO.setOutpatientType("2");
        outpatientDO.setCreateTime(new Date());
        if(outpatientDO.getRegisterDate()==null){
            outpatientDO.setRegisterDate(new Date());
        }
        WlyyOutpatientDO outpatient = outpatientDao.save(outpatientDO);
        WlyyPatientRegisterTimeDO registerTimeDO = null;
@@ -4038,4 +4047,34 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    public List<WlyyHospitalSysDictDO> findByDict(String name,String hospital){
        return sysDictDao.findByHospitalAndDictNameOrderBySortAsc(hospital,name);
    }
    /**
     * 建立档案
     * @param json
     * @return
     * @throws Exception
     */
    public net.sf.json.JSONObject setRecord(String json)throws Exception{
        ArchiveVO archiveVO = objectMapper.readValue(json,ArchiveVO.class);
        if(archiveVO!=null){
           return entranceService.BS16018(archiveVO,demoFlag);
        }
        return null;
    }
    /**
     * 获取HIIS居民档案信息
     * @param idcard
     * @param patient
     * @param admitNum
     * @return
     * @throws Exception
     */
    public JSONArray findPatientRecord(String idcard,String patient,String admitNum)throws Exception{
        String patientId = null;
        if(StringUtils.isNotBlank(patient)){
            patientId = patientMappingService.findHisPatNoByPatient(patient);
        }
       return entranceService.BS10008(idcard,patientId,admitNum,demoFlag);
    }
}

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/EntranceService.java

@@ -22,12 +22,12 @@ import com.yihu.jw.hospital.prescription.dao.PrescriptionDao;
import com.yihu.jw.hospital.prescription.service.entrance.util.ConvertUtil;
import com.yihu.jw.hospital.prescription.service.entrance.util.MqSdkUtil;
import com.yihu.jw.hospital.prescription.service.entrance.util.WebserviceUtil;
import com.yihu.jw.restmodel.hospital.archive.ArchiveVO;
import com.yihu.jw.restmodel.hospital.prescription.*;
import com.yihu.jw.util.common.PwdUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.util.idcard.IdCardUtil;
import com.yihu.jw.utils.StringUtil;
import net.sf.json.JSON;
import net.sf.json.JSONArray;
import net.sf.json.xml.XMLSerializer;
@@ -2282,4 +2282,139 @@ public class EntranceService {
            }}
        return i;
    }
    /**
     * 建立档案
     * @param archiveVO
     * @param demoFlag
     * @return
     * @throws Exception
     */
    public net.sf.json.JSONObject BS16018(ArchiveVO archiveVO, boolean demoFlag) throws Exception {
        String fid="BS16018";
        logger.info(" BS16018 begin");
        String resp="";
        if (demoFlag) {
            resp = getJosnFileResullt(fid);
        } else {
            StringBuffer sbs = new StringBuffer();
            //AccessControl ：用户、密码、服务id
            sbs.append("<ESBEntry><AccessControl><Fid>" + fid + "</Fid><UserName>"+mqUser+"</UserName><Password>"+mqPwd+"</Password></AccessControl>");
            //MessageHeader ：固定值 消费方系统编号 S60,提供方系统编号 S01
            sbs.append("<MessageHeader><Fid>" + fid + "</Fid><MsgDate>" + DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD_HH_MM_SS) + "</MsgDate><SourceSysCode>"+sourceSysCode+"</SourceSysCode><TargetSysCode>"+targetSysCode+"</TargetSysCode></MessageHeader>");
            sbs.append("<MsgInfo>");
            sbs.append("<endNum>20000</endNum>");
            sbs.append("<Msg>");
            sbs.append("<root>");
            sbs.append("<request ");
            if(StringUtils.isNotBlank(archiveVO.getId0000())){
                sbs.append(" id0000=\""+archiveVO.getId0000()+"\" ");
            }
            if(StringUtils.isNotBlank(archiveVO.getCardno())){
                sbs.append(" cardno=\""+archiveVO.getCardno()+"\" ");
            }
            if(StringUtils.isNotBlank(archiveVO.getXming0())){
                sbs.append(" xming0=\""+archiveVO.getXming0()+"\" ");
            }
            if(StringUtils.isNotBlank(archiveVO.getSfzhao())){
                sbs.append(" sfzhao=\""+archiveVO.getSfzhao()+"\" ");
            }
            if(StringUtils.isNotBlank(archiveVO.getXbie00())){
                sbs.append(" xbie00=\""+archiveVO.getXbie00()+"\" ");
            }
            if(StringUtils.isNotBlank(archiveVO.getBrnl00())){
                sbs.append(" brnl00=\""+archiveVO.getBrnl00()+"\" ");
            }
            if(StringUtils.isNotBlank(archiveVO.getYytel0())){
                sbs.append(" yytel0=\""+archiveVO.getYytel0()+"\" ");
            }
            if(StringUtils.isNotBlank(archiveVO.getCsrq00())){
                sbs.append(" csrq00=\""+archiveVO.getCsrq00()+"\" ");
            }
            if(StringUtils.isNotBlank(archiveVO.getBjjbie())){
                sbs.append(" bjjbie=\""+archiveVO.getBjjbie()+"\" ");
            }
            if(StringUtils.isNotBlank(archiveVO.getCardtype())){
                sbs.append(" cardtype=\""+archiveVO.getCardtype()+"\" ");
            }
            if(StringUtils.isNotBlank(archiveVO.getGuid00())){
                sbs.append(" guid00=\""+archiveVO.getGuid00()+"\" ");
            }
            if(StringUtils.isNotBlank(archiveVO.getGrsfen())){
                sbs.append(" grsfen=\""+archiveVO.getGrsfen()+"\" ");
            }
            if(StringUtils.isNotBlank(archiveVO.getAddres())){
                sbs.append(" addres=\""+archiveVO.getAddres()+"\" ");
            }
            if(StringUtils.isNotBlank(archiveVO.getSmdj00())){
                sbs.append(" smdj00=\""+archiveVO.getSmdj00()+"\" ");
            }
            if(StringUtils.isNotBlank(archiveVO.getEhealthCardId())){
                sbs.append(" ehealth_card_id=\""+archiveVO.getEhealthCardId()+"\" ");
            }
            if(StringUtils.isNotBlank(archiveVO.getMindexId())){
                sbs.append(" mindex_id=\""+archiveVO.getMindexId()+"\" ");
            }
            if(StringUtils.isNotBlank(archiveVO.getSmkId())){
                sbs.append(" smk_id=\""+archiveVO.getSmkId()+"\" ");
            }
            if(StringUtils.isNotBlank(archiveVO.getFwqd00())){
                sbs.append(" fwqd00=\""+archiveVO.getFwqd00()+"\" ");
            }
            sbs.append(" />");
            sbs.append("</root>");
            sbs.append("</Msg>");
            sbs.append("<startNum>1</startNum></MsgInfo></ESBEntry>");
            //查询信息拼接
            logger.info(fid+" sbs:"+sbs.toString());
            sbs.append("<startNum>1</startNum></MsgInfo></ESBEntry>");
            resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid);
            resp = MqSdkUtil.xml2jsonArrayRootRow(resp);
            logger.info(fid+" resp:"+resp);
        }
        return ConvertUtil.convertListEnvelopInRequest(resp);
    }
    /**
     * 获取居民基本信息
     * @param idcard 身份证
     * @param patientId his 居民ID
     * @param admitNum 就诊次数
     * @param demoFlag
     * @return
     * @throws Exception
     */
    public JSONArray BS10008(String idcard,String patientId,String admitNum,boolean demoFlag) throws Exception {
        String fid="BS10008";
        String resp="";
        if (demoFlag) {
            resp = getJosnFileResullt(fid);
        } else {
            StringBuffer sbs = new StringBuffer();
            //AccessControl ：用户、密码、服务id
            sbs.append("<ESBEntry><AccessControl><Fid>" + fid + "</Fid><UserName>"+mqUser+"</UserName><Password>"+mqPwd+"</Password></AccessControl>");
            //MessageHeader ：固定值 消费方系统编号 S60,提供方系统编号 S01
            sbs.append("<MessageHeader><Fid>" + fid + "</Fid><MsgDate>" + DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD_HH_MM_SS) + "</MsgDate><SourceSysCode>"+sourceSysCode+"</SourceSysCode><TargetSysCode>"+targetSysCode+"</TargetSysCode></MessageHeader>");
            //查询信息拼接
            sbs.append("<MsgInfo><endNum>1000</endNum>");
            sbs.append("<Msg>");
            if(StringUtils.isNotBlank(idcard)){
                sbs.append(" and Id_Card = '"+idcard+"' ");
            }
            if(StringUtils.isNotBlank(patientId)){
                sbs.append(" and Patient_Id = '"+patientId+"' ");
            }
            if(StringUtils.isNotBlank(admitNum)){
                sbs.append(" and Admit_Num = '"+admitNum+"' ");
            }
            sbs.append("</Msg>");
            sbs.append("<startNum>1</startNum></MsgInfo></ESBEntry>");
            resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid);
            resp = MqSdkUtil.xml2jsonArrayRootRow(resp);
        }
        return ConvertUtil.convertListEnvelopInBodyRow(resp);
    }
}

business/base-service/src/main/java/com/yihu/jw/internet/dao/HospitalImgDao.java

@@ -0,0 +1,11 @@
package com.yihu.jw.internet.dao;
import com.yihu.jw.entity.hospital.jgpt.HospitalImgDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2019/11/28.
 */
public interface HospitalImgDao extends PagingAndSortingRepository<HospitalImgDO, String>, JpaSpecificationExecutor<HospitalImgDO> {
}

business/base-service/src/main/java/com/yihu/jw/internet/service/InternetService.java

@@ -3,6 +3,7 @@ package com.yihu.jw.internet.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.internet.dao.HospitalImgDao;
import com.yihu.jw.internet.dao.IntUpErrorLogDao;
import com.yihu.jw.internet.dao.InternetUpLogDao;
import com.yihu.jw.internet.dao.MedicalSkillOrdersDao;
@@ -12,6 +13,7 @@ import com.yihu.jw.internet.wsapi.Wsapi;
import com.yihu.jw.internet.wsapi.WsapiProxy;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.ImageConvertUtil;
import com.yihu.jw.utils.JSONUtils;
import com.yihu.jw.utils.encode.AESUtils;
import com.yihu.mysql.query.BaseJpaService;
@@ -38,13 +40,15 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
    @Autowired
    private MedicalSkillOrdersDao medicalSkillOrdersDao;
    @Autowired
    private HospitalImgDao hospitalImgDao;
    static String userName = "xmzsyy";
    static String psw = "7j7s9e";
    static String appId = "ws007";
    static String AesEncodeKey = "98sfkf53sf19609j";
    //static String urlString = "http://10.120.102.202:18081/micc/wsapi/1.0?wsdl";  // 正式线路径
    static String urlString = "http://fjhlw.bsoft.com.cn:18081/micc/wsapi/1.0?wsdl";   // 测试线路径
    static String urlString = "http://10.120.102.202:18081/micc/wsapi/1.0?wsdl";  // 正式线路径
    //static String urlString = "http://fjhlw.bsoft.com.cn:18081/micc/wsapi/1.0?wsdl";   // 测试线路径
    static String method = "execute";
    static String token = "";
    static String orgCode = "123502004266006872";
@@ -68,6 +72,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
        String deResult = AESUtils.decrypt(result, AesEncodeKey);
        logger.info(JSONUtils.toString(deResult));
        return deResult;
    }
@@ -90,7 +95,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
        if("200".equals(resJson.get("msg").toString())) {
            token = resJson.get("token").toString();
        }
        logger.info("upNsUserToken : "+token);
        return token;
    }
@@ -114,11 +119,11 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
        jb.put("hospital_address", "厦门市思明区湖滨南路201-209号");
        jb.put("hospital_phone", "0592-2292201");
        jb.put("hospital_img","");
        jb.put("bus_lic", "");
        jb.put("corp_idcord_head","");
        jb.put("corp_idcord_tail", "");
        jb.put("pra_lic", "");
        jb.put("hospital_img",hospitalImgDao.findOne("hsimg").getImg());
        jb.put("bus_lic", hospitalImgDao.findOne("zyxkz").getImg());
        jb.put("corp_idcord_head",hospitalImgDao.findOne("idcardA").getImg());
        jb.put("corp_idcord_tail", hospitalImgDao.findOne("idcardB").getImg());
        jb.put("pra_lic", hospitalImgDao.findOne("zyxkz").getImg());
        jb.put("net_service", "1,3,4,5,7,9,10");
        jb.put("net_service_ot", "");
@@ -258,11 +263,13 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
        //  因为要上传的是医师信息，所以针对到注册用户且无部门信息的用户数据不上传
        String sql = "select a.id,a.name,a.idcard,a.sex,a.birthday, a.cert_no, a.prac_no\n" +
                "      ,a.mobile,b.dept_code,b.dept_name,a.job_title_code\n" +
                "  from base_doctor a\n" +
                "      ,base_doctor_hospital b\n" +
                " where a.id = b.doctor_code\n"  +
                "   and b.dept_code != '' \n" +
                "      ,a.mobile,b.dept_code,b.dept_name,a.job_title_code,i.fzrq,i.zyz,i.zgz,i.cert_no,i.prac_no \n" +
                "  from base_doctor a " +
                "      ,base_doctor_hospital b" +
                "      ,base_doctor_img i " +
                " where a.id = b.doctor_code\n" +
                "   and i.doctor = a.id " +
                "   and b.dept_code != '' " +
                "   and a.job_title_code  not in('4107','054','1313','1413','1415','018','1412','4105','1212','1312','4103','1315','1217','1215','3301','005',\n" +
                "'1213','3501','017','020','058','002','1417','1214','1317','4101','4106') \n" ;
        if(StringUtils.isNotBlank(startDate)){
@@ -301,7 +308,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                jb.put("belong_dept",info.get("dept_code") == null ? dept[0].toString():info.get("dept_code"));
                jb.put("belong_dept_name", info.get("dept_name") == null ? dept[1].toString():info.get("dept_name"));
                jb.put("doo_tel", info.get("mobile")== null ? "":info.get("mobile"));
                jb.put("title_rec_date", "1900-01-01");
                jb.put("title_rec_date", info.get("fzrq"));
                jb.put("prac_type", "1");   // 因为上传的是医师的信息，所以该字段全部默认设置为 1 医师
                jb.put("title_code", dutyInfo[0].toString());  // 需要与监管平台的字典进行映射
                jb.put("first_compeny_code", orgCode);
@@ -311,15 +318,17 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                jb.put("net_service", "1,3,4,5,7,9,10");
                jb.put("cert_no",  info.get("cert_no")== null ? "0":info.get("cert_no"));
                jb.put("prac_no",  info.get("prac_no")== null ? "0":info.get("prac_no"));
                jb.put("doc_cert", "");
                jb.put("cert_doc_prac", "");
                //资质证书
                jb.put("doc_cert",info.get("zgz"));
                //执业证书
                jb.put("cert_doc_prac", info.get("zyz"));
                jb.put("txt_introduction", "");
            }catch (Exception e){
                errorFlag = true;
                saveErrorLog(upid,"3",info.get("id").toString(),"数据格式错误",1);
                error++;
                logger.error(e.toString());
//                logger.error(e.toString());
            }
            if(!errorFlag){
                //上传监管平台
@@ -358,7 +367,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
        if("200".equals(msg)){
            JSONArray reqContent = rs.getJSONArray("reqContent");
            JSONObject req = (JSONObject)reqContent.get(0);
            return req.getString("id");
            return req.getString("miccId");
        }
        return "";
    }
@@ -502,7 +511,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                    jb.put("app_class_code", ins.get("code"));
                    jb.put("id_doctor", docInterId);
                    jb.put("fg_handle", "1");
                    jb.put("handle_time", DateUtil.dateToStr((Date)ins.get("create_time"),"YYYY-MM-DD HH:mm:SS"));
                    jb.put("handle_time", DateUtil.dateToStr((Date)ins.get("create_time"),"yyyy-MM-dd HH:mm:ss"));
                    jb.put("pt_name",ins.get("name").toString());
                    String sex = IdCardUtil.getSexForIdcard_new(ins.get("idcard").toString());
                    jb.put("ge_code", sex=="3"?"9":sex);
@@ -591,14 +600,14 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                    interId = achNsDoctorRecord(idCard);
                }
                String[] dept = depToSubject(info.get("dept_code").toString());
//                String[] dept = depToSubject(info.get("dept_code").toString());
                jb.put("id",orgCode + (String)info.get("id"));
                jb.put("id_doctor",interId == null ? "0":interId);
                jb.put("organ_code",orgCode);
                jb.put("organ_name", orgName);
                jb.put("net_service", dept[0].toString());
                jb.put("net_service_name",dept[1].toString());
                jb.put("net_service", "4");
                jb.put("net_service_name","在线复诊");
                jb.put("val_score",info.get("score") == null ? "0": info.get("score"));
                jb.put("grader",info.get("patient_name") == null ? "0": info.get("patient_name"));
                jb.put("dt_grade",DateUtil.dateToStrLong((Date)info.get("create_time")));
@@ -778,6 +787,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                String[] dept = depToSubject(info.get("dept").toString());
                // 获取监管平台唯一标识
                String visitDocCode = achNsDoctorRecord((String)info.get("docIdCard"));
//                String visitDocCode = achNsDoctorRecord("350102198005012428");
                jb.put("id_online_med", orgCode + info.get("register_no"));
                jb.put("net_service_code", "4");
@@ -835,7 +845,6 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                dataError++;
                logger.error(e.toString());
            }
            String jbstr = jb.toJSONString();
            if(!errorFlag){
                JSONArray jsonArray = new JSONArray();
                jsonArray.add(jb);
@@ -871,11 +880,12 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
        String sql = "select a.id,a.real_order,a.patient_code,a.outpatient_id,a.patient_name\n" +
                "      ,b.sex,b.birthday,b.idcard,b.mobile,b.city_code,a.hospital\n" +
                "      ,a.hospital_name,a.dept,a.dept_name,a.doctor,a.doctor_name,a.his_register_fee,c.idcard as docIdcard\n" +
                "      ,a.hospital_name,p.dept,p.dept_name,a.doctor,a.doctor_name,a.his_register_fee,c.idcard as docIdcard\n" +
                "  from  wlyy_prescription a\n" +
                "         left JOIN base_patient b on a.patient_code = b.id\n" +
                "         left JOIN base_doctor c on a.doctor = c.id\n" +
                " where  c.idcard is not null  and a.real_order is not null ";
                "         JOIN base_patient b on a.patient_code = b.id\n" +
                "         JOIN base_doctor c on a.doctor = c.id\n" +
                "         JOIN wlyy_outpatient p on p.id = a.outpatient_id\n " +
                "  where  c.idcard is not null  and a.real_order is not null ";
        if(StringUtils.isNotBlank(startDate)){
            sql =  sql + "  and a.create_time >=  '" + startDate + "' ";
@@ -895,9 +905,10 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
            LinkedCaseInsensitiveMap info = (LinkedCaseInsensitiveMap) list.get(i);
            JSONObject jb = new JSONObject();
            Boolean errorFlag = false;
            //基于科室转换成国家诊疗科目代码
            String[] dept = depToSubject(info.get("dept_code").toString());
            try {
                //基于科室转换成国家诊疗科目代码
                String[] dept = depToSubject(info.get("dept").toString());
                // 获取监管平台唯一标识
                String visitDocCode = achNsDoctorRecord(info.get("docIdcard").toString());
@@ -1480,5 +1491,4 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
        }
        return  res;
    }
}

business/base-service/src/main/java/com/yihu/jw/utils/ImageConvertUtil.java

@@ -0,0 +1,74 @@
package com.yihu.jw.utils;
import sun.misc.BASE64Decoder;
import sun.misc.BASE64Encoder;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
/**
 * @ClassName ImageConvertUtil
 * @Description TODO
 * @Author heqian
 * @Date 2019/5/16 17:05
 * @Version 1.0
 */
public class ImageConvertUtil {
    static BASE64Encoder encoder = new BASE64Encoder();
    static BASE64Decoder decoder = new BASE64Decoder();
    static String upload_home = System.getProperty("catalina.home")+"resources/repository/";
    public static void main(String[] args) {
        String str = getImageBinary("C://Users//Administrator//Desktop//医生信息//陈兰//资格证.jpg");
        System.out.println(str);
    }
    public static String getImageBinary(){
        File f = new File("d://123.jpg");
        BufferedImage bi;
        try {
            bi = ImageIO.read(f);
            ByteArrayOutputStream baos = new ByteArrayOutputStream();
            ImageIO.write(bi, "jpg", baos);
            byte[] bytes = baos.toByteArray();
            return encoder.encodeBuffer(bytes).trim();
        } catch (IOException e) {
            e.printStackTrace();
        }
        return null;
    }
    public static String getImageBinary(String path){
        File f = new File(path);
        BufferedImage bi;
        try {
            bi = ImageIO.read(f);
            ByteArrayOutputStream baos = new ByteArrayOutputStream();
            ImageIO.write(bi, "jpg", baos);
            byte[] bytes = baos.toByteArray();
            return encoder.encodeBuffer(bytes).trim();
        } catch (IOException e) {
            e.printStackTrace();
        }
        return null;
    }
    public static void base64StringToImage(String base64String, String fileName){
        try {
            byte[] bytes1 = decoder.decodeBuffer(base64String);
            ByteArrayInputStream bais = new ByteArrayInputStream(bytes1);
            BufferedImage bi1 =ImageIO.read(bais);
            File w2 = new File(upload_home + fileName);//鍙互鏄痡pg,png,gif鏍煎紡
            ImageIO.write(bi1, "jpg", w2);//涓嶇杈撳嚭浠�涔堟牸寮忓浘鐗囷紝姝ゅ涓嶉渶鏀瑰姩
        } catch (IOException e) {
            e.printStackTrace();
        }
    }
}

business/base-service/src/mqConfig/esbmq-config.xml

@@ -66,6 +66,10 @@
				<MS02014_0>EwellQ.S60.MS02014.PUT</MS02014_0>
				<MS02014_1>EwellQ.S60.MS02014.GET</MS02014_1>
				<!--建立档案-->
				<BS16018_0>EwellQ.S60.BS16018.PUT</BS16018_0>
				<BS16018_1>EwellQ.S60.BS16018.GET</BS16018_1>
				<!--检查检验start-->
				<BS20030_0>EwellQ.S60.BS20030.PUT</BS20030_0>
				<BS20030_1>EwellQ.S60.BS20030.GET</BS20030_1>

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/jgpt/HospitalImgDO.java

@@ -0,0 +1,33 @@
package com.yihu.jw.entity.hospital.jgpt;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by Trick on 2019/11/28.
 */
@Entity
@Table(name = "hospital_img")
public class HospitalImgDO extends UuidIdentityEntity {
    private String name;
    private String img;
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getImg() {
        return img;
    }
    public void setImg(String img) {
        this.img = img;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyInspectionDO.java

@@ -27,6 +27,7 @@ public class WlyyInspectionDO extends UuidIdentityEntity {
    private String code;//项目编码',
    private String name;//(检查方法)',
    private String chargeAmount;//单价
    private String groupName;//检查检验方法
    private String information;//病史与体征',
    private String checkEquip;//类别',
@@ -278,4 +279,12 @@ public class WlyyInspectionDO extends UuidIdentityEntity {
    public void setCheckPartName(String checkPartName) {
        this.checkPartName = checkPartName;
    }
    public String getChargeAmount() {
        return chargeAmount;
    }
    public void setChargeAmount(String chargeAmount) {
        this.chargeAmount = chargeAmount;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -336,10 +336,14 @@ public class BaseHospitalRequestMapping {
        public static final String findByDict ="/findByDict";
    
        //根据居民CODE换取居民请求秘钥
        public static final String getPatientAccetokenByIdcard="getPatientAccetokenByIdcard";
        public static final String getPatientAccetokenByIdcard="/getPatientAccetokenByIdcard";
    
        //医生待办事项列表
        public static final String doctorUpcomingList = "doctorUpcomingList";
        public static final String doctorUpcomingList = "/doctorUpcomingList";
        public static final String setRecord = "/setRecord";
        public static final String findPatientRecord = "/findPatientRecord";
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/archive/ArchiveVO.java

@@ -0,0 +1,173 @@
package com.yihu.jw.restmodel.hospital.archive;
import io.swagger.annotations.ApiModel;
/**
 * Created by Trick on 2019/12/4.
 */
@ApiModel(value = "建档实体", description = "建档实体")
public class ArchiveVO {
    private String id0000;//医保保险号
    private String cardno;//卡号
    private String xming0;//姓名
    private String sfzhao;//身份证
    private String xbie00;//1-男 2-女
    private String brnl00;//年龄
    private String yytel0;//电话
    private String csrq00;//出生日期
    private String bjjbie;//保健级别
    private String cardtype;//2-医保 X-自费
    private String guid00;//市民健康ID
    private String grsfen;//个人身份,自费病人可为空，医保的不能为空
    private String addres;//地址
    private String smdj00;//实名登记
    private String ehealthCardId;//电子健康卡ID
    private String mindexId;//居民健康卡索引ID
    private String smkId;//经信局市民卡ID
    private String fwqd00;//服务渠道
    public String getId0000() {
        return id0000;
    }
    public void setId0000(String id0000) {
        this.id0000 = id0000;
    }
    public String getCardno() {
        return cardno;
    }
    public void setCardno(String cardno) {
        this.cardno = cardno;
    }
    public String getXming0() {
        return xming0;
    }
    public void setXming0(String xming0) {
        this.xming0 = xming0;
    }
    public String getSfzhao() {
        return sfzhao;
    }
    public void setSfzhao(String sfzhao) {
        this.sfzhao = sfzhao;
    }
    public String getXbie00() {
        return xbie00;
    }
    public void setXbie00(String xbie00) {
        this.xbie00 = xbie00;
    }
    public String getBrnl00() {
        return brnl00;
    }
    public void setBrnl00(String brnl00) {
        this.brnl00 = brnl00;
    }
    public String getYytel0() {
        return yytel0;
    }
    public void setYytel0(String yytel0) {
        this.yytel0 = yytel0;
    }
    public String getCsrq00() {
        return csrq00;
    }
    public void setCsrq00(String csrq00) {
        this.csrq00 = csrq00;
    }
    public String getBjjbie() {
        return bjjbie;
    }
    public void setBjjbie(String bjjbie) {
        this.bjjbie = bjjbie;
    }
    public String getCardtype() {
        return cardtype;
    }
    public void setCardtype(String cardtype) {
        this.cardtype = cardtype;
    }
    public String getGuid00() {
        return guid00;
    }
    public void setGuid00(String guid00) {
        this.guid00 = guid00;
    }
    public String getGrsfen() {
        return grsfen;
    }
    public void setGrsfen(String grsfen) {
        this.grsfen = grsfen;
    }
    public String getAddres() {
        return addres;
    }
    public void setAddres(String addres) {
        this.addres = addres;
    }
    public String getSmdj00() {
        return smdj00;
    }
    public void setSmdj00(String smdj00) {
        this.smdj00 = smdj00;
    }
    public String getEhealthCardId() {
        return ehealthCardId;
    }
    public void setEhealthCardId(String ehealthCardId) {
        this.ehealthCardId = ehealthCardId;
    }
    public String getMindexId() {
        return mindexId;
    }
    public void setMindexId(String mindexId) {
        this.mindexId = mindexId;
    }
    public String getSmkId() {
        return smkId;
    }
    public void setSmkId(String smkId) {
        this.smkId = smkId;
    }
    public String getFwqd00() {
        return fwqd00;
    }
    public void setFwqd00(String fwqd00) {
        this.fwqd00 = fwqd00;
    }
}

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/DataUploadJob.java

@@ -39,14 +39,14 @@ public class DataUploadJob implements Job {
//            logger.info("START========2.6 网上医技预约上传开始========");
//            try {
//                res = internetService.upMedicalOnline(startDate,endDate,null);
//            }catch (Exception e){
//                e.printStackTrace();
//                logger.error(e.toString());
//            }
//            logger.info("END==========2.6 网上医技预约上传结束========" + res);
            logger.info("START========2.6 网上医技预约上传开始========");
            try {
                res = internetService.upMedicalOnline(startDate,endDate,null);
            }catch (Exception e){
                e.printStackTrace();
                logger.error(e.toString());
            }
            logger.info("END==========2.6 网上医技预约上传结束========" + res);

svr/svr-internet-hospital-job/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  application:
    name: svr-internet-hospital-job-yx
    name: svr-internet-hospital-job
  cloud:
    config:
      failFast: true

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -904,4 +904,22 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        }
        return success(array);
    }
    @PostMapping(value = BaseHospitalRequestMapping.Prescription.setRecord)
    @ApiOperation(value = "建立档案")
    public Envelop setRecord(@ApiParam(name = "json", value = "档案实体json")
                             @RequestParam(value = "json",required = true) String json)throws Exception{
        return success(prescriptionService.setRecord(json));
    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.findPatientRecord)
    @ApiOperation(value = "获取HIIS居民档案信息")
    public Envelop findPatientRecord(@ApiParam(name = "idcard", value = "居民身份证")
                                     @RequestParam(value = "idcard",required = false) String idcard,
                                     @ApiParam(name = "patient", value = "居民code")
                                     @RequestParam(value = "patient",required = false)String patient,
                                     @ApiParam(name = "admitNum", value = "就诊次数")
                                     @RequestParam(value = "admitNum",required = false)String admitNum)throws Exception{
        return success(prescriptionService.findPatientRecord(idcard,patient,admitNum));
    }
}