Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/config/MvcConfig.java

@@ -18,7 +18,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 * Created by chenweida on 2017/4/6.
 */
@Configuration
//@Profile({"test", "prod"})
@Profile({"test", "prod"})
public class MvcConfig extends WebMvcConfigurerAdapter {
    private Logger logger = LoggerFactory.getLogger(MvcConfig.class);

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

@@ -132,7 +132,8 @@ public class PrescriptionExpressageService {
            }
            case 2: {
                //判断是2 配送员（健管师）取药码
                returnStatus = dispensaryCode_2(userCode, prescriptionDispensaryCode);
//                returnStatus = dispensaryCode_2(userCode, prescriptionDispensaryCode);
                returnStatus = -3;
                break;
            }
            case 3: {

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

@@ -279,8 +279,10 @@ public class PrescriptionInfoService extends BaseService {
     * @param code
     * @return
     */
    public com.alibaba.fastjson.JSONObject getPrescription(String code) {
        String rs = jwPrescriptionService.getRecipe(code, null);
    public com.alibaba.fastjson.JSONObject getPrescription(String code,String patient) {
        Patient p = patientDao.findByCode(patient);
        String rs = jwPrescriptionService.getRecipe(code, p.getSsc());
        com.alibaba.fastjson.JSONObject r = presModeAdapter.modelToSinglePrescription(rs);
        String rState = presCheckStateObj(code);
        if ("1".equals(rState)) {

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

@@ -405,10 +405,10 @@ public class PrescriptionInfoController extends BaseController {
    @RequestMapping(value = "/getPrescription", method = RequestMethod.GET)
    @ApiOperation(value = "获取长处方详细信息")
    public String getPrescription(@RequestParam(required = true) @ApiParam(name = "code", value = "处方CODE") String
                                          code) {
    public String getPrescription(@RequestParam(required = true) @ApiParam(name = "code", value = "处方CODE") String code
            ,@RequestParam(required = true) @ApiParam(name = "patient", value = "居民CODE") String  patient) {
        try {
            return write(200, "查询成功！", "data", prescriptionInfoService.getPrescription(code));
            return write(200, "查询成功！", "data", prescriptionInfoService.getPrescription(code,patient));
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败！");

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

@@ -59,7 +59,7 @@ public class PatientPrescriptionInfoController extends BaseController {
    @ApiOperation(value = "获取长处方详细信息")
    public String getPrescription(@RequestParam(required = true)@ApiParam(name="code",value="处方CODE")String code){
        try {
            return write(200, "查询成功！", "data", prescriptionInfoService.getPrescription(code));
            return write(200, "查询成功！", "data", prescriptionInfoService.getPrescription(code,getUID()));
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败！");