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

@@ -50,9 +50,9 @@ public class MedOrderService {
            mediicineorder.setName(name);
            String age=params.getString("rx_patient_age");
            mediicineorder.setAge(age);
            mediicineorder.setPrescribeNum(params.getString("rx_no"));
            mediicineorder.setUserId(params.getString("user_id"));
            mediicineorder.setShopNo(params.getString("shop_no"));
            mediicineorder.setPrescribeNum(params.getString("rx_no"));
            mediicineorder.setAddress(params.getString("rx_patient_address"));
            mediicineorder.setContact(params.getString("rx_patient_phone"));
            mediicineorder.setIdNum(params.getString("rx_patient_identity"));
@@ -70,6 +70,7 @@ public class MedOrderService {
            mediicineorder.setDeptName(params.getString("rx_doctor_name"));
            mediicineorder.setDoctorAdvice(params.getString("rx_doctoradvice"));
            mediicineorder.setAllergyInfo(params.getString("rx_allergy_info"));
            mediicineorder.setPickUpNum(params.getString("pick_up_num"));
            mediicineorder.setSocialSecurityCardNum(params.getString("SecurityCardNum"));
            Mediicineorder ord=mediicineorderDao.save(mediicineorder);
            JSONArray jsonArray=params.getJSONArray("rx_drugs");
@@ -84,17 +85,20 @@ public class MedOrderService {
                mediicineorderdetail.setDrugNum(jsonObject.getString("drug_num"));
                mediicineorderdetail.setPrice(jsonObject.getFloat("drug_price"));
                mediicineorderdetail.setUseNum(jsonObject.getString("drug_use_num"));
                mediicineorderdetail.setOrderNo(ord.getOrderNum());
                mediicineorderdetail.setUseWay(jsonObject.getString("drug_use_way"));
                mediicineorderdetail.setUseRate(jsonObject.getString("drug_use_rate"));
                mediicineorderdetail.setUseDose(jsonObject.getString("drug_use_dose"));
                mediicineorderdetail.setUnit(jsonObject.getString("drug_use_unit"));
                mediicineorderdetail.setUseWayAdd(jsonObject.getString("drug_use_way_add"));
                mediicineorderdetail.setManufactor(jsonObject.getString(" drug_firm_name"));
                mediicineorderdetail.setManufactor(jsonObject.getString("drug_firm_name"));
                mediicineorderdetail.setGoodsName(jsonObject.getString("drug_name"));
                mediicineorderdetail.setOrgCode(jsonObject.getString("org_code"));
                mediicineorderdetail.setIdOrder(ord.getId());
                mediicineorderdetail.setIdNum(ord.getIdNum());
                mediicineorderdetail.setOrderNo(ord.getOrderNum());
                mediicineorderdetail.setSocialSecurityCardNum(ord.getSocialSecurityCardNum());
                mediicineorderdetail.setGoodsName(jsonObject.getString("drug_name"));
                mediicineorderdetail.setPickUpNum(ord.getPickUpNum());
                mediicineorderdetail.setPrescribeNum(ord.getPrescribeNum());
                mediicineorderdetailList.add(mediicineorderdetail);
            }
            Iterable<Mediicineorderdetail>mediicineorderdetails= mediicineorderdetailDao.save(mediicineorderdetailList);

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -348,9 +348,9 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
            return result;
        }
        if (!StringUtils.isNoneBlank(userDO.getIdcard())){
            registerWithMobile(userDO);
            userDO = registerWithMobile(userDO);
        }else {
            registerWithIdcard(userDO);
            userDO = registerWithIdcard(userDO);
        }
        //组装用户与机构的关联关系

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/med/MedOrderService.java

@@ -70,6 +70,7 @@ public class MedOrderService {
            mediicineorder.setDeptName(params.getString("rx_doctor_name"));
            mediicineorder.setDoctorAdvice(params.getString("rx_doctoradvice"));
            mediicineorder.setAllergyInfo(params.getString("rx_allergy_info"));
            mediicineorder.setPickUpNum(params.getString("pick_up_num"));
            mediicineorder.setSocialSecurityCardNum(params.getString("SecurityCardNum"));
            Mediicineorder ord=mediicineorderDao.save(mediicineorder);
            JSONArray jsonArray=params.getJSONArray("rx_drugs");
@@ -96,6 +97,8 @@ public class MedOrderService {
                mediicineorderdetail.setIdNum(ord.getIdNum());
                mediicineorderdetail.setOrderNo(ord.getOrderNum());
                mediicineorderdetail.setSocialSecurityCardNum(ord.getSocialSecurityCardNum());
                mediicineorderdetail.setPickUpNum(ord.getPickUpNum());
                mediicineorderdetail.setPrescribeNum(ord.getPrescribeNum());
                mediicineorderdetailList.add(mediicineorderdetail);
            }
            Iterable<Mediicineorderdetail>mediicineorderdetails= mediicineorderdetailDao.save(mediicineorderdetailList);