Home Explore Help
Register Sign In
humingfen
/
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 4 years ago
parent
dee98f76ae
commit
2e7d95e292
1 changed files with 6 additions and 4 deletions
Split View Show Diff Stats
  1. 6 4
      business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

+ 6 - 4
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java
View File 

@ -2134,9 +2134,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
 
        WlyyPrescriptionDO prescription = prescriptionDao.save(prescriptionDO);
 
        //========================处方操作结束=============================================================
 
        if(!StringUtils.isNotBlank(prescriptionId)){
 
            //加入处方状态变更流水日志
 
            prescriptionLogService.addPrescriptionLog(prescription.getId(), 10, 2, outpatientDO.getDoctor(), outpatientDO.getDoctorName(), "", new Date());
 
        }
 
        //加入处方状态变更流水日志
 
        prescriptionLogService.addPrescriptionLog(prescription.getId(), 0, 2, outpatientDO.getDoctor(), outpatientDO.getDoctorName(), "", new Date());
 
        //============================下诊断==============================================================
 
        //删除之前诊断
 
@ -8075,8 +8077,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
 
     */
 
    public PageEnvelop findPatientAllPrescription(String keyName, String status, Integer page, Integer size) {
 
        String uid = userAgent.getUID();
 
        StringBuffer sql = new StringBuffer(" SELECT b.*, c.oneself_pickup_flg,f.job_title_code,f.job_title_name  FROM (SELECT a.* FROM wlyy_prescription a WHERE a.patient_code = '");
 
        StringBuffer countSql = new StringBuffer("select COUNT(b.id) count FROM (SELECT a.* FROM wlyy_prescription a WHERE a.patient_code = '");
 
        StringBuffer sql = new StringBuffer(" SELECT b.*, c.oneself_pickup_flg,f.job_title_code,f.job_title_name  FROM (SELECT a.* FROM wlyy_prescription a left join wlyy_outpatient o ON o.id=a.outpatient_id  WHERE o.consumer = '");
 
        StringBuffer countSql = new StringBuffer("select COUNT(b.id) count FROM (SELECT a.* FROM wlyy_prescription a left join wlyy_outpatient o ON o.id=a.outpatient_id  WHERE o.consumer = '");
 
        sql.append(uid).append("') b LEFT JOIN wlyy_prescription_info d ON b.id = d.prescription_id LEFT JOIN wlyy_prescription_expressage c ON c.outpatient_id = b.outpatient_id LEFT JOIN base_doctor f ON b.doctor=f.id  ");
 
        countSql.append(uid).append("') b LEFT JOIN wlyy_prescription_info d ON b.id = d.prescription_id LEFT JOIN wlyy_prescription_expressage c ON c.outpatient_id = b.outpatient_id LEFT JOIN base_doctor f ON b.doctor=f.id  ");