Home Explore Help
Register Sign In
liubing
/
wlyy2.0
forked from Amoy2/wlyy2.0
Watch 1
Star 0
Fork 0
Files
Browse Source

Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionExpressageLogDO.java
wangzhinan 5 years ago
parent
bae90a4ca0
commit
88f5f09f15
1 changed files with 14 additions and 4 deletions
Split View Show Diff Stats
  1. 14 4
      svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

+ 14 - 4
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java
View File 

@ -16,14 +16,12 @@ import com.yihu.jw.entity.hospital.article.KnowledgeArticleUserDO;
 
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
 
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDO;
 
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionInfoDO;
 
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionLogDO;
 
import com.yihu.jw.entity.order.BusinessOrderDO;
 
import com.yihu.jw.entity.ylzinfo.OauthYlzConfigDO;
 
import com.yihu.jw.hospital.dao.consult.KnowledgeArticleUserDao;
 
import com.yihu.jw.hospital.httplog.dao.WlyyHttpLogDao;
 
import com.yihu.jw.hospital.prescription.dao.OauthYlzConfigDao;
 
import com.yihu.jw.hospital.prescription.dao.OutpatientDao;
 
import com.yihu.jw.hospital.prescription.dao.PrescriptionDao;
 
import com.yihu.jw.hospital.prescription.dao.PrescriptionInfoDao;
 
import com.yihu.jw.hospital.prescription.dao.*;
 
import com.yihu.jw.hospital.prescription.service.PayInfoNoticeService;
 
import com.yihu.jw.hospital.prescription.service.PrescriptionExpressageService;
 
import com.yihu.jw.hospital.prescription.service.PrescriptionService;
 
@ -151,6 +149,8 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
 
    private PayInfoNoticeService payInfoNoticeService;
 
    @Autowired
 
    private OutpatientDao outpatientDao;
 
    @Autowired
 
    private PrescriptionLogDao prescriptionLogDao;
 
    private String successxml = "SUCCESS";
 
@ -852,6 +852,16 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
 
                                    String patient = prescriptionDO.getPatientCode();
 
                                    if (prescriptionDO.getStatus()!=30){
 
                                        String pushPayLog = payInfoNoticeService.pushPrescriptionPay(prescriptionDO.getPatientCode(),prescriptionDO.getDoctorName(),voucherNo,prescriptionDO.getOutpatientId(),prescriptionDO.getId(),prescriptionDO.getDrugFee().toString());
 
                                        WlyyPrescriptionLogDO prescriptionLogDO = new WlyyPrescriptionLogDO();
 
                                        prescriptionLogDO.setCreateTime(new Date());
 
                                        prescriptionLogDO.setStatus(30);
 
                                        prescriptionLogDO.setOutpatientId(prescriptionDO.getOutpatientId());
 
                                        prescriptionLogDO.setPrescriptionCode(prescriptionDO.getId());
 
                                        prescriptionLogDO.setUserCode(prescriptionDO.getPatientCode());
 
                                        prescriptionLogDO.setUserName(prescriptionDO.getPatientName());
 
                                        prescriptionLogDO.setUserType(1);
 
                                        prescriptionLogDO.setDatajson("处方结算");
 
                                        prescriptionLogDao.save(prescriptionLogDO);
 
                                        logger.info("处方结算成功"+pushPayLog+"====="+waitPayDetailVO.getRecipeNo());
 
                                    }
 
                                }