眼科版本更改

business/base-service/src/main/java/com/yihu/jw/hospital/family/service/WlyyFamilyMemberService.java

@@ -84,7 +84,7 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
    //添加关联家属
    @Transactional
    public MixEnvelop addFamily(String id,String patientId, String familyName, String dictId, String cardType, String idCard, String phoneNum,boolean demo,String medicareType,String medicare,String clinicId) throws Exception {
    public MixEnvelop addFamily(String id,String patientId, String familyName, String dictId, String cardType, String idCard, String phoneNum,boolean demo,String medicareType,String medicare,String clinicId,String patientCardId) throws Exception {
        MixEnvelop mixEnvelop = new MixEnvelop();
        try{
        BasePatientMemberDictDO basePatientMemberDictDO = basePatientMemberDictDao.findOne(dictId);
@@ -210,7 +210,7 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
                                mixEnvelop.setMessage("眼科通token失效");
                                return mixEnvelop;
                            }
                            res = ykyyPrescriptionService.add(result.getYktFamilyId(),familyName,cardType,idCard,phoneNum, dictId,cardType1,cardNo,authorization);
                            res = ykyyPrescriptionService.add(result.getYktFamilyId(),familyName,cardType,idCard,phoneNum, dictId,cardType1,cardNo,authorization,patientCardId);
                        }
                        if (StringUtils.isNotEmpty(res)){
                            JSONObject jsonObject1 = JSONObject.parseObject(res);
@@ -253,7 +253,7 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
                                mixEnvelop.setMessage("眼科通token失效");
                                return mixEnvelop;
                            }
                            res = ykyyPrescriptionService.add(null,familyName,cardType,idCard,phoneNum, dictId,cardType1,cardNo,authorization);
                            res = ykyyPrescriptionService.add(null,familyName,cardType,idCard,phoneNum, dictId,cardType1,cardNo,authorization,patientCardId);
                        }
                    }
