【疫情防控代码】

business/base-service/src/main/java/com/yihu/jw/file_upload/FileUploadService.java

@@ -279,7 +279,106 @@ public class FileUploadService {
    /**
     * 调用健康上传语音文件.
     * 调用内网本地fasdf
     * @param voices_Path
     * @return
     * @throws Exception
     */
    public String uploadInLocalWxVoice(String voices_Path,String remote_inner_url) throws Exception {
        UploadVO uploadVO = new UploadVO();
        String url = "";
        File f = new File(voices_Path);
        if (f.exists()) {
            logger.info("语音文件转换file-start");
            FileInputStream input = new FileInputStream(f);
            String fileContenType = "text/plain";
            try {
                logger.info("获取文件类型--开始");
                fileContenType = new MimetypesFileTypeMap().getContentType(f);
                logger.info("获取文件类型--成功--fileContenType："+fileContenType);
            } catch (Exception e) {
                logger.info("获取文件类型--失败："+e.getMessage());
            }
            MultipartFile multipartFile = new MockMultipartFile("file", f.getName(), fileContenType, IOUtils.toByteArray(input));
            logger.info("语音文件转换file-转换-multipartFile");
            long size = multipartFile.getSize();
            if(size<=0){
                return url;
            }
            String fileName = multipartFile.getOriginalFilename();
            logger.info("语音文件转换file-转换-multipartFile-成功，开始调用内网接口上传文件");
            String rs = request(remote_inner_url, multipartFile, null);
            logger.info(rs);
            JSONObject json = JSON.parseObject(rs);
            uploadVO = objectMapper.readValue(json.getJSONObject("obj").toJSONString(),UploadVO.class);
            if (uploadVO !=null) {
                url = uploadVO.getFullUri();
                logger.info("开始调用内网接口上传文件成功：url:"+url);
//                map.put("uploadStatus", 0);//文件类型正确
//                map.put("accessory", url);//
                return url;
            }
        }
        return url;
    }
    /**
     * 调用内网上传图片.
     * @param files
     * @return
     * @throws Exception
     */
    public String uploadInLocalWxImage(String files,String tempPath,String remote_inner_url) throws Exception {
        UploadVO uploadVO = new UploadVO();
        System.out.println("files====="+files);
        System.out.println("tempPath====="+tempPath);
        // 文件保存的临时路径
        String[] fileArray = files.split(",");
        String fileUrls = "";
        for (String file : fileArray) {
            System.out.println("file+++"+file);
            File f = new File(tempPath + "/"+file);
            File fs = new File(tempPath +"/"+ file + "_small");
            if (f.exists()) {
                logger.info("图片文件转换file-start");
                FileInputStream input = new FileInputStream(f);
                String fileContenType = "text/plain";
                try {
                    logger.info("获取文件类型--开始");
                    fileContenType = new MimetypesFileTypeMap().getContentType(f);
                    logger.info("获取文件类型--成功--fileContenType："+fileContenType);
                } catch (Exception e) {
                    logger.info("获取文件类型--失败："+e.getMessage());
                }
                MultipartFile multipartFile = new MockMultipartFile("file", f.getName(), fileContenType, IOUtils.toByteArray(input));
                logger.info("图片文件转换file-转换-multipartFile");
                long size = multipartFile.getSize();
                if(size<=0){
                    return fileUrls;
                }
                logger.info("图片文件转换file-转换-multipartFile-成功，开始调用内网接口上传文件");
                String rs = request(remote_inner_url, multipartFile, null);
                logger.info(rs);
                JSONObject json = JSON.parseObject(rs);
                uploadVO = objectMapper.readValue(json.getJSONObject("obj").toJSONString(),UploadVO.class);
                if (uploadVO != null) {
                    fileUrls += uploadVO.getFullUri();
                    f.delete();
                    if (fs.exists()) {
                        fs.delete();
                    }
                }
            }
        }
        return fileUrls;
    }
    /**
     * 调用内网上传语音文件.
     * @param voices_Path
     * @return
     * @throws Exception

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

@@ -11391,6 +11391,30 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                                  String checkPart,String chargeFlag,String chargeCode,String icdCode) throws Exception {
        Map returnMap = new HashMap();
        Integer winNo = 6;
        if (checkPart==null||checkPart==""){
            List<WlyyHospitalSysDictDO> natConfigList = wlyyHospitalSysDictDao.findByDictName("natConfigList");
            checkPart = "鼻/咽拭子";
            chargeFlag = "2";
            chargeCode = "361322";
            icdCode = "Z00.000";
            for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO:natConfigList){
                if (StringUtils.isNoneBlank(wlyyHospitalSysDictDO.getDictValue())&&"checkPart".equalsIgnoreCase(wlyyHospitalSysDictDO.getDictCode())){
                    checkPart = wlyyHospitalSysDictDO.getDictValue();
                }
                if (StringUtils.isNoneBlank(wlyyHospitalSysDictDO.getDictValue())&&"chargeFlag".equalsIgnoreCase(wlyyHospitalSysDictDO.getDictCode())){
                    chargeFlag = wlyyHospitalSysDictDO.getDictValue();
                }
                if (StringUtils.isNoneBlank(wlyyHospitalSysDictDO.getDictValue())&&"chargeCode".equalsIgnoreCase(wlyyHospitalSysDictDO.getDictCode())){
                    chargeCode = wlyyHospitalSysDictDO.getDictValue();
                }
                if (StringUtils.isNoneBlank(wlyyHospitalSysDictDO.getDictValue())&&"icdCode".equalsIgnoreCase(wlyyHospitalSysDictDO.getDictCode())){
                    icdCode = wlyyHospitalSysDictDO.getDictValue();
                }
                if (StringUtils.isNoneBlank(wlyyHospitalSysDictDO.getDictValue())&&"winNo".equalsIgnoreCase(wlyyHospitalSysDictDO.getDictCode())){
                    winNo = Integer.parseInt(wlyyHospitalSysDictDO.getDictValue());
                }
            }
        }
        if (wechatId.equalsIgnoreCase("xm_zsyy_wx")){
            net.sf.json.JSONObject jsondate = new JSONObject();
            jsondate.put("checkPart",checkPart);

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

@@ -625,7 +625,11 @@ public class HcyyEntranceService {
     * @throws Exception
     */
    //查询患者就诊卡
    public String findPatientCard(String idCard)throws Exception{
    public String findPatientCard(String patient)throws Exception{
        BasePatientDO patientDO = patientDao.findById(patient);
        if (patientDO==null){
            throw new Exception("不存在该患者！");
        }
        String api = "FindPatientCard";
        String msgHeader ="<?xml version=\"1.0\" encoding=\"utf-8\"?> " +
                "<root> " +
@@ -635,6 +639,7 @@ public class HcyyEntranceService {
                "   <certificate>"+key+"</certificate> " +
                "</root>";
        String condition ="";
        String idCard = patientDO.getIdcard();
        if (!StringUtils.isEmpty(idCard)){
            condition = "<identity_no>"+idCard+"</identity_no>";
        }

business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@@ -255,6 +255,18 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                        }
                    }
                }
            }else {
                BigDecimal b = new BigDecimal(String.valueOf(wlyyPrescriptionDO.getDrugFee()==null?0:wlyyPrescriptionDO.getDrugFee()));
                BigDecimal c = new BigDecimal(String.valueOf(100));
                BigDecimal bc = b.multiply(c);
                BigDecimal dc = new BigDecimal(0);
                //判断检查检验项目是否有金额
                if (wlyyPrescriptionDO.getInspectFee()!=null){
                    BigDecimal d = new BigDecimal(String.valueOf(wlyyPrescriptionDO.getInspectFee()));
                    dc= d.multiply(c);
                }
                businessOrderDO.setPayPrice(bc.doubleValue());
                businessOrderDao.save(businessOrderDO);
            }
        }
        return businessOrderDOS;
