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

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/XzzxEntranceService.java

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

@@ -36,6 +36,7 @@ import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.base.version.BaseServerVersionVO;
import com.yihu.jw.restmodel.hospital.prescription.*;
import com.yihu.jw.restmodel.iot.company.IotCompanyVO;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import com.yihu.jw.util.common.IdCardUtil;
@@ -542,7 +543,7 @@ public class XzzxEntranceService extends BaseJpaService {
                "</root>";
        String condition ="";
        if (StringUtils.isNoneBlank(idCard)){
            condition = "<identity_no>"+idCard+"</identity_no>";
            condition = "<Idcard>"+idCard+"</Idcard>";
        }
        String msgBody ="<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
                "<root>"+condition+"</root>";
@@ -552,7 +553,7 @@ public class XzzxEntranceService extends BaseJpaService {
        params.put("msgBody",msgBody);
        logger.info("findPatientCard params:"+params.toString());
        String xml = getXzzxWebServiceInfo("CallInterface",params,getSelectUrl());
        String xml = getXzzxWebServiceInfo("FindPatientCard",params,getSelectUrl());
        XMLSerializer xmlSerializer = new XMLSerializer();
        String json = xmlSerializer.read(xml).toString();
@@ -591,7 +592,7 @@ public class XzzxEntranceService extends BaseJpaService {
        params.put("msgBody",msgBody);
        logger.info("getCardInfo params:"+params.toString());
        String xml = getXzzxWebServiceInfo("CallInterface",params,getSelectUrl());
        String xml = getXzzxWebServiceInfo("GetCardInfo",params,getSelectUrl());
        XMLSerializer xmlSerializer = new XMLSerializer();
        String json = xmlSerializer.read(xml).toString();
@@ -631,7 +632,7 @@ public class XzzxEntranceService extends BaseJpaService {
        params.put("msgBody",msgBody);
        logger.info("FindOutpatientInfo params:"+params.toString());
        String xml = getXzzxWebServiceInfo("CallInterface",params,getSelectUrl());
        String xml = getXzzxWebServiceInfo("FindOutpatientInfo",params,getSelectUrl());
        XMLSerializer xmlSerializer = new XMLSerializer();
        String json = xmlSerializer.read(xml).toString();
@@ -679,7 +680,7 @@ public class XzzxEntranceService extends BaseJpaService {
        params.put("msgHeader",msgHeader);
        params.put("msgBody",msgBody);
        logger.info("getOriginPrescriptionList params:"+params.toString());
        String xml = getXzzxWebServiceInfo("CallInterface",params,getSelectUrl());
        String xml = getXzzxWebServiceInfo("GetOriginPrescriptionList",params,getSelectUrl());
        XMLSerializer xmlSerializer = new XMLSerializer();
        String json = xmlSerializer.read(xml).toString();
        logger.info("getOriginPrescriptionList json:"+json);
@@ -726,7 +727,7 @@ public class XzzxEntranceService extends BaseJpaService {
        params.put("msgHeader",msgHeader);
        params.put("msgBody",msgBody);
        logger.info("registered params:"+params.toString());
        String xml = getXzzxWebServiceInfo("CallInterface",params,getOperateUrl());
        String xml = getXzzxWebServiceInfo("Registered",params,getOperateUrl());
        XMLSerializer xmlSerializer = new XMLSerializer();
        String json = xmlSerializer.read(xml).toString();
        logger.info("registered json:"+json);
@@ -742,7 +743,7 @@ public class XzzxEntranceService extends BaseJpaService {
     * @throws Exception
     */
    //处方状态变更
    public String updatePrescriptionStatus(String admNo,String realOrder,String status)throws Exception{
    public String updatePreStatus(String admNo,String realOrder,String status)throws Exception{
        String api = "UpdatePreStatus";
        String msgHeader ="<?xml version=\"1.0\" encoding=\"utf-8\"?> " +
                "<root> " +
@@ -768,7 +769,7 @@ public class XzzxEntranceService extends BaseJpaService {
        params.put("msgHeader",msgHeader);
        params.put("msgBody",msgBody);
        logger.info("updatePreStatus params:"+params.toString());
        String xml = getXzzxWebServiceInfo("CallInterface",params,getOperateUrl());
        String xml = getXzzxWebServiceInfo("UpdatePreStatus",params,getOperateUrl());
        XMLSerializer xmlSerializer = new XMLSerializer();
        String json = xmlSerializer.read(xml).toString();
        logger.info("updatePreStatus json:"+json);
@@ -883,6 +884,17 @@ public class XzzxEntranceService extends BaseJpaService {
        return token;
    }
    public String ehospitalNotice(String userName, String idCard, String phone, String title, String url, String content, String contentString) {
        logger.info("ehospitalNotice:");
        BasePatientDO patientDO = basePatientDao.findByIdcardAndDel(idCard,"1");
        if(patientDO!=null&&StringUtils.isNotBlank(patientDO.getIdcard())){
            sendMes("xm_xzzx_wx",patientDO.getId(),null,content,contentString,"",url);
        }
        return "-2";
    }
//=====================微信模板消息推送接口================================

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

@@ -3,7 +3,6 @@ package com.yihu.jw.patient.dao;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

server/svr-authentication/src/main/java/com/yihu/jw/security/service/RegisterService.java

@@ -171,4 +171,10 @@ public class RegisterService {
        return buffer.toString();
    }
//    public static void main(String ag[]){
//        String dd ="jkzl@2020";
//        String pw =MD5.md5Hex(dd + "{jkzl}");
//        System.out.println(pw);
//    }
}

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

@@ -641,6 +641,31 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        return success(xzzxEntranceService.sendXCXMes( wxId, patient, cardNo, first, noticeContent, remark, miniProgramPagepath, miniProgramAppId));
    }
    @PostMapping(value = "/sendXZMes")
    @ApiOperation(value = "心脏模板消息推送小程序跳转", notes = "心脏模板消息推送小程序跳转")
    public Envelop ehospitalNotice(
            @ApiParam(name = "userName", value = "推送人姓名")
            @RequestParam(value = "userName", required = true) String userName,
            @ApiParam(name = "idCard", value = "推送人身份证")
            @RequestParam(value = "idCard", required = false) String idCard,
            @ApiParam(name = "phone", value = "推送人手机号")
            @RequestParam(value = "phone", required = true) String phone,
            @ApiParam(name = "title", value = "推送标题")
            @RequestParam(value = "title", required = true) String title,
            @ApiParam(name = "url", value = "跳转链接")
            @RequestParam(value = "url", required = false) String url,
            @ApiParam(name = "content", value = "内容简介")
            @RequestParam(value = "content", required = true) String content,
            @ApiParam(name = "contentString", value = "内容明细串")
            @RequestParam(value = "contentString", required = false) String contentString) throws Exception {
        String rs = xzzxEntranceService.ehospitalNotice(userName, idCard, phone, title, url, content, contentString);
        if("1".equals(rs)){
            return success("推送成功");
        }
        return failed("推送失败");
    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.findPatientInfo)
    @ApiOperation(value = "获取居民信息接口", notes = "获取居民信息接口")
    public ObjEnvelop findPatientInfo(@ApiParam(name = "patient", value = "居民ID")