Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/wechat/WechatMenuController.java

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

@@ -512,40 +512,39 @@ public class TnPrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pr
            }
        }
        JSONArray mapList = new JSONArray();
        mapList = tnyyEntranceService.findTnYpxx(chargeCode, null, null, pyKey,hisCode);
        mapList = tnyyEntranceService.findTnYpxx(chargeCode, null, groupNo, pyKey,hisCode);
        JSONArray array = new JSONArray();
        for (int i=0;i<mapList.size();i++){
            JSONObject map = mapList.getJSONObject(i);
            JSONObject object = new JSONObject();
            object.put("charge_code",map.get("YPXH"));
            object.put("drugname",map.get("YPMC"));
            object.put("specification",map.get("YPGG"));
            object.put("pack_unit_name",map.get("YPDW"));
            object.put("mini_unit",map.get("UNITCODE"));
            object.put("mini_unit_name",map.get("UNTCODENAME"));
            object.put("weigh_unit_name",map.get("ZXDW"));
            object.put("weigh_unit",map.get("ZXDW"));
            object.put("pack_unit",map.get("YPDW"));
            object.put("yfdw",map.get("YFDW"));
            object.put("pack_size",map.get("YFBZ"));
            object.put("charge_code",map.get("serial"));
            object.put("drugname",map.get("drugname"));
            object.put("specification",map.get("specification"));
            object.put("pack_unit_name",map.get("pack_unit_name"));
            object.put("mini_unit",map.get("mini_unit"));
            object.put("mini_unit_name",map.get("mini_unit_name"));
            object.put("weigh_unit_name",map.get("weigh_unit_name"));
            object.put("weigh_unit",map.get("weigh_unit"));
            object.put("pack_unit",map.get("pack_unit"));
            object.put("yfdw",map.get("group_no"));
            object.put("pack_size",map.get("pack_size"));
         /*   object.put("yfsx",map.get("yfsx"));//药房属性*/
            object.put("ypjl",map.get("YPJL"));//药剂量
            object.put("jldw",map.get("JLDW"));//剂量单位
            object.put("py_code",map.get("PYDM"));//拼音代码
            object.put("fyfs",map.get("FYFS"));//发药方式
            object.put("supply_code",map.get("GYFF"));//给药方式
            object.put("yfzf",map.get("YFZF"));//药房作废
            object.put("supply_name",map.get("GYFF"));//给药方式名称
            object.put("ypjl",map.get("ypjl"));//药剂量
            object.put("jldw",map.get("jldw"));//剂量单位
            object.put("py_code",map.get("py_code"));//拼音代码
            /*object.put("fyfs",map.get("FYFS"));//发药方式
            object.put("supply_code",map.get("GYFF"));//给药方式*/
         /*   object.put("yfzf",map.get("YFZF"));//药房作废*/
/*            object.put("supply_name",map.get("GYFF"));//给药方式名称*/
/*            object.put("ybfl",map.get("ybfl"));//医保分类*/
            object.put("retprice",map.get("LSJG"));//零售价格
            object.put("kcsl",map.get("KCSL"));//库存
            object.put("stock_amount",map.get("KCSL"));//库存
            object.put("ypcd",map.get("YPCD"));//产地
            object.put("zfpb",map.get("ZFPB"));//作废判别
            object.put("jbywbz",map.get("jbywbz"));//基本药物标志
            object.put("pack_retprice",map.get("BZLJ"));
            if (map.get("XTSB")!=null){
                if (map.getString("XTSB").equalsIgnoreCase("1")){
            object.put("retprice",map.get("retprice"));//零售价格
            object.put("stock_amount",map.get("stock_amount"));//库存
            object.put("ypcd",map.get("manu_name"));//产地
           /* object.put("zfpb",map.get("ZFPB"));//作废判别*/
            object.put("jbywbz",map.get("jbyw"));//基本药物标志
            object.put("pack_retprice",map.get("pack_retprice"));
            if (map.get("group_no")!=null){
                if (map.getString("group_no").equalsIgnoreCase("西药库")||map.getString("group_no").equalsIgnoreCase("成药库")){
                    object.put("group_no",81);
                }else {
                    object.put("group_no",82);

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

@@ -262,21 +262,28 @@ public class TnyyEntranceService {
     * 查询药品信息
     * @param ypdm
     * @param ypmc
     * @param kusl
     * @param group_no
     * @return
     */
    public JSONArray findTnYpxx(String ypdm,String ypmc,String kusl,String pydm ,String hisCode) throws Exception {
        String sql ="SELECT yp.YPXH,yp.XTSB,yp.YPMC,yp.YPGG,yp.YFGG,yp.BFGG,yp.YPSX,yp.TSYP,yp.YPDW,yp.ZXDW,yp.ZXBZ,yp.YFBZ,yp.YFDW,yp.BFBZ," +
    public JSONArray findTnYpxx(String ypdm,String ypmc,String group_no,String pydm ,String hisCode) throws Exception {
        /*String sql ="SELECT yp.YPXH,yp.XTSB,yp.YPMC,yp.YPGG,yp.YFGG,yp.BFGG,yp.YPSX,yp.TSYP,yp.YPDW,yp.ZXDW,yp.ZXBZ,yp.YFBZ,yp.YFDW,yp.BFBZ," +
                "yp.BFDW,yp.ZFPB,yp.YLXZ,yp.FYFS,yp.PYDM,yp.YPBH,yp.MESS,yp.GYFF,yp.TYPE,yp.YPDM,yp.YPJL,yp.JLDW,yp.YKZF,yp.YFZF,yp.ZXCD,yp.YCYL," +
                "kc.YPCD,kc.LSJG,kc.KCSL,kc.BZLJ,yp.UNITCODE,yp.UNTCODENAME  FROM  YK_TYPK yp,YK_KCMX kc where 1=1 and kc.YPXH=yp.YPXH ";
                "kc.YPCD,kc.LSJG,kc.KCSL,kc.BZLJ,yp.UNITCODE,yp.UNTCODENAME  FROM  YK_TYPK yp,YK_KCMX kc where 1=1 and kc.YPXH=yp.YPXH ";*/
        String sql = "SELECT yp.serial,yp.group_no,yp.drugname,yp.dosage,yp.mini_unit,yp.pack_size,yp.specification,yp.retprice,yp.pack_retprice,yp.stock_amount,yp.visible_flag,yp.drug_flag,yp.py_code,yp.pack_unit,yp.manu_name,yp.weigh_unit,yp.vol_unit,yp.mini_unit_name,yp.pack_unit_name,yp.weigh_unit_name,yp.vol_unit_name," +
                "yp.manu_code,yp.ypjl,yp.jldw,yp.fyfs,yp.jbyw  FROM HLW_YP yp where 1=1  ";
        if (StringUtils.isNoneBlank(ypdm)){
            sql+=" and lower(YPDM) like '%"+ypdm.toLowerCase()+"%' ";
            sql+=" and lower(yp.serial) like '%"+ypdm.toLowerCase()+"%' ";
        }
        if (StringUtils.isNoneBlank(ypmc)){
            sql+=" and lower(YPMC) like '%"+ypmc.toLowerCase()+"%' ";
            sql+=" and lower(yp.drugname) like '%"+ypmc.toLowerCase()+"%' ";
        }
        if (StringUtils.isNoneBlank(pydm)){
            sql+=" and lower(PYDM) like '%"+pydm.toLowerCase()+"%' ";
            sql+=" and lower(yp.py_code) like '%"+pydm.toLowerCase()+"%' ";
        }
        if (StringUtils.isNoneBlank(group_no)&&group_no.equalsIgnoreCase("82")){
            sql+=" and yp.group_no='草药库'";
        }else {
            sql+=" and yp.group_no in('成药库','西药库')";
        }
        JSONArray array = new JSONArray();
        Map<String,Object> params = new HashedMap();
@@ -664,7 +671,7 @@ public class TnyyEntranceService {
     * @throws Exception
     */
    public JSONArray findVpacsBw(String pyKey) throws Exception{
        String sql = " SELECT bw.DMMC,bw.jcbw,bw.fyxh,bw.FYMC,bw.FYDW,bw.fysl,bw.FYDJ,bw.jclx,bw.JCMC,bw.SRDM FROM V_pacs_BW bw WHERE 1=1   ";
        String sql = " SELECT bw.DMMC,bw.jcbw,bw.fyxh,bw.FYMC,bw.FYDW,bw.fysl,bw.FYDJ,bw.jclx,bw.JCMC,bw.SRDM FROM HLW_PACS_BW bw WHERE 1=1   ";
        if (StringUtils.isNoneBlank(pyKey)){
            sql+= " and  lower(bw.SRDM) like '%"+pyKey+"%' ";
        }