号别添加判断

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

@@ -78,6 +78,7 @@ import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.wechat.WeixinMessagePushUtils;
import com.yihu.jw.utils.Pkis.PKIService_PortType;
import com.yihu.jw.utils.Pkis.PKIService_ServiceLocator;
import com.yihu.jw.utils.StringUtil;
import com.yihu.jw.utils.WebserviceUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.jw.wechat.dao.BasePatientWechatDao;
@@ -1518,16 +1519,19 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    }
                }
                String chargeTypeList = doctor.get("chargeType").toString();
                if (chargeType.contains(",")){
                    chargeTypeList = chargeType.replace(",","','");
                List<Map<String,Object>> chargeDictDOLists = new ArrayList<>();
                if (null!=doctor.get("chargeType")){
                    String chargeTypeList = doctor.get("chargeType").toString();
                    if (chargeType.contains(",")){
                        chargeTypeList = chargeType.replace(",","','");
                    }
                    String sqlCharge = "select charge_type as \"chargeType\",charge_name as \"chargeName\"," +
                            "req_fee  as \"reqFee\",dept_type_code as \"deptTypeCode\" " +
                            " from wlyy_charge_dict where 1=1";
                    sqlCharge+=" and charge_type in ( '"+chargeTypeList+"')";
                    sqlCharge+=" and dept_type_code in ( '"+deptTyepCode+"')";
                    chargeDictDOLists =  hibenateUtils.createSQLQuery(sqlCharge);
                }
                String sqlCharge = "select charge_type as \"chargeType\",charge_name as \"chargeName\"," +
                        "req_fee  as \"reqFee\",dept_type_code as \"deptTypeCode\" " +
                        " from wlyy_charge_dict where 1=1";
                sqlCharge+=" and charge_type in ( '"+chargeTypeList+"')";
                sqlCharge+=" and dept_type_code in ( '"+deptTyepCode+"')";
                List<Map<String,Object>> chargeDictDOLists =  hibenateUtils.createSQLQuery(sqlCharge);
                doctor.put("chargeTypeList",chargeDictDOLists);
            }
            if (StringUtils.isNotBlank(doctorCode)) {
@@ -3369,7 +3373,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    public Map<String, Object> findDoctorInfo(String doctor, String withWork,String patient) {
        BaseDoctorDO doctorDO = baseDoctorDao.findById(doctor);
        Map<String, Object> rs = new HashedMap();
        if (doctorDO != null) {
            rs.put("doctor", doctor);
@@ -3415,16 +3418,19 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                }
            }
            List<Map<String,Object>> chargeDictDOLists = new ArrayList<>();
            String chargeType = doctorDO.getChargeType();
            if (chargeType.contains(",")){
                chargeType = chargeType.replace(",","','");
            }
            String sqlCharge = "select charge_type as \"chargeType\",charge_name as \"chargeName\"," +
                    "req_fee  as \"reqFee\",dept_type_code as \"deptTypeCode\" " +
                    " from wlyy_charge_dict where 1=1";
            sqlCharge+=" and charge_type in ( '"+chargeType+"')";
            sqlCharge+=" and dept_type_code in ( '"+deptTyepCode+"')";
            List<Map<String,Object>> chargeDictDOLists =  hibenateUtils.createSQLQuery(sqlCharge);
            if (StringUtils.isNotBlank(chargeType)){
                if (chargeType.contains(",")){
                    chargeType = chargeType.replace(",","','");
                }
                String sqlCharge = "select charge_type as \"chargeType\",charge_name as \"chargeName\"," +
                        "req_fee  as \"reqFee\",dept_type_code as \"deptTypeCode\" " +
                        " from wlyy_charge_dict where 1=1";
                sqlCharge+=" and charge_type in ( '"+chargeType+"')";
                sqlCharge+=" and dept_type_code in ( '"+deptTyepCode+"')";
                chargeDictDOLists =  hibenateUtils.createSQLQuery(sqlCharge);
            }
            rs.put("chargeTypeList",chargeDictDOLists);
            //机构科室信息
            List<BaseDoctorHospitalDO> hospitalDOs = baseDoctorHospitalDao.findByDoctorCode(doctorDO.getId());
@@ -3672,16 +3678,19 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                }
            }
            List<Map<String,Object>> chargeDictDOLists = new ArrayList<>();
            String chargeType = doctorDO.getChargeType();
            if (chargeType.contains(",")){
                chargeType = chargeType.replace(",","','");
            }
            String sqlCharge = "select charge_type as \"chargeType\",charge_name as \"chargeName\"," +
                    "req_fee  as \"reqFee\",dept_type_code as \"deptTypeCode\" " +
                    " from wlyy_charge_dict where 1=1";
            sqlCharge+=" and charge_type in ( '"+chargeType+"')";
            sqlCharge+=" and dept_type_code in ( '"+deptTyepCode+"')";
            List<Map<String,Object>> chargeDictDOLists =  hibenateUtils.createSQLQuery(sqlCharge);
            if (StringUtils.isNotBlank(chargeType)){
                if (chargeType.contains(",")){
                    chargeType = chargeType.replace(",","','");
                }
                String sqlCharge = "select charge_type as \"chargeType\",charge_name as \"chargeName\"," +
                        "req_fee  as \"reqFee\",dept_type_code as \"deptTypeCode\" " +
                        " from wlyy_charge_dict where 1=1";
                sqlCharge+=" and charge_type in ( '"+chargeType+"')";
                sqlCharge+=" and dept_type_code in ( '"+deptTyepCode+"')";
                chargeDictDOLists =  hibenateUtils.createSQLQuery(sqlCharge);
            }
            rs.put("chargeTypeList",chargeDictDOLists);
            //机构科室信息
            List<BaseDoctorHospitalDO> hospitalDOs = baseDoctorHospitalDao.findByDoctorCode(doctorDO.getId());
