Merge branch 'dev' of chenweida/patient-co-management into dev

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

@@ -217,11 +217,12 @@ public class PrescriptionExpressageService {
    /**
     * 配送员（健管师）配送码
     *
     *  没用的代码
     * @param userCode
     * @param prescriptionDispensaryCode
     * @return
     */
    @Deprecated
    private Integer dispensaryCode_3(String userCode, PrescriptionDispensaryCode prescriptionDispensaryCode) throws Exception {
        //获取配送的医生信息
        Doctor doctor = doctorDao.findByCode(userCode);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionLogController.java

@@ -100,8 +100,8 @@ public class PrescriptionLogController extends BaseController {
                prescriptionLog.setCreateTime(prescriptionExpressageLog.getCreateTime());
                prescriptionLog.setHospital(prescriptionExpressageLog.getAcceptHospital());
                prescriptionLog.setHospitalName(prescriptionExpressageLog.getAcceptHospitalName());
                prescriptionLog.setUserCode(prescriptionExpressageLog.getAcceptUser());
                prescriptionLog.setUserName(prescriptionExpressageLog.getAcceptUserName());
                prescriptionLog.setUserCode(prescriptionExpressageLog.getExpressageUserCode());
                prescriptionLog.setUserName(prescriptionExpressageLog.getExpressageUserName());
                prescriptionLogs.add(prescriptionLog);
            }
            //排序

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/prescription/PatientPrescriptionLogController.java

@@ -65,8 +65,8 @@ public class PatientPrescriptionLogController extends BaseController {
                prescriptionLog.setCreateTime(prescriptionExpressageLog.getCreateTime());
                prescriptionLog.setHospital(prescriptionExpressageLog.getAcceptHospital());
                prescriptionLog.setHospitalName(prescriptionExpressageLog.getAcceptHospitalName());
                prescriptionLog.setUserCode(prescriptionExpressageLog.getAcceptUser());
                prescriptionLog.setUserName(prescriptionExpressageLog.getAcceptUserName());
                prescriptionLog.setUserCode(prescriptionExpressageLog.getExpressageUserCode());
                prescriptionLog.setUserName(prescriptionExpressageLog.getExpressageUserName());
                prescriptionLogs.add(prescriptionLog);
            }