用户 续方

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

@@ -82,7 +82,9 @@ public class MedOrderService {
            mediicineorder.setAllergyInfo(params.getString("rx_allergy_info"));
            mediicineorder.setPickUpNum(params.getString("pick_up_num"));
            mediicineorder.setSocialSecurityCardNum(params.getString("securityCardNum"));
            mediicineorder.setSocialinsurPayment(params.getString("SocialinsurPayment"));
            mediicineorder.setSocialinsurPayment(params.getString("socialinsurPayment"));
            mediicineorder.setOrderAmount(params.getString("orderAmount"));
            mediicineorder.setPayTime(params.getDate("payTime"));
            Mediicineorder ord=mediicineorderDao.save(mediicineorder);
            JSONArray jsonArray=params.getJSONArray("rx_drugs");
            List<Mediicineorderdetail> mediicineorderdetailList=new ArrayList<>();

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

@@ -95,11 +95,12 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
    public UserDO registerWithIdcard(UserDO userDO) {
        userDO.setSalt(randomString(5));
        if (org.springframework.util.StringUtils.isEmpty(userDO.getEnabled())){
            userDO.setEnabled(1);
        }else {
            userDO.setEnabled(userDO.getEnabled());
        }
//        if (org.springframework.util.StringUtils.isEmpty(userDO.getEnabled())){
//            userDO.setEnabled(1);
//        }else {
//            userDO.setEnabled(userDO.getEnabled());
//        }
        userDO.setEnabled(1);
        userDO.setLocked(0);
        userDO.setLoginFailureCount(0);
        String password = userDO.getPassword();
@@ -118,11 +119,12 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
     */
    public UserDO registerWithMobile(UserDO userDO) {
        userDO.setSalt(randomString(5));
        if (org.springframework.util.StringUtils.isEmpty(userDO.getEnabled())){
            userDO.setEnabled(1);
        }else {
            userDO.setEnabled(userDO.getEnabled());
        }
//        if (org.springframework.util.StringUtils.isEmpty(userDO.getEnabled())){
//            userDO.setEnabled(1);
//        }else {
//            userDO.setEnabled(userDO.getEnabled());
//        }
        userDO.setEnabled(1);
        userDO.setLocked(0);
        userDO.setLoginFailureCount(0);
        String password = userDO.getPassword();

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

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.a1entity.Mediicineorder;
import com.yihu.jw.entity.a1entity.Mediicineorderdetail;
import com.yihu.jw.entity.hospital.DmHospitalDO;
import com.yihu.jw.hospital.HospitalDao;
import com.yihu.jw.hospital.dao.med.MedicineorderDao;
import com.yihu.jw.hospital.dao.med.MediicineorderdetailDao;
import org.apache.commons.lang.StringUtils;
@@ -26,6 +28,8 @@ public class MedOrderService {
    MedicineorderDao mediicineorderDao;
    @Autowired
    MediicineorderdetailDao mediicineorderdetailDao;
    @Autowired
    HospitalDao hospitalDao;
    /**
     * 获取续方订单及药方
     * @return
@@ -50,6 +54,11 @@ public class MedOrderService {
            mediicineorder.setName(name);
            String age=params.getString("rx_patient_age");
            mediicineorder.setAge(age);
            String belongCommunity=params.getString("belong_community");
            mediicineorder.setBelongCommunity(belongCommunity);
            mediicineorder.setSellState("0");
            DmHospitalDO hospitalDO=hospitalDao.findByCode(belongCommunity);
            mediicineorder.setCommunity(hospitalDO.getName());
            mediicineorder.setUserId(params.getString("user_id"));
            mediicineorder.setShopNo(params.getString("shop_no"));
            mediicineorder.setPrescribeNum(params.getString("rx_no"));
@@ -70,8 +79,11 @@ 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.setPickUpNum(mediicineorder.getPrescribeNum());
            mediicineorder.setSocialSecurityCardNum(params.getString("securityCardNum"));
            mediicineorder.setSocialinsurPayment(params.getString("socialinsurPayment"));
            mediicineorder.setOrderAmount(params.getString("orderAmount"));
            mediicineorder.setPayTime(params.getDate("payTime"));
            Mediicineorder ord=mediicineorderDao.save(mediicineorder);
            JSONArray jsonArray=params.getJSONArray("rx_drugs");
            List<Mediicineorderdetail> mediicineorderdetailList=new ArrayList<>();
@@ -93,6 +105,8 @@ public class MedOrderService {
                mediicineorderdetail.setManufactor(jsonObject.getString("drug_firm_name"));
                mediicineorderdetail.setGoodsName(jsonObject.getString("drug_name"));
                mediicineorderdetail.setOrgCode(jsonObject.getString("org_code"));
                mediicineorderdetail.setName(ord.getName());
                mediicineorderdetail.setSex(ord.getSex());
                mediicineorderdetail.setIdOrder(ord.getId());
                mediicineorderdetail.setIdNum(ord.getIdNum());
                mediicineorderdetail.setOrderNo(ord.getOrderNum());