@@ -608,7 +608,7 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
    //添加关联家属
    @Transactional
    public MixEnvelop addFamilyAppoint(String id,String patientId, String familyName, String dictId, String cardType, String idCard, String phoneNum,boolean demo,String medicareType,String medicare,String clinicId) throws Exception {
    public MixEnvelop addFamilyAppoint(String id,String patientId, String familyName, String dictId, String cardType, String idCard, String phoneNum,boolean demo,String medicareType,String medicare,String clinicId,String patientCardId) throws Exception {
        MixEnvelop mixEnvelop = new MixEnvelop();
        try{
            BasePatientMemberDictDO basePatientMemberDictDO = basePatientMemberDictDao.findOne(dictId);
@@ -719,7 +719,7 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
                            mixEnvelop.setMessage("眼科通token失效");
                            return mixEnvelop;
                        }
                        res = ykyyPrescriptionService.add(result.getYktFamilyId(),familyName,cardType,idCard,phoneNum, dictId,cardType1,cardNo,authorization);
                        res = ykyyPrescriptionService.add(result.getYktFamilyId(),familyName,cardType,idCard,phoneNum, dictId,cardType1,cardNo,authorization,patientCardId);
                    }
                    if (StringUtils.isNotEmpty(res)){
                        JSONObject jsonObject1 = JSONObject.parseObject(res);
@@ -762,7 +762,7 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
                            mixEnvelop.setMessage("眼科通token失效");
                            return mixEnvelop;
                        }
                        res = ykyyPrescriptionService.add(null,familyName,cardType,idCard,phoneNum, dictId,cardType1,cardNo,authorization);
                        res = ykyyPrescriptionService.add(null,familyName,cardType,idCard,phoneNum, dictId,cardType1,cardNo,authorization,patientCardId);
                    }
                    if (StringUtils.isNotEmpty(res)){
                        JSONObject jsonObject1 = JSONObject.parseObject(res);
@@ -817,13 +817,16 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
            result.setFamilyMember(patientNewId);
            wlyyPatientFamilyMemberDao.save(result);
            if (!"xm_xzzx_wx".equalsIgnoreCase(wxId)){
                patientMappingDO.setIdcard(idCard);
                patientMappingDO.setSource("1");
                patientMappingDO.setPatientName(familyName);
                patientMappingDO.setMappingCode(familyId);
                patientMappingDO.setPatient(patientNewId);
                patientMappingDO.setCreateTime(new Date());
                patientMappingDao.save(patientMappingDO);
                if (patientMappingDO!=null){
                    patientMappingDO.setIdcard(idCard);
                    patientMappingDO.setSource("1");
                    patientMappingDO.setPatientName(familyName);
                    patientMappingDO.setMappingCode(familyId);
                    patientMappingDO.setPatient(patientNewId);
                    patientMappingDO.setCreateTime(new Date());
                    patientMappingDao.save(patientMappingDO);
                }
            }
            resultMap.put("patientId",patientId);
            resultMap.put("familyMember",patientNewId);
@@ -904,6 +907,7 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
                            String idNo = family.getString("idNo");
                            BasePatientDO patientDO = basePatientDao.findByIdcard(idNo);
                            if (patientDO==null){
                                patientDO = new BasePatientDO();
                                patientDO.setDel("1");
                                patientDO.setName(family.getString("userName"));
                                patientDO.setCreateTime(new Date());
@@ -951,6 +955,7 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
                                    patientMedicareCardDO.setDel("1");
                                    patientMedicareCardDO.setPatientCode(patientDO.getId());
                                    patientMedicareCardDO.setParentType("A");
                                    patientMedicareCardDO.setMedicareNumber(card.getString("patientCardId"));
                                    if (card.getString("cardType").equalsIgnoreCase("1")){
                                        patientMedicareCardDO.setType("A_01");
                                    }else if (card.getString("cardType").equalsIgnoreCase("2")){

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

@@ -1813,12 +1813,15 @@ public class YkyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
     * SELF
     * @return
     */
    public String add(String patientAccountId,String userName,String idType,String idNo,String mobile,String relationship,String cardType,String cardNo,String authorization){
    public String add(String patientAccountId,String userName,String idType,String idNo,String mobile,String relationship,String cardType,String cardNo,String authorization,String patientCardId){
        String url = newYktUrl+"/api/ext/ykt/patient/add";
        Map<String, Object> params = new HashMap<>();
        if (StringUtils.isNoneBlank(patientAccountId)){
            params.put("patientAccountId", patientAccountId);
        }
        if (StringUtils.isNoneBlank(patientCardId)){
            params.put("patientCardId", patientCardId);
        }
        params.put("cardType", cardType);
        params.put("cardNo", cardNo);
        params.put("userName", userName);
@@ -1901,6 +1904,51 @@ public class YkyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
        return SignGenerator.requestYktAndHeader(params,headerParams,url);
    }
    /**
     * 获取居民卡列表
     *
     * @param patientId
     * @param cardNoId
     * @return
     */
    public String selectCardList(String patientId,String patientAccountId){
        BasePatientDO basePatientDO =basePatientDao.findById(patientId);
        String authorization="";
        //删除眼科通的家人关系
        String tokenRes=mobileOnly(basePatientDO.getMobile());
        if (org.apache.commons.lang.StringUtils.isNotBlank(tokenRes)){
            JSONObject object = JSONObject.parseObject(tokenRes);
            if (object.getString("code").equalsIgnoreCase("200")){
                JSONObject object1=object.getJSONObject("data");
                authorization=object1.getString("accessToken");
            }
        }
        return cardList(patientAccountId,authorization);
    }
    /**
     * 删除居民就诊卡
     *
     * @param patientId
     * @param cardNoId
     * @return
     */
    public String deleteCardNoByPatientId(String patientId,String cardNoId){
        BasePatientDO basePatientDO =basePatientDao.findById(patientId);
        String authorization="";
        //删除眼科通的家人关系
        String tokenRes=mobileOnly(basePatientDO.getMobile());
        if (org.apache.commons.lang.StringUtils.isNotBlank(tokenRes)){
            JSONObject object = JSONObject.parseObject(tokenRes);
            if (object.getString("code").equalsIgnoreCase("200")){
                JSONObject object1=object.getJSONObject("data");
                authorization=object1.getString("accessToken");
            }
        }
        return deleteCardNo(cardNoId,authorization);
    }
    /**
     * 调佣眼科通埋点
     *

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

@@ -3506,6 +3506,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
                                                    patientMedicareCardDO.setDel("1");
                                                    patientMedicareCardDO.setPatientCode(patientDO.getId());
                                                    patientMedicareCardDO.setParentType("A");
                                                    patientMedicareCardDO.setMedicareNumber(card.getString("patientCardId"));
                                                    if (card.getString("cardType").equalsIgnoreCase("1")){
                                                        patientMedicareCardDO.setType("A_01");
                                                    }else if (card.getString("cardType").equalsIgnoreCase("2")){
@@ -3606,6 +3607,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
                                                    patientMedicareCardDO.setDel("1");
                                                    patientMedicareCardDO.setPatientCode(patientDO.getId());
                                                    patientMedicareCardDO.setParentType("A");
                                                    patientMedicareCardDO.setMedicareNumber(card.getString("patientCardId"));
                                                    if (card.getString("cardType").equalsIgnoreCase("1")){
                                                        patientMedicareCardDO.setType("A_01");
                                                    }else if (card.getString("cardType").equalsIgnoreCase("2")){
@@ -3954,6 +3956,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
                                                        patientMedicareCardDO.setDel("1");
                                                        patientMedicareCardDO.setPatientCode(patientDO.getId());
                                                        patientMedicareCardDO.setParentType("A");
                                                        patientMedicareCardDO.setMedicareNumber(card.getString("patientCardId"));
                                                        if (card.getString("cardType").equalsIgnoreCase("1")) {
                                                            patientMedicareCardDO.setType("A_01");
                                                        } else if (card.getString("cardType").equalsIgnoreCase("2")) {
@@ -4054,6 +4057,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
                                                        patientMedicareCardDO.setDel("1");
                                                        patientMedicareCardDO.setPatientCode(patientDO.getId());
                                                        patientMedicareCardDO.setParentType("A");
                                                        patientMedicareCardDO.setMedicareNumber(card.getString("patientCardId"));
                                                        if (card.getString("cardType").equalsIgnoreCase("1")) {
                                                            patientMedicareCardDO.setType("A_01");
                                                        } else if (card.getString("cardType").equalsIgnoreCase("2")) {
@@ -4337,6 +4341,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
            parameters.put("grant_type", "ihealthDcotor");
            //解密密码
            if (parameters.get("password") != null) {
                parameters.put("grant_type", "password");
                KeyPair keyPair = (KeyPair) httpSession.getAttribute("privateKey");
                String password = com.yihu.jw.security.utils.RSAUtils.decryptBase64(parameters.get("password"), keyPair);
                logger.info("password："+password);

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

@@ -430,6 +430,7 @@ public class WlyyYkyyEndpoint extends AbstractEndpoint {
                            patientMedicareCardDO.setDel("1");
                            patientMedicareCardDO.setPatientCode(patientDO.getId());
                            patientMedicareCardDO.setParentType("A");
                            patientMedicareCardDO.setMedicareNumber(card.getString("patientCardId"));
                            if (card.getString("cardType").equalsIgnoreCase("1")){
                                patientMedicareCardDO.setType("A_01");
                            }else if (card.getString("cardType").equalsIgnoreCase("2")){
@@ -578,6 +579,7 @@ public class WlyyYkyyEndpoint extends AbstractEndpoint {
                            patientMedicareCardDO.setDel("1");
                            patientMedicareCardDO.setPatientCode(patientDO.getId());
                            patientMedicareCardDO.setParentType("A");
                            patientMedicareCardDO.setMedicareNumber(card.getString("patientCardId"));
                            if (card.getString("cardType").equalsIgnoreCase("1")){
                                patientMedicareCardDO.setType("A_01");
                            }else if (card.getString("cardType").equalsIgnoreCase("2")){

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

@@ -385,6 +385,7 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
            String medicareType = jsonObject.getString("medicareType");
            String medicare = jsonObject.getString("medicare");
            String clinicId = jsonObject.getString("clinicId");
            String patientCardId = jsonObject.getString("patientCardId");
            boolean checkCode =false;
            if(!StringUtils.isEmpty(code)){
                checkCode = this.verification(client_id, username, code);
@@ -413,7 +414,7 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
                //获取建档信息
                if ("xm_ykyy_wx".equalsIgnoreCase(wxId)){
                    mixEnvelop = wlyyFamilyMemberService.addFamily(id, patientId, familyName, dictId, cardType, idCard, username, false, medicareType, medicare, clinicId);
                    mixEnvelop = wlyyFamilyMemberService.addFamily(id, patientId, familyName, dictId, cardType, idCard, username, false, medicareType, medicare, clinicId,patientCardId);
                    if (mixEnvelop!=null){
                        if(mixEnvelop.getStatus() == 200) {
                            JSONObject jdObject = ykyyEntranceService.patientJDKH(idCard,familyName,username,medicare,clinicId);
@@ -435,14 +436,14 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
                                    mixEnvelop.setMessage(jdObject.getString("message"));
                                    return mixEnvelop;
                                }else {
                                    mixEnvelop = wlyyFamilyMemberService.addFamily(id, patientId, familyName, dictId, cardType, idCard, username, false, medicareType, medicare, clinicId);
                                    mixEnvelop = wlyyFamilyMemberService.addFamily(id, patientId, familyName, dictId, cardType, idCard, username, false, medicareType, medicare, clinicId,patientCardId);
                                }
                            }
                            return mixEnvelop;
                        }
                    }
                }else {
                    mixEnvelop = wlyyFamilyMemberService.addFamily(id, patientId, familyName, dictId, cardType, idCard, username, false, medicareType, medicare, clinicId);
                    mixEnvelop = wlyyFamilyMemberService.addFamily(id, patientId, familyName, dictId, cardType, idCard, username, false, medicareType, medicare, clinicId,patientCardId);
                }
            } else {
@@ -562,6 +563,7 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
            String medicareType = jsonObject.getString("medicareType");
            String medicare = jsonObject.getString("medicare");
            String clinicId = jsonObject.getString("clinicId");
            String patientCardId=jsonObject.getString("patientCardId");
            boolean checkCode =false;
            if(!StringUtils.isEmpty(code)){
                checkCode = this.verification(client_id, username, code);
@@ -590,7 +592,7 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
                //获取建档信息
                if ("xm_ykyy_wx".equalsIgnoreCase(wxId)) {
                    mixEnvelop = wlyyFamilyMemberService.addFamilyAppoint(id, patientId, familyName, dictId, cardType, idCard, username, false, medicareType, medicare, clinicId);
                    mixEnvelop = wlyyFamilyMemberService.addFamilyAppoint(id, patientId, familyName, dictId, cardType, idCard, username, false, medicareType, medicare, clinicId,patientCardId);
                }
            } else {

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

@@ -544,4 +544,32 @@ public class YkyyPrescriptionEndpoint extends EnvelopRestEndpoint {
    public void synDoctorInfo() {
        prescriptionService.synDoctorInfo();
    }
    @GetMapping(value = "selectCardList")
    @ApiOperation(value = "获取就诊卡列表", notes = "获取就诊卡列表")
    public Envelop selectCardList(@ApiParam(name = "patientId", value = "患者id")
                                  @RequestParam(value = "patientId", required = false)String patientId,
                                  @ApiParam(name = "patientAccountId", value = "就诊人id")
                                  @RequestParam(value = "patientAccountId", required = false)String patientAccountId)throws Exception {
        try {
            return success("ok",prescriptionService.selectCardList(patientId,patientAccountId));
        }catch (Exception e) {
            return  failedObjEnvelopException(e);
        }
    }
    @GetMapping(value = "deleteCardNoByPatientId")
    @ApiOperation(value = "删除就诊卡", notes = "删除就诊卡")
    public Envelop deleteCardNoByPatientId(@ApiParam(name = "patientId", value = "患者id")
                                  @RequestParam(value = "patientId", required = false)String patientId,
                                  @ApiParam(name = "cardNoId", value = "卡id")
                                  @RequestParam(value = "cardNoId", required = false)String cardNoId)throws Exception {
        try {
            return success("ok",prescriptionService.deleteCardNoByPatientId(patientId,cardNoId));
        }catch (Exception e) {
            return  failedObjEnvelopException(e);
        }
    }
}