挂号类型注释变更

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

@@ -955,11 +955,10 @@ public class EntranceService {
                object = (net.sf.json.JSONObject) object.get("row");
            }
            String ybFlag=null != object.get("yb_flag")?object.get("yb_flag").toString():"";
            //市医保，1；省医保，2；自费，3，其他医保，99）
            if ("2".equals(ybFlag)) {
            //市医保，1； 省医保，2； 自费，4；其他医保，99）
            if ("4".equals(ybFlag)) {
                return true;
            }
            if (("1".equals(ybFlag) || "3".equals(ybFlag))) {
            }else if (("1".equals(ybFlag) || "2".equals(ybFlag)|| "99".equals(ybFlag))) {
                String admDateStr = object.get("ADM_DAT")+"";
                //挂号时间
                Date admDate = DateUtil.strToDate(admDateStr + "", DateUtil.YYYY_MM_DD_);

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

@@ -292,6 +292,23 @@ public class MqSdkController extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = "/BS25017")
    @ApiOperation(value = "影像信息表")
    public ObjEnvelop BS25017(@ApiParam(name = "patNo", value = "居民id")
                             @RequestParam(value = "patNo",required = false) String patNo,
                             @ApiParam(name = "dept", value = "挂号科室")
                             @RequestParam(value = "dept",required = false) String dept,
                             @ApiParam(name = "doctor", value = "就诊医生")
                             @RequestParam(value = "doctor",required = false) String doctor) {
        try {
            boolean  obj = entranceService.guahao(patNo,dept,doctor,demoFlag);
            return success(obj);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError("获取失败："+e.getMessage());
        }
    }
}