Merge branch 'dev' of trick9191/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -59,6 +59,7 @@ import com.ylzinfo.ehc.trans.TransResponse;
import jxl.write.*;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.apache.commons.collections.functors.InstantiateFactory;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -1360,6 +1361,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    //设置his药品查询条件
                    setInspectionParam(jsonData,doctorMappingDO,outpatientDO,prescriptionDO,ins,Icd10);
                }
                //保存检查检验。
                wlyyInspectionDao.save(inspections);
            }
            //上传his开方
            return sendHisDiagnosis(jsonData,outpatientDO,prescription);
@@ -1442,7 +1445,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    public void setInspectionParam(com.alibaba.fastjson.JSONArray jsonData,DoctorMappingDO doctorMappingDO,WlyyOutpatientDO outpatientDO,WlyyPrescriptionDO prescriptionDO,WlyyInspectionDO inspectionDO,String Icd10){
        com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
        if(StringUtils.isNotBlank(prescriptionDO.getRealOrder())){
            json.put("realOrder",prescriptionDO.getRealOrder());
        }
        json.put("cardNo",outpatientDO.getCardNo());
        json.put("doctor",doctorMappingDO.getMappingCode());
        json.put("dept",inspectionDO.getDept());