续方微修改

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedOrderEndpoint.java

@@ -6,6 +6,7 @@ import com.yihu.jw.base.service.a3service.MedOrderService;
import com.yihu.jw.base.service.a3service.MedicineDrugsService;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import com.yihu.jw.entity.a1entity.Mediicineorder;
import com.yihu.jw.entity.a1entity.Mediicineorderdetail;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
@@ -30,8 +31,8 @@ public class MedOrderEndpoint extends EnvelopRestEndpoint {
                                @RequestParam(value = "jsonData",required = true)String jsonData){
        Map <String,Object>map =medOrderService.saveOrder(jsonData);
        Mediicineorder mediicineorder=(Mediicineorder)map.get("order");
        Mediicinedrugs mediicinedrugs=(Mediicinedrugs)map.get("drugs");
        if (map.size()>0&&mediicineorder!=null&&mediicinedrugs!=null) {
        Mediicineorderdetail mediicineorderdetail=(Mediicineorderdetail) map.get("drugs");
        if (map.size()>0&&mediicineorder!=null&&mediicineorderdetail!=null) {
            return success(map);
        }
        return failed("处方已存在",500);

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

@@ -4,9 +4,11 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.dao.a2dao.MediicinedrugsDao;
import com.yihu.jw.base.dao.a2dao.MediicineorderDao;
import com.yihu.jw.base.dao.a2dao.MediicineorderdetailDao;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import com.yihu.jw.entity.a1entity.Mediicineorder;
import com.yihu.jw.entity.a1entity.Mediicineorderdetail;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
@@ -28,7 +30,7 @@ public class MedOrderService  {
    @Autowired
    MediicinedrugsDao mediicinedrugsDao;
    @Autowired
    HibenateUtils hibenateUtils;
    MediicineorderdetailDao mediicineorderdetailDao;
    /**
     * 获取续方订单及药方
     * @return
@@ -73,53 +75,52 @@ public class MedOrderService  {
            mediicineorder.setDoctorAdvice(params.getString(" rx_doctoradvice"));
            mediicineorder.setAllergyInfo(params.getString(" rx_allergy_info"));
            JSONArray jsonArray=params.getJSONArray("rx_drugs");
            Mediicinedrugs mediicinedrugs=new Mediicinedrugs();
            Mediicineorderdetail mediicineorderdetail=new Mediicineorderdetail();
            for (int i = 0; i <jsonArray.size() ; i++) {
                JSONObject jsonObject=jsonArray.getJSONObject(i);
                mediicinedrugs.setId(jsonObject.getString("drug_id"));
                mediicinedrugs.setDrugSku(jsonObject.getString("drug_sku "));
                mediicinedrugs.setDrugCode(jsonObject.getString("drug_code"));
                mediicinedrugs.setDrugName(jsonObject.getString("drug_name"));
                mediicinedrugs.setSpecif(jsonObject.getString("drug_specs"));
                mediicinedrugs.setDrugNum(jsonObject.getFloat("drug_num"));
                mediicinedrugs.setPrice(jsonObject.getFloat("drug_price"));
                mediicinedrugs.setUseNum(jsonObject.getFloat("drug_use_num"));
                mediicinedrugs.setUseWay(jsonObject.getString(" drug_use_way"));
                mediicinedrugs.setUseRate(jsonObject.getString(" drug_use_rate"));
                mediicinedrugs.setUseDose(jsonObject.getString(" drug_use_dose"));
                mediicinedrugs.setUnit(jsonObject.getString("drug_use_unit"));
                mediicinedrugs.setUseWayAdd(jsonObject.getString("drug_use_way_add"));
                mediicinedrugs.setManufactor(jsonObject.getString(" drug_firm_name"));
                mediicineorderdetail.setId(jsonObject.getString("drug_id"));
                mediicineorderdetail.setDrugSku(jsonObject.getString("drug_sku "));
                mediicineorderdetail.setDrugCode(jsonObject.getString("drug_code"));
                mediicineorderdetail.setSpecif(jsonObject.getString("drug_specs"));
                mediicineorderdetail.setDrugNum(jsonObject.getFloat("drug_num"));
                mediicineorderdetail.setPrice(jsonObject.getFloat("drug_price"));
                mediicineorderdetail.setUseNum(jsonObject.getFloat("drug_use_num"));
                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"));
            }
            Mediicineorder ord=mediicineorderDao.save(mediicineorder);
            Mediicinedrugs drugs=mediicinedrugsDao.save(mediicinedrugs);
            Mediicineorderdetail drugs=mediicineorderdetailDao.save(mediicineorderdetail);
            result.put("order",ord);
            result.put("drugs",drugs);
            return result;
        }
        return null;
    }
    public List getOrgPhysicDict1(String jsonData) throws Exception {
        List<Mediicinedrugs> list=new ArrayList<>();
        if (StringUtils.isNotBlank(jsonData)){
            JSONObject params=JSONObject.parseObject(jsonData);
            JSONArray jsonArray=params.getJSONArray("data");
            for (int i = 0; i <jsonArray.size() ; i++) {
                JSONObject jsonObject=jsonArray.getJSONObject(i);
                Mediicinedrugs mediicinedrugs=new Mediicinedrugs();
                mediicinedrugs.setDrugCode(jsonObject.getString("physic_code"));
                mediicinedrugs.setDrugName(jsonObject.getString("physic_name"));
                mediicinedrugs.setSpecif(jsonObject.getString("physic_spec"));
                mediicinedrugs.setUnit(jsonObject.getString("dose_unit"));
                mediicinedrugs.setUseDose(jsonObject.getString("min_dose"));
                mediicinedrugs.setPrice(jsonObject.getFloat("retail_price"));
                mediicinedrugs.setDosForm(jsonObject.getString("physic_form"));
                mediicinedrugs.setDrugClass(jsonObject.getString("subject_class"));
                list.add(mediicinedrugsDao.save(mediicinedrugs));
            }
            return list;
        }
        return null;
    }
//    public List getOrgPhysicDict1(String jsonData) throws Exception {
//        List<Mediicinedrugs> list=new ArrayList<>();
//        if (StringUtils.isNotBlank(jsonData)){
//            JSONObject params=JSONObject.parseObject(jsonData);
//            JSONArray jsonArray=params.getJSONArray("data");
//            for (int i = 0; i <jsonArray.size() ; i++) {
//                JSONObject jsonObject=jsonArray.getJSONObject(i);
//                Mediicinedrugs mediicinedrugs=new Mediicinedrugs();
//                mediicinedrugs.setDrugCode(jsonObject.getString("physic_code"));
//                mediicinedrugs.setDrugName(jsonObject.getString("physic_name"));
//                mediicinedrugs.setSpecif(jsonObject.getString("physic_spec"));
//                mediicinedrugs.setUnit(jsonObject.getString("dose_unit"));
//                mediicinedrugs.setUseDose(jsonObject.getString("min_dose"));
//                mediicinedrugs.setPrice(jsonObject.getFloat("retail_price"));
//                mediicinedrugs.setDosForm(jsonObject.getString("physic_form"));
//                mediicinedrugs.setDrugClass(jsonObject.getString("subject_class"));
//                list.add(mediicinedrugsDao.save(mediicinedrugs));
//            }
//            return list;
//        }
//        return null;
//    }
}

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

@@ -58,7 +58,7 @@ public class MedicineServive {
                        org.setUnit(h.getString("dose_unit"));
                        org.setUseDose(h.getString("min_dose"));
                        org.setOrgCode(h.getString("orgCode"));
                        Mediicinedrugs mediicinedrugs=mediicinedrugsDao.save(org);
                        mediicinedrugsDao.save(org);
                        addCount++;
                    }else{
                        Mediicinedrugs org = mediicinedrugsDao.findByDrugCode(drugCode);