眼科bug修改

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

@@ -1948,7 +1948,7 @@ public class YkyyEntranceService {
                ykEmrJcsqDO.setJzxh(Integer.parseInt(admNo));
            }
            ykEmrJcsqDO.setXmid(Integer.valueOf(wlyyInspectionDO.getCode()));
            JSONArray jsonArray = this.findZlxm(null,wlyyInspectionDO.getCode());
            JSONArray jsonArray = this.findZlxm(null,wlyyInspectionDO.getCode(),"");
            if (jsonArray!=null&&jsonArray.size()>0){
                JSONObject deptobject = jsonArray.getJSONObject(0);
                deptNo = deptobject.getString("dept");
@@ -2939,10 +2939,12 @@ public class YkyyEntranceService {
    }
    //查询诊疗项目视图
    public JSONArray findZlxm(String itemName,String itemCode) throws Exception{
    public JSONArray findZlxm(String itemName,String itemCode,String deptCode) throws Exception{
        String sql = "select t.item_code as \"code\",t.item_name as \"name\"," +
                "t.price as \"chargeAmount\",t.total_unit as \"totalUnit\"," +
                "t.zxks as \"dept\" from VEMR_ORDER_ITEM t where 1=1";
                "t.price as \"charge_amount\",t.total_unit as \"totalUnit\"," +
                "t.zxks as \"dept\" ,m.name as \"exec_unit_name\" from VEMR_ORDER_ITEM t " +
                " left join V_HLW_KSXX m on m.code = t.zxks " +
                " where 1=1";
        if (StringUtils.isNotEmpty(itemName)){
            sql+=" and t.ITEM_NAME like '%"+itemName+"%'";
        }
@@ -2951,6 +2953,9 @@ public class YkyyEntranceService {
            String ids = org.apache.commons.lang.StringUtils.join(split, ",");
            sql+=" and t.item_code in ("+ids+")";
        }
        if (StringUtils.isNotEmpty(deptCode)){
            sql+=" and t.zxks ="+deptCode+"";
        }
        System.out.println(sql);
        Map<String,Object> params = new HashedMap();
        params.put("sql",sql);
@@ -2963,6 +2968,9 @@ public class YkyyEntranceService {
        JSONArray array= new JSONArray();
        if (status==200){
            array = rs.getJSONArray("detailModelList");
            for (int i=0;i<array.size();i++){
            }
        }
        return array;
    }

business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@@ -184,7 +184,7 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                //判断检查检验项目是否有金额
                if (wlyyPrescriptionDO.getInspectFee()!=null){
                    BigDecimal d = new BigDecimal(String.valueOf(wlyyPrescriptionDO.getInspectFee()));
                    dc= d.multiply(d);
                    dc= d.multiply(c);
                }
                businessOrderDO.setPayPrice(bc.doubleValue()+dc.doubleValue());
                businessOrderDO.setDescription("处方结算");

business/base-service/src/main/java/com/yihu/jw/utils/YkyySMSService.java

@@ -163,7 +163,7 @@ public class YkyySMSService {
            }else if ("oneself_pick".equalsIgnoreCase(temlateCode)){//病人自取
                smsTemplateDO = smsTemplateDao.findByClientId("oneself_pick");
                if (smsTemplateDO!=null){
                    content = smsTemplateDO.getContent().replace("{{病人姓名}}",wlyyOutpatientDO.getPatientName()).replace("{{时间}}",DateUtil.dateToStrLong(wlyyPrescriptionDO.getCreateTime())).replace("{{门诊号码}}",wlyyOutpatientDO.getRealOrder())
                    content = smsTemplateDO.getContent().replace("{{病人姓名}}",wlyyOutpatientDO.getPatientName()).replace("{{门诊号码}}",wlyyOutpatientDO.getRealOrder())
                    .replace("{{性别}}",sex);
                    if (wxPushLogDO==null&&"1".equalsIgnoreCase(sendMesControl)){
                        ykyySendSMS(mobile,smsTemplateDO.getHeader()+content);

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

@@ -1220,9 +1220,11 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
	public ObjEnvelop findZlxm(@ApiParam(name = "itemName", value = "itemName")
								   @RequestParam(value = "itemName", required = false)String itemName,
							   @ApiParam(name = "itemCode", value = "itemCode")
							   @RequestParam(value = "itemCode", required = false)String itemCode)throws Exception {
							   @RequestParam(value = "itemCode", required = false)String itemCode,
                               @ApiParam(name = "deptCode", value = "deptCode")
                                   @RequestParam(value = "deptCode", required = false)String deptCode)throws Exception {
		JSONArray array= ykyyEntranceService.findZlxm(itemName,itemCode);
		JSONArray array= ykyyEntranceService.findZlxm(itemName,itemCode,deptCode);
		ObjEnvelop objEnvelop = new ObjEnvelop();
		objEnvelop.setObj(array);
		return objEnvelop;