Merge branch 'medicare' of liubing/wlyy2.0 into medicare

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicineorder.java

@@ -131,7 +131,7 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
    private Date prescribeTime;
    /**
     * 出货状态
     * 出货状态  -4订单超过规定取药时间 -3药品无药 -2作废 -1线下药房 0待发药 1已发药
     */
    private String sellState;

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/open/nologin/ServiceNoLoginEndPoint.java

@@ -154,6 +154,16 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
                return failed("电子健康卡扫码失败");
            }
        }
        //流程更改所有订单都需要重新拉取订单，只返回未取药订单数据，避免患者超过有效期后才去取药。
        if (StringUtils.isBlank(cardNum)&&StringUtils.isNotBlank(pickUpNum)){
            try {
                cardNum = orderservice.getCardNum(pickUpNum);
            }catch (Exception e){
                return failed(e.getMessage());
            }
        }
        //拉取线下智业订单
        if (StringUtils.isNoneBlank(cardNum)){
            orderservice.getPhysicApplyWaitExecList(deviceId,cardNum,patientName);

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineOrderService.java

@@ -1458,6 +1458,8 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                    JSONObject data = ehc.getJSONObject("data");
                    String code = data.getString("CODE");
                    if (code.equalsIgnoreCase("1")){
                        String sql = " update t_mediicine_order set sell_state=-4  where social_security_card_num='"+cardNo+"' and sell_state=0 and belong_community='"+mediicinedevice.getBelongCommunity()+"' ";
                        jdbcTemplate.execute(sql);
                        JSONArray array = data.getJSONArray("returnData");
                        if (array!=null&&array.size()!=0){
                            JSONArray jsonArray = array.getJSONArray(0);
@@ -1466,7 +1468,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                                String realOrder = jsonObject.getString("RECIPE_NO");
                                String alyNo = jsonObject.getString("APPLY_NO");
                                Mediicineorder mediicineorder = orderDao.findByOrderNum(realOrder);
                                if (mediicineorder==null){
                                if (mediicineorder==null) {
                                    mediicineorder = new Mediicineorder();
                                    mediicineorder.setOrderNum(realOrder);
                                    mediicineorder.setApplyNo(alyNo);
@@ -1477,7 +1479,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                                    mediicineorder.setPrescribeNum(realOrder);
                                    mediicineorder.setSellState("0");
                                    mediicineorder.setInfo("慢病");
                                    if (org.apache.commons.lang.StringUtils.isNotBlank(patientName)){
                                    if (org.apache.commons.lang.StringUtils.isNotBlank(patientName)) {
                                        mediicineorder.setName(patientName);
                                    }
                                    mediicineorder.setSocialSecurityCardNum(cardNo);
@@ -1485,16 +1487,16 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                                    mediicineorder.setCommunity(community);
                                    mediicineorder.setDeptNum(jsonObject.getString("EXEC_DEPT"));
                                    mediicineorder.setDoctorName(jsonObject.getString("APPLY_OPERATOR_NAME"));
                                    mediicineorder.setPrescribeTime(DateUtil.strToDateLong(jsonObject.getString("APPLY_TIME")+" 00:00:00"));
                                    mediicineorder.setPayTime(DateUtil.strToDateLong(jsonObject.getString("APPLY_TIME")+" 00:00:00"));
                                    mediicineorder.setPrescribeTime(DateUtil.strToDateLong(jsonObject.getString("APPLY_TIME") + " 00:00:00"));
                                    mediicineorder.setPayTime(DateUtil.strToDateLong(jsonObject.getString("APPLY_TIME") + " 00:00:00"));
                                    mediicineorder = orderDao.save(mediicineorder);
                                    JSONArray drugList = jsonObject.getJSONArray("APPLY_DETAIL");
                                    for (int j =0;j<drugList.size();j++){
                                    for (int j = 0; j < drugList.size(); j++) {
                                        JSONObject drugObj = drugList.getJSONObject(j);
                                        String itemQc = drugObj.getString("ITEM_QUANTITY_C");
                                        String quantity = getNumbers(itemQc);
                                        String packageName = splitNotNumber(itemQc);
                                        if (!org.apache.commons.lang3.StringUtils.isNoneBlank(quantity)){
                                        if (!org.apache.commons.lang3.StringUtils.isNoneBlank(quantity)) {
                                            mediicineorder.setOrderState("-1");
                                            mediicineorder.setSellState("-3");
                                            orderDao.save(mediicineorder);
@@ -1520,6 +1522,9 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                                        mediicineorderdetail.setSocialSecurityCardNum(cardNo);
                                        orderdetailDao.save(mediicineorderdetail);
                                    }
                                }else {
                                    mediicineorder.setSellState("0");
                                    orderDao.save(mediicineorder);
                                }
                            }
                        }
@@ -2130,6 +2135,19 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
//        return result;
    }
    /**
     * 通过取药码获取卡号
     * @param pickUpNum
     * @return
     */
    public String getCardNum(String pickUpNum) throws Exception {
        Mediicineorder mediicineorder = orderDao.findMediicineorderByPickUpNum(pickUpNum);
        if (null==mediicineorder){
            throw new Exception("二维码（取药码）错误");
        }
        return mediicineorder.getSocialSecurityCardNum();
    }
    /**
     * 检查订单并且返回订单列表