Merge branch 'master' of http://106.14.62.141:8081/sa_aidea/aidea

aidea-modules/couponrecord-module/src/main/java/com/cftech/couponrecord/service/impl/PdaCouponrecordServiceImpl.java

@@ -67,7 +67,7 @@ public class PdaCouponrecordServiceImpl implements PdaCouponrecordService {
                         map.put("id", logId);
                         map.put("resultJson", rtnJson.toString());
                         map.put("status", 1);
-                        couponrecordMapper.updatePdaLog(map);
+                       // couponrecordMapper.updatePdaLog(map);
                     }
                 } else if (info.getStatus().equals("0")) {
                     rtnJson.put("code", 500);
@@ -77,12 +77,22 @@ public class PdaCouponrecordServiceImpl implements PdaCouponrecordService {
                     map.put("resultJson", rtnJson.toString());
                     map.put("status", 1);
                 } else if (info.getStatus().equals("2")) {
+                    Map<String, Object> map1 = couponrecordMapper.getHospitalIdByfaNo(facilityNo);
+                    if (map1 != null && map1.size() > 0) {
                         rtnJson.put("code", 201);
                         rtnJson.put("msg", "检测券已使用！");
                         map = new HashMap<String, Object>();
                         map.put("id", logId);
                         map.put("resultJson", rtnJson.toString());
                         map.put("status", 1);
+                    } else {
+                        rtnJson.put("code", 500);
+                        rtnJson.put("msg", "未找到设备号对应的医院！");
+                        map = new HashMap<String, Object>();
+                        map.put("id", logId);
+                        map.put("resultJson", rtnJson.toString());
+                        map.put("status", 1);
+                    }
                 } else {
                     rtnJson.put("code", 500);
                     rtnJson.put("msg", "检测券已过期！");