处方保存接口和作废接口

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

@@ -2958,22 +2958,6 @@ public Map checkSyncHis(String IoFlag,String PayCardNo,String NullahNumber,Strin
                System.out.println("obj:"+obj);
                if (StringUtils.isNotBlank(obj)) {
                    List<Map<String,Object>> returnList = transXmlCommen(obj);
                    for (Map<String,Object> saveMap:returnList){
                        if (null!=saveMap.get("checkInfoMapList")){
                            String  checkInfo = saveMap.get("checkInfoMapList").toString();
                             JSONArray jsonArray=JSONArray.parseArray(checkInfo);
                             for(int i=0;i<jsonArray.size();i++){
                                 JSONObject jsonObject1 = JSONObject.parseObject(jsonArray.get(i).toString());
                                 //存在强制阻断即认为处方审核未通过不允许保存处方
                                 if(null!=jsonObject1.get("WARNING_LEVEL")&&"强制阻断".equalsIgnoreCase(jsonObject1.get("WARNING_LEVEL").toString())){
                                     wlyyPrescriptionCheckDO.setStatus(1);
                                     break;
                                 }
                             }
                        }else {
                            wlyyPrescriptionCheckDO.setStatus(2);
                        }
                    }
                    Map<String,Object> checkIdMap = new HashMap<>();
                    checkIdMap.put("prescriptionOnly",tjPrescriptionId);
                    returnList.add(checkIdMap);

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/analysis/AnalysisService.java

@@ -56,7 +56,7 @@ public class AnalysisService {
                " t.inspect_fee as \"inspectFee\" , " +
                " t.reg_fee as \"regFee\"  from wlyy_outpatient o " +
                " left join wlyy_prescription t on o.id = t.outpatient_id where o.status != -1" +
                " and t.status = 30 ";
                " and t.status in (30,31,32,100,101) ";
        sqlCountFee+= " and o.doctor = '"+doctor+"'";
        if("xm_ykyy_wx".equals(wxId)){
            if (flag){