@@ -960,10 +972,12 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                                        if (StringUtils.isNoneBlank(wlyyPrescriptionDO.getAdmNo())){
                                            condition = " t.JZXH = '"+wlyyPrescriptionDO.getAdmNo()+"' and ";
                                        }
                                        String address =wlyyPrescriptionExpressageDO.getProvinceName()+ wlyyPrescriptionExpressageDO.getCityName()+wlyyPrescriptionExpressageDO.getTownName()+wlyyPrescriptionExpressageDO.getAddress();
                                        //同步his写入自取信息
                                        String updatesql = "update v_ms_dd01 t set t.PSFS = 0 ,t.FKZT=1 ,t.SJR= '"+wlyyPrescriptionExpressageDO.getName()+"' ," +
                                                " t.SJRDH = '"+wlyyPrescriptionExpressageDO.getMobile()+"' ,"+
                                                " t.SJRDZ = '"+wlyyPrescriptionExpressageDO.getAddress()+"' ,"+
                                                " t.SJRDZ = '"+address+"' ,"+
                                                " t.YFSB = '"+wlyyPrescriptionExpressageDO.getHospitalCode()+"'"+
                                                " where "+condition+" t.CFSB ='"+wlyyPrescriptionDO.getRealOrder()+"'";
                                        ykyyEntranceService.updateHisStatus(updatesql);

