chenjiasheng 3 rokov pred
rodič
commit
e7355b391d

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

@ -15,6 +15,7 @@ import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
@RestController
@ -31,7 +32,7 @@ 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");
        Mediicineorderdetail mediicineorderdetail=(Mediicineorderdetail) map.get("drugs");
        Iterable<Mediicineorderdetail> mediicineorderdetail= (List<Mediicineorderdetail>) map.get("drugs");
        if (map.size()>0&&mediicineorder!=null&&mediicineorderdetail!=null) {
            return success(map);
        }

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

@ -75,9 +75,11 @@ public class MedOrderService  {
            mediicineorder.setDoctorAdvice(params.getString(" rx_doctoradvice"));
            mediicineorder.setAllergyInfo(params.getString(" rx_allergy_info"));
            JSONArray jsonArray=params.getJSONArray("rx_drugs");
            Mediicineorderdetail mediicineorderdetail=new Mediicineorderdetail();
            List<Mediicineorderdetail> list=new ArrayList<>();
            Mediicineorderdetail mediicineorderdetail;
            for (int i = 0; i <jsonArray.size() ; i++) {
                JSONObject jsonObject=jsonArray.getJSONObject(i);
                mediicineorderdetail=new Mediicineorderdetail();
                mediicineorderdetail.setId(jsonObject.getString("drug_id"));
                mediicineorderdetail.setDrugSku(jsonObject.getString("drug_sku "));
                mediicineorderdetail.setDrugCode(jsonObject.getString("drug_code"));
@ -91,9 +93,10 @@ public class MedOrderService  {
                mediicineorderdetail.setUnit(jsonObject.getString("drug_use_unit"));
                mediicineorderdetail.setUseWayAdd(jsonObject.getString("drug_use_way_add"));
                mediicineorderdetail.setManufactor(jsonObject.getString(" drug_firm_name"));
                list.add(mediicineorderdetail);
            }
            Mediicineorder ord=mediicineorderDao.save(mediicineorder);
            Mediicineorderdetail drugs=mediicineorderdetailDao.save(mediicineorderdetail);
            Iterable<Mediicineorderdetail> drugs=mediicineorderdetailDao.save(list);
            result.put("order",ord);
            result.put("drugs",drugs);
            return result;