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

patient-co-wlyy/src/main/java/com/yihu/wlyy/entity/patient/Patient.java

@@ -30,6 +30,7 @@ public class Patient extends IdEntity implements Serializable {
	 */
	private static final long serialVersionUID = 8358924836164389434L;
	private String test;
	// 业务主键
	private String code;
	// 身份证号

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/label/SignPatientLabelInfoService.java

@@ -227,6 +227,9 @@ public class SignPatientLabelInfoService extends BaseService {
            json.put("renewTime", renew.get("czrq"));
        }
        json.put("countryCode",p.getSickVillage()==null?"":p.getSickVillage());
        json.put("countryName",p.getSickVillageName()==null?"":p.getSickVillageName());
        return json;
    }

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

@@ -0,0 +1,13 @@
package com.yihu.wlyy.service.app.prescription;
import com.yihu.wlyy.service.BaseService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
 * Created by Trick on 2017/7/25.
 */
@Service
@Transactional
public class PrescriptionInfoService extends BaseService {
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorFamilyContractController.java

@@ -900,6 +900,9 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                    json.put("jtSign", new JSONObject(jtSign));
                }
                json.put("countryCode",temp.getSickVillage()==null?"":temp.getSickVillage());
                json.put("countryName",temp.getSickVillageName()==null?"":temp.getSickVillageName());
                return write(200, "患者信息查询成功！", "data", json);
            } else {
                return error(-1, "患者信息查询失败！");
@@ -969,6 +972,9 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                    json.put("jtSign", new JSONObject(jtSign));
                }
                json.put("countryCode",temp.getSickVillage()==null?"":temp.getSickVillage());
                json.put("countryName",temp.getSickVillageName()==null?"":temp.getSickVillageName());
                return write(200, "患者信息查询成功！", "data", json);
            } else {
                return error(-1, "患者信息查询失败！");

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

@@ -0,0 +1,18 @@
package com.yihu.wlyy.web.patient.prescription;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
/**
 * Created by Trick on 2017/7/25.
 */
@Controller
@RequestMapping(value = "/patient/prescriptionInfo", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者端-长处方接口")
public class PatientPrescriptionInfoController extends BaseController {
}