@@ -4950,7 +4959,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        if (pagesize <= 0) {
            pagesize = 10;
        }*/
      wechatId = "12";
        String sql = "SELECT " +
                " d.id AS \"id\", " +
                " d.photo AS \"photo\", " +
@@ -5123,16 +5131,19 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                }
            }
            String chargeType = map.get("chargeType").toString();
            if (chargeType.contains(",")){
                chargeType = chargeType.replace(",","','");
            List<Map<String,Object>> chargeDictDOLists = new ArrayList<>();
            if(null!=map.get("chargeType")){
                String chargeType = map.get("chargeType").toString();
                if (chargeType.contains(",")){
                    chargeType = chargeType.replace(",","','");
                }
                String sqlCharge = "select charge_type as \"chargeType\",charge_name as \"chargeName\"," +
                        "req_fee  as \"reqFee\",dept_type_code as \"deptTypeCode\" " +
                        " from wlyy_charge_dict where 1=1";
                sqlCharge+=" and charge_type in ( '"+chargeType+"')";
                sqlCharge+=" and dept_type_code in ( '"+deptTyepCode+"')";
                chargeDictDOLists =  hibenateUtils.createSQLQuery(sqlCharge);
            }
            String sqlCharge = "select charge_type as \"chargeType\",charge_name as \"chargeName\"," +
                    "req_fee  as \"reqFee\",dept_type_code as \"deptTypeCode\" " +
                    " from wlyy_charge_dict where 1=1";
            sqlCharge+=" and charge_type in ( '"+chargeType+"')";
            sqlCharge+=" and dept_type_code in ( '"+deptTyepCode+"')";
            List<Map<String,Object>> chargeDictDOLists =  hibenateUtils.createSQLQuery(sqlCharge);
            map.put("chargeTypeList",chargeDictDOLists);
            //查询医生各项评价平均分
            String sqlscore = "SELECT " +