server/svr-authentication/pom.xml

@@ -196,6 +196,16 @@
            <artifactId>spring-test</artifactId>
            <!--<version>RELEASE</version>-->
        </dependency>
        <dependency>
            <groupId>com.zy</groupId>
            <artifactId>alipay-sdk-java</artifactId>
            <version>4.10.159.ALL</version>
        </dependency>
        <dependency>
            <groupId>com.zy</groupId>
            <artifactId>kasite-sdk</artifactId>
            <version>20201027</version>
        </dependency>
    </dependencies>
    <build>

server/svr-authentication/src/main/java/com/yihu/jw/security/core/userdetails/jdbc/WlyyUserDetailsService.java

@@ -1,5 +1,6 @@
package com.yihu.jw.security.core.userdetails.jdbc;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.base.login.BaseLoginLogDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
@@ -14,6 +15,7 @@ import com.yihu.jw.security.dao.patient.BasePatientWechatDao;
import com.yihu.jw.security.dao.patient.WlyyPatientFamilyMemberDao;
import com.yihu.jw.security.model.WlyyUserDetails;
import com.yihu.jw.security.model.WlyyUserSimple;
import com.yihu.jw.security.service.HcyyService;
import com.yihu.jw.security.utils.IdCardUtil;
import com.yihu.jw.security.utils.ImUtil;
import com.yihu.jw.util.date.DateUtil;
@@ -105,6 +107,8 @@ public class WlyyUserDetailsService extends JdbcDaoSupport implements UserDetail
    @Autowired
    private BaseGetuiClientDao baseGetuiClientDao;
    @Autowired
    private HcyyService hcyyService;
    @Autowired
    private ImUtil imUtil;
    @Value("${kick.eachOther}")
    private String kickEachOther;
