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/entrance/EntranceService.java

@@ -659,6 +659,7 @@ public class EntranceService {
            }
            if (StringUtils.isNotBlank(ksdm)) {
                sbs.append("<query compy=\"=\" item=\"ADM_SPEC\" splice=\"and\" value=\"'" + ksdm + "'\"/>");
                sbs.append("<query compy=\"=\" item=\"under_dept\" splice=\"and\" value=\"'" + ksdm + "'\"/>");
            }
            sbs.append("<query compy=\"\" item=\"icd_name\" splice=\"and\" value=\"is not null\"/>");
            sbs.append("<order item=\"CON_DATE\" sort=\"desc\"/>");
@@ -813,6 +814,8 @@ public class EntranceService {
                py_code = py_code.toUpperCase();
                logger.info("py_code=" + py_code);
                sbs.append("<query compy=\"like\" item=\"py_code\" splice=\"and\" value=\"'%" + py_code + "%'\"/>");
                sbs.append("<query compy=\"like\" item=\"py_code2\" splice=\"and\" value=\"'%" + py_code + "%'\"/>");
                sbs.append("<query compy=\"like\" item=\"py_code3\" splice=\"and\" value=\"'%" + py_code + "%'\"/>");
            }
            if (StringUtils.isNotBlank(stock_amount)) {
                sbs.append("<query compy=\"&gt;\" item=\"stock_amount\" splice=\"and\" value=\"'" + stock_amount + "'\"/>");
@@ -2388,7 +2391,7 @@ public class EntranceService {
                                //获取中山医院的医生
                                String winNo = "6";
                                doctorCode = null == jsonObjectBody.get("Emp_Code") ? "" : jsonObjectBody.get("Emp_Code").toString();
                                //根据医生及分部，获取医生号别
                            /*    //根据医生及分部，获取医生号别
                                net.sf.json.JSONArray jsonArrayCharge = BS55010(winNo, doctorCode, null, false);
                                String chareType = null;
                                if (null != jsonArrayCharge) {
@@ -2398,10 +2401,17 @@ public class EntranceService {
                                            chareType = null == jsonObjectBodyCharge.get("charge_type") ? null : jsonObjectBodyCharge.get("charge_type").toString();
                                        }
                                    }
                                }
                                }*/
                                String chareType = "32";
                                //保存医生信息
                                BaseDoctorDO baseDoctorDO = new BaseDoctorDO();
                                String idCard = null == jsonObjectBody.get("Card_Id") ? "" : jsonObjectBody.get("Card_Id").toString();
                                String atddrNo =null;
                                if (jsonObjectBody.get("yb_gjxmbm") != null){
                                    if (!jsonObjectBody.get("yb_gjxmbm").toString().equalsIgnoreCase("[]")){
                                        atddrNo =jsonObjectBody.get("yb_gjxmbm").toString();
                                    }
                                }
                                if (idCard.equalsIgnoreCase(idcard)){
                                    jsonObject1 = jsonObjectBody;
                                    List<BaseDoctorDO> baseDoctorDOS = baseDoctorDao.findByIdcard(idCard);
@@ -2409,10 +2419,16 @@ public class EntranceService {
                                        baseDoctorDO=baseDoctorDOS.get(0);
                                        String disableFlag = null == jsonObjectBody.get("Disable_Flag") ? "" : jsonObjectBody.get("Disable_Flag").toString();
                                        //互联网医院：1停用，0使用  转 i健康：1正常，0作废
                                        baseDoctorDO.setDel("1".equals(disableFlag) ? "0" : "1");
                                /*        baseDoctorDO.setDel("1".equals(disableFlag) ? "0" : "1");*/
                                        doctorName = null == jsonObjectBody.get("Emp_Name") ? "" : jsonObjectBody.get("Emp_Name").toString();
                                        baseDoctorDO.setName(doctorName);
                                        if ("0".equalsIgnoreCase(disableFlag)){
                                            baseDoctorDO.setAtddrNo(atddrNo);
                                        }
                                    }else {
                                        baseDoctorDO.setIdcard(idCard);
                                        baseDoctorDO.setAtddrNo(atddrNo);
                                        baseDoctorDO.setBirthday(IdCardUtil.getBirthdayForIdcard(idCard));
                                        baseDoctorDO.setSex(Integer.valueOf(IdCardUtil.getSexForIdcard(idCard)));
                                        baseDoctorDO.setLocked(0);
@@ -2420,11 +2436,14 @@ public class EntranceService {
                                        String disableFlag = null == jsonObjectBody.get("Disable_Flag") ? "" : jsonObjectBody.get("Disable_Flag").toString();
                                        //互联网医院：1停用，0使用  转 i健康：1正常，0作废
                                        baseDoctorDO.setDel("1".equals(disableFlag) ? "0" : "1");
                                        if ("0".equalsIgnoreCase(disableFlag)){
                                            baseDoctorDO.setAtddrNo(atddrNo);
                                        }
                                        baseDoctorDO.setMobile("0");
                                        baseDoctorDO.setName(doctorName);
                                        baseDoctorDO.setIsFamous(0);
                                        baseDoctorDO.setCreateTime(new Date());
                                        baseDoctorDO.setUpdateTime(new Date());
                                        baseDoctorDO.setTwfzChargeType("32");
                                        if (StringUtils.isNotBlank(idCard)) {
                                            baseDoctorDO.setSalt(PwdUtil.randomString(5));
                                            try {
@@ -2441,6 +2460,7 @@ public class EntranceService {
                                        doctorName = null == jsonObjectBody.get("Emp_Name") ? "" : jsonObjectBody.get("Emp_Name").toString();
                                        //号别
                                        baseDoctorDO.setChargeType(chareType);
                                        baseDoctorDO.setName(doctorName);
                                        // 用医生和机构id、部门判断数据是否存在，若不存在则保存医生机构关联关系
                                        String deptCode = null == jsonObjectBody.get("Dept_Code") ? "" : jsonObjectBody.get("Dept_Code").toString();
@@ -2464,18 +2484,21 @@ public class EntranceService {
                                    }
                                    baseDoctorDO = baseDoctorDao.save(baseDoctorDO);
                                    //根据医生和机构判断数据是否存在，若不存在则在mapping中追加记录
                                    List<DoctorMappingDO> doctorMappingDOS = doctorMappingDao.findByDoctorAndOrgCode(baseDoctorDO.getId(), "350211A1002");
                                    if (!(null != doctorMappingDOS && doctorMappingDOS.size() > 0)) {
                                        DoctorMappingDO doctorMappingDO = new DoctorMappingDO();
                                        doctorMappingDao.delete(doctorMappingDOS);
                                        doctorMappingDO.setDoctor(baseDoctorDO.getId());
                                        doctorMappingDO.setDoctorName(doctorName);
                                        doctorMappingDO.setMappingCode(doctorCode);
                                        doctorMappingDO.setMappingName(doctorName);
                                        doctorMappingDO.setOrgCode("350211A1002");
                                        doctorMappingDO.setOrgName("厦门大学附属中山医院");
                                        doctorMappingDao.save(doctorMappingDO);
                                    String disableFlag = null == jsonObjectBody.get("Disable_Flag") ? "" : jsonObjectBody.get("Disable_Flag").toString();
                                    if ("0".equalsIgnoreCase(disableFlag)){
                                        //根据医生和机构判断数据是否存在，若不存在则在mapping中追加记录
                                        List<DoctorMappingDO> doctorMappingDOS = doctorMappingDao.findByDoctorAndOrgCode(baseDoctorDO.getId(), "350211A1002");
                                        if (!(null != doctorMappingDOS && doctorMappingDOS.size() > 0)) {
                                            DoctorMappingDO doctorMappingDO = new DoctorMappingDO();
                                            doctorMappingDao.delete(doctorMappingDOS);
                                            doctorMappingDO.setDoctor(baseDoctorDO.getId());
                                            doctorMappingDO.setDoctorName(doctorName);
                                            doctorMappingDO.setMappingCode(doctorCode);
                                            doctorMappingDO.setMappingName(doctorName);
                                            doctorMappingDO.setOrgCode("350211A1002");
                                            doctorMappingDO.setOrgName("厦门大学附属中山医院");
                                            doctorMappingDao.save(doctorMappingDO);
                                        }
                                    }
                                    break;
                                }
@@ -2543,25 +2566,41 @@ public class EntranceService {
                                String winNo = "6";
                                doctorCode = null == jsonObjectBody.get("Emp_Code") ? "" : jsonObjectBody.get("Emp_Code").toString();
                                //根据医生及分部，获取医生号别
/*
                                net.sf.json.JSONArray jsonArrayCharge = BS55010(winNo, doctorCode, null, false);
                                String chareType = null;
                                if (null != jsonArrayCharge) {
*/
                                String chareType = "32";
                               /* if (null != jsonArrayCharge) {
                                    for (Object objectCharge : jsonArrayCharge) {
                                        net.sf.json.JSONObject jsonObjectBodyCharge = (net.sf.json.JSONObject) objectCharge;
                                        if (null != jsonObjectBodyCharge) {
                                            chareType = null == jsonObjectBodyCharge.get("charge_type") ? null : jsonObjectBodyCharge.get("charge_type").toString();
                                        }
                                    }
                                }
                                }*/
                                //保存医生信息
                                BaseDoctorDO baseDoctorDO = new BaseDoctorDO();
                                String idCard = null == jsonObjectBody.get("Card_Id") ? "" : jsonObjectBody.get("Card_Id").toString();
                                String atddrNo =null;
                                if (jsonObjectBody.get("yb_gjxmbm") != null){
                                    if (!jsonObjectBody.get("yb_gjxmbm").toString().equalsIgnoreCase("[]")){
                                        atddrNo =jsonObjectBody.get("yb_gjxmbm").toString();
                                    }
                                }
                                List<BaseDoctorDO> baseDoctorDOS = baseDoctorDao.findByIdcard(idCard);
                                if (baseDoctorDOS!=null&&baseDoctorDOS.size()!=0){
                                    baseDoctorDO=baseDoctorDOS.get(0);
                                    doctorName = null == jsonObjectBody.get("Emp_Name") ? "" : jsonObjectBody.get("Emp_Name").toString();
                                    baseDoctorDO.setName(doctorName);
                                    String disableFlag = null == jsonObjectBody.get("Disable_Flag") ? "" : jsonObjectBody.get("Disable_Flag").toString();
                                    //互联网医院：1停用，0使用  转 i健康：1正常，0作废
/*
                                    baseDoctorDO.setDel("1".equals(disableFlag) ? "0" : "1");
*/
                                    if ("0".equalsIgnoreCase(disableFlag)){
                                        baseDoctorDO.setAtddrNo(atddrNo);
                                    }
                                }else {
                                    baseDoctorDO.setIdcard(idCard);
@@ -2570,13 +2609,16 @@ public class EntranceService {
                                    baseDoctorDO.setLocked(0);
                                    baseDoctorDO.setEnabled(1);
                                    String disableFlag = null == jsonObjectBody.get("Disable_Flag") ? "" : jsonObjectBody.get("Disable_Flag").toString();
                                    if ("0".equalsIgnoreCase(disableFlag)){
                                        baseDoctorDO.setAtddrNo(atddrNo);
                                    }
                                    //互联网医院：1停用，0使用  转 i健康：1正常，0作废
                                    baseDoctorDO.setDel("1".equals(disableFlag) ? "0" : "1");
                                    baseDoctorDO.setMobile("0");
                                    baseDoctorDO.setName(doctorName);
                                    baseDoctorDO.setIsFamous(0);
                                    baseDoctorDO.setCreateTime(new Date());
                                    baseDoctorDO.setUpdateTime(new Date());
                                    baseDoctorDO.setTwfzChargeType("32");
                                    if (StringUtils.isNotBlank(idCard)) {
                                        baseDoctorDO.setSalt(PwdUtil.randomString(5));
                                        try {
@@ -2593,6 +2635,7 @@ public class EntranceService {
                                    doctorName = null == jsonObjectBody.get("Emp_Name") ? "" : jsonObjectBody.get("Emp_Name").toString();
                                    //号别
                                    baseDoctorDO.setChargeType(chareType);
                                    baseDoctorDO.setName(doctorName);
                                    // 用医生和机构id、部门判断数据是否存在，若不存在则保存医生机构关联关系
                                    String deptCode = null == jsonObjectBody.get("Dept_Code") ? "" : jsonObjectBody.get("Dept_Code").toString();
@@ -2616,19 +2659,23 @@ public class EntranceService {
                                }
                                baseDoctorDO = baseDoctorDao.save(baseDoctorDO);
                                //根据医生和机构判断数据是否存在，若不存在则在mapping中追加记录
                                List<DoctorMappingDO> doctorMappingDOS = doctorMappingDao.findByDoctorAndOrgCode(baseDoctorDO.getId(), "350211A1002");
                                if (!(null != doctorMappingDOS && doctorMappingDOS.size() > 0)) {
                                    DoctorMappingDO doctorMappingDO = new DoctorMappingDO();
                                    doctorMappingDao.delete(doctorMappingDOS);
                                    doctorMappingDO.setDoctor(baseDoctorDO.getId());
                                    doctorMappingDO.setDoctorName(doctorName);
                                    doctorMappingDO.setMappingCode(doctorCode);
                                    doctorMappingDO.setMappingName(doctorName);
                                    doctorMappingDO.setOrgCode("350211A1002");
                                    doctorMappingDO.setOrgName("厦门大学附属中山医院");
                                    doctorMappingDao.save(doctorMappingDO);
                                String disableFlag = null == jsonObjectBody.get("Disable_Flag") ? "" : jsonObjectBody.get("Disable_Flag").toString();
                                if ("0".equalsIgnoreCase(disableFlag)){
                                    //根据医生和机构判断数据是否存在，若不存在则在mapping中追加记录
                                    List<DoctorMappingDO> doctorMappingDOS = doctorMappingDao.findByDoctorAndOrgCode(baseDoctorDO.getId(), "350211A1002");
                                    if (!(null != doctorMappingDOS && doctorMappingDOS.size() > 0)) {
                                        DoctorMappingDO doctorMappingDO = new DoctorMappingDO();
                                        doctorMappingDao.delete(doctorMappingDOS);
                                        doctorMappingDO.setDoctor(baseDoctorDO.getId());
                                        doctorMappingDO.setDoctorName(doctorName);
                                        doctorMappingDO.setMappingCode(doctorCode);
                                        doctorMappingDO.setMappingName(doctorName);
                                        doctorMappingDO.setOrgCode("350211A1002");
                                        doctorMappingDO.setOrgName("厦门大学附属中山医院");
                                        doctorMappingDao.save(doctorMappingDO);
                                    }
                                }
                                i++;
                            }

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

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