修改药品查询接口

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PatientPrescriptionPayService.java

@@ -26,6 +26,7 @@ import com.yihu.wlyy.repository.patient.SignFamilyDao;
import com.yihu.wlyy.repository.prescription.*;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.service.third.httplog.LogService;
import com.yihu.wlyy.service.third.jw.JwPrescriptionService;
import com.yihu.wlyy.service.weixin.wxpay.common.Configure;
import com.yihu.wlyy.service.weixin.wxpay.model.BindCard;
import com.yihu.wlyy.service.weixin.wxpay.model.Charge;
@@ -119,6 +120,8 @@ public class PatientPrescriptionPayService extends BaseService {
    private PrescriptionInfoService infoService;
    @Autowired
    private PushMsgTask pushMsgTask;
    @Autowired
    private JwPrescriptionService jwPrescriptionService;
    /**
     * 长处方配送信息查询接口
@@ -512,7 +515,8 @@ public class PatientPrescriptionPayService extends BaseService {
                            message.setCzrq(new Date());
                            messageDao.save(message);
                        }
                       //支付成功发起结算
                        jwPrescriptionService.executeSickSettle(prescriptionCode);
                    } else if ("1".equals(tradeStatus)) {
                        prescriptionPay.setTradeStatus("0");//交易状态 成功1 失败0
                        prescription.setStatus(21);////续费状态 30支付成功 21支付失败

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jw/ZyDictService.java

@@ -72,19 +72,11 @@ public class ZyDictService {
     * @return
     */
    public List<Map<String, Object>> findDictByDoctorAndName(String doctor,String name){
        String sql = "select " +
                        "p.physic_code drugCode," +
                        "p.physic_name drugName," +
                        "p.physic_spec drugFormat" +
                        " from zy_iv_physic_dict p," +
                        " (SELECT o.physic_code" +
                        "   ,o.org_code " +
                        "   from " +
                        "       wlyy_doctor_mapping h," +
                        "       zy_iv_org_physic_allot_dict o" +
                        "   WHERE o.org_code = h.jw_doctor_hospital " +
                        "   and h.doctor_code = ?) ho" +
                        " WHERE ho.physic_code = p.physic_code";
        String sql = "SELECT yp.physic_code drugCode,yp.physic_name drugName,yp.physic_spec drugFormat,yp.subject_class subjectClass,yp.dose_unit physicDoseUnit, " +
                " com1.`name`physicDoseUnitName,yp.quantity_unit drugNumUnit,com2.`name`drugNumUnitName FROM zy_common_dict com1,zy_common_dict com2,(SELECT p.physic_code, " +
                " p.physic_name,p.physic_spec,p.subject_class,p.dose_unit,p.quantity_unit,class.class_name FROM zy_iv_subject_class_dict class,zy_iv_physic_dict p, " +
                " (SELECT o.physic_code,o.org_code FROM wlyy_doctor_mapping h,zy_iv_org_physic_allot_dict o WHERE o.org_code=h.jw_doctor_hospital AND h.doctor_code=? " +
                " )ho WHERE ho.physic_code=p.physic_code AND class.class_code=p.subject_class  " ;
        if(StringUtils.isNotBlank(name)){
            if(isEnglish(name)){
                sql += " and p.spell_code like '%"+name.toUpperCase()+"%'";
@@ -92,6 +84,7 @@ public class ZyDictService {
                sql += " and p.physic_name like '%"+name+"%'";
            }
        }
        sql +=" )yp WHERE com1.dict_name='IV_MEASURE_UNIT_DICT'AND com1.`code`=yp.dose_unit AND com2.dict_name='IV_MEASURE_UNIT_DICT'AND com2.`code`=yp.quantity_unit;";
//        subjectClass
//        drugNumUnit":"224","drugNumUnitName":"支",
//        physicDoseUnit":"224","physicDoseUnitName":"支",