Browse Source

删除PC版本的项目

chenweida 7 years ago
parent
commit
841996229a

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

@ -68,7 +68,7 @@ public class PrescriptionExpressageService {
            prescriptionLogDao.save(prescriptionLog);
            return returnStatus;
        }
        if(prescriptionDispensaryCode.getIsUse()==1){
        if (prescriptionDispensaryCode.getIsUse() == 1) {
            //判断编码是否使用过
            PrescriptionLog prescriptionLog = new PrescriptionLog();
            prescriptionLog.setCode(UUID.randomUUID().toString());
@ -81,6 +81,7 @@ public class PrescriptionExpressageService {
            prescriptionLog.setStatus(PrescriptionLog.PrescriptionLogStatus.expressageing_error.getValue());
            prescriptionLog.setRemark("编码重复扫描");
            prescriptionLogDao.save(prescriptionLog);
            returnStatus = -2;
            return returnStatus;
        }
        switch (prescriptionDispensaryCode.getType()) {
@ -99,7 +100,7 @@ public class PrescriptionExpressageService {
                returnStatus = dispensaryCode_3(userCode, prescriptionDispensaryCode);
                break;
            }
            default:{
            default: {
                PrescriptionLog prescriptionLog = new PrescriptionLog();
                prescriptionLog.setCode(UUID.randomUUID().toString());
                prescriptionLog.setPrescriptionCode(prescriptionDispensaryCode.getPrescriptionCode());
@ -109,9 +110,10 @@ public class PrescriptionExpressageService {
                prescriptionLog.setUserCode(userCode);
                prescriptionLog.setUserType(2);
                prescriptionLog.setStatus(PrescriptionLog.PrescriptionLogStatus.expressageing_error.getValue());
                prescriptionLog.setRemark("二维码类型错误");
                prescriptionLog.setRemark("编码类型错误");
                prescriptionLogDao.save(prescriptionLog);
                break;
                returnStatus = -3;
                return returnStatus;
            }
        }
        return returnStatus;
@ -205,10 +207,11 @@ public class PrescriptionExpressageService {
    /**
     * 保存快递单号和增加处方物流记录为配送
     *
     * @param prescriptionExpressage
     * @throws Exception
     */
    public void updatePrescriptionExpressage(PrescriptionExpressage prescriptionExpressage)throws Exception{
    public void updatePrescriptionExpressage(PrescriptionExpressage prescriptionExpressage) throws Exception {
        //保存处方物流记录
        prescriptionExpressageDao.save(prescriptionExpressage);

+ 4 - 0
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionCodeController.java

@ -98,6 +98,10 @@ public class PrescriptionCodeController extends BaseController {
            Integer status = prescriptionExpressageService.expressage(code, getUID());
            if (status == -1) {
                return error(-1, "取药码错误");
            } else if (status == -2) {
                return error(-1, "编码已使用");
            } else if (status == -3) {
                return error(-1, "编码类型错误");
            }
            return write(200, "配送成功", "status", status);
        } catch (Exception e) {