代码修改

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

@@ -111,12 +111,25 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
                if(basePatientDO==null){
                    basePatientDO = new BasePatientDO();
                }
                basePatientDO.setMobile(phoneNum);
                //判断手机号是否已经存在
                List<BasePatientDO> pList = basePatientDao.findByMobileAndDel(phoneNum,"1");
                if(pList.size()==0){
                    //手机号未被绑定
                    basePatientDO.setMobile(phoneNum);
                }
                basePatientDO.setMobileRemarks(phoneNum);
            }
        }else{
            if(basePatientDO==null){
                basePatientDO = new BasePatientDO();
            }
            //判断手机号是否已经存在
            List<BasePatientDO> pList = basePatientDao.findByMobileAndDel(phoneNum,"1");
            if(pList.size()==0){
                //手机号未被绑定
                basePatientDO.setMobile(phoneNum);
            }
            basePatientDO.setMobileRemarks(phoneNum);
        }
        Map<String,Object> resultMap = new HashMap<>();
        PatientMappingDO patientMappingDO = patientMappingDao.findByIdcard(idCard);
@@ -284,7 +297,7 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
                            mixEnvelop.setMessage("您所添加的家属的名称有误，无法发送验证码");
                            return mixEnvelop;
                        }
                        basePatientDO.setMobile(Next_Of_Kin_Phone);
//                        basePatientDO.setMobile(Next_Of_Kin_Phone);
                        basePatientDO.setPhone(Next_Of_Kin_Phone);
                        basePatientDO.setName(Pat_name);
                        basePatientDO.setBirthday(IdCardUtil.getBirthdayForIdcard(idCard));
@@ -1017,7 +1030,7 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
        }else {
            String sql = "select t.id as \"id\",t.card_type as \"cardType\", " +
                    "t.patient as \"patient\",b.name as \"name\",b.sex as \"sex\","+
                    "b.birthday as\"birthday\",b.idcard as \"idcard\",b.mobile as \"mobile\"," +
                    "b.birthday as\"birthday\",b.idcard as \"idcard\",if(b.mobile is null,b.mobile_remarks,b.mobile) as \"mobile\"," +
                    "t.family_member as \"familyMember\",c.relation_name as \"relationName\",t.medicare as \"medicare\" "+
                    " from wlyy_patient_family_member t left join base_patient b" +
                    " on t.family_member = b.id left join base_patient_member_dict c on t.family_relation=c.id where 1=1 and t.is_del=1 ";

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

@@ -5148,7 +5148,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                " and m.doctor_code='"+doctor+"') a ";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        if(list.size()>0){
            return list.get(0).get("doctorLable")+"";
            Object doctorLable = list.get(0).get("doctorLable");
            if(doctorLable==null){
                return "";
            }
            return doctorLable+"";
        }
        return "";
    }

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

@@ -348,6 +348,7 @@ public class DsyyEntranceService {
                        DictHospitalDeptDO deptDO = list.get(0);
                        deptDO.setName(deptjson.getString("name"));
                        deptDO.setDeptType(deptjson.getString("deptAttr"));
                        deptDO.setConsultDeptFlag(deptjson.getString("consultDeptFlag"));
                        dictHospitalDeptDao.save(deptDO);
                    }else {
                        //新增
@@ -361,9 +362,7 @@ public class DsyyEntranceService {
                        deptDO.setDeptType(deptjson.getString("deptAttr"));
                        dictHospitalDeptDao.save(deptDO);
                    }
                }
            }
        }
        return "success";

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

@@ -169,27 +169,27 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
                return  mixEnvelop;
            }
        }else if ("xm_dsyy_wx".equalsIgnoreCase(wxId)){
            JSONObject object = dsyyPrescriptionService.queryCardListToHospital("",idCard);
            if (object!=null){
                if (object.getString("retCode").equalsIgnoreCase("00")){
                    jsonArrayDsyy = object.getJSONArray("cardlist");
                    if(jsonArrayDsyy!=null&&jsonArrayDsyy.size()>0){
                        JSONObject jsonObject= jsonArrayDsyy.getJSONObject(0);
                        String Pat_name = jsonObject.getString("userName");
                        String Next_Of_Kin_Phone = jsonObject.getString("phone");
                        if(!Next_Of_Kin_Phone.equalsIgnoreCase(phoneNum)){
                            mixEnvelop.setStatus(408);
                            mixEnvelop.setMessage("您所添加的家属的电话有误，无法发送验证码");
                            return mixEnvelop;
                        }
                        if(!Pat_name.equalsIgnoreCase(familyName)){
                            mixEnvelop.setStatus(408);
                            mixEnvelop.setMessage("您所添加的家属的名称有误，无法发送验证码");
                            return mixEnvelop;
                        }
                    }
                }
            }
//            JSONObject object = dsyyPrescriptionService.queryCardListToHospital("",idCard);
//            if (object!=null){
//                if (object.getString("retCode").equalsIgnoreCase("00")){
//                    jsonArrayDsyy = object.getJSONArray("cardlist");
//                    if(jsonArrayDsyy!=null&&jsonArrayDsyy.size()>0){
//                        JSONObject jsonObject= jsonArrayDsyy.getJSONObject(0);
//                        String Pat_name = jsonObject.getString("userName");
//                        String Next_Of_Kin_Phone = jsonObject.getString("phone");
//                        if(!Next_Of_Kin_Phone.equalsIgnoreCase(phoneNum)){
//                            mixEnvelop.setStatus(408);
//                            mixEnvelop.setMessage("您所添加的家属的电话有误，无法发送验证码");
//                            return mixEnvelop;
//                        }
//                        if(!Pat_name.equalsIgnoreCase(familyName)){
//                            mixEnvelop.setStatus(408);
//                            mixEnvelop.setMessage("您所添加的家属的名称有误，无法发送验证码");
//                            return mixEnvelop;
//                        }
//                    }
//                }
//            }
        }else if ("sd_tnzyy_wx".equalsIgnoreCase(wxId)){
            com.alibaba.fastjson.JSONArray jsonArray1 = tnyyEntranceService.selectPatientMappingCode(idCard);
@@ -261,11 +261,12 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
            }else if("xm_dsyy_wx".equalsIgnoreCase(wxId)){
                System.out.println("发送第三医院验证码开始");
                int result = 1;
                if (null!=jsonArrayDsyy&&jsonArrayDsyy.size() > 0) {
                    result = dsyyPrescriptionService.SendSms(phoneNum, "您好，您当前操作的验证码是：" + captcha + "，2分钟内有效。如非本人操作，请忽略");
                } else {
                    result = 2;
                }
//                if (null!=jsonArrayDsyy&&jsonArrayDsyy.size() > 0) {
//                    result = dsyyPrescriptionService.SendSms(phoneNum, "您好，您当前操作的验证码是：" + captcha + "，2分钟内有效。如非本人操作，请忽略");
//                } else {
//                    result = 2;
//                }
                result = dsyyPrescriptionService.SendSms(phoneNum, "您好，您当前操作的验证码是：" + captcha + "，2分钟内有效。如非本人操作，请忽略");
                if (0 == result) {
                    this.store(client_id, phoneNum, captcha, 120);
                    mixEnvelop.setMessage("验证码发送成功");