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

svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/YkyyController.java

@@ -341,7 +341,11 @@ public class YkyyController extends EnvelopRestEndpoint {
                        List<Map<String,Object>> fyxhList = hibenateUtils.createSQLQuery(fyxhSql);
                        if (fyxhList.size()>0){
                            ykMsYj02DO.setXmlx(Integer.valueOf(fyxhList.get(0).get("xmlx").toString()));
                            Integer xmlx = 0;
                            if (fyxhList.get(0).get("xmlx")!=null){
                                xmlx = Integer.valueOf(fyxhList.get(0).get("xmlx").toString());
                            }
                            ykMsYj02DO.setXmlx(xmlx);
                            ykMsYj02DO.setFygb(Integer.valueOf(fyxhList.get(0).get("fygb").toString()));
                            ykMsYj02DO.setYldj(new BigDecimal(fyxhList.get(0).get("fydj").toString()));
                            ykMsYj02DO.setHjje(totalprice);