@@ -971,6 +975,58 @@ public class WlyyUserDetailsService extends JdbcDaoSupport implements UserDetail
        return null;
    }
    public JSONObject getHcHLWyyUser(String openid,String memberId){
        JSONObject patient = new JSONObject();
        try {
            String result = hcyyService.queryMemberByOpenId(openid,memberId);
            JSONObject jsonObject = JSONObject.parseObject(result);
            String RespCode = jsonObject.getString("RespCode");
            BasePatientDO patient1 = new BasePatientDO();
            if (RespCode.equalsIgnoreCase("10000")){
                JSONArray array = jsonObject.getJSONArray("Data");
                if (array!=null&&array.size()!=0){
                    patient = array.getJSONObject(0);
                    String idcard = patient.getString("IdCardNo");
                    BasePatientDO patientDO2 = patientDao.findByIdcardAndDel(idcard,"1");
                    String salt = UUID.randomUUID().toString().substring(0,5);
                    String mobile = patient.getString("Mobile");
                    String pw = null;
                    if(org.apache.commons.lang3.StringUtils.isNotBlank(mobile)){
                        pw = mobile.substring(mobile.length()-6);
                    }else{
                        pw = idcard.substring(idcard.length()-6);
                    }
                    if (patientDO2!=null){
                        patient1=patientDO2;
                    }else {
                        patient1.setPassword(MD5.md5Hex(pw + "{" + salt + "}"));
                        patient1.setSalt(salt);
                    }
                    patient1.setIdcard(idcard);
                    patient1.setCardType(patient.getString("CardType"));
                    patient1.setName(patient.getString("MemberName"));
                    patient1.setSex(StringUtils.isNotBlank(idcard)?Integer.parseInt(IdCardUtil.getSexForIdcard_new(idcard)):null);
                    patient1.setMobile(mobile);
                    patient1.setDel("1");
                    patient1.setEnabled(1);
                    patient1.setLocked(0);
                    patient1.setCreateTime(new Date());
                    patient1.setUpdateTime(new Date());
                    patient1.setBirthday(IdCardUtil.getBirthdayForIdcard(idcard));
                    patient1 = patientDao.save(patient1);
                    logger.info("结束同步患者数据");
                }
            }
                return patient;
        }catch (Exception e){
            logger.error(e);
        }
        return null;
    }
    public static void main(String arg[]){
        String ps = MD5.md5Hex("327127" + "{" + "Ar8f2" + "}");

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -1727,41 +1727,50 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
    }
    @RequestMapping(value = "/oauth/ssoPatientLogin", method = RequestMethod.POST)
    public ObjEnvelop ssoPatientLogin(String authCode,String client_id,String code,String appId,String login_type){
    public ObjEnvelop ssoPatientLogin(String authCode,String client_id,String code,String appId,String login_type,String openId,String memberId){
        if (StringUtils.isEmpty(client_id)) {
            throw new InvalidRequestException("client_id is null");
        }
        if (StringUtils.isEmpty(authCode)) {
            throw new InvalidRequestException("authCode is null");
        }
        if (StringUtils.isEmpty(code)) {
            throw new InvalidRequestException("code is null");
        }
        if (StringUtils.isEmpty(appId)) {
            throw new InvalidRequestException("appId is null");
        if (!wechatId.equalsIgnoreCase("xm_hcyy_wx")){
            if (StringUtils.isEmpty(client_id)) {
                throw new InvalidRequestException("client_id is null");
            }
            if (StringUtils.isEmpty(authCode)) {
                throw new InvalidRequestException("authCode is null");
            }
            if (StringUtils.isEmpty(code)) {
                throw new InvalidRequestException("code is null");
            }
            if (StringUtils.isEmpty(appId)) {
                throw new InvalidRequestException("appId is null");
            }
        }
        try {
            logger.info("authCode :"+authCode);
            Map<String, String> parameters = new HashedMap();
            if (!wechatId.equalsIgnoreCase("xm_hcyy_wx")) {
                logger.info("authCode :"+authCode);
            Map<String,Object> rs = oauthSsoService.savePatient(code,appId,authCode,wechatId);
            Integer c = (Integer) rs.get("code");
            if(c != 1){
                return ObjEnvelop.getError(rs.get("mes")+"");
            }
                Map<String,Object> rs = oauthSsoService.savePatient(code,appId,authCode,wechatId);
                Integer c = (Integer) rs.get("code");
                if(c != 1){
                    return ObjEnvelop.getError(rs.get("mes")+"");
                }
            BasePatientDO patientDO = (BasePatientDO)rs.get("patient");
            if(patientDO==null){
                return ObjEnvelop.getError("获取居民信息失败");
                BasePatientDO patientDO = (BasePatientDO)rs.get("patient");
                if(patientDO==null){
                    return ObjEnvelop.getError("获取居民信息失败");
                }
                parameters.put("username",patientDO.getIdcard());
                parameters.put("grant_type", "ihealthCode");
            }else {
                JSONObject patient = userDetailsService.getHcHLWyyUser(openId,memberId);
                if (patient==null){
                    return ObjEnvelop.getError("获取居民信息失败");
                }
                parameters.put("username",patient.getString("IdCardNo"));
                parameters.put("grant_type", "ihealthCode");
            }
            ClientDetails authenticatedClient = clientDetailsService.loadClientByClientId(client_id);
            Map<String, String> parameters = new HashedMap();
            parameters.put("username",patientDO.getIdcard());
            parameters.put("grant_type", "ihealthCode");
            TokenRequest tokenRequest = oAuth2RequestFactory.createTokenRequest(parameters, authenticatedClient);
            if (authenticatedClient != null) {
                oAuth2RequestValidator.validateScope(tokenRequest, authenticatedClient);

svr/svr-internet-hospital-entrance/src/main/resources/application.yml

@@ -527,3 +527,45 @@ express:
  sf_code: WH000091
  sf_check_word: SFAHKAOFAAITyjt7890
---
#海沧医院内网
spring:
  profiles: hcyyProd
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    url: jdbc:mysql://127.0.0.1:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: wlyy
    password: 2oEq3Kf7@zjxl
# mq 是否获取his数据，flag代表获取演示数据，false代表获取his真实数据
demo:
  flag: false
#支付支付
pay:
  flag: true
hospital:
  url: https://wx.xmzsh.com
  mqUser: JKZL
  mqPwd: 123456
  SourceSysCode: S60
  TargetSysCode: S01
im:
  im_list_get: http://192.168.118.240:3000/
  data_base_name: im
fastDFS:
  fastdfs_file_url: http://127.0.0.1:8888/
fast-dfs:
  tracker-server: :22122 #服务器地址
#是否开启i健康接口 0关闭，1开启
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
wechat:
  id: xm_xzzx_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
  url: http://172.16.100.37:8090/hospitalPortal-sms/sms/sendMessage
express:
  sf_url: http://bsp-oisp.sf-express.com/bsp-oisp/sfexpressService
  sf_code: WH000061
  sf_check_word: BEWFSCXSyjt4314rz

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/PatientConsultEndpoint.java

@@ -368,7 +368,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
							logger.info("voice_wx_type:"+wechat_appid);
							voiceurl = fileUploadService.uploadWxVoice(voicepath);
//					uploadVO.setFullUri(map.get("accessory").toString());
						}else if ("xm_xzzx_wx".equalsIgnoreCase(wechat_appid)){
						}else if ("xm_xzzx_wx".equalsIgnoreCase(wechat_appid)||"xm_hcyy_wx".equalsIgnoreCase(wechat_appid)){
							voiceurl = fileUploadService.uploadWxVoiceToEntrance(remote_inner_url,voicepath);
							logger.info(voiceurl);
						}else {

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@@ -54,6 +54,7 @@ import com.yihu.jw.order.pay.utils.PayLogService;
import com.yihu.jw.order.pay.ylz.YlzPayService;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionInfoVO;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionVO;
import com.yihu.jw.restmodel.iot.common.UploadVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
@@ -86,18 +87,23 @@ import net.sf.json.JSONArray;
import net.sf.json.xml.XMLSerializer;
import org.apache.axis.utils.StringUtils;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang.time.DateUtils;
import org.apache.http.NameValuePair;
import org.apache.http.message.BasicNameValuePair;
import org.apache.jasper.tagplugins.jstl.core.Url;
import org.apache.http.entity.ContentType;
import org.apache.poi.util.IOUtils;
import org.apache.tomcat.util.http.fileupload.FileItem;
import org.apache.tomcat.util.http.fileupload.FileItemFactory;
import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.util.StreamUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
import javax.activation.MimetypesFileTypeMap;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
@@ -234,6 +240,11 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private YqfkService yqfkService;
    @Value("${testPattern.sign}")
    private String isClose;
    @Value("${testPattern.remote_inner_url}")
    private String remote_inner_url;
    @GetMapping(value = BaseHospitalRequestMapping.PatientNoLogin.findDoctorByHospitalAndDiseaseAndDept)
@@ -509,7 +520,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            return  failedObjEnvelopException(e);
        }
    }
    
    @GetMapping(value = BaseHospitalRequestMapping.PatientNoLogin.getUpcomingByDoctor)
    @ApiOperation(value = "获取医生待办详情", notes = "获取医生待办详情")
    public Envelop getUpcomingByDoctor(@ApiParam(name = "doctorIdcard", value = "doctorIdcard", required = true)
@@ -1962,6 +1973,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            @ApiParam(name = "times", value = "")
            @RequestParam(value = "times",required = false) Integer times) throws Exception {
        JSONObject object = new JSONObject();
        UploadVO uploadVO = new UploadVO();
        //处理语音文件
        if(!org.springframework.util.StringUtils.isEmpty(wxId)){
@@ -1979,7 +1991,12 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                        voiceurl = fileUploadService.uploadWxVoice(voicepath);
//					uploadVO.setFullUri(map.get("accessory").toString());
                    }else {
                        voiceurl = fileUtil.copyTempVoice(voicepath,fastdfs_file_url);
                        if(isClose.equals("2")){
                            voiceurl = fileUploadService.uploadInLocalWxVoice(voicepath,remote_inner_url);
                        }else {
                            voiceurl = fileUtil.copyTempVoice(voicepath,fastdfs_file_url);
                        }
                    }
                    obj.put("path", voiceurl);
                    obj.put("times", times);
@@ -1997,7 +2014,12 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                        imgeUrl = fileUploadService.uploadWxImage(imagepath);
//					uploadVO.setFullUri(map.get("accessory").toString());
                    }else{
                        imgeUrl = fileUtil.copyTempImage(imagepath,upload_temp_path);
                        if(isClose.equals("2")){
                            imgeUrl = fileUploadService.uploadInLocalWxImage(imagepath,upload_temp_path,remote_inner_url);
                        }else {
                            imgeUrl = fileUtil.copyTempImage(imagepath,upload_temp_path);
                        }
                    }
                    logger.info("imgeUrl"+imgeUrl);
                    object.put("path",imgeUrl);

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

@@ -28,10 +28,7 @@ import com.yihu.jw.hospital.prescription.dao.OutpatientDao;
import com.yihu.jw.hospital.prescription.dao.PrescriptionDiagnosisDao;
import com.yihu.jw.hospital.prescription.dao.PrescriptionInfoDao;
import com.yihu.jw.hospital.prescription.service.*;
import com.yihu.jw.hospital.prescription.service.entrance.DoctorPreSignService;
import com.yihu.jw.hospital.prescription.service.entrance.EntranceService;
import com.yihu.jw.hospital.prescription.service.entrance.TnyyEntranceService;
import com.yihu.jw.hospital.prescription.service.entrance.XzzxEntranceService;
import com.yihu.jw.hospital.prescription.service.entrance.*;
import com.yihu.jw.hospital.service.SystemMessage.HospitalSystemMessageService;
import com.yihu.jw.im.dao.ConsultDao;
import com.yihu.jw.im.service.ImService;
@@ -158,6 +155,8 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    private String qywxUrl;
    @Autowired
    public ImUtil imUtil;
    @Autowired
    private HcyyEntranceService hcyyEntranceService;
    
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.findOutpatientList)
    @ApiOperation(value = " 查询某个时间段的患者门诊就诊记录")
@@ -372,6 +371,16 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        try {
            if ("xm_zsyy_wx".equalsIgnoreCase(wxId)){
                return success(prescriptionService.findPatientCard(patient));
            }else if ("xm_hcyy_wx".equalsIgnoreCase(wxId)){
                String result = hcyyEntranceService.findPatientCard(patient);
                JSONArray jsonArray = new JSONArray();
                if (result!=null&&result!=""){
                    JSONArray array = JSONArray.parseArray(result);
                    if (array!=null&&array.size()!=0){
                        jsonArray = array.getJSONArray(0);
                    }
                }
                return success(jsonArray);
            }else if ("xm_tasy_wx".equalsIgnoreCase(wxId)){
                return success(tasyNatService.findPatientCard(patient));
            }else {